From patchwork Fri Apr 11 05:43:44 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 14047577 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 8D7A1C36010 for ; Fri, 11 Apr 2025 05:44:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 973E1280168; Fri, 11 Apr 2025 01:44:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8F06E28015B; Fri, 11 Apr 2025 01:44:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6CC78280168; Fri, 11 Apr 2025 01:44:14 -0400 (EDT) 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 4BC4A28015B for ; Fri, 11 Apr 2025 01:44:14 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 78ECB161DAC for ; Fri, 11 Apr 2025 05:44:14 +0000 (UTC) X-FDA: 83320672428.11.F909CE0 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf21.hostedemail.com (Postfix) with ESMTP id 3C0A41C000C for ; Fri, 11 Apr 2025 05:44:12 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=WYFZ7CnM; spf=pass (imf21.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=1744350252; 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=xSwQ4iCG3DdOe+HAaKEvxIlF3f5JEkN2KdugtOX9U50=; b=e/97D+PnbVz3VM4xpDpBlDix19Tmaew6cRdyhNzRd4vrlgAoQ/aNrsml5veZ+W0CdDb349 YlcqyZgORIzgr9Ec+M0VvxV99WOYpyNYFCYX8JLgu2e5ooBCnUKfMCCVxEcuhAc4Idu9/K /7azsEFCKj0pXpG5TH2CP/U53WfA0TA= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=WYFZ7CnM; spf=pass (imf21.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=1744350252; a=rsa-sha256; cv=none; b=T9WO+niK1A7fyn1+QdhcnFsKtDT/36spqaH5vXljUSRYo/sGnwMGHAZ79fh2jd+swjdimI edGSyJCBOgEbl4jjMAEykAfx/7TahjkRDUnsqBcSOADlrBsDI5/Z402Fl4f1JKZ+yfTaQb HV+/f55SEd+93BZUPRet/JWrT5lpKRs= 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 53ANKZns019094; Fri, 11 Apr 2025 05:44:05 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=xSwQ4iCG3DdOe+HAa KEvxIlF3f5JEkN2KdugtOX9U50=; b=WYFZ7CnM2oNanTi0EAIrmYRux7ZReGgWh PJqAzWte2965sU+Hf6ihFWy9KmJLhELsYz79bfIgu8dZ+TV2GDip00WBBPwVEPhg yk48c9nQnUu3zdMTC2WKEOb/Zc9ydKznQrH5+DGvi+cRLMdtKoK28O3TkEgBFgOr CPMkT9fJlKYoAJt/SV2cLXBXLBXBWuKqt/AXNewdCwqply/Rv7vCYP0+0l1vsmsg pjnG7BDHqTIixYQ9A99XRAKaD58b9Xqg27Q0y8N6r0YFPUiZHkuF7/EsBmlj33/s XFSAhRvqJg4i809Ugh0oQl///bknis8a+LxwQ9ekRTZTluXpmIIsA== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 45xe13vft3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Apr 2025 05:44:04 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 53B1AB48025537; Fri, 11 Apr 2025 05:44:03 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 45ugbm9gwk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Apr 2025 05:44:03 +0000 Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 53B5i1Ew41156930 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Apr 2025 05:44:01 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 7C70820043; Fri, 11 Apr 2025 05:44:01 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AD40B2004B; Fri, 11 Apr 2025 05:44:00 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.63.197.14]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 11 Apr 2025 05:44:00 +0000 (GMT) Received: from jarvis.ozlabs.ibm.com (haven.au.ibm.com [9.63.198.114]) (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 2BCBB602EA; Fri, 11 Apr 2025 15:43:57 +1000 (AEST) 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, christophe.leroy@csgroup.eu Subject: [PATCH v14 01/11] mm/page_table_check: Reinstate address parameter in [__]page_table_check_pud_set() Date: Fri, 11 Apr 2025 15:43:44 +1000 Message-ID: <20250411054354.511145-2-ajd@linux.ibm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250411054354.511145-1-ajd@linux.ibm.com> References: <20250411054354.511145-1-ajd@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: Di7zFUZd1-pdqJ5m7IVKXnK0zDaEFJ5q X-Proofpoint-GUID: Di7zFUZd1-pdqJ5m7IVKXnK0zDaEFJ5q X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1095,Hydra:6.0.680,FMLib:17.12.68.34 definitions=2025-04-11_01,2025-04-10_01,2024-11-22_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 mlxscore=0 bulkscore=0 malwarescore=0 phishscore=0 mlxlogscore=999 adultscore=0 suspectscore=0 priorityscore=1501 spamscore=0 impostorscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504110038 X-Rspamd-Queue-Id: 3C0A41C000C X-Stat-Signature: nukfpdh1bsbc8iyzg336ayo4sn87necd X-Rspam-User: X-Rspamd-Server: rspam12 X-HE-Tag: 1744350252-718444 X-HE-Meta: U2FsdGVkX191dinz9n8lleQSIJ1hzRTW1krME95UgX9rHRlEhlsvIVnoGprzzigEkkLTCBFkzzxNcYDV4isiSFnKYyUdJ4VjCvEjGuqVQyUi2QDeCjd+v997KG6nY0cL5OEuJkLOc+vFheFzEjdRwO6E+RSIPrKIYU9LlAWv6PyLQmR67JWRjVY1rYGkf8BpQ5ghQEiEChDR5vxOQNx1loSYYE09eLzs10Nctk7VTxkP6KdeFbPjX6f9b2YAr1NhoN/rZE2lIXCI8WzZSLzwhUbN7X9w+cWhz8sIt+0FdEs0j1xnwgW8rIAy6whF6lF7UKUfib2uRkCgi5A5wKyUkFKCJaEszdh27/U1ujMrM3D6cTVYgmHbW8I9fR23UTUFP07nrXJGAaTJ2PhukL56gsRPztmivTaIUDbI0BAfckXcNz8yPefcKFZSXZzYJnnc0eDI84Xd6UXOTM9pkpAmg7MdNruW8+2c5T6z+PqIDEeVR3oLhxnd0b0Foy0Evn1YcRdMgTC3Z8Zs9L84XcXlS3AZCdgJXL1werM4okHWVfzDgf4dcnkq1na0dA4BZkEbGiXgBzQQ7+e9IRGH/vRWLNyG3SbVn+tdDkjm10MTlCGJbB7i4BPlr13ZleI3XD8Wk0diQxOgEMkgnEb+7LuCQLL9HLWzHOrabkJJhiobMLPqUZV9KiY9/iSE6LYVY0BwsBy/igADWnwAJHT95VK9T8u+pntajtx6YrMCuqKcdHuUHCWkDJ09Heo45/61YiUyxE3Yy13tlTGGnOS44CevzSpmweQpqSsqZX8aFpaaxZ4FoZCMu1C1Mk2QLe4k+3IBVYHsZXXbL/SXKjM3MCdcGLQWlrZyhiylYEmBtdrvKqANYRtuAbKDzKMGlsFaH1yrt3HZfXXxHZQz4/S2cwFju3giqdHBK8NgY6iU4AoVoxT+zzZd3QCWlc9yPV8cvkMoso92Pc+iW+4= 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 This reverts commit 6d144436d954 ("mm/page_table_check: remove unused parameter in [__]page_table_check_pud_set"). Reinstate previously unused parameters for the purpose of supporting powerpc platforms, as many do not encode user/kernel ownership of the page in the pte, but instead in the address of the access. Signed-off-by: Rohan McLure Reviewed-by: Pasha Tatashin [ajd: rebase on riscv changes, remove riscv commit message comment] Signed-off-by: Andrew Donnellan --- v13: remove inaccurate comment on riscv in the commit message v14: fix an x86 usage I missed (found by akpm) --- arch/arm64/include/asm/pgtable.h | 2 +- arch/riscv/include/asm/pgtable.h | 2 +- arch/x86/include/asm/pgtable.h | 4 ++-- include/linux/page_table_check.h | 11 +++++++---- mm/page_table_check.c | 3 ++- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index d3b538be1500..805aec562d07 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -669,7 +669,7 @@ static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr, static inline void set_pud_at(struct mm_struct *mm, unsigned long addr, pud_t *pudp, pud_t pud) { - page_table_check_pud_set(mm, pudp, pud); + page_table_check_pud_set(mm, addr, pudp, pud); return __set_pte_at(mm, addr, (pte_t *)pudp, pud_pte(pud), PUD_SIZE >> PAGE_SHIFT); } diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 428e48e5f57d..56e6ad5179c9 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -831,7 +831,7 @@ static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr, static inline void set_pud_at(struct mm_struct *mm, unsigned long addr, pud_t *pudp, pud_t pud) { - page_table_check_pud_set(mm, pudp, pud); + page_table_check_pud_set(mm, addr, pudp, pud); return __set_pte_at(mm, (pte_t *)pudp, pud_pte(pud)); } diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 7bd6bd6df4a1..d1ed35779948 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1287,7 +1287,7 @@ static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr, static inline void set_pud_at(struct mm_struct *mm, unsigned long addr, pud_t *pudp, pud_t pud) { - page_table_check_pud_set(mm, pudp, pud); + page_table_check_pud_set(mm, addr, pudp, pud); native_set_pud(pudp, pud); } @@ -1440,7 +1440,7 @@ static inline pmd_t pmdp_establish(struct vm_area_struct *vma, static inline pud_t pudp_establish(struct vm_area_struct *vma, unsigned long address, pud_t *pudp, pud_t pud) { - page_table_check_pud_set(vma->vm_mm, pudp, pud); + page_table_check_pud_set(vma->vm_mm, address, pudp, pud); if (IS_ENABLED(CONFIG_SMP)) { return xchg(pudp, pud); } else { diff --git a/include/linux/page_table_check.h b/include/linux/page_table_check.h index 6722941c7cb8..d188428512f5 100644 --- a/include/linux/page_table_check.h +++ b/include/linux/page_table_check.h @@ -20,7 +20,8 @@ void __page_table_check_pud_clear(struct mm_struct *mm, pud_t pud); void __page_table_check_ptes_set(struct mm_struct *mm, pte_t *ptep, pte_t pte, unsigned int nr); void __page_table_check_pmd_set(struct mm_struct *mm, pmd_t *pmdp, pmd_t pmd); -void __page_table_check_pud_set(struct mm_struct *mm, pud_t *pudp, pud_t pud); +void __page_table_check_pud_set(struct mm_struct *mm, unsigned long addr, + pud_t *pudp, pud_t pud); void __page_table_check_pte_clear_range(struct mm_struct *mm, unsigned long addr, pmd_t pmd); @@ -83,13 +84,14 @@ static inline void page_table_check_pmd_set(struct mm_struct *mm, pmd_t *pmdp, __page_table_check_pmd_set(mm, pmdp, pmd); } -static inline void page_table_check_pud_set(struct mm_struct *mm, pud_t *pudp, +static inline void page_table_check_pud_set(struct mm_struct *mm, + unsigned long addr, pud_t *pudp, pud_t pud) { if (static_branch_likely(&page_table_check_disabled)) return; - __page_table_check_pud_set(mm, pudp, pud); + __page_table_check_pud_set(mm, addr, pudp, pud); } static inline void page_table_check_pte_clear_range(struct mm_struct *mm, @@ -134,7 +136,8 @@ static inline void page_table_check_pmd_set(struct mm_struct *mm, pmd_t *pmdp, { } -static inline void page_table_check_pud_set(struct mm_struct *mm, pud_t *pudp, +static inline void page_table_check_pud_set(struct mm_struct *mm, + unsigned long addr, pud_t *pudp, pud_t pud) { } diff --git a/mm/page_table_check.c b/mm/page_table_check.c index 68109ee93841..893555860d91 100644 --- a/mm/page_table_check.c +++ b/mm/page_table_check.c @@ -233,7 +233,8 @@ void __page_table_check_pmd_set(struct mm_struct *mm, pmd_t *pmdp, pmd_t pmd) } EXPORT_SYMBOL(__page_table_check_pmd_set); -void __page_table_check_pud_set(struct mm_struct *mm, pud_t *pudp, pud_t pud) +void __page_table_check_pud_set(struct mm_struct *mm, unsigned long addr, + pud_t *pudp, pud_t pud) { if (&init_mm == mm) return;