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 48EB3C7115C for ; Wed, 25 Jun 2025 06:39:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E24896B0089; Wed, 25 Jun 2025 02:39:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DD4496B00BD; Wed, 25 Jun 2025 02:39:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id CEAB66B00BE; Wed, 25 Jun 2025 02:39:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id BFDAB6B0089 for ; Wed, 25 Jun 2025 02:39:55 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 672621042C6 for ; Wed, 25 Jun 2025 06:39:55 +0000 (UTC) X-FDA: 83592972750.10.C9B1FCA Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf24.hostedemail.com (Postfix) with ESMTP id 3AE0D180003 for ; Wed, 25 Jun 2025 06:39:53 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b="pRZrZe/h"; spf=pass (imf24.hostedemail.com: domain of ajd@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=ajd@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750833593; 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:dkim-signature; bh=pvxzQftsklntHnrA7DbfG4RgW+xDva+08SMsEQP9cZI=; b=dhFkfLhlzyy4EKOsWx7jLb+59PFkolVV9Zc4c0lOsi8YR48K/8UjYciTEVWoaftKZgbHdl DE0HqTBDZL/YDaVVtNTY/U2/SjMEcbBYqOfiV7CW8egGBwTbtVAngMXrQsXZuFhe6PLdR+ eCaevRtvmhvXdO/UHonkLo/pANMYeHY= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b="pRZrZe/h"; spf=pass (imf24.hostedemail.com: domain of ajd@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=ajd@linux.ibm.com; dmarc=pass (policy=none) header.from=ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750833593; a=rsa-sha256; cv=none; b=PLYS3jF8oUDmkni/FqjBga97NK/IsdvzNraeb3A8TnFBuFA5jSLaNDvss8YEAvIC6/ldY4 gJcJxXFmHCp4wvbWLLEdcqExW4gFJ0r9XtMsrZNbIU03/YO0MOhHL3iVn91vXUBhTEWNrH hjf3HI+aHI+fBrvxXtq7fLl9ieVjhFM= Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55OLnUx1026632; Wed, 25 Jun 2025 06:39:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=pvxzQftsklntHnrA7 DbfG4RgW+xDva+08SMsEQP9cZI=; b=pRZrZe/hlDpT+SZk9xio9IbmAEST/znBJ ONYGfXZci+i4KjfVqrp5zTyWRO3qXl4W7DF1S7JbQ3zxioQczjAbvUCt24ZmuO7W Bx6uFXVg8Y7E1mqMgSgW/cXWzpA3UizNhfVEd7D2ofxv4v1S/pNrpbOhTy2TGwBK Hj3VbDmwa/bS/6cvYqPbnsXaifCaaO5i03RR7GatrE93pVkHLrtqw8f9O9GezaCP VL9LEERCW3ACBdO5mBrl/ySsoGDUsaEE6eLm4h1a07K4cLAQGHaSQNgudqfQvf3D E9oN/ZjdJOto+7cleQxjxHut1im99aTRESRexkAZvERimp/EiAhYw== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 47dme1de1c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Jun 2025 06:39:47 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 55P61LOT006414; Wed, 25 Jun 2025 06:39:46 GMT Received: from smtprelay04.wdc07v.mail.ibm.com ([172.16.1.71]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 47e82p800x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Jun 2025 06:39:46 +0000 Received: from smtpav02.dal12v.mail.ibm.com (smtpav02.dal12v.mail.ibm.com [10.241.53.101]) by smtprelay04.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 55P6dkpL45023610 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Jun 2025 06:39:46 GMT Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D2AD858936; Wed, 25 Jun 2025 06:39:45 +0000 (GMT) Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3DFA958913; Wed, 25 Jun 2025 06:39:41 +0000 (GMT) Received: from jarvis.ozlabs.ibm.com.com (unknown [9.36.18.35]) by smtpav02.dal12v.mail.ibm.com (Postfix) with ESMTP; Wed, 25 Jun 2025 06:39:40 +0000 (GMT) From: Andrew Donnellan To: linuxppc-dev@lists.ozlabs.org, pasha.tatashin@soleen.com, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, x86@kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, sweettea-kernel@dorminy.me, christophe.leroy@csgroup.eu, mingo@kernel.org Subject: [PATCH v15 12/13] powerpc: mm: Use set_pte_at_unchecked() for internal usages Date: Wed, 25 Jun 2025 16:37:52 +1000 Message-ID: <20250625063753.77511-13-ajd@linux.ibm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250625063753.77511-1-ajd@linux.ibm.com> References: <20250625063753.77511-1-ajd@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=Tc6WtQQh c=1 sm=1 tr=0 ts=685b99b3 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=6IFa9wvqVegA:10 a=VnNF1IyMAAAA:8 a=aG8EAFyCJnWj3sFUJ80A:9 X-Proofpoint-GUID: XsVVmKatoER0_bgca1BpFKwcQx2I9Bb9 X-Proofpoint-ORIG-GUID: XsVVmKatoER0_bgca1BpFKwcQx2I9Bb9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI1MDA0NSBTYWx0ZWRfX/YIpcrmg0mJ3 MDYpcX5+36ek3piMnPjbRaUECMzjXR781FxvMjLu9rJTT0MHqTwqOdUcYjJHp8nhp1vY4z1/Lwg ZIq2KF9D4mmwfIsTaa/igQuEithZwErtFThkjCcMWARTvRPzimGzhxAcUb1qQTh5bP8ZX4+auWI ZbW/trLIBk3twNVxfFXOc73eFrPmjFfBzP+EbbksKRcVpRbYETG/FUAdo1Av5zfoHYB95ns1LQB YMnmIjvzLKDLbp0SIvdfw3mvkrBwC6Q8qWfvTB7VC80q1e3giXQqe6tVuFnaXvJ71WoAQRwls1R Cz8m3PZZpP7QU77BPE6h/0rdCS0y1hElLCfQuodb4KwgE5fEYwicDj6yESOx61szsx9crFYuYKQ 2lW34qyuxlHEzRMN8eF7v2hzwOgQnOLaFxxEhtB2JANE3DIc1fZdu0I8+3MGxETsc0ryjHXH X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-25_01,2025-06-23_07,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 priorityscore=1501 mlxscore=0 mlxlogscore=833 phishscore=0 spamscore=0 malwarescore=0 suspectscore=0 impostorscore=0 clxscore=1015 adultscore=0 bulkscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506250045 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 3AE0D180003 X-Stat-Signature: ofeypgpa4aze1orwsktpfy751bh68usw X-HE-Tag: 1750833593-767461 X-HE-Meta: U2FsdGVkX18ZbvAUjAcEcC3O+wl/HMj6UkrDc2VX8pw/DF/Y0aVIhofyzpepOnR+Z5eyt8JN4EomRtN0jtf0HutkBU82g00BxroTTAVl4YEEBKyLOnmS+ytOzDshMfY4a/hkH5YWa0nBscq9A/jbXx97Kb8yH7ls8EnmcGr/j5aiJj9jkpwwFKf3oIH/OtPq8ukm7pmJ5FewZ9RMz8hj2iFRoIoIGB1J1EqstmWZMQBtKPYkvZeeRfh8hy3PpA/3ibctn94j+cosg/so6mulnosFFUCJv+mxeMxSWp7YeBg/DJ1i1RTPhF4xQUPd+bwhKy1FXcN0PjfJc5UF1NaL/ofRwcKv+wFSYtx2yrl6WPg7VIC2lTHrREA5Nwchcsk2FrVcLQfq36gGnZip6rTGLGdk7eiiVJqX05zGZtgiF7OQaFjizqJJQbDzAzi3GWiP32xffAUGn31NXDCAay+coU7CwHtYGczyu/aw5CIiake1acc2Bx6anpGdzmFnzSnD+ZtB7ZvZu3+HtqORC39HlHD5WSjxj2qvrFRXQJIwISbX6BJBdu1B/P7NoIfCprPyFZPqEALXwkP2ndt3cUV7EQbcT9gLiJ0qop9IHYtPlQmmPKxySQ0T9RjHvvfHRxWfMbUHy+hl2nnso58o7RjXwm+QxJ18XAJsPBlEyH2z4OAG1w5OKPwqMPHtYf8HvyaFXSs1rL6VeKIwGllgps51G/tdEwxuj4Q8Lg07XYvHhdTcWJC2k16ETa3poRb6tea0w0OGFfQ5VKvP9zkvlw2Ic8rIczkgPxtlCmTi7dmoG+kcLhvjqO+wN2+t1+2iTDYurMPdasjII3U7du/CqwALN8vwNtHzxF+yTPc1WFh1Zjgs2KTSMwO0Wbln61XuN61fw7nZkCBxarfQk3byj8CuJYfC5/NFYDrFsYpZhbDEt/s/R39DyMG9LEPgcv563JYg 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: From: Rohan McLure In the new set_ptes() API, set_pte_at() (a special case of set_ptes()) is intended to be instrumented by the page table check facility. There are however several other routines that constitute the API for setting page table entries, including set_pmd_at() among others. Such routines are themselves implemented in terms of set_ptes_at(). A future patch providing support for page table checking on powerpc must take care to avoid duplicate calls to page_table_check_p{te,md,ud}_set(). Allow for assignment of pte entries without instrumentation through the set_pte_at_unchecked() routine introduced in this patch. Cause API-facing routines that call set_pte_at() to instead call set_pte_at_unchecked(), which will remain uninstrumented by page table check. set_ptes() is itself implemented by calls to __set_pte_at(), so this eliminates redundant code. [ajd@linux.ibm.com: don't change to unchecked for early boot/kernel mappings] Signed-off-by: Rohan McLure Signed-off-by: Andrew Donnellan --- v13: don't use the unchecked version for early-boot kernel mappings (Pasha) --- arch/powerpc/include/asm/pgtable.h | 2 ++ arch/powerpc/mm/book3s64/pgtable.c | 6 +++--- arch/powerpc/mm/book3s64/radix_pgtable.c | 6 +++--- arch/powerpc/mm/pgtable.c | 8 ++++++++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h index d0938e9c33fb..4fe970992147 100644 --- a/arch/powerpc/include/asm/pgtable.h +++ b/arch/powerpc/include/asm/pgtable.h @@ -46,6 +46,8 @@ struct mm_struct; void set_ptes(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte, unsigned int nr); #define set_ptes set_ptes +void set_pte_at_unchecked(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t pte); #define update_mmu_cache(vma, addr, ptep) \ update_mmu_cache_range(NULL, vma, addr, ptep, 1) diff --git a/arch/powerpc/mm/book3s64/pgtable.c b/arch/powerpc/mm/book3s64/pgtable.c index 0db01e10a3f8..1468a815fa5e 100644 --- a/arch/powerpc/mm/book3s64/pgtable.c +++ b/arch/powerpc/mm/book3s64/pgtable.c @@ -128,7 +128,7 @@ void set_pmd_at(struct mm_struct *mm, unsigned long addr, WARN_ON(!(pmd_leaf(pmd))); #endif trace_hugepage_set_pmd(addr, pmd_val(pmd)); - return set_pte_at(mm, addr, pmdp_ptep(pmdp), pmd_pte(pmd)); + return set_pte_at_unchecked(mm, addr, pmdp_ptep(pmdp), pmd_pte(pmd)); } void set_pud_at(struct mm_struct *mm, unsigned long addr, @@ -145,7 +145,7 @@ void set_pud_at(struct mm_struct *mm, unsigned long addr, WARN_ON(!(pud_leaf(pud))); #endif trace_hugepage_set_pud(addr, pud_val(pud)); - return set_pte_at(mm, addr, pudp_ptep(pudp), pud_pte(pud)); + return set_pte_at_unchecked(mm, addr, pudp_ptep(pudp), pud_pte(pud)); } static void do_serialize(void *arg) @@ -551,7 +551,7 @@ void ptep_modify_prot_commit(struct vm_area_struct *vma, unsigned long addr, if (radix_enabled()) return radix__ptep_modify_prot_commit(vma, addr, ptep, old_pte, pte); - set_pte_at(vma->vm_mm, addr, ptep, pte); + set_pte_at_unchecked(vma->vm_mm, addr, ptep, pte); } #ifdef CONFIG_TRANSPARENT_HUGEPAGE diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c index 9f764bc42b8c..2a52089018a5 100644 --- a/arch/powerpc/mm/book3s64/radix_pgtable.c +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c @@ -1600,7 +1600,7 @@ void radix__ptep_modify_prot_commit(struct vm_area_struct *vma, (atomic_read(&mm->context.copros) > 0)) radix__flush_tlb_page(vma, addr); - set_pte_at(mm, addr, ptep, pte); + set_pte_at_unchecked(mm, addr, ptep, pte); } int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot) @@ -1611,7 +1611,7 @@ int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot) if (!radix_enabled()) return 0; - set_pte_at(&init_mm, 0 /* radix unused */, ptep, new_pud); + set_pte_at_unchecked(&init_mm, 0 /* radix unused */, ptep, new_pud); return 1; } @@ -1658,7 +1658,7 @@ int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot) if (!radix_enabled()) return 0; - set_pte_at(&init_mm, 0 /* radix unused */, ptep, new_pmd); + set_pte_at_unchecked(&init_mm, 0 /* radix unused */, ptep, new_pmd); return 1; } diff --git a/arch/powerpc/mm/pgtable.c b/arch/powerpc/mm/pgtable.c index 61df5aed7989..4cc9af7961ca 100644 --- a/arch/powerpc/mm/pgtable.c +++ b/arch/powerpc/mm/pgtable.c @@ -224,6 +224,14 @@ void set_ptes(struct mm_struct *mm, unsigned long addr, pte_t *ptep, } } +void set_pte_at_unchecked(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t pte) +{ + VM_WARN_ON(pte_hw_valid(*ptep) && !pte_protnone(*ptep)); + pte = set_pte_filter(pte, addr); + __set_pte_at(mm, addr, ptep, pte, 0); +} + void unmap_kernel_page(unsigned long va) { pmd_t *pmdp = pmd_off_k(va); -- 2.49.0