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 42737C636CC for ; Thu, 16 Feb 2023 08:17:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 886BD6B0071; Thu, 16 Feb 2023 03:17:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8367D6B0072; Thu, 16 Feb 2023 03:17:04 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 725756B0073; Thu, 16 Feb 2023 03:17:04 -0500 (EST) 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 623D06B0071 for ; Thu, 16 Feb 2023 03:17:04 -0500 (EST) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 3CA67161103 for ; Thu, 16 Feb 2023 08:17:04 +0000 (UTC) X-FDA: 80472449568.30.483706C Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by imf01.hostedemail.com (Postfix) with ESMTP id 377DA4000D for ; Thu, 16 Feb 2023 08:17:01 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; spf=none (imf01.hostedemail.com: domain of alex@ghiti.fr has no SPF policy when checking 217.70.178.231) smtp.mailfrom=alex@ghiti.fr; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1676535422; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yl0O6zKtht70N63HJwPX5Y+hR7XQIuEJW6Wxrs/1hnI=; b=4bcHfmpwm3Qu6ICkKULXGCKkNuuKAwZR4DajH921K4nAFx0+Z1PRnv8fIpbpa/5xlA+Jwd FJLA8lHY3yUEqlDG7/60PPX4zAePlMIcQv9AbUCUohq+5DtsfTzBN/1zENyKAMVQDzkTjs Yn5zwj8+mmfCnRN6R1rAa9fPl7XDRj0= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; spf=none (imf01.hostedemail.com: domain of alex@ghiti.fr has no SPF policy when checking 217.70.178.231) smtp.mailfrom=alex@ghiti.fr; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1676535422; a=rsa-sha256; cv=none; b=DiFUsL0wnynHNWHVPZoybDjAOKIuGYA88upmJbCTLZuwatr0oUKtuOHsfjV0liTUagy/mN VfS7q7N89+SgYSfGwU2GrVqIWkzPIIkxhlVzsZFOMnQ9CTNb5hFglSfsHCuzmmqbWFc2RN jypVIx8nSpmV0a6Z0RzNMbfkaqYvmkc= Received: (Authenticated sender: alex@ghiti.fr) by mail.gandi.net (Postfix) with ESMTPSA id 9C48910000E; Thu, 16 Feb 2023 08:16:56 +0000 (UTC) Message-ID: Date: Thu, 16 Feb 2023 09:16:55 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.7.1 Subject: Re: [PATCH 10/7] riscv: Implement the new page table range API Content-Language: en-US To: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-riscv@lists.infradead.org, Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-arch@vger.kernel.org References: <20230211033948.891959-1-willy@infradead.org> <20230215000446.1655635-1-willy@infradead.org> <20230215000446.1655635-2-willy@infradead.org> From: Alexandre Ghiti In-Reply-To: <20230215000446.1655635-2-willy@infradead.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: abp4kwc946bqqpcrgeo7ysztexx89pot X-Rspam-User: X-Rspamd-Queue-Id: 377DA4000D X-Rspamd-Server: rspam06 X-HE-Tag: 1676535421-879190 X-HE-Meta: U2FsdGVkX19l6VvOEamYms3+1cUJkKJt4t03QmoPdsZ5ETCjW7PjhJIntu2NlFXWuUAUG1vkZ10kBY/uNi6fhyAjsJhFvIJ2p/DOzQ4DW27HcXonA/Ni2GWv2p1oV8SzUHDAv88GN1kyRXWFUFc5ddF7CMVoA+vYe6hZIAkQx32MwHMUcxR5QpEa1MOQlXIc+uY9rlL42z1/Ewte6KY9FrAgOQt4r71+4cUxKWqb5Sr7FTAESeKZmlKg1f7p4lonZ/uuxKux3xJmgfPh6kew59yrY6rVEEPV9sOXL6ARVWQvpI0KSEFNQQ/R3kqV1aIYEUcBH5Mk3fWzXA6xmK5oEwZFvbertVjFmFuG60gO+7a2LS249juQT7Zi/DgSSVCowynF1ZJ34MbbtirJ7IhsS8Xz0FHlcbWptNWTGzzMTSqvg4MrYDvospxXfVvZMDTNd3+FIbaeajMrOIRJ5anDqcFXOo+jPFoGUIkram4EaHIyluK/29BcBXwv+AIOiLOfuMHfRtbsppSNWVUCQ/ajDs0hxTmWGog8QXbz7GKE8ttpTx1QSnJpgL1UWBWk1sVoqNd0P7KypSYkXacwTLtDu8oDUMvIF3Mz7B6z3d6E9XrUGGCBvo7F8uBcuDnIODiB+1h9fosGoPzLQz3DBjnDhT0tPqTqmrJnmSsPOuOHUkketI9Nxef1nXppMIM/+Up1NzHrCELykRFIbS1u2kxXWMe+vOFdDDHFuDKIvn+iepfZehHCKr4HYTGsFFeA7570/YS4u67TBRoJriPt+nnUoEgRmwUl4GpikTTsQ+FbOUrsQWiNtLDeuQldWIPHDsrlTnEiXlwtDu58m1eauiHKfm5tJmYyqIieZSmapguztSLthKZZJ/86sgK3jUj1wVTyO8U5no1Uwqhi+h3Jbhh6uRJ5lBVTy7VhcEu9Uu6HozEOIr8o+DH7ssKCxN7pdqxlZUipVFwE73GnUQjR1qk gmC7StAp HSk4XlktBvay/CGCLn7Se4RMD0cInxgY6dynF9vxA1Kn/mjildcle/tCBpRdtwI6BoynmtKvl37dI/fIKXESQq+U8V34zHzrtmNTu79RFCs6lM6z8VDA2N8Y7POWJ/6/3MnslhPsyGRnJrJJdJTcACsYsWbXhfY/xUE3I3ffpsUs28OedtQTL/P/nPO7TZOkedBkn 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 2/15/23 01:04, Matthew Wilcox (Oracle) wrote: > Add set_ptes(), update_mmu_cache_range() and flush_dcache_folio(). > > The PG_dcache_clear flag changes from being a per-page bit to being a > per-folio bit. > > Signed-off-by: Matthew Wilcox (Oracle) > --- > arch/riscv/include/asm/cacheflush.h | 19 +++++++++---------- > arch/riscv/include/asm/pgtable.h | 25 ++++++++++++++++++------- > arch/riscv/mm/cacheflush.c | 11 ++--------- > 3 files changed, 29 insertions(+), 26 deletions(-) > > diff --git a/arch/riscv/include/asm/cacheflush.h b/arch/riscv/include/asm/cacheflush.h > index 03e3b95ae6da..10e5e96f09b5 100644 > --- a/arch/riscv/include/asm/cacheflush.h > +++ b/arch/riscv/include/asm/cacheflush.h > @@ -15,20 +15,19 @@ static inline void local_flush_icache_all(void) > > #define PG_dcache_clean PG_arch_1 > > -static inline void flush_dcache_page(struct page *page) > +static inline void flush_dcache_folio(struct folio *folio) > { > - /* > - * HugeTLB pages are always fully mapped and only head page will be > - * set PG_dcache_clean (see comments in flush_icache_pte()). > - */ > - if (PageHuge(page)) > - page = compound_head(page); > - > - if (test_bit(PG_dcache_clean, &page->flags)) > - clear_bit(PG_dcache_clean, &page->flags); > + if (test_bit(PG_dcache_clean, &folio->flags)) > + clear_bit(PG_dcache_clean, &folio->flags); > } > +#define flush_dcache_folio flush_dcache_folio > #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 > > +static inline void flush_dcache_page(struct page *page) > +{ > + flush_dcache_folio(page_folio(page)); > +} > + > /* > * RISC-V doesn't have an instruction to flush parts of the instruction cache, > * so instead we just flush the whole thing. > diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h > index 13222fd5c4b4..03706c833e70 100644 > --- a/arch/riscv/include/asm/pgtable.h > +++ b/arch/riscv/include/asm/pgtable.h > @@ -405,8 +405,8 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) > > > /* Commit new configuration to MMU hardware */ > -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_area_struct *vma, > + unsigned long address, pte_t *ptep, unsigned int nr) > { > /* > * The kernel assumes that TLBs don't cache invalid entries, but > @@ -415,8 +415,10 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, > * Relying on flush_tlb_fix_spurious_fault would suffice, but > * the extra traps reduce performance. So, eagerly SFENCE.VMA. > */ > - flush_tlb_page(vma, address); > + flush_tlb_range(vma, address, address + nr * PAGE_SIZE); > } > +#define update_mmu_cache(vma, addr, ptep) \ > + update_mmu_cache_range(vma, addr, ptep, 1) > > #define __HAVE_ARCH_UPDATE_MMU_TLB > #define update_mmu_tlb update_mmu_cache > @@ -456,12 +458,21 @@ static inline void __set_pte_at(struct mm_struct *mm, > set_pte(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 pteval, unsigned int nr) > { > - page_table_check_ptes_set(mm, addr, ptep, pteval, 1); > - __set_pte_at(mm, addr, ptep, pteval); > + page_table_check_ptes_set(mm, addr, ptep, pteval, nr); > + > + for (;;) { > + __set_pte_at(mm, addr, ptep, pteval); > + if (--nr == 0) > + break; > + ptep++; > + addr += PAGE_SIZE; > + pte_val(pteval) += 1 << _PAGE_PFN_SHIFT; > + } > } > +#define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1) > > static inline void pte_clear(struct mm_struct *mm, > unsigned long addr, pte_t *ptep) > diff --git a/arch/riscv/mm/cacheflush.c b/arch/riscv/mm/cacheflush.c > index 3cc07ed45aeb..b725c3f6f57f 100644 > --- a/arch/riscv/mm/cacheflush.c > +++ b/arch/riscv/mm/cacheflush.c > @@ -81,16 +81,9 @@ void flush_icache_mm(struct mm_struct *mm, bool local) > #ifdef CONFIG_MMU > void flush_icache_pte(pte_t pte) > { > - struct page *page = pte_page(pte); > + struct folio *folio = page_folio(pte_page(pte)); > > - /* > - * HugeTLB pages are always fully mapped, so only setting head page's > - * PG_dcache_clean flag is enough. > - */ > - if (PageHuge(page)) > - page = compound_head(page); > - > - if (!test_and_set_bit(PG_dcache_clean, &page->flags)) > + if (!test_and_set_bit(PG_dcache_clean, &folio->flags)) > flush_icache_all(); > } > #endif /* CONFIG_MMU */ Reviewed-by: Alexandre Ghiti Thanks, Alex