From patchwork Thu Feb 15 10:31:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Roberts X-Patchwork-Id: 13557858 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 CADB1C48BEF for ; Thu, 15 Feb 2024 10:32:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 417308D001C; Thu, 15 Feb 2024 05:32:50 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 3C4F56B0083; Thu, 15 Feb 2024 05:32:50 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 266FC8D001C; Thu, 15 Feb 2024 05:32:50 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0E7076B0082 for ; Thu, 15 Feb 2024 05:32:50 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id DC6C61C199C for ; Thu, 15 Feb 2024 10:32:49 +0000 (UTC) X-FDA: 81793674858.14.D2623A2 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf14.hostedemail.com (Postfix) with ESMTP id 2357610000D for ; Thu, 15 Feb 2024 10:32:47 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf14.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=1707993168; 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=ZeD0LRgPYyPlqU6eixwfCpwvc0jLGbSMmuxIvFt/HH8=; b=qRqIW2SH2Brn/X13CmVfC28rg7pwBrodPHSMQjiXmQ9bEcWcCe07sj8PjdNC7E9TxsgwW9 omeUFu7UVNt883VCWpW1w2+84jbjvHs5Beg/2s53UEu3bJn4fJ6oFBzJtjqnrh3Q+wmlVF 0XnmTC/s1JJGvE1Kdpg9HyddIjTaBuo= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=pass (policy=none) header.from=arm.com; spf=pass (imf14.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=1707993168; a=rsa-sha256; cv=none; b=XiBKQcHKtFybITIcEvGdiNWrGK9HduwAnrk5ZjJ2Vs+sZhoWPP0JVIbgnultPsgqzylmzA UgNdZQStiTp3TgEVynGXe97lr5g5DcWDUo/Cj55cNAbdYuMnwBuoIK2z/BEeUbDD8+zDLz jB0HSq3CJ8T/1zQo1RM4/obPjRqE7Jk= 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 222B7153B; Thu, 15 Feb 2024 02:33:28 -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 18FC43F7B4; Thu, 15 Feb 2024 02:32:43 -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 , 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 v6 08/18] arm64/mm: Convert set_pte_at() to set_ptes(..., 1) Date: Thu, 15 Feb 2024 10:31:55 +0000 Message-Id: <20240215103205.2607016-9-ryan.roberts@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240215103205.2607016-1-ryan.roberts@arm.com> References: <20240215103205.2607016-1-ryan.roberts@arm.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 2357610000D X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: sy94u3jdpr7um1f7bq3dmmyfniqyq3ya X-HE-Tag: 1707993167-393255 X-HE-Meta: U2FsdGVkX18+pAykQ7t37kX7J/VTQhWPmxEoqcASGQfvt/rpKbY/svgSGuACX/8HdVfwl+OqmB6HGqjRu5TH0bpVO/uMrQ3tTWUaAf57+5x4R+Riha0y0m4A9CJs6uSlzfyL8qLxfyquuTlBNGxj9JR1tk5HLMxjJIqi2Puz99IuqQspzLBa6NZrWHjfG7/M8ok5NaGAI2tU2XGnCunMcMU5EBeGbcebGYxPkwnlt1F8gm44tpjT3CGv2uLH+JpMBiMVD/SkyQCgdAKNzen0A5RNvxAMBfCSCD23ZoTPHinRl6/eVE90C1bbsWBpiWE7ETTkZAFNu0edC6nvqCNUFNKD749t5G16/mxx54DKpooXeqDl7j2ng/vQkhb3Wc9BkYWU0XX9w8lc59OnGhs82ChneKjOxlz0LaJOpbAiONkrKKyyQNq37gILqbPAySzGJLJJexgLoZwYJZYyWSyYEQYN1qfXIwzPj1CVtSEUeg/QWyaJa7QKqB5BAsfAXD1aHowLYu2MCtOGdOslvfjZ+Wn1mjblLiMqcqDs3jLRSFROfVN2aclKZqUBJcVkJ96H4sjkjFK2lLPnxdHg+zvCKGMKnliVmx7K/rXLmD6K9CZ0meuVWxwoCDrwAkMGiO2/1o3IepY4PKD5qio28aqeFrt3JIRhqUCzfMJs0aLe3XwlCwAwBi2L87fMPrNfp//dyuf/SPCP0sml/KOFQbX9w2Xplca2KzbWii6KeZstlw7HQ0OJVmmwv+lQcmHoScG5YUo4a3o1h178dqNYgeXWgxHPxxWI9OIZ+Cg8xIsBy/s20eVaV1dFYWp3tGNisQZq98dXwx2yZB5ctf5XwCPmyn9XMeFUJOQz+0MypRQGapzy8eauSDihLhNDGHNcGma41+rzPW8ImkeB3BmQmEzQ6Vgi7QZYbbgjAbxuAk6QzwZXjG/JPm0UXAQ80burFM5uY4H1JMCKxZYiSJgYZkl QuEdnVPD NG+C7xZElHfqJ+Np+y4sAf2dt546F0ycpq3ZchtEOshmAThfpNv0iCm+sn2n608cuP/rR71tD2jSJOGZbwy4sqsZalxTr/7E/ubW1ioB7yi9iDBW+/graywDrjfWuNLT7Und/sTWGJXW1NoBHA3K0EFMcbJUhVdOHqIVD2QUL7AYM/ZKMaWd3anCwoUMVq151NviXRgFQ+mhO8raZt6ubih3CMThloKt3zMuSq//PNnNGbZG3ANCGketOs6Y4iW1OVlzT8DYYDo5TJb3ZG7fzjb6Jcxq6urKYDdE2PDDC2+ZHN5U= 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: 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 Acked-by: Catalin Marinas --- 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,