From patchwork Mon Dec 18 10:50:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13496569 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 DAF6FC35274 for ; Mon, 18 Dec 2023 10:51:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7F4136B009A; Mon, 18 Dec 2023 05:51:39 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 7C9886B009B; Mon, 18 Dec 2023 05:51:39 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 66BAA6B009C; Mon, 18 Dec 2023 05:51:39 -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 56E2E6B009A for ; Mon, 18 Dec 2023 05:51:39 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 2BC47C1112 for ; Mon, 18 Dec 2023 10:51:39 +0000 (UTC) X-FDA: 81579623118.13.1AB41E3 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf28.hostedemail.com (Postfix) with ESMTP id 7DD5EC001F for ; Mon, 18 Dec 2023 10:51:37 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702896697; 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; bh=TnFSlpEh5uzhY/eJyrzYI0R1Q6mihQVRrU2NPpRvEVc=; b=Re7JKpSJSDYo9TvH5ODiCh/xUsRY8ZwGXdZu5uSZw1HvG/lIBuEJLv65bNdBEwBv4oYATy tj1La6Jo4daFI9SQxLsyS8uGrd48909R9Y/3WrRAerCKK7EPNNx9zgPyCJu5gEYG98cGkI H1FwfJNPppv0Wk/eICC9K6hKRYR5nPk= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of ryan.roberts@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=ryan.roberts@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702896697; a=rsa-sha256; cv=none; b=yXdtRAYpDiPD0eAcZZf0xoDmcswIevt6klTyd3qilivppIe/LFX9qxPVCWBp3yI46XffTb 9Z3pgaQ7SIOE5Q0dqqOLQe1H9xD/ZSW319vK62Drj2/K0yg7mzrhgiz/arcvvXRoJyVfoJ w0aPkQuyMFb/Yv0I6EbUR+wr4ae1ip0= Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 13D8C2F4; Mon, 18 Dec 2023 02:52:21 -0800 (PST) Received: from e125769.cambridge.arm.com (e125769.cambridge.arm.com [10.1.196.26]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 346023F738; Mon, 18 Dec 2023 02:51:33 -0800 (PST) From: Ryan Roberts To: Catalin Marinas , Will Deacon , Ard Biesheuvel , Marc Zyngier , Oliver Upton , James Morse , Suzuki K Poulose , Zenghui Yu , Andrey Ryabinin , Alexander Potapenko , Andrey Konovalov , Dmitry Vyukov , Vincenzo Frascino , Andrew Morton , Anshuman Khandual , Matthew Wilcox , Yu Zhao , Mark Rutland , David Hildenbrand , Kefeng Wang , John Hubbard , Zi Yan , Barry Song <21cnbao@gmail.com>, Alistair Popple , Yang Shi Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 05/16] arm64/mm: set_ptes()/set_pte_at(): New layer to manage contig bit Date: Mon, 18 Dec 2023 10:50:49 +0000 Message-Id: <20231218105100.172635-6-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231218105100.172635-1-ryan.roberts@arm.com> References: <20231218105100.172635-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 7DD5EC001F X-Rspam-User: X-Stat-Signature: 3rper79e1tgmm9fa1pxjehkkqxbxoxae X-Rspamd-Server: rspam01 X-HE-Tag: 1702896697-86516 X-HE-Meta: U2FsdGVkX1+ybNkzwlqy0FR9/mo1Qi8SFdd34MRkWTrL27SZkqQplC2GmEL7MU8d3OtCCHHQOz2nm2ffAg19ms5JRODQ/Eu4UcSflh55PO+P56DKULdPSl54BCXZTmYa/Dg4DJ6YQk2Lvv8LU9/pKy/q2iiRdtnRjaf1P4KFLwHBjAj56HTXhU8+y7wrk9WyM0c9+LYs8XfV5cbkXRoU4Ke8g1BgoDtDJxw0n+vtkoKVbqLgBfYNihrWsbZbeBOuTf850TlGa/bVH6BUG9ZCWPtIGWspK9z3+z4G82YsvOFrNWCIJPXPM6w3ByL+jhWJqcMLj8D27e+QpFSW/6OqGCgaEGJVmV5SEGjlRsbCUv8+niAbrD1iDxntdZIe555UKajkZQ1zHlsRyEGRQYLJDYC5EIS7An5bVw8IIRv0uF50W5ztZAYHUtw/hu8CpXVEEm0GZreXEaaGTlBnCtGwu97MHFBFcbnyQvrZyjJxaEi2COGI+0sjJ+C2a04U4NgGbKeCZRaJWH0ERTANfYlHYv5UZ5zFP+MNsmvg0qO3AOQyGSIVSitKP0DB15ZaqADPnbNrlq+ge+HlHd4Lkc40gx/JNcCTT1zgojyJ+X9eLuiKxtFw8I43D7TjlVqMd5z30KgznfTVUmS3yJgScO137J2y+O2YVuK2gowA1buEmYomw+OVGCgWGBvyDSGBI4m6biamfradEhsXVjwVWKvB/KTmDXCpZRSp4kxfKkAEKZFI7HIbhVbbpLefzxKrk62CAvMI4QotoIABeBVYDas8xUV7Y0OaQygLt3v6xFnrIWLMCsNBr6fQ6fhVaL2gMnLZNMgR1KTyeJn2r0b3g7MdHEGB2bUGn7RR6qodS9Olmps3ttG3ty+x8Qu5K4DVl8p4D1pG58+evAL1kxqwKetBmRbSumOdiya70u2pS2Om4Bx6UnTpNjncWr1bt2Tr+JyH6XfLWCwzh++df2oHI2v IrZggN+L UICc/sKxHqmF6rFrwzTqDuRe0jrSmW1dJ8UdFG/kyQXVG55dvvpG5ckpsPR/dfDoVnUO9PIBgd94xwvyl1E6zi+sceRh0qZWfbEt7EJBy1Ix+RJOotsRPt5mes0mAmaNb7BUg6b8nVU8IoNUrq8W53j16iOsgKi4QP2o/lxvZIqbu78h/i56u9WghnSCGhu9kScID82cZ0YwIXAXB7A3NZC6/2hWknLwbo3InWTzKLNUH3xidO5uC2DGFtoNq6ZLD++GJffvempsc11/6VcJMbmCnwAXFLYmEh25owFMkz8QKWYc= 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: List-Subscribe: List-Unsubscribe: Create a new layer for the in-table PTE manipulation APIs. For now, The existing API is prefixed with double underscore to become the arch-private API and the public API is just a simple wrapper that calls the private API. The public API implementation will subsequently be used to transparently manipulate the contiguous bit where appropriate. But since there are already some contig-aware users (e.g. hugetlb, kernel mapper), we must first ensure those users use the private API directly so that the future contig-bit manipulations in the public API do not interfere with those existing uses. set_pte_at() is a core macro that forwards to set_ptes() (with nr=1). Instead of creating a __set_pte_at() internal macro, convert all arch users to use set_ptes()/__set_ptes() directly, as appropriate. Callers in hugetlb may benefit from calling __set_ptes() once for their whole range rather than managing their own loop. This is left for future improvement. Tested-by: John Hubbard Signed-off-by: Ryan Roberts --- arch/arm64/include/asm/pgtable.h | 10 +++++----- arch/arm64/kernel/mte.c | 2 +- arch/arm64/kvm/guest.c | 2 +- arch/arm64/mm/fault.c | 2 +- arch/arm64/mm/hugetlbpage.c | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 650d4f4bb6dc..323ec91add60 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -342,9 +342,9 @@ static inline void __sync_cache_and_tags(pte_t pte, unsigned int nr_pages) mte_sync_tags(pte, nr_pages); } -static inline void set_ptes(struct mm_struct *mm, - unsigned long __always_unused addr, - pte_t *ptep, pte_t pte, unsigned int nr) +static inline void __set_ptes(struct mm_struct *mm, + unsigned long __always_unused addr, + pte_t *ptep, pte_t pte, unsigned int nr) { page_table_check_ptes_set(mm, ptep, pte, nr); __sync_cache_and_tags(pte, nr); @@ -358,7 +358,6 @@ static inline void set_ptes(struct mm_struct *mm, pte_val(pte) += PAGE_SIZE; } } -#define set_ptes set_ptes /* * Huge pte definitions. @@ -1067,7 +1066,7 @@ static inline void arch_swap_restore(swp_entry_t entry, struct folio *folio) #endif /* CONFIG_ARM64_MTE */ /* - * On AArch64, the cache coherency is handled via the set_pte_at() function. + * On AArch64, the cache coherency is handled via the __set_ptes() function. */ static inline void update_mmu_cache_range(struct vm_fault *vmf, struct vm_area_struct *vma, unsigned long addr, pte_t *ptep, @@ -1121,6 +1120,7 @@ extern void ptep_modify_prot_commit(struct vm_area_struct *vma, pte_t old_pte, pte_t new_pte); #define set_pte __set_pte +#define set_ptes __set_ptes #endif /* !__ASSEMBLY__ */ diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c index a41ef3213e1e..dcdcccd40891 100644 --- a/arch/arm64/kernel/mte.c +++ b/arch/arm64/kernel/mte.c @@ -67,7 +67,7 @@ int memcmp_pages(struct page *page1, struct page *page2) /* * If the page content is identical but at least one of the pages is * tagged, return non-zero to avoid KSM merging. If only one of the - * pages is tagged, set_pte_at() may zero or change the tags of the + * pages is tagged, __set_ptes() may zero or change the tags of the * other page via mte_sync_tags(). */ if (page_mte_tagged(page1) || page_mte_tagged(page2)) diff --git a/arch/arm64/kvm/guest.c b/arch/arm64/kvm/guest.c index aaf1d4939739..629145fd3161 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -1072,7 +1072,7 @@ int kvm_vm_ioctl_mte_copy_tags(struct kvm *kvm, } else { /* * Only locking to serialise with a concurrent - * set_pte_at() in the VMM but still overriding the + * __set_ptes() in the VMM but still overriding the * tags, hence ignoring the return value. */ try_page_mte_tagging(page); diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 460d799e1296..a287c1dea871 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -205,7 +205,7 @@ static void show_pte(unsigned long addr) * * It needs to cope with hardware update of the accessed/dirty state by other * agents in the system and can safely skip the __sync_icache_dcache() call as, - * like set_pte_at(), the PTE is never changed from no-exec to exec here. + * like __set_ptes(), the PTE is never changed from no-exec to exec here. * * Returns whether or not the PTE actually changed. */ diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c index f5aae342632c..741cb53672fd 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -254,12 +254,12 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, if (!pte_present(pte)) { for (i = 0; i < ncontig; i++, ptep++, addr += pgsize) - set_pte_at(mm, addr, ptep, pte); + __set_ptes(mm, addr, ptep, pte, 1); return; } if (!pte_cont(pte)) { - set_pte_at(mm, addr, ptep, pte); + __set_ptes(mm, addr, ptep, pte, 1); return; } @@ -270,7 +270,7 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, clear_flush(mm, addr, ptep, pgsize, ncontig); for (i = 0; i < ncontig; i++, ptep++, addr += pgsize, pfn += dpfn) - set_pte_at(mm, addr, ptep, pfn_pte(pfn, hugeprot)); + __set_ptes(mm, addr, ptep, pfn_pte(pfn, hugeprot), 1); } pte_t *huge_pte_alloc(struct mm_struct *mm, struct vm_area_struct *vma, @@ -478,7 +478,7 @@ int huge_ptep_set_access_flags(struct vm_area_struct *vma, hugeprot = pte_pgprot(pte); for (i = 0; i < ncontig; i++, ptep++, addr += pgsize, pfn += dpfn) - set_pte_at(mm, addr, ptep, pfn_pte(pfn, hugeprot)); + __set_ptes(mm, addr, ptep, pfn_pte(pfn, hugeprot), 1); return 1; } @@ -507,7 +507,7 @@ void huge_ptep_set_wrprotect(struct mm_struct *mm, pfn = pte_pfn(pte); for (i = 0; i < ncontig; i++, ptep++, addr += pgsize, pfn += dpfn) - set_pte_at(mm, addr, ptep, pfn_pte(pfn, hugeprot)); + __set_ptes(mm, addr, ptep, pfn_pte(pfn, hugeprot), 1); } pte_t huge_ptep_clear_flush(struct vm_area_struct *vma,