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 C7805C61DA4 for ; Wed, 15 Feb 2023 00:05:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 09AC76B0072; Tue, 14 Feb 2023 19:05:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 023356B0073; Tue, 14 Feb 2023 19:05:14 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E2E4C6B0074; Tue, 14 Feb 2023 19:05:14 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id CF9396B0072 for ; Tue, 14 Feb 2023 19:05:14 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id A0A0B410C7 for ; Wed, 15 Feb 2023 00:05:14 +0000 (UTC) X-FDA: 80467581348.14.BD850D8 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf06.hostedemail.com (Postfix) with ESMTP id 53A1A180007 for ; Wed, 15 Feb 2023 00:05:12 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="YR6tN/b0"; spf=none (imf06.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=1676419513; 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=I6DsPKc/8oKTSDrS7DmGqt2ttnyNGv79rW5ecTki52o=; b=mS206n5m/69xS06eGYWlm0eQBemBOoWzEEgvqxtpA/y6CjvjwMb7mlYXX2PtpuzdFQouh/ yHEfYJPbuCzifqo05tPGzaWccEl3Iw1TccZZ4A65PcjgiOdEHO5cBORzPwVXIvs0W0xHIb AmPGhJCZt54QdHNnJ4C7CG3GkWHS7dw= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="YR6tN/b0"; spf=none (imf06.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=1676419513; a=rsa-sha256; cv=none; b=LwaKoFmzNaF8MP9HSqucEgsE4oG/r/6LCHxBeY+yRCQoc8Vlr4o0AntMNf2eQcDNMcM5jf MlvEJE5g8ECwX2+b/Yv+BrObQ1Rka54eSgi8zMrCdT1rAv1miu4/ItAm6/61IsVJoaLoCd 1R0Ghz3BA8gEUlFX7rF+kQEx1ZCN9/Y= 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=I6DsPKc/8oKTSDrS7DmGqt2ttnyNGv79rW5ecTki52o=; b=YR6tN/b0SQpWo8xxa7mnaFOI7e uEdA3uBznI3gNqsWAnxwPSvCL9LWifC5CGLRU4Ky/2PBX3daviODQyIR91fm9JgzCDYts0QrBAAam awMtcghx7+0OjllxFB616jQ+i7zJnJKCz91lKjOBLFnU2sXIaaufDvU4xpPtmexVjUc9GqC1GVl4i VHXc7Gr3izXp/9N6nIBt0UFqVwz1XWXmlvmgywhVpqE98oa4/Xst6M5kNrnnlg402HXQLjncH6Y13 aDdKb0C8UQ74TFkqQhikUfvl0VNiob7naRpZIcDXYl8gWdwQBu22v8BRCs8xeRHsdUS81wHaW+T+d +qE3lsGA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pS5IM-006wkj-Qt; Wed, 15 Feb 2023 00:05:10 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, Guo Ren , linux-csky@vger.kernel.org, linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 11/7] csky: Implement the new page table range API Date: Wed, 15 Feb 2023 00:04:44 +0000 Message-Id: <20230215000446.1655635-3-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-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 53A1A180007 X-Stat-Signature: p14uugpauc8mqni5ga3pymamtomc9d3a X-Rspam-User: X-HE-Tag: 1676419512-258094 X-HE-Meta: U2FsdGVkX19qTKwaYX90tqX8nr/B7MNuTULMjRjF4IdwJmGszWCB7TuN0QKy4KzUsUTbAHJ/u2N/UULmW0FMbKHJOevR+jzq2Rhol9eg+ZZTdx/CVfciRZDcbokiE0Vf4nMFSXOzwwU+DtINP9gEaZdA6oMjKDPUj3ws+o4Qyj6cETLNBZHKQKP1pao3qJhWv/nKD1/JemDsvlyC4Tl1RqHcGw28i2kLMKiMoIxLdQvQb4/yxnGhNDpc3qWWSNwwZ55jm1mrs12AcBBh8FBAf+FgQGwBzXaO78IqQ1K45rkmG7bRf5vKFZ27vTGutiv1p1MPUEJ191dc1lB3wXpkak+VgJDr6f8T7zxc9woBZ+kU2aWB/UhmcsKlWpZiZxr+H4A/0pXn1q/0kkqRK9QDUyNmraiE0LgptWZ45Jazf/rmbpd1mz6MujddAgVa+mTgSG/JBjy669jFOxABaxlXlWhnQvGdtvjoqMkEhPAHAzfThvcGGp9IvGfCccnuf070G+3RQnizsZt+DqRtd4vzCKLIu3SFg4A5L+MXY7D1wlq6BlMrP5UqJiBAyOazES2nW5KafJMp8jJIVDiAxucYKS0P+sT/u/2gDHtc6QU1MTUN8zgGhvZtmHLbPVsOzkpt6+gse7lBQKpSRNYkdfeWPUVhFwGaV0piQu7KshDoZiOuL/P79mFCOWlygdP6wHwcnAsoGhVM+pyQyrm33+C0WwfROUwaRAP7iQLTJOa4frIcX4Z1iwdH0OW7vu7HPcSIBKjNsYx57eEUt/Y1y9k0d47bG+RLv0EpyGRgE/nMVhsKnDFEZA6YDts9wqYxdaC7K1sG6pb5q+tPOuzZjE5vLT028toL4B2cnvHIPlrNiBkfZ+zEp6CtzOWj9mDX1w8Rj62+LwW3WuRMvbnDt9tCK3HePH0P7puVwYn2OLFcac+5u4w+cZn5pYHCJZuzpPNkCFhWYUW0cgwfdzGP6G5 p/XiX43d wR1BbknE701sQ2xB/KDKtZMstmsCm4KFe5iJh8iXbmIJmEfjBc3eug6H1X4hQhhd73KMzGMEORHcDsFExN4NQ4ebXxa2gjdrcappSm9RBESMhUuzHYnOWqHl9QO1jp97n+mCHQg1e4oydeaS5vEvxbfLeR6TMbEBOKVVHVwOemA7tjTfhPviXX9Jlj6Kiwcyk3rbkTjlkYFfy9x3ct0op2bNL+I/kF6aXLIPE9r56aREv18M= 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/csky/abiv1/cacheflush.c | 32 +++++++++++++++++----------- arch/csky/abiv1/inc/abi/cacheflush.h | 2 ++ arch/csky/abiv2/cacheflush.c | 30 +++++++++++++------------- arch/csky/abiv2/inc/abi/cacheflush.h | 10 +++++++-- arch/csky/include/asm/pgtable.h | 21 +++++++++++++++--- 5 files changed, 62 insertions(+), 33 deletions(-) diff --git a/arch/csky/abiv1/cacheflush.c b/arch/csky/abiv1/cacheflush.c index fb91b069dc69..ba43f6c26b4f 100644 --- a/arch/csky/abiv1/cacheflush.c +++ b/arch/csky/abiv1/cacheflush.c @@ -14,43 +14,49 @@ #define PG_dcache_clean PG_arch_1 -void flush_dcache_page(struct page *page) +void flush_dcache_folio(struct folio *folio) { struct address_space *mapping; - if (page == ZERO_PAGE(0)) + if (is_zero_pfn(folio_pfn(folio))) return; - mapping = page_mapping_file(page); + mapping = folio_flush_mapping(folio); - if (mapping && !page_mapcount(page)) - clear_bit(PG_dcache_clean, &page->flags); + if (mapping && !folio_mapped(folio)) + clear_bit(PG_dcache_clean, &folio->flags); else { dcache_wbinv_all(); if (mapping) icache_inv_all(); - set_bit(PG_dcache_clean, &page->flags); + set_bit(PG_dcache_clean, &folio->flags); } } +EXPORT_SYMBOL(flush_dcache_folio); + +void flush_dcache_page(struct page *page) +{ + flush_dcache_folio(page_folio(page)); +} EXPORT_SYMBOL(flush_dcache_page); -void update_mmu_cache(struct vm_area_struct *vma, unsigned long addr, - pte_t *ptep) +void update_mmu_cache_range(struct vm_area_struct *vma, unsigned long addr, + pte_t *ptep, unsigned int nr) { unsigned long pfn = pte_pfn(*ptep); - struct page *page; + struct folio *folio; if (!pfn_valid(pfn)) return; - page = pfn_to_page(pfn); - if (page == ZERO_PAGE(0)) + if (is_zero_pfn(pfn)) return; - if (!test_and_set_bit(PG_dcache_clean, &page->flags)) + folio = page_folio(pfn_to_page(pfn)); + if (!test_and_set_bit(PG_dcache_clean, &folio->flags)) dcache_wbinv_all(); - if (page_mapping_file(page)) { + if (folio_flush_mapping(folio)) { if (vma->vm_flags & VM_EXEC) icache_inv_all(); } diff --git a/arch/csky/abiv1/inc/abi/cacheflush.h b/arch/csky/abiv1/inc/abi/cacheflush.h index ed62e2066ba7..0d6cb65624c4 100644 --- a/arch/csky/abiv1/inc/abi/cacheflush.h +++ b/arch/csky/abiv1/inc/abi/cacheflush.h @@ -9,6 +9,8 @@ #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 extern void flush_dcache_page(struct page *); +void flush_dcache_folio(struct folio *); +#define flush_dcache_folio flush_dcache_folio #define flush_cache_mm(mm) dcache_wbinv_all() #define flush_cache_page(vma, page, pfn) cache_wbinv_all() diff --git a/arch/csky/abiv2/cacheflush.c b/arch/csky/abiv2/cacheflush.c index 39c51399dd81..c1cf0d55a2a1 100644 --- a/arch/csky/abiv2/cacheflush.c +++ b/arch/csky/abiv2/cacheflush.c @@ -6,30 +6,30 @@ #include #include -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 *pte, unsigned int nr) { - unsigned long addr; + unsigned long pfn = pte_pfn(*pte); struct page *page; + unsigned int i; - if (!pfn_valid(pte_pfn(*pte))) + if (!pfn_valid(pfn) || is_zero_pfn(pfn)) return; - page = pfn_to_page(pte_pfn(*pte)); - if (page == ZERO_PAGE(0)) - return; + folio = page_folio(pfn_to_page(pfn)); - if (test_and_set_bit(PG_dcache_clean, &page->flags)) + if (test_and_set_bit(PG_dcache_clean, &folio->flags)) return; - addr = (unsigned long) kmap_atomic(page); - - dcache_wb_range(addr, addr + PAGE_SIZE); + for (i = 0; i < folio_nr_pages(folio); i++) { + unsigned long addr = (unsigned long) kmap_local_folio(folio, + i * PAGE_SIZE); - if (vma->vm_flags & VM_EXEC) - icache_inv_range(addr, addr + PAGE_SIZE); - - kunmap_atomic((void *) addr); + dcache_wb_range(addr, addr + PAGE_SIZE); + if (vma->vm_flags & VM_EXEC) + icache_inv_range(addr, addr + PAGE_SIZE); + kunmap_local((void *) addr); + } } void flush_icache_deferred(struct mm_struct *mm) diff --git a/arch/csky/abiv2/inc/abi/cacheflush.h b/arch/csky/abiv2/inc/abi/cacheflush.h index a565e00c3f70..9c728933a776 100644 --- a/arch/csky/abiv2/inc/abi/cacheflush.h +++ b/arch/csky/abiv2/inc/abi/cacheflush.h @@ -18,11 +18,17 @@ #define PG_dcache_clean PG_arch_1 +static inline void flush_dcache_folio(struct folio *folio) +{ + 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) { - if (test_bit(PG_dcache_clean, &page->flags)) - clear_bit(PG_dcache_clean, &page->flags); + flush_dcache_folio(page_folio(page)); } #define flush_dcache_mmap_lock(mapping) do { } while (0) diff --git a/arch/csky/include/asm/pgtable.h b/arch/csky/include/asm/pgtable.h index d4042495febc..a30ae048233e 100644 --- a/arch/csky/include/asm/pgtable.h +++ b/arch/csky/include/asm/pgtable.h @@ -90,7 +90,20 @@ static inline void set_pte(pte_t *p, pte_t pte) /* prevent out of order excution */ smp_mb(); } -#define set_pte_at(mm, addr, ptep, pteval) set_pte(ptep, pteval) + +static inline void set_ptes(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t pte, unsigned int nr) +{ + for (;;) { + set_pte(ptep, pte); + if (--nr == 0) + break; + ptep++; + pte_val(pte) += PAGE_SIZE; + } +} + +#define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1) static inline pte_t *pmd_page_vaddr(pmd_t pmd) { @@ -263,8 +276,10 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; extern void paging_init(void); -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 *pte, unsigned int nr); +#define update_mmu_cache(vma, addr, ptep) \ + update_mmu_cache_range(vma, addr, ptep, 1) #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ remap_pfn_range(vma, vaddr, pfn, size, prot) -- 2.39.1