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 F10D7C77B7C for ; Wed, 25 Jun 2025 07:31:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 92DDC6B00A0; Wed, 25 Jun 2025 03:31:56 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9057F6B00A1; Wed, 25 Jun 2025 03:31:56 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 81BD06B00A2; Wed, 25 Jun 2025 03:31:56 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 731AA6B00A0 for ; Wed, 25 Jun 2025 03:31:56 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 428B61227F1 for ; Wed, 25 Jun 2025 07:31:56 +0000 (UTC) X-FDA: 83593103832.04.D226CF4 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf02.hostedemail.com (Postfix) with ESMTP id D8D7480004 for ; Wed, 25 Jun 2025 07:31:53 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=phg7ujEj; spf=pass (imf02.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=1750836714; 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=TtspHoag1vd4TwPxf0NNX79i602MH9pWUgCD4apfYhM=; b=IsmOhnJH1xkRRtdINwM7IHewafp/C2IhxKpayyw7l4bEYtut7NwS7yXQj4rNB3SEm89sAp hi57i6vKKVgSMrpjJyQ6usAdBigknA6CgUh9CtjqzZRTGGikbL1mgZ3q4hsN1S01VCHw9a bwYZKMkIXYmGSjI2CvVwdg+ZnN1IiDQ= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=phg7ujEj; spf=pass (imf02.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=1750836714; a=rsa-sha256; cv=none; b=MNBR0+iDBFnQJwzmaj2RTEZDpBWjEjiiOgy/On84ZV8a/DrSif7aU4DcZoPlhIJwhwPiXz J/Vdn911s62t3At0YhMTRK1qrpZKFR7gDiLu3i7jOuHmJ4D5dDJGX+ACIqLRsNQaldf5+u tVowdPxxK6Rqe3e7N31AhB3eFKOx958= Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 55OJLOCb010657; Wed, 25 Jun 2025 07:31:50 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=TtspHoag1vd4TwPxf 0NNX79i602MH9pWUgCD4apfYhM=; b=phg7ujEjQ+ZZnA+9288cJDpVtmTO+RDK0 2ncLH9tHzbEwGJ5dK1HKom7YKx+ZhxPpOdiUYhu1n5K5E2SNqLr+hdDw46/Q9sN7 lkCTfNy0qCSqrnkbT6jbdha/6PJ/H9lrq2XlX8Ne2jbQP566SmFKFr27eTQE0Tda xFInk6x5gUdvAxVWyALLB9XktcKTRcWXlC2b0/HqXaNzSMFCdzE+o4mI0yelBBa2 XoxTgKjfSwkzh7eLsvL+rmSg4rTBLCnt9qOTVNTe3I0dfJSJIB9LZi+s54HtiXQw VuqEfRA7Y/kg9j0SwoKKH1taUp4+LmwnCTmjhgjqpV97HFIdPAJHQ== 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 47dm8jdtah-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Jun 2025 07:31:50 +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 55P75jDp002908; Wed, 25 Jun 2025 07:31:48 GMT Received: from smtprelay03.dal12v.mail.ibm.com ([172.16.1.5]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 47e8jm81ju-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Jun 2025 07:31:48 +0000 Received: from smtpav02.dal12v.mail.ibm.com (smtpav02.dal12v.mail.ibm.com [10.241.53.101]) by smtprelay03.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 55P7VlTl4456970 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Jun 2025 07:31:47 GMT Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 171D158896; Wed, 25 Jun 2025 06:38:35 +0000 (GMT) Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 1481F5888C; Wed, 25 Jun 2025 06:38:30 +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:38:29 +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 04/13] mm/page_table_check: Reinstate address parameter in [__]page_table_check_pmd[s]_set() Date: Wed, 25 Jun 2025 16:37:44 +1000 Message-ID: <20250625063753.77511-5-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-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI1MDA1MyBTYWx0ZWRfX0PovtxVj8ThL NNSlhaXr7qMCr+LrjJtY1je6X2A5G+LsrK1JOVNi+P0XFj4G+oyzq0L3+Vzt+FF8RD3H4hsOtZr ZVXGNFBUP5XJgOTKMw7Xa7mwL14sHQq9rCjqqPjrMPATIk451M5Wg0l7+C/02dmgQbCtPSMtlJF Rad49rC3meeeTEp6/GxgDk6bugh12XnOyMqVvPKDK5D1rHxxtWEx7YZR9pHGh5EAvUMhEkELz4V jIxwWgwgBkajBel+Y2r3Oblgh58ABqN3zKOWhU5vDjQjI1qFZpD3O1kWF/UaHB4Y6RTHgcEOJc/ ItsN4zast1iyysvo27LpTH3S+OHIEaLRPLPaMKouq5t+AqFExBdnhaJx6wqZ+yqYTY1G+Ekf0JF MAoAVtDcGB1cIX19mxpK241IXX6zBOTGqVIK4AFKq9cocR3lb18vacjVQTRJLNLS2JdDo5C2 X-Proofpoint-GUID: D26wswk2sk0VpSS0OJ2RVoKeyfuwRq5A X-Proofpoint-ORIG-GUID: D26wswk2sk0VpSS0OJ2RVoKeyfuwRq5A X-Authority-Analysis: v=2.4 cv=combk04i c=1 sm=1 tr=0 ts=685ba5e6 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=6IFa9wvqVegA:10 a=VnNF1IyMAAAA:8 a=7ipKWUHlAAAA:8 a=VwQbUJbxAAAA:8 a=-IAaNFHw-wEKn7DCNmAA:9 a=gpc5p9EgBqZVLdJeV_V1:22 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 priorityscore=1501 malwarescore=0 spamscore=0 adultscore=0 mlxlogscore=788 clxscore=1015 impostorscore=0 suspectscore=0 mlxscore=0 phishscore=0 lowpriorityscore=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-2506250053 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: D8D7480004 X-Stat-Signature: ogm1ntixyzztoiw6pz4msd4gjpg8zhbn X-Rspam-User: X-HE-Tag: 1750836713-706811 X-HE-Meta: U2FsdGVkX1+0Bjco8XLbARCAvvlPqwztCvGcEmZs9Zxrh8oCdhGnZe7Al9xEN85W7XYzB+KwSmLEVXbQ7e97Xib+2Z1GwLe5blvxNfqqdB2a7+GoRpA3sYKwF7P31MNw5SiUQ8QEDAqMCZhZFQkS/PiPcVd8BiE0YZXd3p9MRw3vJLIVqpLZkiwEI/Cbq0glNRJWlhAY6bSuFeJCFf6acyq/YzlNgrLH1LTJhFhViMW9MOMBLMr3p5Dke6JB69cF3f1mVkQQH7k5pSsgRxST0NRzqEN1z0SEOWkbLsmAa5wKrICX1AgKmIj7x7ZzTu+uEabkhO7SfcIdesvs98YBv4F7nub8Jd0nDKEbEU0GEEjpyyPD6gS69zxV5A/UAn9K8+TmEultbIRD61fOj/ybphdHCOumQq7TSnL+CYsU4CW1EtWjoPaZ2fR4u0qOn62Dws6yb3XCcd5DYTukI301NaKtaxhv1HSEiX433MxWo/9szThPUEWL8DwVJv0qQTNFs0wQWSyCdmbkP+xKHAm9k7f1sS9NXE6vcGWPfOrJcxxHFsrAaj1U8WtLIBk4rCuXn3VLW5klipEDNFHLx+XjI9uFciAZy50a/FYcmV9XjLeFNVTXi0GbDWvxvzk/Bq567k0eZxkdijeEqFb/bLW+JpsFhTP5J074/p4PwlGYam8I5+Hem1yFA+/IV0N4Kok/aQ5lEjz+z8yZHr3e4w+Np3r0a2Cyt35mXD1NSi2dEg6ygOkVJdpYn2YXRT2Ux46oFr9t3mc8A8aaRvJMzHCWXahNR+gxH7HA/+4gK0CSvs03g2Zh1QH7gZu+Rd1ZGExY0PP7S7gl1KHrXWPQ93Y6pdPHoofIP49Lu1pA2hCMpCLwc5wU5t7aAg3yVmpToB9stND/tjtGv0vwV2WEyvvVcUOPtXLNXg4D6FemFfZ6ke4G7TfQN2InS3Pdcs6b11CZ6IcLPEuQmAUGSg8xGiM liWhnkZc Scc3SfF2YPlDszfLPAXcf8c74j4MjjQW4eLf8eMnkQSmwpHrGg9vcH2Ajz9M1gbIV+2D04Nps7AuCMYrxCZFs5hk3+Ys2ln+BYpTaD7I03nOTF27VN/mgQ/Rg0LyOUjrQpz+ydhr0sEJxpyWZsWGNRhGZosdo6ITRGNu9lrmEU7Y7k4eDwKvqT5sOYi49bBDR14JMFcY1ljcoYMJ4Qgc+OhYfiBheUxhwZJrTQz+wFlJMbI3w/CRULby4UUbfZfZ/tbW8jg8VGbW0Ke3WPRsFpvbMdIqqlDdI7NHlLkpURDMnL4RTGiybwusI/uwcjLQm/hFeSnXksP2mFb3aoTYPoWzr2ooCj+ca9J8LzdY/Z/koUgr5vHgl2tOFsA== 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 a3b837130b58 ("mm/page_table_check: remove unused parameter in [__]page_table_check_pmd_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. Apply this to __page_table_check_pmds_set(), page_table_check_pmd_set(), and the page_table_check_pmd_set() wrapper macro. [ajd@linux.ibm.com: rebase on arm64 + riscv changes, update commit message] Signed-off-by: Rohan McLure Reviewed-by: Pasha Tatashin Acked-by: Ingo Molnar # x86 Signed-off-by: Andrew Donnellan --- v13: remove inaccurate comment on riscv in the commit message v14: rebase v15: rebase, amend commit message --- arch/arm64/include/asm/pgtable.h | 5 +++-- arch/riscv/include/asm/pgtable.h | 4 ++-- arch/x86/include/asm/pgtable.h | 4 ++-- include/linux/page_table_check.h | 12 ++++++------ mm/page_table_check.c | 4 ++-- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index be463058207c..0d34157106ee 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -723,7 +723,8 @@ static inline void __set_ptes_anysz(struct mm_struct *mm, unsigned long addr, page_table_check_ptes_set(mm, ptep, pte, nr); break; case PMD_SIZE: - page_table_check_pmds_set(mm, (pmd_t *)ptep, pte_pmd(pte), nr); + page_table_check_pmds_set(mm, addr, (pmd_t *)ptep, + pte_pmd(pte), nr); break; #ifndef __PAGETABLE_PMD_FOLDED case PUD_SIZE: @@ -1538,7 +1539,7 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm, static inline pmd_t pmdp_establish(struct vm_area_struct *vma, unsigned long address, pmd_t *pmdp, pmd_t pmd) { - page_table_check_pmd_set(vma->vm_mm, pmdp, pmd); + page_table_check_pmd_set(vma->vm_mm, address, pmdp, pmd); return __pmd(xchg_relaxed(&pmd_val(*pmdp), pmd_val(pmd))); } #endif diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 8142b7c48295..62778ccdcf52 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -822,7 +822,7 @@ static inline pud_t pud_mkspecial(pud_t pud) static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp, pmd_t pmd) { - page_table_check_pmd_set(mm, pmdp, pmd); + page_table_check_pmd_set(mm, addr, pmdp, pmd); return __set_pte_at(mm, (pte_t *)pmdp, pmd_pte(pmd)); } @@ -893,7 +893,7 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm, static inline pmd_t pmdp_establish(struct vm_area_struct *vma, unsigned long address, pmd_t *pmdp, pmd_t pmd) { - page_table_check_pmd_set(vma->vm_mm, pmdp, pmd); + page_table_check_pmd_set(vma->vm_mm, address, pmdp, pmd); return __pmd(atomic_long_xchg((atomic_long_t *)pmdp, pmd_val(pmd))); } diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index ab10efb392d1..995ca7e6e0e9 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1260,7 +1260,7 @@ static inline pud_t native_local_pudp_get_and_clear(pud_t *pudp) static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp, pmd_t pmd) { - page_table_check_pmd_set(mm, pmdp, pmd); + page_table_check_pmd_set(mm, addr, pmdp, pmd); set_pmd(pmdp, pmd); } @@ -1403,7 +1403,7 @@ static inline void pmdp_set_wrprotect(struct mm_struct *mm, static inline pmd_t pmdp_establish(struct vm_area_struct *vma, unsigned long address, pmd_t *pmdp, pmd_t pmd) { - page_table_check_pmd_set(vma->vm_mm, pmdp, pmd); + page_table_check_pmd_set(vma->vm_mm, address, pmdp, pmd); if (IS_ENABLED(CONFIG_SMP)) { return xchg(pmdp, pmd); } else { diff --git a/include/linux/page_table_check.h b/include/linux/page_table_check.h index 0bf18b884a12..cf7c28d8d468 100644 --- a/include/linux/page_table_check.h +++ b/include/linux/page_table_check.h @@ -19,8 +19,8 @@ void __page_table_check_pmd_clear(struct mm_struct *mm, pmd_t pmd); 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_pmds_set(struct mm_struct *mm, pmd_t *pmdp, pmd_t pmd, - unsigned int nr); +void __page_table_check_pmds_set(struct mm_struct *mm, unsigned long addr, + pmd_t *pmdp, pmd_t pmd, unsigned int nr); void __page_table_check_puds_set(struct mm_struct *mm, unsigned long addr, pud_t *pudp, pud_t pud, unsigned int nr); void __page_table_check_pte_clear_range(struct mm_struct *mm, @@ -77,12 +77,12 @@ static inline void page_table_check_ptes_set(struct mm_struct *mm, } static inline void page_table_check_pmds_set(struct mm_struct *mm, - pmd_t *pmdp, pmd_t pmd, unsigned int nr) + unsigned long addr, pmd_t *pmdp, pmd_t pmd, unsigned int nr) { if (static_branch_likely(&page_table_check_disabled)) return; - __page_table_check_pmds_set(mm, pmdp, pmd, nr); + __page_table_check_pmds_set(mm, addr, pmdp, pmd, nr); } static inline void page_table_check_puds_set(struct mm_struct *mm, @@ -132,7 +132,7 @@ static inline void page_table_check_ptes_set(struct mm_struct *mm, } static inline void page_table_check_pmds_set(struct mm_struct *mm, - pmd_t *pmdp, pmd_t pmd, unsigned int nr) + unsigned long addr, pmd_t *pmdp, pmd_t pmd, unsigned int nr) { } @@ -149,7 +149,7 @@ static inline void page_table_check_pte_clear_range(struct mm_struct *mm, #endif /* CONFIG_PAGE_TABLE_CHECK */ -#define page_table_check_pmd_set(mm, pmdp, pmd) page_table_check_pmds_set(mm, pmdp, pmd, 1) +#define page_table_check_pmd_set(mm, addr, pmdp, pmd) page_table_check_pmds_set(mm, addr, pmdp, pmd, 1) #define page_table_check_pud_set(mm, addr, pudp, pud) page_table_check_puds_set(mm, addr, pudp, pud, 1) #endif /* __LINUX_PAGE_TABLE_CHECK_H */ diff --git a/mm/page_table_check.c b/mm/page_table_check.c index 3c39e4375886..09258f2ad93f 100644 --- a/mm/page_table_check.c +++ b/mm/page_table_check.c @@ -218,8 +218,8 @@ static inline void page_table_check_pmd_flags(pmd_t pmd) WARN_ON_ONCE(swap_cached_writable(pmd_to_swp_entry(pmd))); } -void __page_table_check_pmds_set(struct mm_struct *mm, pmd_t *pmdp, pmd_t pmd, - unsigned int nr) +void __page_table_check_pmds_set(struct mm_struct *mm, unsigned long addr, + pmd_t *pmdp, pmd_t pmd, unsigned int nr) { unsigned long stride = PMD_SIZE >> PAGE_SHIFT; unsigned int i; -- 2.49.0