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 1FBDCC61DA4 for ; Wed, 15 Mar 2023 10:13:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B2C036B0078; Wed, 15 Mar 2023 06:13:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B03786B0081; Wed, 15 Mar 2023 06:13:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9CC686B0082; Wed, 15 Mar 2023 06:13:12 -0400 (EDT) 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 8CE856B0078 for ; Wed, 15 Mar 2023 06:13:12 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 3F7F6A6E51 for ; Wed, 15 Mar 2023 10:13:12 +0000 (UTC) X-FDA: 80570719824.25.C12CE24 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf10.hostedemail.com (Postfix) with ESMTP id 413DDC001F for ; Wed, 15 Mar 2023 10:13:10 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="MxO/x+FR"; spf=pass (imf10.hostedemail.com: domain of rppt@kernel.org designates 145.40.68.75 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=1678875190; 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=Tyelz56FZSpoFYqNShDX088owpUdrvgraDp0pTjJtJM=; b=tHSHFusj7FgM5FeFF+BXL4ElzzPCM66XfmlL7RxQls2kwXNMYYF+1EoIkT7WRxGGbdiPNF 1Clz13/dekihhXYBJiNdUBjfNbK5a8nmn3j3tJTkvTUiJ+dXQYVeZoXvoa+OPMceZ1sSoC Sp28s0dqnYZFwXQepN4HMld/XYBXcXQ= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="MxO/x+FR"; spf=pass (imf10.hostedemail.com: domain of rppt@kernel.org designates 145.40.68.75 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=1678875190; a=rsa-sha256; cv=none; b=GD58MLx9iKMJZKQW2ql//84jUMfEftHgxusy8dsnabVG3ugFYIEfVpkeD/mFEJ2gsrXW58 agk4aOQLPNttKHoChGZFzPLEfc25mR1/uV8bFWD9m8Y3/cmC7f4+WoWF8RmIeu6y1Zh4FR l06dZOH0LJmrkuOCtzQzjyLAz+/Iy7s= 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 ams.source.kernel.org (Postfix) with ESMTPS id D7387B81DBE; Wed, 15 Mar 2023 10:13:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 38093C433EF; Wed, 15 Mar 2023 10:13:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678875187; bh=SpzWDoK7qAGbMSU8Yr17uy7Rhx7zMtILCSejQpFo2l0=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=MxO/x+FRKRcxyeSR6+WSyd5a99oglmZ4Eq/yFZkg3B46/PASztZONy+1cGcWgOCNO HyqAWjzf0JmyuETSbby0vCf62/nwRBLH8YVWpMq+Wp+FlJIr3v58JlZgxKPIgKC+6R h0/bwbhV31cqmrA0zrIVqG/O+mWnYkVotW9ErvJiglV/5//h6ekCQlVn4UBUFC8rKe jhydY5GFmUO8pK1E4IxjqPYN9iZbVLJCxPrsRL3mXb7vfLJRKxVKKnZ5OhK2tVb6MC gLqn3CF8lR8yiUwTNPQ68NfiN604iLw52DNEjWwYVC+sr2S0b6Im3KvNnMPwchwfzA nrm5v7jmbq90A== Date: Wed, 15 Mar 2023 12:12:54 +0200 From: Mike Rapoport To: "Matthew Wilcox (Oracle)" Cc: linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Max Filippov , linux-xtensa@linux-xtensa.org Subject: Re: [PATCH v4 28/36] xtensa: Implement the new page table range API Message-ID: References: <20230315051444.3229621-1-willy@infradead.org> <20230315051444.3229621-29-willy@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230315051444.3229621-29-willy@infradead.org> X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 413DDC001F X-Stat-Signature: x3wzs88r348dwkrkhsrmhoibphsfckxq X-Rspam-User: X-HE-Tag: 1678875190-996620 X-HE-Meta: U2FsdGVkX18rvtRZddnjtXAki+L1LNswL+Q6rxADS1wf/asm1NNNIBJNRG+b6ngukpwhz4xP8bzF58qok0WfwP82luUy9ETr+91ct4KEy0VvSoCMAVLMj6AmT47+bcNz2Tf6HCPj9UgRFv+4YEdHoC9VgDvJ+xUNBluvmdMkCEe0VeN+gezDAe9RY23tdYMXta8q5vgEF0cB753O60fFYJIlDdyVGmIqHQHZGJTFqcKsc1K0wmFCUmJRMhQ+jzXJXYG9tS8VO+5eOntOAyCRaBWC97He5oBQWvUAmT6eIWTFy5HaWla1kjULDS/Y6v3xz31S5vn4jzNx8Q9ySqZf0I9rcQ9chbdWsKS29JwknYy3YW8Ib9lrd+b8Uqjn94+ikkGb5f9srw5IzYfChnBnY4yPFf4UvS4fdw80Wuj4YOt7X8MIwjled1WyAWImtYW1Lcjwo1Q+HgZsdccaN1QV3kHSAbq2O420HP9yyzkPaSzl9sI1dRVdx7XYHU8+obZL0Vl0nDIIfDLYWoH21SJz4NNXFoKXYieWXfdg3KTkJDFzw2WdzkYYxDaGPlfhtKk8qGVa9EmiSXL9sZzhegCuo5umHLuQsgJh4BGAno2lN8oIhYH0/7GmgwKqkRPcmGIWxiEhVitqD4mmy81g6lNlt621TzzHCtrEK/mo9B00zDnoJBBx5JAPFd/slg0jrcYra85eDKOEBN+XXDjHgNHWuQdhuwBBTAo238ovzg7rib24YP7k0ASN+P0MROK6wQW3cjE+YfIe4rnTG5xFQ4cOA/Uf907IYaAfkVrVLTwBjVXU7heFCGpb7f1VqDIuYLwX1iBNhdNE5/GLKO9/48R8ISptsRhY3wqKaTWhmsGOdqPRbHRuiFLoLn+Q6iMBwBYe25HcFqQsivJAntyLGNFbOKSzr/76NHr9dngNgr3OqYToMAWvb6AnJDAJT2bz+y9d3PnPJHu7iFTq8fByswa WkIH6dr6 5RN5PHEMhdjAXoA/e5o8ttN6hb3DovZZ5YTjnVvJYjkF/XKiFV08kGdZ5yTIs1wg7yNYvRBKx5AoXQZALKO2sc6phOMyCtN85kd0HzCq4LtVja8x/p1pIDJbLzrEEzC3gdWAaY1ahk89e21P+ppTpA/XsNytcMFK42Q9S/c+5wS2PuEOa6vy4cfx1D9wwj6xZEaQNJT13ZuYrj1r7d+LfLNoAPXRg7TgCJbJ+BWXTDmiZ5Gjg/8O76hfIzd+w4H7O/qhbfOQ6wSDvsDA0kfQSdHR/GuhKhbD5eu+6RK4n+CSL7+y0nEYBhOvOhDmFdUay0wt/qTQeM6fPdggIga/NMZRrhwci0HD6kiHixMouKkD+v66/Bl9eAlxutyH0/sFFSOovxbaFbqvazYi7cRYj4t9/NFjTACa7onCZ0GWigpGy8EyiavoWWT3woqUCl/vmNzBptGHV+W2nKk5+GUIcbWL01D/RpTAhB5yVHMYuRDQlCs/cHOldKTuHOxz16nSAUSyH 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:36AM +0000, Matthew Wilcox (Oracle) wrote: > Add PFN_PTE_SHIFT, update_mmu_cache_range(), flush_dcache_folio() and > flush_icache_pages(). > > Signed-off-by: Matthew Wilcox (Oracle) > Cc: Max Filippov > Cc: linux-xtensa@linux-xtensa.org Acked-by: Mike Rapoport (IBM) > --- > arch/xtensa/include/asm/cacheflush.h | 9 ++- > arch/xtensa/include/asm/pgtable.h | 17 +++--- > arch/xtensa/mm/cache.c | 83 ++++++++++++++++------------ > 3 files changed, 62 insertions(+), 47 deletions(-) > > diff --git a/arch/xtensa/include/asm/cacheflush.h b/arch/xtensa/include/asm/cacheflush.h > index 7b4359312c25..35153f6725e4 100644 > --- a/arch/xtensa/include/asm/cacheflush.h > +++ b/arch/xtensa/include/asm/cacheflush.h > @@ -119,8 +119,14 @@ void flush_cache_page(struct vm_area_struct*, > #define flush_cache_vmap(start,end) flush_cache_all() > #define flush_cache_vunmap(start,end) flush_cache_all() > > +void flush_dcache_folio(struct folio *folio); > +#define flush_dcache_folio flush_dcache_folio > + > #define ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE 1 > -void flush_dcache_page(struct page *); > +static inline void flush_dcache_page(struct page *page) > +{ > + flush_dcache_folio(page_folio(page)); > +} > > void local_flush_cache_range(struct vm_area_struct *vma, > unsigned long start, unsigned long end); > @@ -156,6 +162,7 @@ void local_flush_cache_page(struct vm_area_struct *vma, > > /* This is not required, see Documentation/core-api/cachetlb.rst */ > #define flush_icache_page(vma,page) do { } while (0) > +#define flush_icache_pages(vma, page, nr) do { } while (0) > > #define flush_dcache_mmap_lock(mapping) do { } while (0) > #define flush_dcache_mmap_unlock(mapping) do { } while (0) > diff --git a/arch/xtensa/include/asm/pgtable.h b/arch/xtensa/include/asm/pgtable.h > index fc7a14884c6c..80bc70251aad 100644 > --- a/arch/xtensa/include/asm/pgtable.h > +++ b/arch/xtensa/include/asm/pgtable.h > @@ -274,6 +274,7 @@ static inline pte_t pte_mkwrite(pte_t pte) > * and a page entry and page directory to the page they refer to. > */ > > +#define PFN_PTE_SHIFT PAGE_SHIFT > #define pte_pfn(pte) (pte_val(pte) >> PAGE_SHIFT) > #define pte_same(a,b) (pte_val(a) == pte_val(b)) > #define pte_page(x) pfn_to_page(pte_pfn(x)) > @@ -301,15 +302,9 @@ static inline void update_pte(pte_t *ptep, pte_t pteval) > > struct mm_struct; > > -static inline void > -set_pte_at(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pteval) > -{ > - update_pte(ptep, pteval); > -} > - > -static inline void set_pte(pte_t *ptep, pte_t pteval) > +static inline void set_pte(pte_t *ptep, pte_t pte) > { > - update_pte(ptep, pteval); > + update_pte(ptep, pte); > } > > static inline void > @@ -407,8 +402,10 @@ static inline pte_t pte_swp_clear_exclusive(pte_t pte) > > #else > > -extern void update_mmu_cache(struct vm_area_struct * vma, > - unsigned long address, pte_t *ptep); > +void update_mmu_cache_range(struct vm_area_struct *vma, > + unsigned long address, pte_t *ptep, unsigned int nr); > +#define update_mmu_cache(vma, address, ptep) \ > + update_mmu_cache_range(vma, address, ptep, 1) > > typedef pte_t *pte_addr_t; > > diff --git a/arch/xtensa/mm/cache.c b/arch/xtensa/mm/cache.c > index 19e5a478a7e8..27bd798e4d89 100644 > --- a/arch/xtensa/mm/cache.c > +++ b/arch/xtensa/mm/cache.c > @@ -121,9 +121,9 @@ EXPORT_SYMBOL(copy_user_highpage); > * > */ > > -void flush_dcache_page(struct page *page) > +void flush_dcache_folio(struct folio *folio) > { > - struct address_space *mapping = page_mapping_file(page); > + struct address_space *mapping = folio_flush_mapping(folio); > > /* > * If we have a mapping but the page is not mapped to user-space > @@ -132,14 +132,14 @@ void flush_dcache_page(struct page *page) > */ > > if (mapping && !mapping_mapped(mapping)) { > - if (!test_bit(PG_arch_1, &page->flags)) > - set_bit(PG_arch_1, &page->flags); > + if (!test_bit(PG_arch_1, &folio->flags)) > + set_bit(PG_arch_1, &folio->flags); > return; > > } else { > - > - unsigned long phys = page_to_phys(page); > - unsigned long temp = page->index << PAGE_SHIFT; > + unsigned long phys = folio_pfn(folio) * PAGE_SIZE; > + unsigned long temp = folio_pos(folio); > + unsigned int i, nr = folio_nr_pages(folio); > unsigned long alias = !(DCACHE_ALIAS_EQ(temp, phys)); > unsigned long virt; > > @@ -154,22 +154,26 @@ void flush_dcache_page(struct page *page) > return; > > preempt_disable(); > - virt = TLBTEMP_BASE_1 + (phys & DCACHE_ALIAS_MASK); > - __flush_invalidate_dcache_page_alias(virt, phys); > + for (i = 0; i < nr; i++) { > + virt = TLBTEMP_BASE_1 + (phys & DCACHE_ALIAS_MASK); > + __flush_invalidate_dcache_page_alias(virt, phys); > > - virt = TLBTEMP_BASE_1 + (temp & DCACHE_ALIAS_MASK); > + virt = TLBTEMP_BASE_1 + (temp & DCACHE_ALIAS_MASK); > > - if (alias) > - __flush_invalidate_dcache_page_alias(virt, phys); > + if (alias) > + __flush_invalidate_dcache_page_alias(virt, phys); > > - if (mapping) > - __invalidate_icache_page_alias(virt, phys); > + if (mapping) > + __invalidate_icache_page_alias(virt, phys); > + phys += PAGE_SIZE; > + temp += PAGE_SIZE; > + } > preempt_enable(); > } > > /* There shouldn't be an entry in the cache for this page anymore. */ > } > -EXPORT_SYMBOL(flush_dcache_page); > +EXPORT_SYMBOL(flush_dcache_folio); > > /* > * For now, flush the whole cache. FIXME?? > @@ -207,45 +211,52 @@ EXPORT_SYMBOL(local_flush_cache_page); > > #endif /* DCACHE_WAY_SIZE > PAGE_SIZE */ > > -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; > + unsigned int i; > > if (!pfn_valid(pfn)) > return; > > - page = pfn_to_page(pfn); > + folio = page_folio(pfn_to_page(pfn)); > > - /* Invalidate old entry in TLBs */ > - > - flush_tlb_page(vma, addr); > + /* Invalidate old entries in TLBs */ > + for (i = 0; i < nr; i++) > + flush_tlb_page(vma, addr + i * PAGE_SIZE); > + nr = folio_nr_pages(folio); > > #if (DCACHE_WAY_SIZE > PAGE_SIZE) > > - if (!PageReserved(page) && test_bit(PG_arch_1, &page->flags)) { > - unsigned long phys = page_to_phys(page); > + if (!folio_test_reserved(folio) && test_bit(PG_arch_1, &folio->flags)) { > + unsigned long phys = folio_pfn(folio) * PAGE_SIZE; > unsigned long tmp; > > preempt_disable(); > - tmp = TLBTEMP_BASE_1 + (phys & DCACHE_ALIAS_MASK); > - __flush_invalidate_dcache_page_alias(tmp, phys); > - tmp = TLBTEMP_BASE_1 + (addr & DCACHE_ALIAS_MASK); > - __flush_invalidate_dcache_page_alias(tmp, phys); > - __invalidate_icache_page_alias(tmp, phys); > + for (i = 0; i < nr; i++) { > + tmp = TLBTEMP_BASE_1 + (phys & DCACHE_ALIAS_MASK); > + __flush_invalidate_dcache_page_alias(tmp, phys); > + tmp = TLBTEMP_BASE_1 + (addr & DCACHE_ALIAS_MASK); > + __flush_invalidate_dcache_page_alias(tmp, phys); > + __invalidate_icache_page_alias(tmp, phys); > + phys += PAGE_SIZE; > + } > preempt_enable(); > > - clear_bit(PG_arch_1, &page->flags); > + clear_bit(PG_arch_1, &folio->flags); > } > #else > - if (!PageReserved(page) && !test_bit(PG_arch_1, &page->flags) > + if (!folio_test_reserved(folio) && !test_bit(PG_arch_1, &folio->flags) > && (vma->vm_flags & VM_EXEC) != 0) { > - unsigned long paddr = (unsigned long)kmap_atomic(page); > - __flush_dcache_page(paddr); > - __invalidate_icache_page(paddr); > - set_bit(PG_arch_1, &page->flags); > - kunmap_atomic((void *)paddr); > + for (i = 0; i < nr; i++) { > + void *paddr = kmap_local_folio(folio, i * PAGE_SIZE); > + __flush_dcache_page((unsigned long)paddr); > + __invalidate_icache_page((unsigned long)paddr); > + kunmap_local(paddr); > + } > + set_bit(PG_arch_1, &folio->flags); > } > #endif > } > -- > 2.39.2 > > -- Sincerely yours, Mike.