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 A6788C7EE31 for ; Tue, 28 Feb 2023 21:37:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6D4646B0088; Tue, 28 Feb 2023 16:37:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4AC376B007E; Tue, 28 Feb 2023 16:37:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DFD7D6B0087; Tue, 28 Feb 2023 16:37:45 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 769236B0081 for ; Tue, 28 Feb 2023 16:37:45 -0500 (EST) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id DB848C088D for ; Tue, 28 Feb 2023 21:37:44 +0000 (UTC) X-FDA: 80518012848.22.6C5B453 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf20.hostedemail.com (Postfix) with ESMTP id 2A46B1C001E for ; Tue, 28 Feb 2023 21:37:41 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hTwQ3kkA; spf=none (imf20.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=1677620262; a=rsa-sha256; cv=none; b=v/dXBxScYSGnhDsn8tNcegFjGahGGIxLI0p5xGXadpKAYBF5eGWAGyUDVtwhes4uSlJA70 4Qj9yyNFr3kRRNSC2khEVsvrPnvYDzf2gktc2CR27cnr1CfC6B7MNjzMOFbb1PyUtQT76z e3ACOB1uFH5exRquwu8pPBIsQhdw5hc= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hTwQ3kkA; spf=none (imf20.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=1677620262; 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=B5j2SOFWmtz+byodXTEtLGjajHY9V7moC1330qT7ZY8=; b=TUMxCZe+faD4CqylahQcok7d1D0YlpI7UwYekFMHJQ4HTp14Rm/5Y+XfkvjdQvJAXHDwSQ u+LK6nDZEcexdRwvpCc2UUyQQUV8Ll3b4mDKXdWdgS5E5WpJXLq4+CcSNQsR8CcHYOQxhN yRxUd5Bq6Nn7WOecF+RE2QFw3TCaNOE= 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=B5j2SOFWmtz+byodXTEtLGjajHY9V7moC1330qT7ZY8=; b=hTwQ3kkAP6iIZQTqLZVTocWHRU Ij3tn6LImZ/3nzMEl0hGpChAT3eXCsnlnPct5tN2GBKBcYJJxGmusv0GWljHEUfTTdiLmKHl5/r/A e1YPRGY8lpZlVpJynqExNBNvobacTeIKUky/55E9Nu4xkWqD2oK4Xop0YMzVOQkfM0MT3m83D4raZ CDbD2yw0ifcg4sTX9tBxeMl+2SPPPSpHQGW4VCQOOGfbCjgvwVahkjYzQyw9sMF0z5xp+5oOV95vo fgf/Yv+a30t9tD4bft/P+9AsaFx/62mVSHWM8mzEHdXQ3lZYd0+qgXY50cjIO3qJS6iVvinCLisyw Y0jkOjMA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pX7fI-0018ot-92; Tue, 28 Feb 2023 21:37:40 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, Guo Ren , linux-csky@vger.kernel.org Subject: [PATCH v3 09/34] csky: Implement the new page table range API Date: Tue, 28 Feb 2023 21:37:12 +0000 Message-Id: <20230228213738.272178-10-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230228213738.272178-1-willy@infradead.org> References: <20230228213738.272178-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Queue-Id: 2A46B1C001E X-Rspamd-Server: rspam01 X-Stat-Signature: on16byosq16u44xxqxza6fgszar1hgcz X-HE-Tag: 1677620261-214247 X-HE-Meta: U2FsdGVkX19Ao2GqDjN3cWhese7UTesnpuI42NMkTgu6tyq6hNg0yrdIA2p7uSQAkrLlWGXS1Ev24BwjjDR1FCF9xayZ99CEwq0MDvHcPyjtlWQhGJk01VhNwafS6Y6Sk38lsNIr/OV0sv89TV77cblBAqszLsOcVvKcKhSByHx0wV7cQdwrioNeLYxNqcZXVayl3+3ykAx8bBxdCZymgmAg/y8nPQ99EGT83AmzGTpnh0Q5BMKq7gI4zS6zA12MgYt8Zxrd5qmPNXM4DlimJAyZa+KT0W5bYAy7JEpyO1ofKZZhlaKm0TVz3L5Ftlxndcwwa+vcapLmyxNXY7xOX43ZYuMhfoEjZVtRHV2X//9u+UgY7nmqNT3z7o1FEztRK5J0c9lOwAZz1az/1hnS/IxG1JtM9K8J4Aitnsx/PI/rKaGbI7iuqvXBiTleOz8Qybc+Y3T1d5q3dG83T7Vzmfbah023tEh1qnGYhw2NFuC43D0WarCnhHXCipVeI8wWJc6oLyQZnH6+jztVVTJpnVkWH7K2rMruzXoTvAD3mtUZF6swallzh8zBWdBIR84vP3b57e4G2kP4Vtek64KB10vNntPI37JLlB8Ap6Wnk8x1PK/3tGZwHZbwEZJW5afh03z2WfeefH9TJMOphrT/TcQdK6v6SSRJDvIwtEJf6mRrur4PgoyJZKrAEMwAvPLXILuO7wUqSvhQ19/MNsFoJuokAxjzbYNsmyjajHEKPT88XmSNA3Na3sAD3adTVUK1K6UD+LdLX1SQJegHfSYE1xOnUSWH4PLyxUX/gUi7yCRSXjG54WYsBPZ2FrXTgH759+7u5fB+tQlyJu4ufKUJrZy3cECIYWh+hSVeMIO/6iPCmbTq5Nkh4Ks9z6Jwgx4Yl3IqD5tucXkx4ELXLPJJkVLDcuW99b3efAnR78aanF1Eu6i3hnSok4MESXzyOvO0C40vA7oTi6QVtwf+ovP cub+nRvf g455rdUw+af4lFSVgyK1py06/NzWSDZe1s392gzUrojiVyD22uRpNbA/cIWqXbFxl4oWa71cR12Zo4ieQN1fUm47BTPFekhlus3/MwU/EABqc4r4OSBVJr9tQ7+MJ9gSNs5dtDxGckYJJi9huDGSsoJ0X37peHVTllX03MFUHci0ViYmOLnJq9CGstlgfu9h8LyahcEz76ESZK+9EIm8/yhVfBQksj9fNTvSjIQ8yMZGFcS0dwrriGh9/atz2fSiQ6oly 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) 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 | 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