From patchwork Fri Feb 2 08:07:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13542345 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 CD6FCC47258 for ; Fri, 2 Feb 2024 08:08:57 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4B0BD6B0095; Fri, 2 Feb 2024 03:08:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4612A6B0096; Fri, 2 Feb 2024 03:08:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 329D86B0098; Fri, 2 Feb 2024 03:08:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 22EB56B0095 for ; Fri, 2 Feb 2024 03:08:57 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id EC661120E67 for ; Fri, 2 Feb 2024 08:08:56 +0000 (UTC) X-FDA: 81746137872.25.56C120F Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf28.hostedemail.com (Postfix) with ESMTP id 456DDC0009 for ; Fri, 2 Feb 2024 08:08:55 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706861335; 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=5nP/62q17o0sXhInGhbvTK+r1jxCZnzghRQj+6N9kKY=; b=CbRNRNLJBgfTMF4PtkD6JU5+aQeONOy2Wzfu+R2CC89MVc8V5fjbsFx5rt9jrRMuwaPTqE fy4sf//EdH6uDwL00LGbU782VYBwPoj+HHNiJ8mJ9TjeMq10zbJePjVvkPeWPbtDbUTINK XZbb/o0aLhrCB/7WSVu+sNMvJBvLZ+M= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; 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 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706861335; a=rsa-sha256; cv=none; b=vXmhDd4XbUVsQWaE4PeQya5ijohaOJpc7AudrVh9lS2a0W4yBLwT4jpCDtkeQHYBiFCf1I 8R5djQsIrygtM0tustHx8LV7aKi+G/hCPTR3ft/IcmGVHa9jwEbUYZxmTRMgA0GzM/LCf5 JNztq6l4ZBoVsyOopQF8Nrnq0DO+oSU= 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 CCB8F1A25; Fri, 2 Feb 2024 00:09:36 -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 E0BD93F5A1; Fri, 2 Feb 2024 00:08:50 -0800 (PST) From: Ryan Roberts To: Catalin Marinas , Will Deacon , Ard Biesheuvel , Marc Zyngier , James Morse , Andrey Ryabinin , Andrew Morton , Matthew Wilcox , Mark Rutland , David Hildenbrand , Kefeng Wang , John Hubbard , Zi Yan , Barry Song <21cnbao@gmail.com>, Alistair Popple , Yang Shi , Nicholas Piggin , Christophe Leroy , "Aneesh Kumar K.V" , "Naveen N. Rao" , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, x86@kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v5 10/25] arm64/mm: set_ptes()/set_pte_at(): New layer to manage contig bit Date: Fri, 2 Feb 2024 08:07:41 +0000 Message-Id: <20240202080756.1453939-11-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240202080756.1453939-1-ryan.roberts@arm.com> References: <20240202080756.1453939-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspam-User: X-Stat-Signature: szok1foet9tbogqjkafcb3neymnso38o X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 456DDC0009 X-HE-Tag: 1706861335-644043 X-HE-Meta: U2FsdGVkX1+1LOz1RJy1VMSdE5JmHUSVK2ypBGSGDPfd/KcdlX4XvjnOSN8as5RM3npp1d6saK52B6RJWxLCU941rjyciG0cfjESSjuOIPYtKQtWB8bu9wxm3y7spQPXeusizWBQLxbVBkbrwsfU+oFYqu9C4DEcAo2S3A3ZpkEdyVVqKku4gConcVX3m0IIQXn16q4pwWY4ugPP0uWBNyNJNnmeKKCD9E3iJXk6cZHdgVqoGErHLs693sbiG2Gi79rvf+1/UiKdDFOOjpCKNrP+g5lHBxkNhn7/GUj76VU1uGrmAy9p45O7/bU9YZOhABFJiWLvuTLC9ACmVCLtlEL9LGnBIA2SKD/TREkc68jZvAxksdkNx/+HR+I8Ar4oyEEoow2xnTg/Kq2Hg5NsBa/+42ERKvms5bkyQWVQP8E4dbN7buQ58s17G23L7BL5Je3MGjAvwDNc3rpfrffEhxRARj+KeHp4muzhnzz9cq9q9aUaDssF5J1kj0vOQpLUjzlFoRxwMP9tHt4daAdVHScHpiOYN8OSZWViIrUXTQIQzYeFUOZptrAUfknsFi5sjBxhYzEGFemnZfmU/emrJyQh0JV0kZin6YK+WX1kVWRLsVJ3N6ejS7cuUGdr0gUXy0tf4+PihD/NQNB7S01CVEi23t6/VA3FuxIsuFdt4Mi0bjxVnDhFBKImXvUR8Veypj+0mYudHKHbi+xcaVNYB3iJNZ/iTBDtEYyd8DhQHbb20NtpS1hyFhphYVHd8Py5B/3K0Q4+EE4Ec2E2/m+9KFuiyW4hn4P2L6h/YRdkoV/VbWi2YVU2un/6Mt8xooIhB9nZ16eF6IMVDOKqzjLjAGZqdiJdZ3P+5vyoI03XcIw3S24Z2v2oJO7ITZpCKWFIpWPxXUv+wJqFAfiHFEjmwqJnpl8DqYnxWAEpCR0Eca/jJjb/0IUS/xlvklDu3+IYjgnkFiYm64k3d0BErvL vzmYmCNs bLxAfTjN94coyMwd+tTmeYBpHliLVJWnywj6/DmF1QCRH/u7y1hkB1YTW89QoMtvWTMk9sTYj5prZb4iYNbm0eX5wQK7lXjOhe3i7PF9zqkICLSnbsg1KGGD18QdcHr6Wsa3aZtXoREyNsmub6J/atI0+lLR1hW4wGDhOpAph+bHVa61g4X3Mmr7hIrXbTq0or90zn3S0Qxy01KiqKCiXYdogMCWBW2aAQqaAOY2fgWXajieXUa5kgThibaYBtVgQusiweqWbL1SHFE6f5T/TOp3aLtbSd59W/D8OKHFnHF9rWCA= 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 3cb45e8dbb52..f1fd6c5e3eca 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -358,9 +358,9 @@ static inline pte_t pte_advance_pfn(pte_t pte, unsigned long nr) return pfn_pte(pte_pfn(pte) + nr, pte_pgprot(pte)); } -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); @@ -374,7 +374,6 @@ static inline void set_ptes(struct mm_struct *mm, pte = pte_advance_pfn(pte, 1); } } -#define set_ptes set_ptes /* * Huge pte definitions. @@ -1079,7 +1078,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, @@ -1140,6 +1139,7 @@ void vmemmap_update_pte(unsigned long addr, pte_t *ptep, pte_t pte); #endif #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 13189322a38f..23d0dfc16686 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 8116ac599f80..9d7e7315eaa3 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,