From patchwork Mon Dec 4 10:54:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13478188 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 3B039C10F04 for ; Mon, 4 Dec 2023 10:55:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C602B6B02A1; Mon, 4 Dec 2023 05:55:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id C0F516B02A3; Mon, 4 Dec 2023 05:55:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AD75C6B02A4; Mon, 4 Dec 2023 05:55:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 9DFE46B02A1 for ; Mon, 4 Dec 2023 05:55:13 -0500 (EST) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6E016C01B3 for ; Mon, 4 Dec 2023 10:55:13 +0000 (UTC) X-FDA: 81528828906.25.4827228 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf15.hostedemail.com (Postfix) with ESMTP id B5D40A0007 for ; Mon, 4 Dec 2023 10:55:11 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701687311; 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=nX6cppQWykzFlGLv1/MzIfjs0FHZmU2vVGTO0jGCe+w=; b=jlXpEcKYKxvA1jP3agB50y0bsZVzyhR5qpM+BM0CPM3owsrU9xqS2mXY2deJC1WMBjAjkY dn8Vsi7NXXCLxf3VyF9zlkR5IRQGwoSaYnZJ0d1mdYu4pCufZqmzg7aH6SqEmYGwAHZxNr HcFi1EdyYHcEMl9M3n8xlL2hS64Z73g= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; 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 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701687311; a=rsa-sha256; cv=none; b=J86/TErgi4I7GsrrAUX2RdAXO5yjp4CIEbe6r9MogA+8OHHMxy/AMGxDgRazPsST46chSf GpxV5TLsHETS8SN5hs8KbgaZc2CdZY6KshnzgNzzfOv6u5gV3MgHqlEnHFphhjru2TgQ+2 BLj1LZKwNMnLYERHJZTE2LvdczhCbcM= 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 60A4E16A3; Mon, 4 Dec 2023 02:55:58 -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 ACD7D3F6C4; Mon, 4 Dec 2023 02:55:07 -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 v3 04/15] arm64/mm: set_ptes()/set_pte_at(): New layer to manage contig bit Date: Mon, 4 Dec 2023 10:54:29 +0000 Message-Id: <20231204105440.61448-5-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231204105440.61448-1-ryan.roberts@arm.com> References: <20231204105440.61448-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: B5D40A0007 X-Rspam-User: X-Rspamd-Server: rspam02 X-Stat-Signature: xp1tp1hi1stw7etpb9y4pyzdjjpr65ho X-HE-Tag: 1701687311-602079 X-HE-Meta: U2FsdGVkX18owzZ0m5U+CNm8tw3y4e2tEh8CCzlUC/GJRowy/ErSpGnM1wA5Y/5Ov7ai53AOQ3KNyU1ELGjVwqTkpwTpuai3Q92AnmjSdoBWdEHEd0epFXYg6+IFCCDYuS6Y4swdwZHtlNnCXm/feE6NcI9o4TO7lw3p2i4fTk67VvbhRcN+OGqVI/gyWUVfVHSDjrlOMB6riymoCYQJaEXHkl0bO09Jk1BQg5aJzZDZquYg5TxJHHxoCEI8kRP4hLDBm8sAs1Ivc8ttHvn7U/uP+EbIRV5uh5Cw0C7c1B6x2OjizSEQmH1evad1iaMY+zKB10aFnC98UjYM/tibVI+7VTIgL/0wTCNzZEPAiIWTQ2r7M8XsA4rUKfHtz3ILpYEIj8vTkITogJpXAQNkmFr0rdQrQH8uKeQTuHCbGWDSgcqqHUw9r3PG33wJX2bBdqZDbDFjbvJtpkY+KPXNjrd2BD7KsM/zxRJ2l2z5IihaX3VFJl/DeZhpFNGikREk6cecpiMdkLdpxman94QJcj+BRNJmdRGgMb/RJSWKsCmBanxN8hZ+RVsVX+SCb+HsdKSUoX5fq5GKpBHokiQd20etys2ZWx9psN7T4O9ov3Iez137yx6LyFS85hEYyo/NEeDQShqBwtTM+lD5yrolXBNfNuIoPHkkFx6yZkVfCa9yHIqNzW8cN0Vid3AVBhjHK9AlRsDZVzlHQYw+mezYUrc7wojQOpd996WrR62xDKDtsJe5O2E/vpQ2GnG8VUjvtpo6QyUvuBaDwZmNeL6dRARdlR1AW5/8x+j1o2/EqqokTby+DTEqc5ICtOpWlHbGohfz224XtN37oWWXMrscJHlr8F5esSilBybHex09BQy+n9x224WGSXdu9oxzRwyK8FUEZfKjBYg6E3vHlRVbImU90dE8VaEmxM6FTUs3TPqTPgPDriadYJVFh/+7GSFjSrS+z2auzTTwHYIZ/LC 2M0zaWst EIbh9VR/Moyh735zTNeZkaW41fljSAYk6BlkenLa7dHbinkUMhBZAHgCt9H0z4+8KZS/ggS2IQ4yCht+hOH/f5MU+eOTeVRuMmymR5ETv61aZ0ahTyeR+xgurT6lRWTaWkC1oufM8Ibxn/hgxkv7nJMPOYljKe9Mqx6eTSmQmFZke+3CbNTDRTq5pyxaZHTd5XFaijwWSp18WAPsObaQK+q/5ZnsVl6qiypzvKJ1UvX61ZVIdgKW/YtawWLD5EZgbmLl4pIvngEr43NrCqlVzmeT83g== 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. 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,