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 EEECEC64ED8 for ; Mon, 27 Feb 2023 17:57:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7A4F66B0078; Mon, 27 Feb 2023 12:57:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 755506B0082; Mon, 27 Feb 2023 12:57:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 61D186B0087; Mon, 27 Feb 2023 12:57:48 -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 4E2456B0078 for ; Mon, 27 Feb 2023 12:57:48 -0500 (EST) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 15D38140B4F for ; Mon, 27 Feb 2023 17:57:48 +0000 (UTC) X-FDA: 80513829816.27.0F326CF Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf27.hostedemail.com (Postfix) with ESMTP id 413A140009 for ; Mon, 27 Feb 2023 17:57:45 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=e2kdPfSk; spf=none (imf27.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=1677520666; a=rsa-sha256; cv=none; b=e1bfG0AUH8cE9qGHQf6FKW4pQ9QjpnVKceCJux6lnWkSzwmqe7IZQcFw/0NHOzP4bT4V0R Pf2h0VpwS8CcLXRvkMlr1o8S16Hl6smPlfPoieHxV7SzeRC2ESz/85Cu3E8Bg3/23Y161l ngW2s9fnv6b47Vkxj0Tc15Uuzr5B5wI= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=e2kdPfSk; spf=none (imf27.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=1677520666; 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=RnM8KszZJiX+sNWI95I2pqTk92H44CKgzXj9Vqv/ocM=; b=w4pBU10xH3BYPphm8uEi8yrob3P7sS4RrG2I/thW6IFpc1YMMeBgmwD0pi7qHpc+RUKd+q AqpJ0djARoKs0GuEPf0l3yV3oQKLm1aWINMYAF61A3R6ig2hqN0qvw61oujJUaAuZz9G4u dH7OoS1XS0nAMtm70r9Q/pBCzgd+SzM= 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=RnM8KszZJiX+sNWI95I2pqTk92H44CKgzXj9Vqv/ocM=; b=e2kdPfSkBwto7dMcOp3qWzfFre 6ZzeOB5qWGHTpG16KQskkagJiE2sBldHr2fJsDXQxVT7+oemOn7ZNxBY02d8YZbamuCziWPXOvDxp GZScJVAeHibEv0uGbwGUOiNi0Bj69a6EZtPl9FT1PjewLMY9rRmyhlP0ad5UgcGXLH0MLqn8ZJPA8 FNV8aS5YLIfkiChEwWfcPxtze2smOeP1f9+n+lNbpIqRv1NtHE/KmJMYJ6HJ2dYcRJxPdDmJPhF0D f6sA9ThdkPd/tCx4holKfEBZz+qKkE94I2tCeG/wCvbl3KcpKsdRiSwRnkSspc/8GOJnaV5OBBbCS 1KEZmRDw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1pWhku-000IXC-57; Mon, 27 Feb 2023 17:57:44 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org, linux-arch@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-kernel@vger.kernel.org, Catalin Marinas , linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 07/30] arm64: Implement the new page table range API Date: Mon, 27 Feb 2023 17:57:18 +0000 Message-Id: <20230227175741.71216-8-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-Queue-Id: 413A140009 X-Rspamd-Server: rspam01 X-Stat-Signature: hazuhzrqikew4ekpfm7mraj3amurz5cb X-HE-Tag: 1677520665-831235 X-HE-Meta: U2FsdGVkX1/yybn+OFlYgmH3hB/LCWWKSQZqokiSfFKu8x6vM1pyIXxBVq0kf9DJTdJquGzB1FXGG+gP4z8iOP/VrQRCbrDicbtcSOo0/Lw5mpSalw6tjx6o0mqxrK8wUuLF4TL3ZvopoyD51ef4lgPFqOrudC730bmlfRhbJjBDR9ehHAimiOXV25ROVNc0St/xS3g5Zg2TcY6JjthOGOHdlDuQ71nBHOsxPkx1YPSyJFsiU95eRPVXRdaCzcE1/14vINSqQqWs4/MUKuUk+Fi5+3iroSnC4LlXEOcsbCOJJR4w0NYcdhdMzrigZXqEGJrSXcgWIBOArVww+vmtrGIPK5HnguBMdvbx3Kc1cu8V01uvCdJwuX/kathcSXmRDfEtHUiNgmCGsI0hcCbEi6VKdoHRadAU+KGmihdyBxzdC7/ZoqNKsCqbtSf80AoOEwj4ChTSGLGjP0L+MY26nh3zwen4/IoVDvnq1vOeGx1266CjJax8B5pFJjsZ/CXOvBwwsb6tXwkU8Is6ceZhfpflIHRkoV9lzcTHOeJI4Ai+Nr85/iFDQUyF34A2SpUv7R93WG1B2FlD4+j1vEV95SHptyAp3KZY6zyVA6CHJGVZQaqh+b30IUhUPi/Hw9+BbIFP14gHFmLhe+Q/1WriPPbudewmr7mgvlhIrbPU1kq8I7PqLSwjh8zH5W66B+5VCc/9sJM7497GuEMEL0IpWgfS52V3Uef+mE1f8iuk1y2JQytJa3pprbYcKfScbjIxiHkWbqrpigJ+8I6c3yvdUpzOI+qYyySK8EG80Ma8UPjX3JeK+N2MJx+2c+vmzPwddrdtVNIu7uRbp4QCXndnFzfwifY0Y+4H2mE1F4PyPMg52uqvDlKvi+rtdzqggsVcfjdYsCRx7GPYFle9X5yZturjHqma+rFQ2ZIJXMVavkIj3AJ/Df8fFfI+cqqfysx6/7nzFCA4h+Ov5LQhT7K pfL17TNQ e1jCK1rQX7OAXr4BvdD/qm0/RKGcjEZVgGX/MorCOH9iQINAK+2J8YaSJPlCgUHZqKeTgPk0fG5Za2VCMrqCyqrJw3IYASmmKrOpQZP7+HwxVMF9Hqj8ECDW8UHgXxc6fhqvZW/gK0pvTdWApnO1w0Nj4Fpm64/hWdZlWZ7zu96EUBXSryz6bYH9fEfKcQ3Vt26j1XNXbjy0wjLyVH3y2LLQk/MPVpBxehapGaghmhCQe9sAaH/MgPhTjph7p9kM5vs7L 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) Reviewed-by: Catalin Marinas Cc: linux-arm-kernel@lists.infradead.org --- arch/arm64/include/asm/cacheflush.h | 4 +++- arch/arm64/include/asm/pgtable.h | 25 ++++++++++++++------ arch/arm64/mm/flush.c | 36 +++++++++++------------------ 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h index 37185e978aeb..d115451ed263 100644 --- a/arch/arm64/include/asm/cacheflush.h +++ b/arch/arm64/include/asm/cacheflush.h @@ -114,7 +114,7 @@ extern void copy_to_user_page(struct vm_area_struct *, struct page *, #define copy_to_user_page copy_to_user_page /* - * flush_dcache_page is used when the kernel has written to the page + * flush_dcache_folio is used when the kernel has written to the page * cache page at virtual address page->virtual. * * If this page isn't mapped (ie, page_mapping == NULL), or it might @@ -127,6 +127,8 @@ extern void copy_to_user_page(struct vm_area_struct *, struct page *, */ #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 static __always_inline void icache_inval_all_pou(void) { diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 69765dc697af..4d1b79dbff16 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -355,12 +355,21 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr, set_pte(ptep, pte); } -static inline void set_pte_at(struct mm_struct *mm, unsigned long addr, - pte_t *ptep, pte_t pte) -{ - page_table_check_ptes_set(mm, addr, ptep, pte, 1); - return __set_pte_at(mm, addr, ptep, pte); +static inline void set_ptes(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t pte, unsigned int nr) +{ + page_table_check_ptes_set(mm, addr, ptep, pte, nr); + + for (;;) { + __set_pte_at(mm, addr, ptep, pte); + if (--nr == 0) + break; + ptep++; + addr += PAGE_SIZE; + pte_val(pte) += PAGE_SIZE; + } } +#define set_pte_at(mm, addr, ptep, pte) set_ptes(mm, addr, ptep, pte, 1) /* * Huge pte definitions. @@ -1059,8 +1068,8 @@ static inline void arch_swap_restore(swp_entry_t entry, struct folio *folio) /* * On AArch64, the cache coherency is handled via the set_pte_at() function. */ -static inline void update_mmu_cache(struct vm_area_struct *vma, - unsigned long addr, pte_t *ptep) +static inline void update_mmu_cache_range(struct vm_area_struct *vma, + unsigned long addr, pte_t *ptep, unsigned int nr) { /* * We don't do anything here, so there's a very small chance of @@ -1069,6 +1078,8 @@ static inline void update_mmu_cache(struct vm_area_struct *vma, */ } +#define update_mmu_cache(vma, addr, ptep) \ + update_mmu_cache_range(vma, addr, ptep, 1) #define update_mmu_cache_pmd(vma, address, pmd) do { } while (0) #ifdef CONFIG_ARM64_PA_BITS_52 diff --git a/arch/arm64/mm/flush.c b/arch/arm64/mm/flush.c index 5f9379b3c8c8..deb781af0a3a 100644 --- a/arch/arm64/mm/flush.c +++ b/arch/arm64/mm/flush.c @@ -50,20 +50,13 @@ void copy_to_user_page(struct vm_area_struct *vma, struct page *page, void __sync_icache_dcache(pte_t pte) { - struct page *page = pte_page(pte); + struct folio *folio = page_folio(pte_page(pte)); - /* - * HugeTLB pages are always fully mapped, so only setting head page's - * PG_dcache_clean flag is enough. - */ - if (PageHuge(page)) - page = compound_head(page); - - if (!test_bit(PG_dcache_clean, &page->flags)) { - sync_icache_aliases((unsigned long)page_address(page), - (unsigned long)page_address(page) + - page_size(page)); - set_bit(PG_dcache_clean, &page->flags); + if (!test_bit(PG_dcache_clean, &folio->flags)) { + sync_icache_aliases((unsigned long)folio_address(folio), + (unsigned long)folio_address(folio) + + folio_size(folio)); + set_bit(PG_dcache_clean, &folio->flags); } } EXPORT_SYMBOL_GPL(__sync_icache_dcache); @@ -73,17 +66,16 @@ EXPORT_SYMBOL_GPL(__sync_icache_dcache); * it as dirty for later flushing when mapped in user space (if executable, * see __sync_icache_dcache). */ -void flush_dcache_page(struct page *page) +void flush_dcache_folio(struct folio *folio) { - /* - * HugeTLB pages are always fully mapped and only head page will be - * set PG_dcache_clean (see comments in __sync_icache_dcache()). - */ - if (PageHuge(page)) - page = compound_head(page); + if (test_bit(PG_dcache_clean, &folio->flags)) + clear_bit(PG_dcache_clean, &folio->flags); +} +EXPORT_SYMBOL(flush_dcache_folio); - if (test_bit(PG_dcache_clean, &page->flags)) - clear_bit(PG_dcache_clean, &page->flags); +void flush_dcache_page(struct page *page) +{ + flush_dcache_folio(page_folio(page)); } EXPORT_SYMBOL(flush_dcache_page); -- 2.39.1