From patchwork Thu Jun 22 14:41:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13289250 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 2994BEB64DB for ; Thu, 22 Jun 2023 14:42:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B83408D0006; Thu, 22 Jun 2023 10:42:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B31C18D0001; Thu, 22 Jun 2023 10:42:36 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89A3D8D0006; Thu, 22 Jun 2023 10:42:36 -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 771A28D0001 for ; Thu, 22 Jun 2023 10:42:36 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 519C01C763E for ; Thu, 22 Jun 2023 14:42:36 +0000 (UTC) X-FDA: 80930649912.17.B59FBAB Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf15.hostedemail.com (Postfix) with ESMTP id 87A78A0004 for ; Thu, 22 Jun 2023 14:42:34 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; spf=pass (imf15.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=1687444954; 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=fYvhdkX/ZWLQAoUTwjzI4mzSzxcxmlI7JPHyvYv9B00=; b=wth4ZqebjR1E3NKSGQSRDBpN1vPzDvF/5zFeg1T71igFqrqxwQb5vU1SgqiBKMayGAs+3e 1fQofLX3optTI7oprdItYGsYsKXCnDJ21TVfMigI5cZbBVqMsLUTRbvgN0wWWOQcSRcPEo UVYbpMzEMEZRDXrQiSPA/LzG7LVPL60= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687444954; a=rsa-sha256; cv=none; b=0RrNPntf6U//9Fs5ZCCg2SLt5iMArKH4U72uuVunTEJs9T6Agq12PjjksJeClS1bXe3vuX LmwxXNBUAfXF/kE41+ZMsXXFgJ21/SDaxGR7yjnIoqFKWpCYsOWCUgFMLkwzRo5o/kEQbe l0qg3PDexoergdpkRGs89TO64jjr6r8= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; spf=pass (imf15.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 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 6CB6C113E; Thu, 22 Jun 2023 07:43:17 -0700 (PDT) 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 DC8543F663; Thu, 22 Jun 2023 07:42:30 -0700 (PDT) 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 Cc: Ryan Roberts , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v1 02/14] arm64/mm: set_ptes()/set_pte_at(): New layer to manage contig bit Date: Thu, 22 Jun 2023 15:41:57 +0100 Message-Id: <20230622144210.2623299-3-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230622144210.2623299-1-ryan.roberts@arm.com> References: <20230622144210.2623299-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Stat-Signature: 7ne97e3p6qr65u88of1b358mzfdamjaw X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 87A78A0004 X-Rspam-User: X-HE-Tag: 1687444954-455576 X-HE-Meta: U2FsdGVkX19TiFOsNGZfasnE64xip4Mq7DFkTY/rL2zqavclOscPSljCnRKi0CvldqPfUhrdWCBthZz/us6mVAHC3G6iikwcoYaWphVYeNhNt/M+dqlc73C2D0FqTOE5M4TKpDWomf8czDCmHxdu150Z250aeK4rlbvSLuYuF+408oC6YXXEb5cju3Rqhw3MIyo8GvfosASJ1SodkVU98GtypEXvtwg7CekieWA7KdI503Vmhn7QV93eSX1dFVgRJ80zyWSnPotzs6MjSvZpJacteVC6X3T755EpfD7LClY8f3bAKS4PSMCbfBNwVvP4fkMo0Zr+P4AraDbmaYGZ6g9gKRvTz/yoxiwdJuZXnfd4alxn38ahrQ0v2HzLRJaMRil1yL5T6/Jm98KQ+8Fx3pFNbGVNZsWoUWqnqDrPM0gMqLyjt1up2KVBnsA18YZs5LllNyJ4sCnjlki//4MJ9TadF8OK9K9Uv8is1cVZY0qTDjmdbX6D92nFoJ4x1mncYD3ldOchfoaqmedMw5ZxOBd+/NZVxLGbfzIj0+pjKf66HUczJvzdMnOoxVcR0mjKjWCplxgyHhFb2cOW3vAL7r5edQOT7NHcD9acKxuVvJt2tA1B+pOF9dd3KSCb4tyy9oJLqv35e1AqxPUuNYo+EHl+v5ANYBExJzWNq+E+fwpNHQD6RbAHo3kaF2DLzTKwlFeKNuP4mrjDW7mIOIYbhRql89ihW15nobgvWOM9ehKyFvXS9DoVn1T6OBS6YyWTZ9FgXnUj7Q1kNyh8QXRVCfONFqY7r5bm3CWC0JM+/7IWWKKBLkVpua+LoPxdh6qae2ea9pEi4Uyb1llSB63TSgTOP8KNfGGGwR6+OLeL+32uDPsM9GwV0+CkW9dg+h3ECg3q7lZW9+FDlAGjqnfEjSu+vTX7qgkUxX+tLURygsiQTWRGZ7aE8FmgKgFokXZ/E6Gkkmj9VahkEZWuNNu MRv6s4Px oknsPlrW2Ay2in9hVCUHgIWE4/pKxJ4RGc4wQSfEawQIe+ddw1g6XI8mlSJ3O4GxLgPwMpBlOamjAx0tpZB6oKS2yRa2RWC4B9UwcUK43B1cIDoW1Epc9wd9mlJbdekfH9wjz4avtxpT1/y1I2t8qc1r1F9T3OlrANVd+p6DkQSj8D9sARtwgWuOyXx4GH54zVfAO00Fw42PP9ZvPZfzJqP9lK3NH5qLUw+pWvZ2tDsmqL7Bv5Yxw780cIULseMC5F1OvTeW92FXXZ/mUKrw/bT9i1A== 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: 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. No behavioural changes intended. Signed-off-by: Ryan Roberts --- arch/arm64/include/asm/pgtable.h | 12 +++++++++--- 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, 17 insertions(+), 11 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 7f5ce5687466..84919a3c558e 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -356,7 +356,7 @@ static inline void __set_pte_at(struct mm_struct *mm, unsigned long addr, __set_pte(ptep, pte); } -static inline void set_ptes(struct mm_struct *mm, unsigned long addr, +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); @@ -370,7 +370,6 @@ static inline void set_ptes(struct mm_struct *mm, unsigned long addr, 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_area_struct *vma, unsigned long addr, pte_t *ptep, unsigned int nr) @@ -1134,6 +1133,13 @@ static inline void set_pte(pte_t *ptep, pte_t pte) __set_pte(ptep, pte); } +#define set_ptes set_ptes +static inline void set_ptes(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t pte, unsigned int nr) +{ + __set_ptes(mm, addr, ptep, pte, nr); +} + #endif /* !__ASSEMBLY__ */ #endif /* __ASM_PGTABLE_H */ diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c index 7e89968bd282..9b248549a020 100644 --- a/arch/arm64/kernel/mte.c +++ b/arch/arm64/kernel/mte.c @@ -90,7 +90,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 20280a5233f6..478df2edcf99 100644 --- a/arch/arm64/kvm/guest.c +++ b/arch/arm64/kvm/guest.c @@ -1087,7 +1087,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 6045a5117ac1..d3a64624ed88 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -191,7 +191,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 95364e8bdc19..31a1da655bf1 100644 --- a/arch/arm64/mm/hugetlbpage.c +++ b/arch/arm64/mm/hugetlbpage.c @@ -264,12 +264,12 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, ncontig = num_contig_ptes(folio_size(folio), &pgsize); for (i = 0; i < ncontig; i++, ptep++) - 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; } @@ -281,7 +281,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, @@ -496,7 +496,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; } @@ -525,7 +525,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,