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 20138C678D4 for ; Fri, 3 Mar 2023 12:50:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7F0E76B0072; Fri, 3 Mar 2023 07:50:14 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7793E6B0073; Fri, 3 Mar 2023 07:50:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 61A1F6B0074; Fri, 3 Mar 2023 07:50:14 -0500 (EST) 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 4ADD56B0072 for ; Fri, 3 Mar 2023 07:50:14 -0500 (EST) Received: from smtpin29.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 226D9A0D24 for ; Fri, 3 Mar 2023 12:50:14 +0000 (UTC) X-FDA: 80527569948.29.6FBE0F3 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf12.hostedemail.com (Postfix) with ESMTP id 647EB4001B for ; Fri, 3 Mar 2023 12:50:12 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="jq/wlIbU"; spf=pass (imf12.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=1677847812; 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=z1FumuW5b8xKO2KJClKbjjmXw6CPsauiOThELaOpdtA=; b=sCi2Ki7D3YOYyIp7wbJ6XwPdhnBw5/DQb2aT8cAlmf/J38QV2i7t0ePDoWjvr23NX99jJ5 mBLqtC5PRIpqeH0hHndzhTyGKJDDsbCl4dRrsfd5vsonSUYYaRqiEjoZEaI0whvnZwlD5H wWWVWbdetZC6zJDBCA8R0YdsAPA9lOg= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="jq/wlIbU"; spf=pass (imf12.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=1677847812; a=rsa-sha256; cv=none; b=zzGy+vgdpoH0u2u/QYBOTnm6fPrSszhXdLmWCNodsfLUPcjg0g1thGwoKCZPTWR6Ej56bl 8+1G0LxVdwsl+ePIYP8r8mvksrGXXWahEPOM/ZWBFcTFOw15X0sRx/rAIJ6FLEK/yryeCc FUpEgroSkFo9gJbw365+0hpIEG8/2Zw= 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 738AF61742; Fri, 3 Mar 2023 12:50:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 03047C433EF; Fri, 3 Mar 2023 12:50:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677847810; bh=PZ2Ce91kgZFEmOYlhfDXn2Xr6BsBLgCv6OQM1Gjk+Oo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=jq/wlIbU+cH5rU0B0xt9rYmQYFsbmOEIF7NQvoknlUvzxoRNivUFKnHVO5/+SD15v +xqkIhkN+/COCmbRs5mtRvJOuspdxVqjOP/KHdqEJMXpbx3wi4hpb+dMRcllqOJHx/ f9Q5YAR3gAypnte1fnkoZJrRkBg1LfjjIRsRScSF2WJWSrF5zV87Ku3tQshHOP+/ds SzZvBYabdKzwYJy0Skb6JgMRK0yYHiyrGQHVd9Nrqcp8G9viAHWN+dHgAnABa7/ifz xj2aEXhZT6l3yFsaEQmMpl89TJLHCKAkKWxGmUlmBifXyd0BZCeeCmuB8328XvDabq LYbK/VIduOlKg== Date: Fri, 3 Mar 2023 14:49:57 +0200 From: Mike Rapoport To: "Matthew Wilcox (Oracle)" Cc: linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Dinh Nguyen Subject: Re: [PATCH v3 16/34] nios2: Implement the new page table range API Message-ID: References: <20230228213738.272178-1-willy@infradead.org> <20230228213738.272178-17-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230228213738.272178-17-willy@infradead.org> X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 647EB4001B X-Stat-Signature: kf15bzr41oz3w8xb1sraty8rbryohn86 X-Rspam-User: X-HE-Tag: 1677847812-208829 X-HE-Meta: U2FsdGVkX18HKVdNua3FiJoBcATBn7Rk/+6jxKOJyVHsVeADlnlLEwo8BhRLpLe5RTs8pj5+FqjON1pwXf2NAf/5t71Cp6HFSkVI01p4XhzO5GQwgqKeyFskVzFXjhPM/fjCoODU92HTyTlv0wU5LUGUgDOFv9YJl/DXpQg+TaV10XSjh+WAw2Xz1J0t8/4riYvjN8h8PURMeZIdABFHO7XF3SZ79RBFzxGc2PhVTRKYqME/UZCBfWHDqwiQFizTIGDv+wECjzwB22wV6PyrqUvkT1s9xWDg61a36IAncvsNldbHlikykSL0SaKg1KpSFIt2EAxEsrbdvHZDAGCJdvDXzCxk2m7AEjaNeEjUzKNOxHPOgfVcy3UapdW2U7O1R0/7NA3yY4GozduTwAQGOTUcxJo1SJ4Mq5U0LahArZCUrwpMvCfxuGfkYQW/ScgvZqPRFRnUOkCwAU48q0QCVfDPcYwxkAlG0QlooeZamrlcKZgaeaIjEpc9dYRTJks7jNU8W4W/pRN5oz4aj/TU+u5LAUGTGy4OAn7KqJzIajU52yNy4EFlDZyNt0hy/p4lLxRoDmTsQ6sy0SO3lvX2MlT+9p3B5s1hNr8w8zkxuo6PyqPp75vV0khovxpJ6b20k3hvJjZJnneuumFpSZBM/jsYT/SZYbMZR8BN/c4Lu8ZqMbDAUiRTxnTE1aog/dUfeuh555D3K50yf648nOXfE4zEm92WRI6HGxAnVqeaDs7ekUivZJhiSB+meeJN+BwDltNT2u5jeIu68WU+GqCYA2VbmzzWiiBWHZ3USwK+KrgATGgIbIHAhE/aJfawDYfC/r2taEcx55R/xqVGuxV25CJvV8HaZaJ0MfG/BKmG5TeSynv2r2+7eHoiG6aZ8suD5fdyfGZftMFlcZ+XNVSLrVmOHvNWCsu/JXEP59+5/yOTh46dNBFxEji4pKitBgA5lM0jUjlSn60Pi+OE7hM CxmkLKcv nX/j2o0qtmLDf+8eGepc/uhjg/sh4Hfa0rnRa6U7F3K9CwMCjlBI0uhnRH46D5TX0/4qwj0I8hD0bnRXmZuHPjXi9epgIIpS5wNMvda15u7B+aeo8wTODQWll46hz3fl+vRRQN+gRwv5q7mWLo/YqvxEUCZdD5/6pTpsgIGzH9Ss4PTTIJmay2YtJPLBquBp/9puPpfgy/pGYc3erIrBVRWepCoO5vyh6fxrSX2KaqaqW29ugSAqP55kZzQ5ZeP2PzkPgT6Vn2eOsFYDWLurt2f1DQE9U2g1cDoopk6zLFAbeH08Ltw9k4Rl8Vv+MpW/Vgsv7ghXiq3od3Y2C74n9CnAMBzZ+pi2UPyPEVVkrrBTx9Qqx9Tq/UJIXQ1YNbcxwIR46QveVpGL3osAjoE6L0awjqID/mEMhwJvbTd1HWtfHi3A= 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 Tue, Feb 28, 2023 at 09:37:19PM +0000, Matthew Wilcox (Oracle) wrote: > Add set_ptes(), update_mmu_cache_range(), flush_icache_pages() and > flush_dcache_folio(). Change the PG_arch_1 (aka PG_dcache_dirty) flag > from being per-page to per-folio. This failed for me with CC arch/nios2/mm/cacheflush.o arch/nios2/mm/cacheflush.c: In function 'flush_dcache_folio': arch/nios2/mm/cacheflush.c:195:48: error: passing argument 2 of 'flush_aliases' from incompatible pointer type [-Werror=incompatible-pointer-types] 195 | flush_aliases(mapping, folio); | ^~~~~ | | | struct folio * arch/nios2/mm/cacheflush.c:74:71: note: expected 'struct page *' but argument is of type 'struct folio *' 74 | static void flush_aliases(struct address_space *mapping, struct page *page) | ~~~~~~~~~~~~~^~~~ In file included from arch/nios2/mm/cacheflush.c:10: arch/nios2/mm/cacheflush.c: At top level: include/linux/export.h:57:43: error: redefinition of '__ksymtab_flush_dcache_folio' 57 | static const struct kernel_symbol __ksymtab_##sym \ | ^~~~~~~~~~ include/linux/export.h:96:9: note: in expansion of macro '__KSYMTAB_ENTRY' 96 | __KSYMTAB_ENTRY(sym, sec) | ^~~~~~~~~~~~~~~ include/linux/export.h:140:41: note: in expansion of macro '___EXPORT_SYMBOL' 140 | #define __EXPORT_SYMBOL(sym, sec, ns) ___EXPORT_SYMBOL(sym, sec, ns) | ^~~~~~~~~~~~~~~~ include/linux/export.h:147:41: note: in expansion of macro '__EXPORT_SYMBOL' 147 | #define _EXPORT_SYMBOL(sym, sec) __EXPORT_SYMBOL(sym, sec, "") | ^~~~~~~~~~~~~~~ include/linux/export.h:150:41: note: in expansion of macro '_EXPORT_SYMBOL' 150 | #define EXPORT_SYMBOL(sym) _EXPORT_SYMBOL(sym, "") | ^~~~~~~~~~~~~~ arch/nios2/mm/cacheflush.c:207:1: note: in expansion of macro 'EXPORT_SYMBOL' 207 | EXPORT_SYMBOL(flush_dcache_folio); | ^~~~~~~~~~~~~ include/linux/export.h:57:43: note: previous definition of '__ksymtab_flush_dcache_folio' with type 'const struct kernel_symbol' 57 | static const struct kernel_symbol __ksymtab_##sym \ | ^~~~~~~~~~ include/linux/export.h:96:9: note: in expansion of macro '__KSYMTAB_ENTRY' 96 | __KSYMTAB_ENTRY(sym, sec) | ^~~~~~~~~~~~~~~ include/linux/export.h:140:41: note: in expansion of macro '___EXPORT_SYMBOL' 140 | #define __EXPORT_SYMBOL(sym, sec, ns) ___EXPORT_SYMBOL(sym, sec, ns) | ^~~~~~~~~~~~~~~~ include/linux/export.h:147:41: note: in expansion of macro '__EXPORT_SYMBOL' 147 | #define _EXPORT_SYMBOL(sym, sec) __EXPORT_SYMBOL(sym, sec, "") | ^~~~~~~~~~~~~~~ include/linux/export.h:150:41: note: in expansion of macro '_EXPORT_SYMBOL' 150 | #define EXPORT_SYMBOL(sym) _EXPORT_SYMBOL(sym, "") | ^~~~~~~~~~~~~~ arch/nios2/mm/cacheflush.c:201:1: note: in expansion of macro 'EXPORT_SYMBOL' 201 | EXPORT_SYMBOL(flush_dcache_folio); | ^~~~~~~~~~~~~ arch/nios2/mm/cacheflush.c: In function 'update_mmu_cache_range': arch/nios2/mm/cacheflush.c:235:40: error: passing argument 2 of 'flush_aliases' from incompatible pointer type [-Werror=incompatible-pointer-types] 235 | flush_aliases(mapping, folio); | ^~~~~ | | | struct folio * arch/nios2/mm/cacheflush.c:74:71: note: expected 'struct page *' but argument is of type 'struct folio *' 74 | static void flush_aliases(struct address_space *mapping, struct page *page) | ~~~~~~~~~~~~~^~~~ cc1: some warnings being treated as errors make[4]: *** [scripts/Makefile.build:252: arch/nios2/mm/cacheflush.o] Error 1 make[3]: *** [scripts/Makefile.build:494: arch/nios2/mm] Error 2 make[2]: *** [scripts/Makefile.build:494: arch/nios2] Error 2 make[1]: *** [Makefile:2028: .] Error 2 make[1]: Leaving directory '/home/mike/build/cross/nios2/defconfig' make: *** [Makefile:226: __sub-make] Error 2 > Signed-off-by: Matthew Wilcox (Oracle) > Cc: Dinh Nguyen > --- > arch/nios2/include/asm/cacheflush.h | 6 ++- > arch/nios2/include/asm/pgtable.h | 27 +++++++++---- > arch/nios2/mm/cacheflush.c | 61 ++++++++++++++++------------- > 3 files changed, 58 insertions(+), 36 deletions(-) > > diff --git a/arch/nios2/include/asm/cacheflush.h b/arch/nios2/include/asm/cacheflush.h > index d0b71dd71287..8624ca83cffe 100644 > --- a/arch/nios2/include/asm/cacheflush.h > +++ b/arch/nios2/include/asm/cacheflush.h > @@ -29,9 +29,13 @@ extern void flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, > unsigned long pfn); > #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 > > extern void flush_icache_range(unsigned long start, unsigned long end); > -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); > > #define flush_cache_vmap(start, end) flush_dcache_range(start, end) > #define flush_cache_vunmap(start, end) flush_dcache_range(start, end) > diff --git a/arch/nios2/include/asm/pgtable.h b/arch/nios2/include/asm/pgtable.h > index 0f5c2564e9f5..8a77821a17a5 100644 > --- a/arch/nios2/include/asm/pgtable.h > +++ b/arch/nios2/include/asm/pgtable.h > @@ -178,15 +178,23 @@ static inline void set_pte(pte_t *ptep, pte_t pteval) > *ptep = pteval; > } > > -static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, > - pte_t *ptep, pte_t pteval) > +static inline void set_ptes(struct mm_struct *mm, unsigned long addr, > + pte_t *ptep, pte_t pte, unsigned int nr) > { > - unsigned long paddr = (unsigned long)page_to_virt(pte_page(pteval)); > - > - flush_dcache_range(paddr, paddr + PAGE_SIZE); > - set_pte(ptep, pteval); > + unsigned long paddr = (unsigned long)page_to_virt(pte_page(pte)); > + > + flush_dcache_range(paddr, paddr + nr * PAGE_SIZE); > + for (;;) { > + set_pte(ptep, pte); > + if (--nr == 0) > + break; > + ptep++; > + pte_val(pte) += 1; > + } > } > > +#define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1) > + > static inline int pmd_none(pmd_t pmd) > { > return (pmd_val(pmd) == > @@ -273,7 +281,10 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) > extern void __init paging_init(void); > extern void __init mmu_init(void); > > -extern void update_mmu_cache(struct vm_area_struct *vma, > - unsigned long address, pte_t *pte); > +void update_mmu_cache_range(struct vm_area_struct *vma, unsigned long address, > + pte_t *ptep, unsigned int nr); > + > +#define update_mmu_cache(vma, addr, ptep) \ > + update_mmu_cache_range(vma, addr, ptep, 1) > > #endif /* _ASM_NIOS2_PGTABLE_H */ > diff --git a/arch/nios2/mm/cacheflush.c b/arch/nios2/mm/cacheflush.c > index 6aa9257c3ede..471485a84b2c 100644 > --- a/arch/nios2/mm/cacheflush.c > +++ b/arch/nios2/mm/cacheflush.c > @@ -138,10 +138,11 @@ void flush_cache_range(struct vm_area_struct *vma, unsigned long start, > __flush_icache(start, end); > } > > -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) > { > unsigned long start = (unsigned long) page_address(page); > - unsigned long end = start + PAGE_SIZE; > + unsigned long end = start + nr * PAGE_SIZE; > > __flush_dcache(start, end); > __flush_icache(start, end); > @@ -158,19 +159,19 @@ void flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, > __flush_icache(start, end); > } > > -void __flush_dcache_page(struct address_space *mapping, struct page *page) > +void __flush_dcache_folio(struct address_space *mapping, struct folio *folio) > { > /* > * Writeback any data associated with the kernel mapping of this > * page. This ensures that data in the physical page is mutually > * coherent with the kernels mapping. > */ > - unsigned long start = (unsigned long)page_address(page); > + unsigned long start = (unsigned long)folio_address(folio); > > - __flush_dcache(start, start + PAGE_SIZE); > + __flush_dcache(start, start + folio_size(folio)); > } > > -void flush_dcache_page(struct page *page) > +void flush_dcache_folio(struct folio *folio) > { > struct address_space *mapping; > > @@ -178,32 +179,38 @@ void flush_dcache_page(struct page *page) > * The zero page is never written to, so never has any dirty > * cache lines, and therefore never needs to be flushed. > */ > - if (page == ZERO_PAGE(0)) > + if (is_zero_pfn(folio_pfn(folio))) > return; > > - mapping = page_mapping_file(page); > + mapping = folio_flush_mapping(folio); > > /* Flush this page if there are aliases. */ > if (mapping && !mapping_mapped(mapping)) { > - clear_bit(PG_dcache_clean, &page->flags); > + clear_bit(PG_dcache_clean, &folio->flags); > } else { > - __flush_dcache_page(mapping, page); > + __flush_dcache_folio(mapping, folio); > if (mapping) { > - unsigned long start = (unsigned long)page_address(page); > - flush_aliases(mapping, page); > - flush_icache_range(start, start + PAGE_SIZE); > + unsigned long start = (unsigned long)folio_address(folio); > + flush_aliases(mapping, folio); > + flush_icache_range(start, start + folio_size(folio)); > } > - set_bit(PG_dcache_clean, &page->flags); > + set_bit(PG_dcache_clean, &folio->flags); > } > } > -EXPORT_SYMBOL(flush_dcache_page); > +EXPORT_SYMBOL(flush_dcache_folio); > + > +void flush_dcache_page(struct page *page) > +{ > + flush_dcache_folio(page_folio(page)); > +} > +EXPORT_SYMBOL(flush_dcache_folio); > > -void update_mmu_cache(struct vm_area_struct *vma, > - unsigned long address, pte_t *ptep) > +void update_mmu_cache_range(struct vm_area_struct *vma, unsigned long address, > + pte_t *ptep, unsigned int nr) > { > pte_t pte = *ptep; > unsigned long pfn = pte_pfn(pte); > - struct page *page; > + struct folio *folio; > struct address_space *mapping; > > reload_tlb_page(vma, address, pte); > @@ -215,19 +222,19 @@ void update_mmu_cache(struct vm_area_struct *vma, > * The zero page is never written to, so never has any dirty > * cache lines, and therefore never needs to be flushed. > */ > - page = pfn_to_page(pfn); > - if (page == ZERO_PAGE(0)) > + if (is_zero_pfn(pfn)) > return; > > - mapping = page_mapping_file(page); > - if (!test_and_set_bit(PG_dcache_clean, &page->flags)) > - __flush_dcache_page(mapping, page); > + folio = page_folio(pfn_to_page(pfn)); > + mapping = folio_flush_mapping(folio); > + if (!test_and_set_bit(PG_dcache_clean, &folio->flags)) > + __flush_dcache_folio(mapping, folio); > > - if(mapping) > - { > - flush_aliases(mapping, page); > + if (mapping) { > + flush_aliases(mapping, folio); > if (vma->vm_flags & VM_EXEC) > - flush_icache_page(vma, page); > + flush_icache_pages(vma, &folio->page, > + folio_nr_pages(folio)); > } > } > > -- > 2.39.1 > > -- Sincerely yours, Mike.