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 66389C61DA4 for ; Wed, 15 Feb 2023 00:05:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EF3816B007B; Tue, 14 Feb 2023 19:05:17 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id E54A46B0080; Tue, 14 Feb 2023 19:05:17 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CA79E6B0081; Tue, 14 Feb 2023 19:05:17 -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 AE4E66B007B for ; Tue, 14 Feb 2023 19:05:17 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 6C044160A03 for ; Wed, 15 Feb 2023 00:05:17 +0000 (UTC) X-FDA: 80467581474.21.82C4C31 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf09.hostedemail.com (Postfix) with ESMTP id BAF1B14000D for ; Wed, 15 Feb 2023 00:05:15 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="gulMP2V/"; spf=none (imf09.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=1676419515; 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=v+YCB1fx4UPA9iEkgC9GqZSNjcLUQaLXo5P2YNuoVqs=; b=SzuH8BJURSof+incguaekh+IbqmI7uvPKGaNPkQLbyvA4jtiv2zucTKbRP/qCB1yQF8dKN NPQ68mlFv+CX/gIN3PMZAqkOjq157e6N+tYzIWBarGE3L46BrGsSiA4cYUUEI6bUpV7udo FJgWVtpR+HEBGQgcq+7ZPGWcL4sNEuo= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="gulMP2V/"; spf=none (imf09.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=1676419515; a=rsa-sha256; cv=none; b=MLhc8yfaM5/udKUNG+V8VPSqbXQqhSsalex67pd7gYQ+v7vAQV7LIsoxb9ynmJealtthCj dxB35g+sZsvcj3vEGrahapOPqz7emt6fyGa2iD9gVBGtjwJ/DDJtNjoYUKZuavu7EjuFt9 F+zS9CEq0JIz6IEIEa1g02Qo9VHw7Yw= 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=v+YCB1fx4UPA9iEkgC9GqZSNjcLUQaLXo5P2YNuoVqs=; b=gulMP2V/waJdjiu05gvVHbNrv6 hgj16IWg8ovGkNxY3/qNWLG1GfEPbEdR7zfggUscuiwUOvFdgepGat8uqxdFP23N6aSQsJOg02vw5 0u3NieyYTCx3MaJr1Ro89AENDlpJwyFFxp93FwPxy5kC43eS41FIRuPu/2JS/ma342VVSivoAN5yo iRQHVihKskj6YRpY4CGVg9yYs/rrJ+ALVCXlnLvMQ8JdenlQ8NHn6PkkUqVjWJDjCvgmeXfhx5eKr DlRjiOwnh433a96MCrwGLUXJ5wYNYR4unNbEoKHd+oMrT3ViYiyCr9u3hscvF5Qjsic6ulV658bi1 ossiVp4g==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pS5IM-006wkh-Nt; Wed, 15 Feb 2023 00:05:10 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-riscv@lists.infradead.org, Alexandre Ghiti , Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 10/7] riscv: Implement the new page table range API Date: Wed, 15 Feb 2023 00:04:43 +0000 Message-Id: <20230215000446.1655635-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230215000446.1655635-1-willy@infradead.org> References: <20230211033948.891959-1-willy@infradead.org> <20230215000446.1655635-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: BAF1B14000D X-Stat-Signature: 5u4o93jhh31xp14wwysahuc8qbcfziy8 X-HE-Tag: 1676419515-908639 X-HE-Meta: U2FsdGVkX1+2TyE0OOaxd+VaSYxfCs+nJCVER9uB0dcLDiDBb+okAQfpbJQ/1+Pr12pB+ohqQfZVbIJqRHdo7ETfcWhvL4S6htjjQ1tQADipzgb1wLsgsr0COKYOaAu6l/o0LhKKwnsxXW+jXwN1saLrelxz8iWqYNjHAZ6N0OjgAVmFRIXYjRZ3t0ZOL91G2G7swWaMf/pni814Sb75jUongYNyWOz1t+g/1OGXsDN0NUJV2IcZY+C4iWE1di73fykpH080JH3zyv/FZZ0L899lG5yZUImwS/H7RR16+0HqjxEl6zhavhRvKE6zDi2/Bc37rKDejkrPsS0fZB0LF9riB69/9uxYhlTH3PpC+CM8qPpFOYRgiluXb6y4QeR+1H0MInfZ+JvQYrJPDecgCAUq2+qZT5PtEad4q+lY8DdSrBtywMTbNswFwXQ1QDhwjFH6vKiIZSmzIzPv8zUBPCqmh5ZdwcLPYlSkhS17PPUG/3jc2L90VA0kOrm14eOA4lsW0s4jfo44vul52gyUFnqVAK7uo3HTwBzZ6OHXSHM19IAbhTVZw5vNrp2spFdMcLbUJe1gRjbYVkurc+xpDYgVNT0sb01T1BZf0TNlepJprI20muOImUqUCopb1hblLMQ1XARytXMk1VjGu87yz9YY8a5qfPuqW6/mcHNWfw6BbJBCCubMAU6/yAIA6u03gUyDgU6iYonvySqD9hBBwvWhz4040gPtG1WkxwvE8LCQBLnzfHwK3KX+2tBE0h1K7o/XGh7oAdyKqSBcCC2kvX/wn5AvLDLK1TwYa+V+4fU8upW8GugbODrg9ggbgl95jl3sRut8uY6GbnFpb/6qwBMpuJqftAxPEaKuJLTuj+cDdfaZenCJ9fjtwN+45xeFplt4kqqpj0U1pjTdM6axyuDkgf9dk7kAGtj5UuJO+SzZDU1nNyoS5EXgZY2iiqCNPQyLlhxRtvxYSU/pjJ2 dXlD1v7U hyBuTF/vihM5LxTBHfgGZ0gzhhxGJCfcW5PrzXlT3AbVAbooO0HZse51+pd5o46EkSDkTSbOqeBzzwnOnGJLRnfNwazq+Et/kT/2P3le8BYWd7hZLkkUGjdp/u0Yq+uJUZxr2E6OuvkNm8J3/Xy2HH/PHxuJRsumCsTGBQqZjthGLUbau0aJXmE8whJLPYtGvqvPF/XH7svZ4ZvE= 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(). 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 */ -- 2.39.1