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 0B505C7EE2E for ; Mon, 27 Feb 2023 17:58:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B776E6B009E; Mon, 27 Feb 2023 12:57:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id AD87F6B009D; Mon, 27 Feb 2023 12:57:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 732966B0099; Mon, 27 Feb 2023 12:57:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 0FBC16B009C for ; Mon, 27 Feb 2023 12:57:50 -0500 (EST) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C87CA140481 for ; Mon, 27 Feb 2023 17:57:49 +0000 (UTC) X-FDA: 80513829858.07.F02A5D9 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf23.hostedemail.com (Postfix) with ESMTP id 0B0FD140012 for ; Mon, 27 Feb 2023 17:57:47 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="oduE/873"; spf=none (imf23.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=1677520668; 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=FcAVSqRhOvKHjYDKfG+YKts/V6VftTlUNnoYvCjS+is=; b=CpcMBzE5QtQ5CeL/UN0q6uG5JDN+lYg5WQAvGe6adiRosPhPHzRt5PKWOx+Y3JattzbUS9 OYagI08PPK9E+Fi3Q5SQiy5btwO3uQ6+6R13TA3/odPvv04toyMHe5WbR9y3PmqtZXPgbr 3eEAY0rbBqNnnwASICyVTfhnHPqBpRo= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b="oduE/873"; spf=none (imf23.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=1677520668; a=rsa-sha256; cv=none; b=kea3Zb4nJT27HpDb8/abDAqP1TSisL1KkXZghRVJfAM/zb7C5nA0Rqzx5nVoXx1olxjmdk Lbon2f3qQKCxeQuoq5P3ZqKQGi7Hk3yh9Uhosw9eXMUu06vK+oJCR8yasA6GtsxxDLmnD1 d9Ohhf2AnXy5yq5OHqTN/c4tegekmUc= 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=FcAVSqRhOvKHjYDKfG+YKts/V6VftTlUNnoYvCjS+is=; b=oduE/873LY4TwSZyoAOMOKJOyP xXxts9JED1MF554jNMWSsOvEsnO0EYuncvAN9hjmrTJayQ7UIXPyYXZZKT6a79DJGzELdLksphJDy 5W+dTaVULNh+n0yLtuQvxjwgSn7gdjgmj0Q1dgtw79FhvhrjJC9yanZ7AOlHIUwnAkl1C1xUDWAqp C8nv7A4sS7Jx43txb8g3DOXFYnsd7dEhPX+y8Vu96gdfUu6Yd32TcgZ2nUR7DQ+u7Fp6rV/Z5zVjD lImQ23LRH//blmVTQ0btFdu/WJMWymPs+f3H9BABVs/jMbMwtxdJHobktTIBKoL+BbMDepenzzCAr CBDR2xng==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pWhkw-000IYf-EB; Mon, 27 Feb 2023 17:57:46 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, Max Filippov , linux-xtensa@linux-xtensa.org Subject: [PATCH v2 26/30] xtensa: Implement the new page table range API Date: Mon, 27 Feb 2023 17:57:37 +0000 Message-Id: <20230227175741.71216-27-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230227175741.71216-1-willy@infradead.org> References: <20230227175741.71216-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: x4t4ymyzrg1nxyndgjyubf6fmrg4a6yp X-Rspamd-Queue-Id: 0B0FD140012 X-HE-Tag: 1677520667-91767 X-HE-Meta: U2FsdGVkX1+p8QjJEja1xTOkecow0Uj71plCgL386wkXInkXfdhE0wbHFZFw3Dk+jDqGQkFgpRfMq93AZ/qKIFooTL3Tl/X7woccmqatbFXqcEbmnICt1fXeMwTJPgllT2eV8rsIv5MXRT3hyYmQCd1nrpiQoEZO9uQh63dcwFclw2mJSdcVS/ll/xoYb5pTeKQt5w1SgtFbNHRk+2MDzrkd0gJ9LYh6V+H0Cpbro5pOREFo1s9W0f0J+kWs/r7wdWP00fCZo1mCrESd3f1N3uOirivWHQgCG+Iv1ZZPzvDOvLBiZ1PMS41+jr+64+PFou0tmSmFzpcKIf7OuwKH4GSwntjAgZO0Q31SW63M9tGglmwyrAX7wFzmpynN7I1a1XB0sabA6C3ezyFv3/TXU3+RszErLaCNUmAhgZ9DAbCTOgLuERdumtxcCVsnyalOIbsW4TW+DxewFMewIuuoacKbZ99o/KvKFfdFTrFaPT5jFpCn7tVPXnsFJ4tiYuG1sYQeejm/7LN0cMmMA6gv/cWKJabHrYDv0YTrGIdfy+TItNrpb5+muZ8n+zj5L8nkDlhrjMP88LZzFTvql4oXxXN0nFUfGeCvzm2vxiSy4IXDYi2AA2KbzHg0vq4rD3V+vThRk9aAIp37iuaj5UawZsHMds7bGIiQfHfHTp29h/gKqELRl/X2oHJ/J/1TVj1ljd2xQLJTmeRm+dHgR08UtF8Y6m+ag3oX/TRBa/rNJ3gicryc0JYk6Q+Sz5kDxelcFgtZ7tHAMY6YJP0KFpOVrWDO9qYL8YBlKuGFeE/NWlrKT0tgnXddI00/8AzjVxx3QbMnDirERcYqhQ9FgLlcB+CBIPX+oiCv2FngZXK3HfuioSiAtw+j1gGl2XRDZII5BcWV6Hci43WZg0qq98/5/UiMOpO5zXCvOlADdtuoeVn2jSjrHIAyO36QFaDTdVWYyP/+Sl0LINZslogxIB3 WsPS0PQq V+w6ieOCERQ0vWCc8SNP7Pw3LnPHOlOErBjNa0+MWEOA4VgImcRQuS8hNuugch/ehyccm3AWtIHm1WYLJDC+m7lXsRmL1vfVvKIJ9vbfAZERCLddRoSx8csLp9sb6o6gz+/20DGqDtDptb957PSdEoFHW0oo4fugxQUTdTvoMmsk8y/o6fHwTz5pNjaU5ruK/EROdIacMbrAtwfRAvH87r3SO/xnPKO+k9fUMohpU+Ay3q679tHtOWeZH5jJJ2S47y2tR+04ESe7Fjkge/gLUOM13sg== 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(), flush_dcache_folio() and flush_icache_pages(). Signed-off-by: Matthew Wilcox (Oracle) Cc: Max Filippov Cc: linux-xtensa@linux-xtensa.org --- arch/xtensa/include/asm/cacheflush.h | 9 ++- arch/xtensa/include/asm/pgtable.h | 24 +++++--- arch/xtensa/mm/cache.c | 83 ++++++++++++++++------------ 3 files changed, 72 insertions(+), 44 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..293101530541 100644 --- a/arch/xtensa/include/asm/pgtable.h +++ b/arch/xtensa/include/asm/pgtable.h @@ -301,17 +301,25 @@ 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) +static inline void set_pte(pte_t *ptep, pte_t pte) { - update_pte(ptep, pteval); + update_pte(ptep, pte); } -static inline void set_pte(pte_t *ptep, pte_t pteval) +static inline void set_ptes(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t pte, unsigned int nr) { - update_pte(ptep, pteval); + 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 void set_pmd(pmd_t *pmdp, pmd_t pmdval) { @@ -407,8 +415,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..65c0d5298041 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_atomic(paddr); + } + set_bit(PG_arch_1, &folio->flags); } #endif } -- 2.39.1