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 8268FC76196 for ; Wed, 15 Mar 2023 05:14:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 79D088E0002; Wed, 15 Mar 2023 01:14:51 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 725996B0075; Wed, 15 Mar 2023 01:14:51 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3CA466B007B; Wed, 15 Mar 2023 01:14:51 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2C8E06B0075 for ; Wed, 15 Mar 2023 01:14:51 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id C7823AB7CA for ; Wed, 15 Mar 2023 05:14:50 +0000 (UTC) X-FDA: 80569967940.14.64D51B2 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf10.hostedemail.com (Postfix) with ESMTP id 29742C0011 for ; Wed, 15 Mar 2023 05:14:48 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=qvKCLfOT; spf=none (imf10.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=1678857289; 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=LW+93YDvE0rhXiX71/y+XJfftY4tnk1rGrYMJAeDkKc=; b=FIIFh1A445lE/C6JwitBM/r2/IL1WOBkqDgzO2jDgp395HeMqWYcq2NpV/U4uQkhyU4dnJ kN0a4Ykq05PbhfXSVls0GRiQ7aBUIaNm27bEHSII5BS7yRzlroUC1Tqgf7CrgXXClbTcs4 LcgoRVjK2lqjOXMr8k6M5zq7lCzne3M= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=qvKCLfOT; spf=none (imf10.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=1678857289; a=rsa-sha256; cv=none; b=bngpUjdl2VCWbsMqvOUdSCUPpmTDSMHsietbPlIp/FGF2niZxfvtTGjCoXb0ef6164OLw8 P03xGXLYtsRc7eeqWknn/4gHswlzyUKe6UxarvjhjpbZ/1A2CUBuOzmMmfJ3JCgfeiYwXt LIPXIlXjGWrMWMoWOCpVk0N1D3tyJa0= 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=LW+93YDvE0rhXiX71/y+XJfftY4tnk1rGrYMJAeDkKc=; b=qvKCLfOTWAstPHTM9tNUxHlRc+ WTnelyFVDsGQ+YeKDJ7XNwmOTH40+1/2qIkRkn9GsgIXXnV8pFpZ78kxf1Z0+WtC4l1pQ8pZPSZql pvr9OgyHeLbgFVmtSQNnH7c595wjFINTxqzxYnA+blzPnexMwpkd+qfI+YGRTyvlnEXyE099EDw/f NZ74j+2vo8ioFryx+hOe5ygAYZusqhed/xEQ0QPI2H2IhUPsbU90DTyotrfXwX1mzQdyQJSb/q5MC p1f+ShNT5H/yGybCgtisIsE0Ur1WlTLHBRu12qtRz2r2bXAizHLN7v9XvsSi5eOW1r4QO+u17d7ot WWXsf+Xw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pcJTL-00DYBS-Fe; Wed, 15 Mar 2023 05:14:47 +0000 From: "Matthew Wilcox (Oracle)" To: linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Guo Ren , linux-csky@vger.kernel.org Subject: [PATCH v4 10/36] csky: Implement the new page table range API Date: Wed, 15 Mar 2023 05:14:18 +0000 Message-Id: <20230315051444.3229621-11-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 Content-Transfer-Encoding: 8bit X-Stat-Signature: pm6firuh7crsyz58r8y87u69gi3zkehn X-Rspam-User: X-Rspamd-Queue-Id: 29742C0011 X-Rspamd-Server: rspam06 X-HE-Tag: 1678857288-475866 X-HE-Meta: U2FsdGVkX18FG5+9usx0WA2he+TTi/cg9jKE76tDY4ouJ49nJM9oI/UVF0eud3Sbj7je3/YmegOORckW2LYm3Fw+byPL5uNBhI9B1WKb608dmDusgANxedZKxSXUetI6CAiVlKL2Gqf0BRgRG7UCXoglGE+tivK6YjtGOhnFgsF/aljhRepIPyclTmhQKtKSnaWedIcPzo11mknyx8gvZUwRsRmd6U9YmKcuyIfaZVKFfRQoJIiglDf0ukjzqtia82OHaUQNh0Cr3u2rOaY+eZ0w1tqD+g+EKe+L4eIMCGcgC7zZQxqdTn/3YBAt1z6TdpS9PMG1/Nd6OvD8O5TKZoubk7XpMrssd54SFrz7G9LTupdLtdxCmXmlA3c80Vwzf5F74rFLzSUm2F+isln5FbXeR5q0oGV4z+W4Vki9aI+/B80tF1s1K3Mp83HP0+dbYRj+MXnP/zFNry1BlgAo94LEdQXTTjCKUmOtnNBdHoE0dDfcmAZlsRxh2utVgCzXdMqMHPQdIB8FsUUdkwYF+u3TF7xl7E6Fse0IZwYWnk/5HdzpctXGP3oUqzqs9AsKSVj3/lgp6pdVfczZ91X1vJU1XP2gCWzygS4Kdoe4HCfX0BYiJfo4DbrbdpOZ3RR2fKcOkP6TpDPA8d/qChdhPb4k616y7D1SrgHXwqF2DZBe9cHIRatacNtVqj5hA26UZCGLDKR8UjNI9VPMlXCNm3J6/5V3vsELSd2N+YS7Ps8ix5vv//b/Vc3728UzEo5xNzrlPDJOHxi3EwhEOOn7wY1NNmyMfh6olJsUmnlQiGiJZkHtKmOkjn+UIcZFUjyaYDdWDy40rOASqFD3zVUCKaIXxMXQEms+/srRtVTLJTixLWhiaAjmWyXOtMl9xS4ctPFAPwdlN+w4MiS1gLm76+HDqH5uPegfoKnnsa9d3BGjTkxDxLbvzzfaDoL7OhIyCRMCwumuGDru+6R0Wtm n8DMSal0 k7uSWQdaUtjurDJCt8Yds3/XpcCm/PL0OklbOSKvpIc55kFJLJZXULvrS7QhzP+veSzNbVyQwcy08eA68rPUID6EBKgXsYKpBn1Fint1PhNRdz5jDh+pZ+k6eaY+rTVdFMpFqd+4oYGaHGsVSzGN1MSWQDBZQVNY+nEOgVEvDtTWqCf0sxcnNiZl1oFaX7ziC9C1gf6wPPyqNbM5PdQYe8CGnN2ewwUIXMKXE7QiWOuA1aZ0pyJoMMT3hFSRrbUcyYcuS 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 PFN_PTE_SHIFT, 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) Acked-by: Guo Ren Cc: linux-csky@vger.kernel.org --- arch/csky/abiv1/cacheflush.c | 32 +++++++++++++++++----------- arch/csky/abiv1/inc/abi/cacheflush.h | 2 ++ arch/csky/abiv2/cacheflush.c | 32 ++++++++++++++-------------- arch/csky/abiv2/inc/abi/cacheflush.h | 10 +++++++-- arch/csky/include/asm/pgtable.h | 8 ++++--- 5 files changed, 50 insertions(+), 34 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..622e5b1b3f8a 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; - struct page *page; + unsigned long pfn = pte_pfn(*pte); + struct folio *folio; + 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..8cd27104f408 100644 --- a/arch/csky/include/asm/pgtable.h +++ b/arch/csky/include/asm/pgtable.h @@ -28,6 +28,7 @@ #define pgd_ERROR(e) \ pr_err("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e)) +#define PFN_PTE_SHIFT PAGE_SHIFT #define pmd_pfn(pmd) (pmd_phys(pmd) >> PAGE_SHIFT) #define pmd_page(pmd) (pfn_to_page(pmd_phys(pmd) >> PAGE_SHIFT)) #define pte_clear(mm, addr, ptep) set_pte((ptep), \ @@ -90,7 +91,6 @@ 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 pte_t *pmd_page_vaddr(pmd_t pmd) { @@ -263,8 +263,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.2