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 lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5FBBAC48BEB for ; Thu, 15 Feb 2024 11:20:32 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4TbCKW0bnYz3vg7 for ; Thu, 15 Feb 2024 22:20:31 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=arm.com (client-ip=217.140.110.172; helo=foss.arm.com; envelope-from=mark.rutland@arm.com; receiver=lists.ozlabs.org) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lists.ozlabs.org (Postfix) with ESMTP id 4TbCK259P8z3cFX for ; Thu, 15 Feb 2024 22:20:06 +1100 (AEDT) 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 400A814BF; Thu, 15 Feb 2024 03:20:16 -0800 (PST) Received: from FVFF77S0Q05N (unknown [10.57.68.11]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BF8B73F7B4; Thu, 15 Feb 2024 03:19:31 -0800 (PST) Date: Thu, 15 Feb 2024 11:19:28 +0000 From: Mark Rutland To: Ryan Roberts Subject: Re: [PATCH v6 08/18] arm64/mm: Convert set_pte_at() to set_ptes(..., 1) Message-ID: References: <20240215103205.2607016-1-ryan.roberts@arm.com> <20240215103205.2607016-9-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240215103205.2607016-9-ryan.roberts@arm.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kefeng Wang , x86@kernel.org, David Hildenbrand , Catalin Marinas , Yang Shi , Dave Hansen , linux-mm@kvack.org, Andrey Ryabinin , "H. Peter Anvin" , Will Deacon , Ard Biesheuvel , Marc Zyngier , Alistair Popple , Barry Song <21cnbao@gmail.com>, Matthew Wilcox , Ingo Molnar , Zi Yan , John Hubbard , Borislav Petkov , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, James Morse , Andrew Morton , linuxppc-dev@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Thu, Feb 15, 2024 at 10:31:55AM +0000, Ryan Roberts wrote: > Since set_ptes() was introduced, set_pte_at() has been implemented as a > generic macro around set_ptes(..., 1). So this change should continue to > generate the same code. However, making this change prepares us for the > transparent contpte support. It means we can reroute set_ptes() to > __set_ptes(). Since set_pte_at() is a generic macro, there will be no > equivalent __set_pte_at() to reroute to. > > Note that a couple of calls to set_pte_at() remain in the arch code. > This is intentional, since those call sites are acting on behalf of > core-mm and should continue to call into the public set_ptes() rather > than the arch-private __set_ptes(). > > Tested-by: John Hubbard > Signed-off-by: Ryan Roberts Acked-by: Mark Rutland Mark. > --- > arch/arm64/include/asm/pgtable.h | 2 +- > 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, 9 insertions(+), 9 deletions(-) > > diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h > index de034ca40bad..9a2df85eb493 100644 > --- a/arch/arm64/include/asm/pgtable.h > +++ b/arch/arm64/include/asm/pgtable.h > @@ -1084,7 +1084,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, > diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c > index a41ef3213e1e..59bfe2e96f8f 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..6e0df623c8e9 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 a254761fa1bd..3235e23309ec 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 2892f925ed66..27f6160890d1 100644 > --- a/arch/arm64/mm/hugetlbpage.c > +++ b/arch/arm64/mm/hugetlbpage.c > @@ -247,12 +247,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; > } > > @@ -263,7 +263,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, > @@ -471,7 +471,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; > } > @@ -500,7 +500,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, > -- > 2.25.1 > 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 604D9C48BEB for ; Thu, 15 Feb 2024 11:19:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Xq32MZTJmNMzCZUfP0+TH/CF8cI39bvdjrTgutqRwLU=; b=nSVDJkgBQt+Dsl /Lqsl/eTja7AibxvxcXdghiWZ321k3bGV/CGH3PmndSoz+aMnl0mfUTlArl6FWMBhT5XqmEnd5pTy 8kJEGbnD4CprtupiG+a9qKz7VNpELrdISn1YOcTsnc3IeH25WDljfxm1WfcHoM694dV1sKCot3Kq6 gz7u3elB6DTtmHLf8Tt2AjoAxyDd4zsNvhJgdhz+7gEa9Fq+a8KvZJByVFwEAxNADwwk48nTemJ4w PDCpMkhPgy5KQUpngpx5IXhnJN8MkFvhArh7NO9sY9Cf+HhHJSVIQEm+yvI9O13oRx8mwRMEKgf0Q bZrjLKjUfMOqv/q3YyNA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1raZmH-0000000G0CY-177l; Thu, 15 Feb 2024 11:19:41 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1raZmE-0000000G0B2-35l1 for linux-arm-kernel@lists.infradead.org; Thu, 15 Feb 2024 11:19:40 +0000 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 400A814BF; Thu, 15 Feb 2024 03:20:16 -0800 (PST) Received: from FVFF77S0Q05N (unknown [10.57.68.11]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BF8B73F7B4; Thu, 15 Feb 2024 03:19:31 -0800 (PST) Date: Thu, 15 Feb 2024 11:19:28 +0000 From: Mark Rutland To: Ryan Roberts Cc: Catalin Marinas , Will Deacon , Ard Biesheuvel , Marc Zyngier , James Morse , Andrey Ryabinin , Andrew Morton , Matthew Wilcox , David Hildenbrand , Kefeng Wang , John Hubbard , Zi Yan , Barry Song <21cnbao@gmail.com>, Alistair Popple , Yang Shi , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , linux-arm-kernel@lists.infradead.org, x86@kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v6 08/18] arm64/mm: Convert set_pte_at() to set_ptes(..., 1) Message-ID: References: <20240215103205.2607016-1-ryan.roberts@arm.com> <20240215103205.2607016-9-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240215103205.2607016-9-ryan.roberts@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240215_031938_910766_33B75BB7 X-CRM114-Status: GOOD ( 30.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Feb 15, 2024 at 10:31:55AM +0000, Ryan Roberts wrote: > Since set_ptes() was introduced, set_pte_at() has been implemented as a > generic macro around set_ptes(..., 1). So this change should continue to > generate the same code. However, making this change prepares us for the > transparent contpte support. It means we can reroute set_ptes() to > __set_ptes(). Since set_pte_at() is a generic macro, there will be no > equivalent __set_pte_at() to reroute to. > > Note that a couple of calls to set_pte_at() remain in the arch code. > This is intentional, since those call sites are acting on behalf of > core-mm and should continue to call into the public set_ptes() rather > than the arch-private __set_ptes(). > > Tested-by: John Hubbard > Signed-off-by: Ryan Roberts Acked-by: Mark Rutland Mark. > --- > arch/arm64/include/asm/pgtable.h | 2 +- > 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, 9 insertions(+), 9 deletions(-) > > diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h > index de034ca40bad..9a2df85eb493 100644 > --- a/arch/arm64/include/asm/pgtable.h > +++ b/arch/arm64/include/asm/pgtable.h > @@ -1084,7 +1084,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, > diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c > index a41ef3213e1e..59bfe2e96f8f 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..6e0df623c8e9 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 a254761fa1bd..3235e23309ec 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 2892f925ed66..27f6160890d1 100644 > --- a/arch/arm64/mm/hugetlbpage.c > +++ b/arch/arm64/mm/hugetlbpage.c > @@ -247,12 +247,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; > } > > @@ -263,7 +263,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, > @@ -471,7 +471,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; > } > @@ -500,7 +500,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, > -- > 2.25.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel 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 67C83C4829E for ; Thu, 15 Feb 2024 11:19:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 01BDD8D000E; Thu, 15 Feb 2024 06:19:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id F0EBB8D0001; Thu, 15 Feb 2024 06:19:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DD6DB8D000E; Thu, 15 Feb 2024 06:19:37 -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 CA5348D0001 for ; Thu, 15 Feb 2024 06:19:37 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id A593880FD5 for ; Thu, 15 Feb 2024 11:19:37 +0000 (UTC) X-FDA: 81793792794.01.081AF07 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf30.hostedemail.com (Postfix) with ESMTP id 05ABF80010 for ; Thu, 15 Feb 2024 11:19:35 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of mark.rutland@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=mark.rutland@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=1707995976; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=toehE11OK7qp1iCR7GEOCYjJ7pV4MsK8sV/Pxg0cUqI=; b=MZtlJHSL0zpw2fGT5YWR5KGmZILoG+Chedr0ntazowzKp2fmN1RGBearUjduzaex5zNYF3 jCLFtkpiRzgzXqTBD201KnD+detMDmR8uyGEJYs4IVumQgdkHqv/9TUB5sXxqTLFSfgGcv 5SecAhryeuh4+NWcRsmHYLksDHVj6SA= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1707995976; a=rsa-sha256; cv=none; b=mErlR3UrGpve9MP3sshhtOo0HTr+ouQ+rNK3p1NqweJQWcZAMLiDRMW6J/aVD3iyDPEmIW Lt182KSKQr5v19c63m4N8brQ2d+TZqECXetJ8HQX7tpEr/W8w7PzDR1xLr5B2sFwQ0VSSZ kWH2pSlyCEnGZirLfJZxzY7bozUq5cs= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=none; spf=pass (imf30.hostedemail.com: domain of mark.rutland@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=mark.rutland@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 400A814BF; Thu, 15 Feb 2024 03:20:16 -0800 (PST) Received: from FVFF77S0Q05N (unknown [10.57.68.11]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BF8B73F7B4; Thu, 15 Feb 2024 03:19:31 -0800 (PST) Date: Thu, 15 Feb 2024 11:19:28 +0000 From: Mark Rutland To: Ryan Roberts Cc: Catalin Marinas , Will Deacon , Ard Biesheuvel , Marc Zyngier , James Morse , Andrey Ryabinin , Andrew Morton , Matthew Wilcox , David Hildenbrand , Kefeng Wang , John Hubbard , Zi Yan , Barry Song <21cnbao@gmail.com>, Alistair Popple , Yang Shi , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , "H. Peter Anvin" , linux-arm-kernel@lists.infradead.org, x86@kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v6 08/18] arm64/mm: Convert set_pte_at() to set_ptes(..., 1) Message-ID: References: <20240215103205.2607016-1-ryan.roberts@arm.com> <20240215103205.2607016-9-ryan.roberts@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240215103205.2607016-9-ryan.roberts@arm.com> X-Rspamd-Queue-Id: 05ABF80010 X-Rspam-User: X-Stat-Signature: wxsknszxsyewiwuou8ezirx64stw1qyx X-Rspamd-Server: rspam03 X-HE-Tag: 1707995975-412553 X-HE-Meta: U2FsdGVkX19aRTj1RVdhdH1VLW0XWNWChttDt9sVu090p1rhav/EQMOU+LDuqm34RqCv6eElW6fkExoy3uVzEv9GxxOK26ROGIN04rs5Egb3I4IMlIrI5eSF/gCnpJTolSNyop6urrBpZBge6DwDI1ehmd2Bi4TfYGAl2dFpSB3jMVHvZ3PEXYJeBL3ET5HfvRKK8/ONfahSKp6mt44SUTWFrzbJoLLh8tV570Kg6h7H0dDJ1XqpCj/KHns9xiCL6sCIVNtDjmgR2HHpdEwLTCJNrL+h5QN0x3FoJpz03qjemO6olUu+UC487z1qkGc/ipe0nWHdLv7vVAnyvdtUr9H9CnK8HnNiQoNvw8Osgjnmt5Fggcd6ltZrH1ATjMq6gQiCpN5aq5FxfDa8NPeA3Xg7eSk6SskZ81TNKoqD0xSEHfX+UDX8T25DML4cEN+4W7NPm8MuPnhEFwGwkVk7Fx/ZGQy5o+LeMRQrbsoDIjlMmqKvqsqrnUwPt+izoWj1Tms1FmUe/uJmNIH9vzTXf1MfIbn0bwxr/oJkZzKlN/1+RZnMA4WkInlbEEQRC80hhLL4d0ZaLSKAioQFk22fnN0gEu+CE0jCYZwQdeyRNR37y4teFYz9PiPW9ftraV+e6yiR+FJBLE/0Q2hMzXbqEGydYoldcpbtTXg9vV0AXx6DUNbdo/2OSGoI03JF5OnrW5j4GrcaYDaVZ75RNa46afsJAxNbOnyN+mRJb3aVIoJdtJiwLBj2qDfu7OM568lScIhdJ0RGs+hp/W3ZnMy3HVQAr6tnCZKCTMcVbuTbiHqvw40Bl40H9nqWeKsKS6lhvGUvsB1UuI7fOfnV3odA0XfApDCNHyZynbLVQoQrSVisezYC7Ezg1yJ72J1a/o0SDrHxTmowXBXw+KsnQYIbSKuNBqKqqsRpGYtc5XDfQy6k7oXaL20hx5J/6HwbciO6dvLT33osLK/i0qy4dMN TST/xUmt oAOlP299ZsG7iYktOkuTa86jOG6MqdVC0IIcM3bkDKdm5cUITWUW9bdQdi7VW9+qVsfb+DDegear3Xq7EFDStfx9cB+KiNZzHKqaYn/fSuXzqq2V45uS8zXLpHm05ZovbtY76PqHMN2bvi6SawUBwSklw9fJo2U5gnzrcOGsxbnw9Tc5c9tNypmCoOdOKLxgjG0u7ZKTxS2I4NVqH4pWMYKZJWu8WtvNgufCRxhZP6haZD4IK0fGxdYoLYiwhviOvhjddVB1k7vuwdyid5wopcBoEnNEY0BVQq3zQfYW5oLYlD8+w7lrLbJzYug== 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: On Thu, Feb 15, 2024 at 10:31:55AM +0000, Ryan Roberts wrote: > Since set_ptes() was introduced, set_pte_at() has been implemented as a > generic macro around set_ptes(..., 1). So this change should continue to > generate the same code. However, making this change prepares us for the > transparent contpte support. It means we can reroute set_ptes() to > __set_ptes(). Since set_pte_at() is a generic macro, there will be no > equivalent __set_pte_at() to reroute to. > > Note that a couple of calls to set_pte_at() remain in the arch code. > This is intentional, since those call sites are acting on behalf of > core-mm and should continue to call into the public set_ptes() rather > than the arch-private __set_ptes(). > > Tested-by: John Hubbard > Signed-off-by: Ryan Roberts Acked-by: Mark Rutland Mark. > --- > arch/arm64/include/asm/pgtable.h | 2 +- > 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, 9 insertions(+), 9 deletions(-) > > diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h > index de034ca40bad..9a2df85eb493 100644 > --- a/arch/arm64/include/asm/pgtable.h > +++ b/arch/arm64/include/asm/pgtable.h > @@ -1084,7 +1084,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, > diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c > index a41ef3213e1e..59bfe2e96f8f 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..6e0df623c8e9 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 a254761fa1bd..3235e23309ec 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 2892f925ed66..27f6160890d1 100644 > --- a/arch/arm64/mm/hugetlbpage.c > +++ b/arch/arm64/mm/hugetlbpage.c > @@ -247,12 +247,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; > } > > @@ -263,7 +263,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, > @@ -471,7 +471,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; > } > @@ -500,7 +500,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, > -- > 2.25.1 >