From patchwork Wed Mar 15 05:14:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 13175326 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 0AC8EC7618D for ; Wed, 15 Mar 2023 05:15:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A5BA38E0017; Wed, 15 Mar 2023 01:15:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9BF828E000C; Wed, 15 Mar 2023 01:15:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 85E0A8E0017; Wed, 15 Mar 2023 01:15:00 -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 65FFC8E000C for ; Wed, 15 Mar 2023 01:15:00 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 41201160A90 for ; Wed, 15 Mar 2023 05:15:00 +0000 (UTC) X-FDA: 80569968360.08.2415E93 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf14.hostedemail.com (Postfix) with ESMTP id 8A8B7100004 for ; Wed, 15 Mar 2023 05:14:57 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="YSru/PFc"; spf=none (imf14.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678857297; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=38B1+LejdXOH6t72uoRMfRzsT0ieNPnJ8TZi4WwwYkA=; b=586r6O9rGqLYP+naG/c5EwPR/FIWEE9/f801EMv+y5hsDeK6SBVoW4IT6kxCE8PoO3jHrI G56yJ+J9tbE9wuF8GwJLxvdHIPkfADgQOqes+2LnZjS1x5jY44K+v9KGlpa+GsKx9ecxGr LmoQ0j1Zs6w6WAjxuhosF5BkWOduMLA= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="YSru/PFc"; spf=none (imf14.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678857297; a=rsa-sha256; cv=none; b=eH6Uo2mJH4ydQhWPp8kMesLerwVTlt+yJp45N3zX7M9NVQvxbTPRj4deIb7E29kt2+Z0pH 8N/OMPWUDw2nupP1MzEABWP3MZuHn5peYfJAE0xjBTuj9Fiz13HKDr6T0oRu3o/tV5oYZc HUKKDh1yBmfTHvmdwuZ40QcLJKkAWSc= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=38B1+LejdXOH6t72uoRMfRzsT0ieNPnJ8TZi4WwwYkA=; b=YSru/PFci3y3bCGvb/huM4Bus8 xg7e8+jo7m6B1eY/kE0HJW0YZ/jpoBBuU9KeOSdWhZ42Zi7JLSm5tEG6aFOLKQkrpXpupQ2fGhm9U pA96HH6Qhxyy4UbB7cdqndmz5bxU3sgj/DfTeLck48vJE/qvEtpNw1fzrrcDSKvztNXKOGiTsqjdf Pfs+hzfnE/S3roSZw6GVOLjmPUCfX2mjmWfM3nzUnJyygzCWp5P9JSgqk1wcDQ8/m2IyXv5lHjuoJ GYoNBiPiS74kGZX5/SYXTFhGv1U9PV0fzL88fcYpy6vK6ydgySUupqbQjzCwu1UhkncUr1iorqjao kUVFBJxw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pcJTM-00DYCR-RM; Wed, 15 Mar 2023 05:14:48 +0000 From: "Matthew Wilcox (Oracle)" To: linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Alexandre Ghiti , Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-riscv@lists.infradead.org Subject: [PATCH v4 21/36] riscv: Implement the new page table range API Date: Wed, 15 Mar 2023 05:14:29 +0000 Message-Id: <20230315051444.3229621-22-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230315051444.3229621-1-willy@infradead.org> References: <20230315051444.3229621-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 8A8B7100004 X-Rspam-User: X-Stat-Signature: wqxb5a6i7madrktxkxqp3haxh5az1d69 X-HE-Tag: 1678857297-954883 X-HE-Meta: U2FsdGVkX18SefVBJ2rRTNmXVtNoxuHEeNfpKK0yLcuI5a5yNxeEoHnqktaeeQGXr/S9Hqbu+WtadHO3erMQp5owcOpVMrqYeKtZFH6lKNDew7GiZDSh+fqn7uZMlQTqiP2a8tzwEk+53DB2/MJF7HywkwxoGAd/WtZSp6HQMVczSAyGImUeKDmrf7ZkFNIPiqrgWcoxHJM8eBUGgkKKbarcwnkQsLLn3TsTNPvsCsCYWZ/0iN+2tLyIAFzZOEILy2XkCkPzy7kR1mM1uYspSJTlyrS3sdrSrCDXyUef9izdR0o6BCNC4iTAyMhvImuFKC2cZadgzYdXecwfaa6husNPu13DRJJxpndvYGQqJ1XCZabcZrKlwYMibTlVxXRLj/5h13Z+2cPCfQl2abqnWcItKMrgBWjGYiSzXYM8rBWQWHySm0/9EmTV5CX/UINiiUgrDzD4zTM7J+GcGNeKdZfeoLIXHVbk6yIxuqBg30AfVOBsBTz7jC44t1MJkHjxzLC51ShzyicAAfI5ENLC5y0HhtFtTJLKTMBzo8M//W8FWiWRoxCZeVxjdwI238Bsj73H4cR2l7e5vk/1FWTfw/bbA3yTSIFm5k847GNV1a7LPMc8D6KvKSk19b2q9SGUpXi/S5KrAgCUrcDbkycSSZ5h2y3b+cRg5eRkbN2GKvK7zMZP55B37GcYARf2Fs00Eqh+NoewUX2EyTUzUSof74Znrbbm0cXJiRl/2xnck1pAsOIJMSWRGZKPbTaykb+gRd3IhP9+H1wu2m72lmOkH0n+nrbz1Ke1N/3Z6w92j7As49XFn7o51g+BSZAq2twtYZpHvE6qOaFBM1YZiwE37JdC3GuhPlEnSVu4FJqAl8hKw0QXgKycZJzUuZXXJc+6RnhQOH0zaWrgvWDh1K4eopUaJncJTDIFas3hmK0x8c5iInERZjniKtkpV8eSHZxggMJ//waLQkIJ/EhsLHt BqSsf0fs fibIVrTS4+MHFl7Mu7mLzmxO3tcYdGgXdU3NtULbcASADESTM3AzmcYEGhHJ9HIZmP6hxRqe0vY9rWtlolMFQnjHtoqcV5Hu1Yf7lPnWticro1Upo+m2hmqALAl3wlB8Rles+p13jhD7MMIb7q5pDZ4ii82B4Tdwjl419mIChaSiDE6McPmpb0sH3BwUBhqgwdl4SXsOPKg3eLJpzhUQ5gJw7JPEoa1eh3n1C3xRw1KXZCewTOldnJxtSYhZucFqq5mrnS+nTyG1i028GTMFgXDvvyFCm0MrH+x5eH0hOwl7l18ZKr0r8xpxclPq+IorcKV46CHfAlkfD0CNyE7F68vviZyMxCJcU0mQpX6a6Dhsep+5Xiz+0X4VlIw== 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: Add set_ptes(), update_mmu_cache_range() and flush_dcache_folio(). Change the PG_dcache_clean flag from being per-page to per-folio. Signed-off-by: Matthew Wilcox (Oracle) Reviewed-by: Alexandre Ghiti Cc: Paul Walmsley Cc: Palmer Dabbelt Cc: Albert Ou Cc: linux-riscv@lists.infradead.org Acked-by: Mike Rapoport (IBM) --- arch/riscv/include/asm/cacheflush.h | 19 +++++++++---------- arch/riscv/include/asm/pgtable.h | 26 +++++++++++++++++++------- arch/riscv/mm/cacheflush.c | 11 ++--------- 3 files changed, 30 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 b516f3b59616..b077bc8c498c 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,11 @@ 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. */ - local_flush_tlb_page(address); + while (nr--) + local_flush_tlb_page(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 +459,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_ptes set_ptes 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 fcd6145fbead..e36a851e5788 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_bit(PG_dcache_clean, &page->flags)) { + if (!test_bit(PG_dcache_clean, &folio->flags)) { flush_icache_all(); set_bit(PG_dcache_clean, &page->flags); }