From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F068C6FD1D for ; Wed, 15 Mar 2023 10:11:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 22C6D6B0078; Wed, 15 Mar 2023 06:11:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1DCC76B007E; Wed, 15 Mar 2023 06:11:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0A4A76B0080; Wed, 15 Mar 2023 06:11:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id EEE076B0078 for ; Wed, 15 Mar 2023 06:11:37 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id BB8A3160F44 for ; Wed, 15 Mar 2023 10:11:37 +0000 (UTC) X-FDA: 80570715834.12.3D79F19 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf06.hostedemail.com (Postfix) with ESMTP id ED8E2180011 for ; Wed, 15 Mar 2023 10:11:34 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=bi4WlO+P; spf=pass (imf06.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678875095; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=gGOhqYzvgOVUybin5m74msNdFZN11sTEmBLada2nY/g=; b=2M2oevbvpBivAwpIW/ig/96jbw9+HHoPWXswXn8O23zu1qaPgXj/8Bvih1cV8W4i7Zu7XA SbYAfLGu8BkypTIlL1HO/vn1c69APhA1VIH20t3/7Yd8kKmjb/kfVOCOq6mUWPiDjZYwl1 ZkoZxxGwcVYgIElC+LJAHA3OR/Vldlw= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=bi4WlO+P; spf=pass (imf06.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678875095; a=rsa-sha256; cv=none; b=BX1YEw1S4byimf+v9QmNg78e2rqIfxtuafgMQ8IvFtge0hPwG4H8SqBtX4hSqcH5C/l7b2 6cB7/ebTPQxg5Rq73MolTmIFRmSPpYcrGwm/V5rGrJ6wKJfR72eN+fTMRtDGI5XnC0Zk/p hV3ZinokMnWFjdHKEltmB+rtqN6etoY= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 26D5E61CCF; Wed, 15 Mar 2023 10:11:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4955C433EF; Wed, 15 Mar 2023 10:11:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678875094; bh=2YGepKnUPthEHs7BQ3Q+GQKbEKurUEPs7Ce+pm8dnSY=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=bi4WlO+P3WmbfFnHs3sAxtbjF+f9YngYjr6v4pXaWK9RWakpxCbwRcTOpzkhoa4Wg j1ypCrLwRfVf6xfDBFZ507BCzqNSJkeb/n/z+yyyFMKVbJYRl5rwhhAvjfdBV90GAB 6/6VFINYnVs90LOu+8AE/1lyqs6ON1wpU95b0S4Cy+El5lmlIVouaSicrJRA+HR/bf sNj06iDNDmSJfpEsOEQ6rBOl6tCUA4sjMsFjrRSUAFuGvOvmFynFAT8gc7abFuw7kq nqViw81tQ94e5w0JBezD/KNYw4hahde/BS8kvvpw5/lOnxBcKukgiOLw1+iEGbyVci aYgevpUdgY3bQ== Date: Wed, 15 Mar 2023 12:11:21 +0200 From: Mike Rapoport To: "Matthew Wilcox (Oracle)" Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, "David S. Miller" , sparclinux@vger.kernel.org Subject: Re: [PATCH v4 24/36] sparc32: Implement the new page table range API Message-ID: References: <20230315051444.3229621-1-willy@infradead.org> <20230315051444.3229621-25-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230315051444.3229621-25-willy@infradead.org> X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: ED8E2180011 X-Stat-Signature: 1ajmynde4kyp9dy5pyjt6m7cahkngx4y X-HE-Tag: 1678875094-410974 X-HE-Meta: U2FsdGVkX1+vRgKx+MyUk3QgTfs8ma6/FoJrnLUg/68xkOKdglmcY6P996+uIhUCpqqtqxjcSCujnhGWKotzI+4MblOaQ/6A9C/va8h7yrVKt4gbeUqx4ttKMRfDv8jaIu+7xQUzE7aJN/Gy04Vy35P+nlK/yZCL/FTfdiUnyA9tomf4UVEUliAO+yC07Lo62xpdV0+pEY3FnHEUL9METTLEIpgVawcaqg+o41r22oTjTU16k2ynjHyL2p2wLuyYjnRweE+SbNabll7VFP6PWcok6n+9NbcfQyqn3uqO9f6KTxzcFd7a6k4d9nOwLQ7PYjuLJYLypU1CJSXCfVNGIJbG5p/l0+1Rt1lF+M/F3R7tRkzTZ0xIOsdXFl+T3whqICsj13anodyZkMQndwR8ieG8BPiz59chCAYgPxfbHFZYYmE94oRiyAnRvslKXcIgUBXluXDuwDV1wtdMU/lhmdcOYCcVKdPocDqmjy6fB0brWqR1w3R687GgjoUxMe+zM6knrsTvZptiguRyp75EZkJd9NpM/4bkRzH8tK30hDUbJqSeRsfkGqU+SFs0PvW1/tC+yp0liOp1JaaU6Ks9MBNRpKDBeMVfNc5snaAmVSMB6/W6UI2ett29Fz6sCKbYvFn21/vEqiM4LS3OrGGDNapW00rpHyABlSyYvAme5mgQMjV+y2/afroUkPSEpCzQLQQe5nVkTNhy3BvXlou7TxEYiggCO9mVPk2YXtTurW9TTj6Iovppj0qbjUvAx2sL5q4X9nC4iS5D47/KClD7Vp00zC+SahbM/pvORNOz6nD2WwD24D3Yi3jJchWcCaKFcA3ramBdaNxOztmTcd6zGkYsTj2y08UJTD9cjIt4hLoKG3ZBZYAQyfoWKVY49PxtqM2hghZWqVESx/q997uYp+NFHodBE8fQ5U4qqtDdspjiiWwNVv9Em+4v/wxZyfb8QR1S2uWOpB0OOG/1VEP P/dFM5jh pJup3sVt6IfTu0OxO0uOJNK5LIn+0FOAju+b86d1y/nHSQW9tgViPTkkfVrAqmDAmoSw2mM4b3VFyouLXr62Kfoj6sshBloEo2mRcBjx2J0D7toiyBv1DRDWwiIhk5Uhc1r9LpXzGynNp/fr7yPptuoxlfJA8jef+TEGVcy12y9IhYBOAE26tOh8cay8pJTN//wOu8SAjW0fIILOoSHCOjCtkdl58BFa/YjfpvEAoi7Ex3loOBUu77OyA7Qf+EisE6nvta9BajRvN7H+FDkKmvEB+VrxDIFwroGHa3oklSQ4FmtF1rl/wCz0AZMKu+YHhvBmRQe1JEhuq56r07r9ppKHvuFhPDIJgY9Nm6Iih0qH9bOLvN8PhaWN+nbPYOz0emV4wlX8GF1TadsyTAAsML6MuWt+bp5hQGy5QBE8Ay2wSZh/VsRGo6n8yKEUwcZy8rmUMXd7WhXFxkJ37EBuZyrig0XKfdRqYQO2d74gIjiKjTjk= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: On Wed, Mar 15, 2023 at 05:14:32AM +0000, Matthew Wilcox (Oracle) wrote: > Add PFN_PTE_SHIFT, update_mmu_cache_range(), flush_dcache_folio() and > flush_icache_pages(). > > Signed-off-by: Matthew Wilcox (Oracle) > Cc: "David S. Miller" > Cc: sparclinux@vger.kernel.org Acked-by: Mike Rapoport (IBM) > --- > arch/sparc/include/asm/cacheflush_32.h | 9 +++++++-- > arch/sparc/include/asm/pgtable_32.h | 8 ++++---- > arch/sparc/mm/init_32.c | 13 +++++++++++-- > 3 files changed, 22 insertions(+), 8 deletions(-) > > diff --git a/arch/sparc/include/asm/cacheflush_32.h b/arch/sparc/include/asm/cacheflush_32.h > index adb6991d0455..8dba35d63328 100644 > --- a/arch/sparc/include/asm/cacheflush_32.h > +++ b/arch/sparc/include/asm/cacheflush_32.h > @@ -16,6 +16,7 @@ > sparc32_cachetlb_ops->cache_page(vma, addr) > #define flush_icache_range(start, end) do { } while (0) > #define flush_icache_page(vma, pg) do { } while (0) > +#define flush_icache_pages(vma, pg, nr) do { } while (0) > > #define copy_to_user_page(vma, page, vaddr, dst, src, len) \ > do { \ > @@ -35,11 +36,15 @@ > #define flush_page_for_dma(addr) \ > sparc32_cachetlb_ops->page_for_dma(addr) > > -struct page; > void sparc_flush_page_to_ram(struct page *page); > +void sparc_flush_folio_to_ram(struct folio *folio); > > #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 > -#define flush_dcache_page(page) sparc_flush_page_to_ram(page) > +#define flush_dcache_folio(folio) sparc_flush_folio_to_ram(folio) > +static inline void flush_dcache_page(struct page *page) > +{ > + flush_dcache_folio(page_folio(page)); > +} > #define flush_dcache_mmap_lock(mapping) do { } while (0) > #define flush_dcache_mmap_unlock(mapping) do { } while (0) > > diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h > index d4330e3c57a6..7514611d14d3 100644 > --- a/arch/sparc/include/asm/pgtable_32.h > +++ b/arch/sparc/include/asm/pgtable_32.h > @@ -101,8 +101,6 @@ static inline void set_pte(pte_t *ptep, pte_t pteval) > srmmu_swap((unsigned long *)ptep, pte_val(pteval)); > } > > -#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval) > - > static inline int srmmu_device_memory(unsigned long x) > { > return ((x & 0xF0000000) != 0); > @@ -256,6 +254,7 @@ static inline pte_t pte_mkyoung(pte_t pte) > return __pte(pte_val(pte) | SRMMU_REF); > } > > +#define PFN_PTE_SHIFT (PAGE_SHIFT - 4) > #define pfn_pte(pfn, prot) mk_pte(pfn_to_page(pfn), prot) > > static inline unsigned long pte_pfn(pte_t pte) > @@ -268,7 +267,7 @@ static inline unsigned long pte_pfn(pte_t pte) > */ > return ~0UL; > } > - return (pte_val(pte) & SRMMU_PTE_PMASK) >> (PAGE_SHIFT-4); > + return (pte_val(pte) & SRMMU_PTE_PMASK) >> PFN_PTE_SHIFT; > } > > #define pte_page(pte) pfn_to_page(pte_pfn(pte)) > @@ -318,6 +317,7 @@ void mmu_info(struct seq_file *m); > #define FAULT_CODE_USER 0x4 > > #define update_mmu_cache(vma, address, ptep) do { } while (0) > +#define update_mmu_cache_range(vma, address, ptep, nr) do { } while (0) > > void srmmu_mapiorange(unsigned int bus, unsigned long xpa, > unsigned long xva, unsigned int len); > @@ -422,7 +422,7 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma, > ({ \ > int __changed = !pte_same(*(__ptep), __entry); \ > if (__changed) { \ > - set_pte_at((__vma)->vm_mm, (__address), __ptep, __entry); \ > + set_pte(__ptep, __entry); \ > flush_tlb_page(__vma, __address); \ > } \ > __changed; \ > diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c > index 9c0ea457bdf0..d96a14ffceeb 100644 > --- a/arch/sparc/mm/init_32.c > +++ b/arch/sparc/mm/init_32.c > @@ -297,11 +297,20 @@ void sparc_flush_page_to_ram(struct page *page) > { > unsigned long vaddr = (unsigned long)page_address(page); > > - if (vaddr) > - __flush_page_to_ram(vaddr); > + __flush_page_to_ram(vaddr); > } > EXPORT_SYMBOL(sparc_flush_page_to_ram); > > +void sparc_flush_folio_to_ram(struct folio *folio) > +{ > + unsigned long vaddr = (unsigned long)folio_address(folio); > + unsigned int i, nr = folio_nr_pages(folio); > + > + for (i = 0; i < nr; i++) > + __flush_page_to_ram(vaddr + i * PAGE_SIZE); > +} > +EXPORT_SYMBOL(sparc_flush_folio_to_ram); > + > static const pgprot_t protection_map[16] = { > [VM_NONE] = PAGE_NONE, > [VM_READ] = PAGE_READONLY, > -- > 2.39.2 > > -- Sincerely yours, Mike.