From patchwork Tue Feb 11 16:14:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 13969571 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 0F24DC021A6 for ; Tue, 11 Feb 2025 16:15:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9317828000F; Tue, 11 Feb 2025 11:15:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8E1AC28000D; Tue, 11 Feb 2025 11:15:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7358F28000F; Tue, 11 Feb 2025 11:15:16 -0500 (EST) 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 541DB28000D for ; Tue, 11 Feb 2025 11:15:16 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 10C1E4705C for ; Tue, 11 Feb 2025 16:15:16 +0000 (UTC) X-FDA: 83108163432.19.C162CD1 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf28.hostedemail.com (Postfix) with ESMTP id 7FC32C000D for ; Tue, 11 Feb 2025 16:15:13 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=iCI+86Qa; spf=pass (imf28.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=1739290513; 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=r4OZfx8Ch6jO+R8i/FyGZDWFbeHt/ASFZW5600pQVo4=; b=5mVFBulVBBR22lWo528hKHgASdyTrbYMWJc6vo6UGC2ChhPiVHWak3Lv+EES8QxsMqQlPC cutvoGLfIUB15OJII9z9sphTDEzQGIuo1vvkjywD6tGeTRy6AzDuOYsUBcUcW+1lTl4qLS pkAULp8uO/WZVSPfc4obWQlVqmnnXoU= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=iCI+86Qa; spf=pass (imf28.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=1739290513; a=rsa-sha256; cv=none; b=Ka8v8O3IMStjqpCJ2QDLMcn67WobwhY2DlP5eQ3sRLupbObwHrfu4hzMw1JCrKF8zj8Jaa UNlvrGiWGZHUIqbJebIfIk/yE0iW7EuMniga4r19JJRHpyc2+Jttfw0Cr6E94ZgTJfAbVg de34M6Qh228nCXU9x+dsUlG22UO6Hhg= Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51BE4SOY023533; Tue, 11 Feb 2025 16:15:09 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=r4OZfx8Ch6jO+R8i/ FyGZDWFbeHt/ASFZW5600pQVo4=; b=iCI+86Qark3N09/Vjm0UoI7/7MU+o7P2J 8zGhz2fnUtRxeH1ALcGWwTXLZJVcXECMz2n17igAXI9qYV/7nEdyeElAvn32X4dA 7t8eKUhK43TiIw4wF95O/PL0QwkInSD+kZs39X8zfBj40WeRB8zXaEfoh+4QsMCG mmRvwNu8RNba4AXoDD/cxArDt+neJw2DrOtIizTX9cUKK9IRCCu9WTM6pFIlCUoc B3PTrjnXCoIJMS6wiuXn96lklKZJeJZ8wfYifULcQz5/x/Tw3GjvsGBOi8b8mhqC nwdbuQUGDj8mYtp+vT+3htz/AZJx9qMltCedCyl3EpiuqyMOTSvdg== 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 44qtkac2ds-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Feb 2025 16:15:08 +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 51BDBSV3001358; Tue, 11 Feb 2025 16:15:07 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 44pjkn43k2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Feb 2025 16:15:06 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 51BGF4av37552530 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Feb 2025 16:15:04 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CF5FB2004D; Tue, 11 Feb 2025 16:15:04 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EA0E820043; Tue, 11 Feb 2025 16:15:03 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.63.197.14]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 11 Feb 2025 16:15:03 +0000 (GMT) Received: from jarvis.ozlabs.ibm.com.com (unknown [9.150.7.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.au.ibm.com (Postfix) with ESMTPSA id AFCCC6013D; Wed, 12 Feb 2025 03:14:59 +1100 (AEDT) From: Andrew Donnellan To: linuxppc-dev@lists.ozlabs.org Cc: x86@kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, pasha.tatashin@soleen.com, sweettea-kernel@dorminy.me Subject: [PATCH v13 10/11] powerpc: mm: Use set_pte_at_unchecked() for internal usages Date: Wed, 12 Feb 2025 03:14:03 +1100 Message-ID: <20250211161404.850215-11-ajd@linux.ibm.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250211161404.850215-1-ajd@linux.ibm.com> References: <20250211161404.850215-1-ajd@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: SA9oqZPbdfv-FJNFi_bHJSqLbghGZnbK X-Proofpoint-ORIG-GUID: SA9oqZPbdfv-FJNFi_bHJSqLbghGZnbK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1057,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-02-11_07,2025-02-11_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 mlxscore=0 phishscore=0 lowpriorityscore=0 clxscore=1015 malwarescore=0 spamscore=0 mlxlogscore=674 impostorscore=0 bulkscore=0 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502110106 X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 7FC32C000D X-Stat-Signature: knhoe94udp8934d5wmj5cfzekftnadh6 X-Rspam-User: X-HE-Tag: 1739290513-709731 X-HE-Meta: U2FsdGVkX1+akEvt/+I+mveHj/z8hT6WytLjUvtt4VSjYc12zp/krKT8XU6ZoZfp9qNFILFf69NxRBWYOuoY/Yb9rQoVTCCMXELCv7lpbs1ccsqZqatrlWhw1QaMhSbDmNES2/K202TwmbS9oaz2w/DSl3Mgj4QSB9SmX2Mt99wweXq5Mmzso7Ed74JDQvKR93wiIX0TAljLnL6TMKW25brGoar7EPuhOcB2gJtcclzf9ie+aqs7mXzr1sgDOZrQdSG+Yd6wGzyqBSlfS+7CC4HudIf27GwRK2G0+KT/nSOlLZDn2Xym7cYb5QnP78fTm26k5MeJpZMxJ/d90HM/XJJnDuFdTCyjOuMPqdO3ZZp/30cC6oWEP6bMwJar66a/5q5ONRh5yTtvEYTk7S3dYhymIJpRMThcGXI0jhweONRS5LMwdN1AwON4DZBf+o3umtChqG8XykKj3QVqPcytO2Eh+dTyOetgxb72qEKGXIJ5hp8Jr4NC/R/TbeaKRPtHK3hFiiBKuLsMSwT1Vvj5/1XvNBFc9Y/qfGjbgKELCpJrtdGoPEHxqPBJU2lQKLLPAItM5UmcTCglAr2dEwsfrPGhIRZkZOtiiKBR5cMrQ9jBegXPyXPsN88Jl5un6Xb4WZSaBv8vqJtRXlHZChWXbDEjxif5OBlCAQZvy9rQJc/38f3XOTH7BuvoX2oAIYCPpskTtGr23oUpWq28CQkbIOGY+n1/aicSgKVmyIhjNVL7WJKecllhO1b3xP6l1t/s3lRTH7PCkhPKVYbedAbO5N3tQHHOuoF0KizMGRQipAO067xs2CN9F7HHLLwz5u5+RreBQx/ZJJZwEjaMrSdGAgjPLglWqN5xHqkeq9rwDgoioy3S13v8GmIfrjk9PZx4klftj5aEcjNZYZ4HNTVeog47AkrHrWquLgccNXJyGDtlhseHQWCgv8XTZaHTCQtwAAb3wK/i/NeVYWWpW7N 9vzAdMNu BLuiXoxjVmNIXXdeYMNnB3JIKWjJkxko9tvrNMzU+cEPy8b9HZVqMJ1D0XP/eUD6nLNc1cpCr/N72pXPyTeICUZwX/5Ak8G20EuFHcOzl56qCLx8j/po3t9YbFDnTwyfB/t6kmetUKOsNglZCG1OjmXFAf0m9v/gw5+Q6lqjDz/zZpc7jCzQTqfNuHHqrOOZGgfX9jdSJLyiS6eWl+YdWPmBDK9eIq7E16Ut+Dl2TdVXiDGBZ/ZwBOVGH0+nNfOrq4wvUiWAIsSC/3mVkDOj8PLbRAAm60IyYcHB2 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. Signed-off-by: Rohan McLure [ajd: don't change to unchecked for early boot/kernel mappings] 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 3cae32c74fed..221cae4873b9 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 ce64abea9e3e..b4708b2cabba 100644 --- a/arch/powerpc/mm/book3s64/pgtable.c +++ b/arch/powerpc/mm/book3s64/pgtable.c @@ -129,7 +129,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, @@ -146,7 +146,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) @@ -557,7 +557,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 311e2112d782..1704381f5c3c 100644 --- a/arch/powerpc/mm/book3s64/radix_pgtable.c +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c @@ -1586,7 +1586,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) @@ -1597,7 +1597,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; } @@ -1644,7 +1644,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);