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 96BB4EB64DC for ; Tue, 11 Jul 2023 04:00:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1D0BF8E0001; Tue, 11 Jul 2023 00:00:35 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 180828D0001; Tue, 11 Jul 2023 00:00:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 048568E0001; Tue, 11 Jul 2023 00:00:35 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id E4C798D0001 for ; Tue, 11 Jul 2023 00:00:34 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9F0A1AFE0C for ; Tue, 11 Jul 2023 04:00:34 +0000 (UTC) X-FDA: 80997979188.18.B6A493E Received: from outpost1.zedat.fu-berlin.de (outpost1.zedat.fu-berlin.de [130.133.4.66]) by imf16.hostedemail.com (Postfix) with ESMTP id 82DD118001B for ; Tue, 11 Jul 2023 04:00:31 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf16.hostedemail.com: domain of glaubitz@zedat.fu-berlin.de designates 130.133.4.66 as permitted sender) smtp.mailfrom=glaubitz@zedat.fu-berlin.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689048032; 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:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=a2n1zD6bfzS22oTaxp4ewqiRtPsORlsr8jzhccbBY1Q=; b=ywRKD2EbBR2/oqG/Lrrk98NlnkMzkKZs1SB9ntEguuXVS1LtjfLJbGSlegDqXdUkATc9D0 Z5ugrAxlbRjyESODWt9o7rRfD5v9HtS2xJ/dWm01PDCWiE0LKs/PB4q474JhCPTpBBW/Ej FKxm9YEXLiQ2A3udtvGd8E+9YoohOVc= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf16.hostedemail.com: domain of glaubitz@zedat.fu-berlin.de designates 130.133.4.66 as permitted sender) smtp.mailfrom=glaubitz@zedat.fu-berlin.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689048032; a=rsa-sha256; cv=none; b=howDZjHiTHb4im8VQNk6E1JhzPvtvegZmskUA3IOVOSctEIDTN5rwba8Z6mJFg7Mjey6nn BwtbbWQU9JsBSKpa6GhGIbWerPyAhZH1/aaRHvvCJgtm0/nuxAL+D9eLa7V8oPqDK1xO7d vA6N8DfnhuVN+7L0x5kUwc1dBMDBHfY= Received: from inpost2.zedat.fu-berlin.de ([130.133.4.69]) by outpost.zedat.fu-berlin.de (Exim 4.95) with esmtps (TLS1.3) tls TLS_AES_256_GCM_SHA384 (envelope-from ) id 1qJ4Xz-003r5d-US; Tue, 11 Jul 2023 06:00:19 +0200 Received: from p57bd95f7.dip0.t-ipconnect.de ([87.189.149.247] helo=[192.168.178.81]) by inpost2.zedat.fu-berlin.de (Exim 4.95) with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (envelope-from ) id 1qJ4Xz-0046tU-MT; Tue, 11 Jul 2023 06:00:19 +0200 Message-ID: Subject: Re: [PATCH v5 24/38] sh: Implement the new page table range API From: John Paul Adrian Glaubitz To: "Matthew Wilcox (Oracle)" , Andrew Morton Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Mike Rapoport , Yoshinori Sato , Rich Felker , linux-sh@vger.kernel.org Date: Tue, 11 Jul 2023 06:00:18 +0200 In-Reply-To: <20230710204339.3554919-25-willy@infradead.org> References: <20230710204339.3554919-1-willy@infradead.org> <20230710204339.3554919-25-willy@infradead.org> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.48.4 MIME-Version: 1.0 X-Original-Sender: glaubitz@physik.fu-berlin.de X-Originating-IP: 87.189.149.247 X-ZEDAT-Hint: PO X-Rspam-User: X-Stat-Signature: fq4stkkmwhyd9dsme5aeheyhz1knnjgw X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 82DD118001B X-HE-Tag: 1689048031-481943 X-HE-Meta: U2FsdGVkX1/lUxAn2mKzxkN8AQrENDYA7aJzC8Tzhgr6shCn2JiG7/IuKs1olpHQpR1MPQ97yJkTBsyUWbWtPDo5Y80UfaG3ubLO2mRoiI+IQjccwhQA2l6Ebmae32o7PM10kMEv58fllqRzNt6fppgsx5jUKhTRq/zcwSJcEB9ixiMn+taoOwwxbLuJvL6GZ5V/NU2xUmupKQ1aH+fOPC2t/Yx5E81R4N1aTnRiQoVa/ZfZCppozIvTXqyM9+z6w3/d/06o9wBZWw73M76LkmPSG0ogR6mXOJzNy3vwqh1KA0T66aNmx/Z76exIO+4XuKafNJih2nP4iszxhrFvUzNdBtHvqYPZPRWSCjiePEg9O71RtAQqPKQXTw0UHT3kJMZDkm/OjrLl5XUea7EjANjIwDK8ZVq6jHaP+/UYkjtGnEirRHygRng/v3MHlMWOs5jBLVGGdhq1wzCUn9+P6snJNK2CPx9LTq95e8NgCjbbSXZSUXR57u6MzOJP49H/Y1Gz7Kx9anNSnVzZFoC9y5549qUM8ut1qpXPCz4r419gE59HneZrYjMv5ProyWMvEmovEIjHVBo8BNp+fr0782doe3tuuW7v9excb3rP1atimnnCzs+wa4woYAPI9E9vPo5mU9ujCd/2leHZhpfnh8+vlNQzwbkff5cyI5Dg5FcIsfuThx+Y070C110E/iNo3bKyzUyvKIsmZLTndCH5TIZXxWV/5MdfFNB8rsMDRIEKoYG1d3oZvDOKtb/kgQ/sIchQiPGtZvA0/CqiwFJTVnC26rSfWgulfZl7XRZfCpT0r0QxNFur7KUpDQ4uRK7WAqYqOmUgezgX1tn8Qtn4D0t+2T1u2/4fPCI7waV8e6XGaHS+EiOl1FF46P1Y2i9Xg0hBjI7fRVGCTWY5OhdBmVPC74lY2oGvFqtOVUxcQ446sUgDzh/cGXAQynYLeS4VZw0LG+vPVMtgrWvahjb eLES79GZ HupLAa7ySTy9n6dZAweT7CvxWLajliIiIBD3+ReZBCwI5gBm58pAD2XIH3LTYGtpvmsLs571siXiiUNGG038IsPtt90cigH0CNOrHMZ/XSkniuCmEZNa2pUkNyvOKeQF4azGzBI7pHZFV6gjpmgxhGwPDaPTNdJebw97CUCSIKaZqgkiOgudBqILvyS9sVFNK5lJeTwF4Y/Kd47FDKnUx95HC0FHxyiGht2IOv6MJ7qS4T32JsjNCebOljfQ6ywig+tU2oqXvt8XesTm5bH13rgoEFl3Ikyf0hZ8bV3ym4wvo+gNfy/0uhEvtfoSfkwb3vSIpgvdqC5XuvxGzKFhDHD2t/9S9sNM0NVEzbDhhGp9AwYoioOpaIP+cb+AS+itK6qOjdYJ0DbiC8seok0Go1ILIQS8FU7hHDinDmMIP/0T0n81nU6lJjAWUMgeybVFA2F4PPQvsBdb5Mcf91RfeEDf7+RpFrZqWLCCM3DyGP1zTD9ndfHQH/BxpaXIZiUb4pnwM 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: Hi Matthew! On Mon, 2023-07-10 at 21:43 +0100, Matthew Wilcox (Oracle) wrote: > Add PFN_PTE_SHIFT, update_mmu_cache_range(), flush_dcache_folio() and > flush_icache_pages(). Change the PG_dcache_clean flag from being > per-page to per-folio. Flush the entire folio containing the pages in > flush_icache_pages() for ease of implementation. >=20 > Signed-off-by: Matthew Wilcox (Oracle) > Acked-by: Mike Rapoport (IBM) > Cc: Yoshinori Sato > Cc: Rich Felker > Cc: John Paul Adrian Glaubitz > Cc: linux-sh@vger.kernel.org > --- > arch/sh/include/asm/cacheflush.h | 21 ++++++++----- > arch/sh/include/asm/pgtable.h | 7 +++-- > arch/sh/include/asm/pgtable_32.h | 5 ++- > arch/sh/mm/cache-j2.c | 4 +-- > arch/sh/mm/cache-sh4.c | 26 +++++++++++----- > arch/sh/mm/cache-sh7705.c | 26 ++++++++++------ > arch/sh/mm/cache.c | 52 ++++++++++++++++++-------------- > arch/sh/mm/kmap.c | 3 +- > 8 files changed, 89 insertions(+), 55 deletions(-) >=20 > diff --git a/arch/sh/include/asm/cacheflush.h b/arch/sh/include/asm/cache= flush.h > index 481a664287e2..9fceef6f3e00 100644 > --- a/arch/sh/include/asm/cacheflush.h > +++ b/arch/sh/include/asm/cacheflush.h > @@ -13,9 +13,9 @@ > * - flush_cache_page(mm, vmaddr, pfn) flushes a single page > * - flush_cache_range(vma, start, end) flushes a range of pages > * > - * - flush_dcache_page(pg) flushes(wback&invalidates) a page for dcache > + * - flush_dcache_folio(folio) flushes(wback&invalidates) a folio for d= cache > * - flush_icache_range(start, end) flushes(invalidates) a range for ic= ache > - * - flush_icache_page(vma, pg) flushes(invalidates) a page for icache > + * - flush_icache_pages(vma, pg, nr) flushes(invalidates) pages for ica= che > * - flush_cache_sigtramp(vaddr) flushes the signal trampoline > */ > extern void (*local_flush_cache_all)(void *args); > @@ -23,9 +23,9 @@ extern void (*local_flush_cache_mm)(void *args); > extern void (*local_flush_cache_dup_mm)(void *args); > extern void (*local_flush_cache_page)(void *args); > extern void (*local_flush_cache_range)(void *args); > -extern void (*local_flush_dcache_page)(void *args); > +extern void (*local_flush_dcache_folio)(void *args); > extern void (*local_flush_icache_range)(void *args); > -extern void (*local_flush_icache_page)(void *args); > +extern void (*local_flush_icache_folio)(void *args); > extern void (*local_flush_cache_sigtramp)(void *args); > =20 > static inline void cache_noop(void *args) { } > @@ -42,11 +42,18 @@ extern void flush_cache_page(struct vm_area_struct *v= ma, > extern void flush_cache_range(struct vm_area_struct *vma, > unsigned long start, unsigned long end); > #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 > -void flush_dcache_page(struct page *page); > +void flush_dcache_folio(struct folio *folio); > +#define flush_dcache_folio flush_dcache_folio > +static inline void flush_dcache_page(struct page *page) > +{ > + flush_dcache_folio(page_folio(page)); > +} > + > extern void flush_icache_range(unsigned long start, unsigned long end); > #define flush_icache_user_range flush_icache_range > -extern void flush_icache_page(struct vm_area_struct *vma, > - struct page *page); > +void flush_icache_pages(struct vm_area_struct *vma, struct page *page, > + unsigned int nr); > +#define flush_icache_page(vma, page) flush_icache_pages(vma, page, 1) > extern void flush_cache_sigtramp(unsigned long address); > =20 > struct flusher_data { > diff --git a/arch/sh/include/asm/pgtable.h b/arch/sh/include/asm/pgtable.= h > index 3ce30becf6df..729f5c6225fb 100644 > --- a/arch/sh/include/asm/pgtable.h > +++ b/arch/sh/include/asm/pgtable.h > @@ -102,13 +102,16 @@ extern void __update_cache(struct vm_area_struct *v= ma, > extern void __update_tlb(struct vm_area_struct *vma, > unsigned long address, pte_t pte); > =20 > -static inline void > -update_mmu_cache(struct vm_area_struct *vma, unsigned long address, pte_= t *ptep) > +static inline void update_mmu_cache_range(struct vm_fault *vmf, > + struct vm_area_struct *vma, unsigned long address, > + pte_t *ptep, unsigned int nr) > { > pte_t pte =3D *ptep; > __update_cache(vma, address, pte); > __update_tlb(vma, address, pte); > } > +#define update_mmu_cache(vma, addr, ptep) \ > + update_mmu_cache_range(NULL, vma, addr, ptep, 1) > =20 > extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; > extern void paging_init(void); > diff --git a/arch/sh/include/asm/pgtable_32.h b/arch/sh/include/asm/pgtab= le_32.h > index 21952b094650..676f3d4ef6ce 100644 > --- a/arch/sh/include/asm/pgtable_32.h > +++ b/arch/sh/include/asm/pgtable_32.h > @@ -307,14 +307,13 @@ static inline void set_pte(pte_t *ptep, pte_t pte) > #define set_pte(pteptr, pteval) (*(pteptr) =3D pteval) > #endif > =20 > -#define set_pte_at(mm,addr,ptep,pteval) set_pte(ptep,pteval) > - > /* > * (pmds are folded into pgds so this doesn't get actually called, > * but the define is needed for a generic inline function.) > */ > #define set_pmd(pmdptr, pmdval) (*(pmdptr) =3D pmdval) > =20 > +#define PFN_PTE_SHIFT PAGE_SHIFT > #define pfn_pte(pfn, prot) \ > __pte(((unsigned long long)(pfn) << PAGE_SHIFT) | pgprot_val(prot)) > #define pfn_pmd(pfn, prot) \ > @@ -323,7 +322,7 @@ static inline void set_pte(pte_t *ptep, pte_t pte) > #define pte_none(x) (!pte_val(x)) > #define pte_present(x) ((x).pte_low & (_PAGE_PRESENT | _PAGE_PROTNONE)) > =20 > -#define pte_clear(mm,addr,xp) do { set_pte_at(mm, addr, xp, __pte(0)); }= while (0) > +#define pte_clear(mm, addr, ptep) set_pte(ptep, __pte(0)) > =20 > #define pmd_none(x) (!pmd_val(x)) > #define pmd_present(x) (pmd_val(x)) > diff --git a/arch/sh/mm/cache-j2.c b/arch/sh/mm/cache-j2.c > index f277862a11f5..9ac960214380 100644 > --- a/arch/sh/mm/cache-j2.c > +++ b/arch/sh/mm/cache-j2.c > @@ -55,9 +55,9 @@ void __init j2_cache_init(void) > local_flush_cache_dup_mm =3D j2_flush_both; > local_flush_cache_page =3D j2_flush_both; > local_flush_cache_range =3D j2_flush_both; > - local_flush_dcache_page =3D j2_flush_dcache; > + local_flush_dcache_folio =3D j2_flush_dcache; > local_flush_icache_range =3D j2_flush_icache; > - local_flush_icache_page =3D j2_flush_icache; > + local_flush_icache_folio =3D j2_flush_icache; > local_flush_cache_sigtramp =3D j2_flush_icache; > =20 > pr_info("Initial J2 CCR is %.8x\n", __raw_readl(j2_ccr_base)); > diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c > index 72c2e1b46c08..862046f26981 100644 > --- a/arch/sh/mm/cache-sh4.c > +++ b/arch/sh/mm/cache-sh4.c > @@ -107,19 +107,29 @@ static inline void flush_cache_one(unsigned long st= art, unsigned long phys) > * Write back & invalidate the D-cache of the page. > * (To avoid "alias" issues) > */ > -static void sh4_flush_dcache_page(void *arg) > +static void sh4_flush_dcache_folio(void *arg) > { > - struct page *page =3D arg; > - unsigned long addr =3D (unsigned long)page_address(page); > + struct folio *folio =3D arg; > #ifndef CONFIG_SMP > - struct address_space *mapping =3D page_mapping_file(page); > + struct address_space *mapping =3D folio_flush_mapping(folio); > =20 > if (mapping && !mapping_mapped(mapping)) > - clear_bit(PG_dcache_clean, &page->flags); > + clear_bit(PG_dcache_clean, &folio->flags); > else > #endif > - flush_cache_one(CACHE_OC_ADDRESS_ARRAY | > - (addr & shm_align_mask), page_to_phys(page)); > + { > + unsigned long pfn =3D folio_pfn(folio); > + unsigned long addr =3D (unsigned long)folio_address(folio); > + unsigned int i, nr =3D folio_nr_pages(folio); > + > + for (i =3D 0; i < nr; i++) { > + flush_cache_one(CACHE_OC_ADDRESS_ARRAY | > + (addr & shm_align_mask), > + pfn * PAGE_SIZE); > + addr +=3D PAGE_SIZE; > + pfn++; > + } > + } > =20 > wmb(); > } > @@ -379,7 +389,7 @@ void __init sh4_cache_init(void) > __raw_readl(CCN_PRR)); > =20 > local_flush_icache_range =3D sh4_flush_icache_range; > - local_flush_dcache_page =3D sh4_flush_dcache_page; > + local_flush_dcache_folio =3D sh4_flush_dcache_folio; > local_flush_cache_all =3D sh4_flush_cache_all; > local_flush_cache_mm =3D sh4_flush_cache_mm; > local_flush_cache_dup_mm =3D sh4_flush_cache_mm; > diff --git a/arch/sh/mm/cache-sh7705.c b/arch/sh/mm/cache-sh7705.c > index 9b63a53a5e46..b509a407588f 100644 > --- a/arch/sh/mm/cache-sh7705.c > +++ b/arch/sh/mm/cache-sh7705.c > @@ -132,15 +132,20 @@ static void __flush_dcache_page(unsigned long phys) > * Write back & invalidate the D-cache of the page. > * (To avoid "alias" issues) > */ > -static void sh7705_flush_dcache_page(void *arg) > +static void sh7705_flush_dcache_folio(void *arg) > { > - struct page *page =3D arg; > - struct address_space *mapping =3D page_mapping_file(page); > + struct folio *folio =3D arg; > + struct address_space *mapping =3D folio_flush_mapping(folio); > =20 > if (mapping && !mapping_mapped(mapping)) > - clear_bit(PG_dcache_clean, &page->flags); > - else > - __flush_dcache_page(__pa(page_address(page))); > + clear_bit(PG_dcache_clean, &folio->flags); > + else { > + unsigned long pfn =3D folio_pfn(folio); > + unsigned int i, nr =3D folio_nr_pages(folio); > + > + for (i =3D 0; i < nr; i++) > + __flush_dcache_page((pfn + i) * PAGE_SIZE); > + } > } > =20 > static void sh7705_flush_cache_all(void *args) > @@ -176,19 +181,20 @@ static void sh7705_flush_cache_page(void *args) > * Not entirely sure why this is necessary on SH3 with 32K cache but > * without it we get occasional "Memory fault" when loading a program. > */ > -static void sh7705_flush_icache_page(void *page) > +static void sh7705_flush_icache_folio(void *arg) > { > - __flush_purge_region(page_address(page), PAGE_SIZE); > + struct folio *folio =3D arg; > + __flush_purge_region(folio_address(folio), folio_size(folio)); > } > =20 > void __init sh7705_cache_init(void) > { > local_flush_icache_range =3D sh7705_flush_icache_range; > - local_flush_dcache_page =3D sh7705_flush_dcache_page; > + local_flush_dcache_folio =3D sh7705_flush_dcache_folio; > local_flush_cache_all =3D sh7705_flush_cache_all; > local_flush_cache_mm =3D sh7705_flush_cache_all; > local_flush_cache_dup_mm =3D sh7705_flush_cache_all; > local_flush_cache_range =3D sh7705_flush_cache_all; > local_flush_cache_page =3D sh7705_flush_cache_page; > - local_flush_icache_page =3D sh7705_flush_icache_page; > + local_flush_icache_folio =3D sh7705_flush_icache_folio; > } > diff --git a/arch/sh/mm/cache.c b/arch/sh/mm/cache.c > index 3aef78ceb820..9bcaa5619eab 100644 > --- a/arch/sh/mm/cache.c > +++ b/arch/sh/mm/cache.c > @@ -20,9 +20,9 @@ void (*local_flush_cache_mm)(void *args) =3D cache_noop= ; > void (*local_flush_cache_dup_mm)(void *args) =3D cache_noop; > void (*local_flush_cache_page)(void *args) =3D cache_noop; > void (*local_flush_cache_range)(void *args) =3D cache_noop; > -void (*local_flush_dcache_page)(void *args) =3D cache_noop; > +void (*local_flush_dcache_folio)(void *args) =3D cache_noop; > void (*local_flush_icache_range)(void *args) =3D cache_noop; > -void (*local_flush_icache_page)(void *args) =3D cache_noop; > +void (*local_flush_icache_folio)(void *args) =3D cache_noop; > void (*local_flush_cache_sigtramp)(void *args) =3D cache_noop; > =20 > void (*__flush_wback_region)(void *start, int size); > @@ -61,15 +61,17 @@ void copy_to_user_page(struct vm_area_struct *vma, st= ruct page *page, > unsigned long vaddr, void *dst, const void *src, > unsigned long len) > { > - if (boot_cpu_data.dcache.n_aliases && page_mapcount(page) && > - test_bit(PG_dcache_clean, &page->flags)) { > + struct folio *folio =3D page_folio(page); > + > + if (boot_cpu_data.dcache.n_aliases && folio_mapped(folio) && > + test_bit(PG_dcache_clean, &folio->flags)) { > void *vto =3D kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); > memcpy(vto, src, len); > kunmap_coherent(vto); > } else { > memcpy(dst, src, len); > if (boot_cpu_data.dcache.n_aliases) > - clear_bit(PG_dcache_clean, &page->flags); > + clear_bit(PG_dcache_clean, &folio->flags); > } > =20 > if (vma->vm_flags & VM_EXEC) > @@ -80,27 +82,30 @@ void copy_from_user_page(struct vm_area_struct *vma, = struct page *page, > unsigned long vaddr, void *dst, const void *src, > unsigned long len) > { > + struct folio *folio =3D page_folio(page); > + > if (boot_cpu_data.dcache.n_aliases && page_mapcount(page) && > - test_bit(PG_dcache_clean, &page->flags)) { > + test_bit(PG_dcache_clean, &folio->flags)) { > void *vfrom =3D kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK); > memcpy(dst, vfrom, len); > kunmap_coherent(vfrom); > } else { > memcpy(dst, src, len); > if (boot_cpu_data.dcache.n_aliases) > - clear_bit(PG_dcache_clean, &page->flags); > + clear_bit(PG_dcache_clean, &folio->flags); > } > } > =20 > void copy_user_highpage(struct page *to, struct page *from, > unsigned long vaddr, struct vm_area_struct *vma) > { > + struct folio *src =3D page_folio(from); > void *vfrom, *vto; > =20 > vto =3D kmap_atomic(to); > =20 > - if (boot_cpu_data.dcache.n_aliases && page_mapcount(from) && > - test_bit(PG_dcache_clean, &from->flags)) { > + if (boot_cpu_data.dcache.n_aliases && folio_mapped(src) && > + test_bit(PG_dcache_clean, &src->flags)) { > vfrom =3D kmap_coherent(from, vaddr); > copy_page(vto, vfrom); > kunmap_coherent(vfrom); > @@ -136,27 +141,28 @@ EXPORT_SYMBOL(clear_user_highpage); > void __update_cache(struct vm_area_struct *vma, > unsigned long address, pte_t pte) > { > - struct page *page; > unsigned long pfn =3D pte_pfn(pte); > =20 > if (!boot_cpu_data.dcache.n_aliases) > return; > =20 > - page =3D pfn_to_page(pfn); > if (pfn_valid(pfn)) { > - int dirty =3D !test_and_set_bit(PG_dcache_clean, &page->flags); > + struct folio *folio =3D page_folio(pfn_to_page(pfn)); > + int dirty =3D !test_and_set_bit(PG_dcache_clean, &folio->flags); > if (dirty) > - __flush_purge_region(page_address(page), PAGE_SIZE); > + __flush_purge_region(folio_address(folio), > + folio_size(folio)); > } > } > =20 > void __flush_anon_page(struct page *page, unsigned long vmaddr) > { > + struct folio *folio =3D page_folio(page); > unsigned long addr =3D (unsigned long) page_address(page); > =20 > if (pages_do_alias(addr, vmaddr)) { > - if (boot_cpu_data.dcache.n_aliases && page_mapcount(page) && > - test_bit(PG_dcache_clean, &page->flags)) { > + if (boot_cpu_data.dcache.n_aliases && folio_mapped(folio) && > + test_bit(PG_dcache_clean, &folio->flags)) { > void *kaddr; > =20 > kaddr =3D kmap_coherent(page, vmaddr); > @@ -164,7 +170,8 @@ void __flush_anon_page(struct page *page, unsigned lo= ng vmaddr) > /* __flush_purge_region((void *)kaddr, PAGE_SIZE); */ > kunmap_coherent(kaddr); > } else > - __flush_purge_region((void *)addr, PAGE_SIZE); > + __flush_purge_region(folio_address(folio), > + folio_size(folio)); > } > } > =20 > @@ -215,11 +222,11 @@ void flush_cache_range(struct vm_area_struct *vma, = unsigned long start, > } > EXPORT_SYMBOL(flush_cache_range); > =20 > -void flush_dcache_page(struct page *page) > +void flush_dcache_folio(struct folio *folio) > { > - cacheop_on_each_cpu(local_flush_dcache_page, page, 1); > + cacheop_on_each_cpu(local_flush_dcache_folio, folio, 1); > } > -EXPORT_SYMBOL(flush_dcache_page); > +EXPORT_SYMBOL(flush_dcache_folio); > =20 > void flush_icache_range(unsigned long start, unsigned long end) > { > @@ -233,10 +240,11 @@ void flush_icache_range(unsigned long start, unsign= ed long end) > } > EXPORT_SYMBOL(flush_icache_range); > =20 > -void flush_icache_page(struct vm_area_struct *vma, struct page *page) > +void flush_icache_pages(struct vm_area_struct *vma, struct page *page, > + unsigned int nr) > { > - /* Nothing uses the VMA, so just pass the struct page along */ > - cacheop_on_each_cpu(local_flush_icache_page, page, 1); > + /* Nothing uses the VMA, so just pass the folio along */ > + cacheop_on_each_cpu(local_flush_icache_folio, page_folio(page), 1); > } > =20 > void flush_cache_sigtramp(unsigned long address) > diff --git a/arch/sh/mm/kmap.c b/arch/sh/mm/kmap.c > index 73fd7cc99430..fa50e8f6e7a9 100644 > --- a/arch/sh/mm/kmap.c > +++ b/arch/sh/mm/kmap.c > @@ -27,10 +27,11 @@ void __init kmap_coherent_init(void) > =20 > void *kmap_coherent(struct page *page, unsigned long addr) > { > + struct folio *folio =3D page_folio(page); > enum fixed_addresses idx; > unsigned long vaddr; > =20 > - BUG_ON(!test_bit(PG_dcache_clean, &page->flags)); > + BUG_ON(!test_bit(PG_dcache_clean, &folio->flags)); > =20 > preempt_disable(); > pagefault_disable(); What's the best way to test this? Just build Andrew's kernel? I would like to give it a go on my SH7785LCR to be sure nothing breaks. Adrian --=20 .''`. John Paul Adrian Glaubitz : :' : Debian Developer `. `' Physicist `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913