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 7DD59C6FD1D for ; Wed, 15 Mar 2023 09:51:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1ED286B007E; Wed, 15 Mar 2023 05:51:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 19DCF6B0080; Wed, 15 Mar 2023 05:51:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 066E06B0081; Wed, 15 Mar 2023 05:51:11 -0400 (EDT) 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 EC0166B007E for ; Wed, 15 Mar 2023 05:51:10 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id BF7FE140965 for ; Wed, 15 Mar 2023 09:51:10 +0000 (UTC) X-FDA: 80570664300.04.4BD7671 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf29.hostedemail.com (Postfix) with ESMTP id 110D4120006 for ; Wed, 15 Mar 2023 09:51:08 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="t/otul67"; spf=pass (imf29.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678873869; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=mfB6F8m2NK6azGxXHH5BqnujH9qfrzOR2iSsZjmYyMM=; b=3xEE8Q+t8CNPZnUQ2JTfX2yXlNalZeazoqQGwb7LHmyYnQAHnWKqlGijrGaIuJvKncPYKQ yvxIPGCaESOt0aO0FnYCTKO7dCRnhfTZYpf/guOnWdF5QSYSFIiW+3rDpFd7jMEgjo+GBs MhBKZ+Xkie+iXG/qeEzKXgKbXsneLJU= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="t/otul67"; spf=pass (imf29.hostedemail.com: domain of rppt@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678873869; a=rsa-sha256; cv=none; b=R8sgNeYPttX41CuXsjCqohuYeG4Y2wpIdtMMGopTD+5cPP00RB3WL7O658B0ReWfPy93iN HL9+oRkPe1+uOnUNZ8w8P0zjXtWWhFzpqVMO0iByqw50XE2IPcBmCrtDOyyOKgsPW0lBMw PlcaVP9qozzCqgpJgSyLgmJJd85TYrM= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 29E1C61ABD; Wed, 15 Mar 2023 09:51:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D375C4339B; Wed, 15 Mar 2023 09:51:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678873867; bh=SS3nEk8RuVUf6cgvqO5Fgo/W8bTsermC5WUVbt8Pkik=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=t/otul67vrR+5yINptH8xhcO6gsoHDd5eDAMhboCY/asJCWHV5mA4Rd0PUkaP24ks v8UHOu9i7owsvSAL2CAA16Anp7vpQkva5ZywLoHFQADbrqGsWVwvYgQgFjTzZNUHtv TZUWC2PgyH4gPQhGapNkixwkUbd/iJOTLIUThTcmJCzE/7BzoF369dM6oqu0OXRA+q nVD0tbFFjFLKJ2YbbpFh1P5rJqMPsxGjayItEzzdPYxWZVDPfwXcklb52ckVR6bc+d xdy9gnQu4H/oVbLZOwzs4Obeh5Kmoq72XlgQVxJPbiI9P5Tm9bbqYKwtxAqX0uPnW1 Zu/IWISv5Jpbg== Date: Wed, 15 Mar 2023 11:50:55 +0200 From: Mike Rapoport To: "Matthew Wilcox (Oracle)" Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Guo Ren , linux-csky@vger.kernel.org Subject: Re: [PATCH v4 10/36] csky: Implement the new page table range API Message-ID: References: <20230315051444.3229621-1-willy@infradead.org> <20230315051444.3229621-11-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230315051444.3229621-11-willy@infradead.org> X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: auubpr9f8jm9rbh8yi4u439ami4cb7r5 X-Rspamd-Queue-Id: 110D4120006 X-HE-Tag: 1678873868-397456 X-HE-Meta: U2FsdGVkX1+2Ln7noJazrmbRWKUX1yYLJdQBqsvA8RVMNhh1bm6RF84V74dUhrHsGb9Ldj8AN3gxoySga5Gh8Ehs0ZoSyrXMs24zERyWQH8Riii3bKtwue8gLaCKB8GntqLIPkIXO1KgzlpsAYuBv9G5ZeYquMDzMTgfNqeQN+efLRtNCZNR6x1RTQyk4jReNYwclfq3WOnt0pD/C2yiHKuv/B3pADY6VLHYvywwFVOU154VmY3nH+C9XkJ73qkSpjUD1slmCu91SGXso/MJ5TQCHQyG6/uLoXvfhwUiKnTV3cdW2uL7Kv2/IgEoWK5lDXxDwDZoEYtN9Ixy3spkMeUIKWxVap0GN/QBwfqLtL9Lg9Ng9bAM3Q6m5IP0OU5NWZYkqAfQ1RK546Gu7LfA+IJVa5GxeTSaa9pcXoRUocYmKBH8may5pmdToMyxLZ+jAbOJWcUr7Drmz6sCllqiKva0fMCLg6oG0KLkSqguHa3YpPfBayCiRynpqxkaUaqd9rwMA+ciFC4mc8vJrE3al7sv0uTY4MW0EewjGEXCiG1E9BVGqFHTuf/8SGuLoKBPQXfcmJZwLHym+iiVrtG2YsX4JYzhEG+mwJkmaiHXRMsinA7xnKFLkdjnC4iwx7Duhkk7M3Av/cqCoa4910Be6JjP8JN+3lUywS43lRz4iiDLmT7AtkcggsW0OGaYuO+J8/QTOcJGmaMy7tUNc7QAbDoHMtwhIWo8RGofOgw4YM/MpjmB/VlRaP3beYwqT2xdHna4aItEm7PyeTIHzDz8w0kirVQq6uEhhtIs+4rQ4xv9JtShjYrx3FATgPTNAywjAPq3IqUi5pUoEN7gyQyGLjgbFXjjXIDHTQLTN9tdx8hDFjTAKMD6RM28y2lG/Lg0NjqbPTuuFZlTURgWcdDfv678C4nnt0vEFLxGss5HmYj+C3Jhl5EH0PKPIwy07J+zMTD6jH78toE8TQfRQAW o9p+My7f svL2xGMqrtvzuWncMshEIYZsIEYjOI2f7e/kOr3rTenm6guoebxnqF/3C2B2zE5gObVBVV1mwJdMmd30j7p+JnrWWa4ZImLzMsaYLKvWBsfCVsGhx7xIAFO1htqfpUaByTgARKXyWrsJtHsEZgDmK3O0KKr9TB48qv1eAyN3Yt9YDefrzg1dYp7Ei8Cqs1CZF005NKyoT3rXU0YlVMp0/fQZKKl8ihBlHMhvWUr/X3Hg8RCOnoVLosezWn2zSxp46amiulJ5eMgGY9fDjg2SEFxYpWZFoOvFnZEnVR5OWQpKuk4ejTH/WZGqyVbt6dLHMdVpPwC2Li9qClc95ifD/JNti3xP8sszYfK8mDnGtAa4MqFKlfETe3WMsyRtaPIn26bUTndL4m39Ubxez7kPIVmKr3W6cw3EO+H+SrIR4p/3s2Ag= 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: On Wed, Mar 15, 2023 at 05:14:18AM +0000, Matthew Wilcox (Oracle) wrote: > 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 Acked-by: Mike Rapoport (IBM) > --- > 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 > > -- Sincerely yours, Mike.