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 8B35DC77B7C for ; Wed, 25 Jun 2025 06:39:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2B1BE6B00B9; Wed, 25 Jun 2025 02:39:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 261C76B00BA; Wed, 25 Jun 2025 02:39:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 129586B00BB; Wed, 25 Jun 2025 02:39:24 -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 F30DE6B00B9 for ; Wed, 25 Jun 2025 02:39:23 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id C06F51419B0 for ; Wed, 25 Jun 2025 06:39:23 +0000 (UTC) X-FDA: 83592971406.04.5FDC168 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf08.hostedemail.com (Postfix) with ESMTP id 46B2016000E for ; Wed, 25 Jun 2025 06:39:21 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=Agner9J4; spf=pass (imf08.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=1750833561; 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=fGuiIXSiBvLExwEUFGNo/hh3TcmQbmI43quwDPbzXdw=; b=YAVE34f21TmGXEM1swJ7p0Rv4gLqQvDEXXVxFPJ4evdEGtY/TE7DACCOwx85IRyzT7JZZj 2TBby7pb8gNavRwZQu9G5BE8VxVJcb40AkUof5jUzVxhjIAl5ubiQjlYT+BCF9PW0o3ik8 Vy+kery64m2A2sO6TjGAQ4abGkpx52U= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750833561; a=rsa-sha256; cv=none; b=NsizEEtwWR3ixb3TVoXWO7qPlYjre4jkjHTt5O8nujP8uGJCFa+wdLJ+JOM4L2UodsJjTc CSIdpP+M8hVkzr6PE0j2iYaRY3bjuWvWqWv1tkrC+5dO8dmLOJt/LYmcljZLV9D+MAZ/wQ G5Ejb8TytuR36GZ0KytpqUg1pddesu8= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=Agner9J4; spf=pass (imf08.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 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 55OLnUwx026632; Wed, 25 Jun 2025 06:39:15 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=fGuiIXSiBvLExwEUF GNo/hh3TcmQbmI43quwDPbzXdw=; b=Agner9J4jR6myPLLUvpg+TQQ9tOIGmpTw +i/b426hO+mCN0gPDg+7YcPlsOQFIRRUzuZLT2JASjMYcgnYsWBDe3cUtwZkbgay +nzv/lyLWgVoWddULRBCtP9b1aoA2IYyj6q5TdK+ujOq1iwgfnA7zEpAGp1hxk4E TiXHyEJbFeh51YkJWulTJ08IvDWRtUhhrXkneoDQbEIT51U6ar3SMNyxBBVU6Iyj z/wVTZFOmLQZGvVVi/WX+vr2L1hp9Zf9aZbvEmsPq5V1pltq1Bs8vhmJBLilBwDy Yblle3HWcg8tS6g8lwA1DITFHav7hO3PRUKUyBD6UDXSzjYKifcbw== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 47dme1ddwh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Jun 2025 06:39:15 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 55P5LHCj015033; Wed, 25 Jun 2025 06:39:14 GMT Received: from smtprelay01.wdc07v.mail.ibm.com ([172.16.1.68]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 47e72tr4gs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Jun 2025 06:39:14 +0000 Received: from smtpav02.dal12v.mail.ibm.com (smtpav02.dal12v.mail.ibm.com [10.241.53.101]) by smtprelay01.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 55P6dDgE21103012 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Jun 2025 06:39:13 GMT Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4038958905; Wed, 25 Jun 2025 06:39:13 +0000 (GMT) Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5D7C0588F2; Wed, 25 Jun 2025 06:39:08 +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:07 +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 08/13] mm/page_table_check: Reinstate address parameter in [__]page_table_check_pte_clear() Date: Wed, 25 Jun 2025 16:37:48 +1000 Message-ID: <20250625063753.77511-9-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=685b9993 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=6IFa9wvqVegA:10 a=VnNF1IyMAAAA:8 a=7ipKWUHlAAAA:8 a=VwQbUJbxAAAA:8 a=brIg1AGlUOEcU9TjG_MA:9 a=gpc5p9EgBqZVLdJeV_V1:22 X-Proofpoint-GUID: quxvurGeBzAA3VNUa4ueSJmTvWsFr8Ap X-Proofpoint-ORIG-GUID: quxvurGeBzAA3VNUa4ueSJmTvWsFr8Ap X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI1MDA0NSBTYWx0ZWRfXyZ/UlwntqW9x osWXUfeQqojdxiZuSl/0Y9aGwibrV8LvF/c08O9gZWKk15ELpbUOG0iNxN8fgvgdmiPvZfonfbZ uGupJhlAnzVYhCZNOg4bD3am8ijn6j6BLKtg9zp/jDaT8Zy0uNheUUbhtvPevR65PUXHxExNTYk F4ICz/iOGmxObS4h21rIJ2mXvasUuLAn4vdjXSJ1/NlX5PPPm/B7XRh3g4No4OdwNcPTMUfkznm sGoy1OpdegVQIkJWJbxnzDF+6JqNXXXcDFHtlvPp4jUYaoxKIt2RVDFClegQUvAy+LnDzlDHCNq hCBuaXHv3eCmoF4tim/lZ62zOt2pP+cJixzZcqpLhgVY00FZjh1SpyrccQ07HYvlRzZ+2MunRz9 EDKA/Sy7AXSH8YZNicrAGNTuAdyBJj2W4NQBbw3b/vqvFnxJuJOxD98tgvA9uVm9shKC65cn 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=832 phishscore=0 spamscore=0 malwarescore=0 suspectscore=0 impostorscore=0 clxscore=1011 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-Stat-Signature: 8hi1cke9nhtx9aq6md8a993kyakbz3tw X-Rspamd-Queue-Id: 46B2016000E X-Rspamd-Server: rspam08 X-HE-Tag: 1750833561-238534 X-HE-Meta: U2FsdGVkX1/kvHz2QM2L65iC7SRoi9quGxvapGETWhiIbZxRufpN2CmgXhQi3NUmxp6bbc8bAPGZfeKBuspAZMewPol8xD/wudS2kgGNkeRInswkohu5Gu78gYYfiDJ/UOp3hqTtdNHAwPJSk/kqz1mKhnv+bduchDg/VJ4uIHnlGrqemrvFLJnA0kcbHXwlx5NRwkIEA2OwQO/IY4upj+Q8vciJIlapmvsxKWVbHF2V3YHp+VvqIHtq/x2j5dQ2dm8XYSS5gn6SEGjDjPBnNJsgmRUF9fgTVd97BxZQpJiQdKMfdwmGlGZuzgY0cxLGWwX0EePsdYsu5+Pvivis+tVyG69sbOtX4n5VEJ59xtAmKxzTxfyty2mX0hep2pn/OlKk0Y4RTkVciflnppnji7dhadV1VhRWyJnknucx8MDjssFkM4Ukpa17iaxXIj3KAveS2Ly7KHocBAh17ubp/+MQRTgG9Tq0DPMcKTxwu/Whf4U+xjATSqdl2huihIyuYcvOgYTTp41lfKkHbNDsvY8eS4WgQm6782Uiban/fwmepBmPp/xENu5+/RIHDun6WtvpWxSEx6xIY5Gx74MrQaSYWfw+5I7wt6FBV53roWXBw2Vx8L06q4LlO2bU0V0U/90ZcFL+vKui3t7pqzHGcnVJDtVZTbWKzpR365IeRBEW7j9aD/QPCx0EI+SXBXD7fZP/aDzIk1yervi8W0Jj0OcOg0U31/QbS1Qq7BsyR30NS4gQ4+HrCvujcPJpSsLtdn4fas0zJBt7VqCSvnFf/Xic86sbBoEogNnZjnimoaLwtGM/5NyKTEcsTK5qQBbJzdAjoklL19BnEep+RJ3X2YDM6iaT2XZ/bDUYUjkU+nT/40/RSa0s8dP5T4oUnfUvPJsf1tE+o9Xf3CwVWD5F4BxmXXWD7ld7g85lpKgr43RbAY3saW6xvCLy7YIv+BiheqMpqIotTf0e8Ns3UEy z6Ar8gJe bQG7p7qGwP9kDdQy3MWUG/yy5X66qLz+Tzylvwm9IVVoNUBSjEJJqIxROWhSR0FDJWksp3RPBdHDdd9XKkfkAk5s3xKSPZYCYYVjqkIhYH3MU8L94DkmC7qh+oQA5lg1t2qdSCtbroDgBZHQHUXU2QjfBuBSN3QbCGoFAyGqp+sXlzGIWCirpGTS2VoldEUHy9ZEQxK/rrU/9KdOk7v2Qvv7i3dy0s+JciZIc2pwyiWX+DLYJA0y4XXAykfZH9nmPurIt0svlwW0S9WPA3ZMk9T+ZvEAi1ZbZX0hECpfZAO7gbOjzKhDJ483xTTnmJA0J9UNq3XV71equN9eBrL34MtIVOHBY/dlDYO/XqF8UiwYEjfN2cvnFR9g5FWWIFNsaRrUhbnq3tmQwgyyMiZDBbjs+b2Sz+bTnfovb8fXTAriUlnBgi2YP6tYYwU220ilyRJZ6Wqj5FYkcycY= 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 aa232204c468 ("mm/page_table_check: remove unused parameter in [__]page_table_check_pte_clear"). 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. [ajd@linux.ibm.com: rebase, fix additional occurrence and loop handling] Signed-off-by: Rohan McLure Reviewed-by: Pasha Tatashin Acked-by: Ingo Molnar # x86 Signed-off-by: Andrew Donnellan --- v13: fix an additional occurrence v15: rebase, fix loop handling --- 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 +++++++---- include/linux/pgtable.h | 4 ++-- mm/page_table_check.c | 7 ++++--- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index db8bab350a2d..4dae6fd51792 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -1391,7 +1391,7 @@ static inline pte_t __ptep_get_and_clear_anysz(struct mm_struct *mm, switch (pgsize) { case PAGE_SIZE: - page_table_check_pte_clear(mm, pte); + page_table_check_pte_clear(mm, address, pte); break; case PMD_SIZE: page_table_check_pmd_clear(mm, address, pte_pmd(pte)); diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index cc3c690f6c93..99f8a05c595b 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -603,7 +603,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, { pte_t pte = __pte(atomic_long_xchg((atomic_long_t *)ptep, 0)); - page_table_check_pte_clear(mm, pte); + page_table_check_pte_clear(mm, address, pte); return pte; } diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 50d76a38ab9f..8de92004f3fb 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1298,7 +1298,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) { pte_t pte = native_ptep_get_and_clear(ptep); - page_table_check_pte_clear(mm, pte); + page_table_check_pte_clear(mm, addr, pte); return pte; } @@ -1314,7 +1314,7 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, * care about updates and native needs no locking */ pte = native_local_ptep_get_and_clear(ptep); - page_table_check_pte_clear(mm, pte); + page_table_check_pte_clear(mm, addr, pte); } else { pte = ptep_get_and_clear(mm, addr, ptep); } diff --git a/include/linux/page_table_check.h b/include/linux/page_table_check.h index 3973b69ae294..12268a32e8be 100644 --- a/include/linux/page_table_check.h +++ b/include/linux/page_table_check.h @@ -14,7 +14,8 @@ extern struct static_key_true page_table_check_disabled; extern struct page_ext_operations page_table_check_ops; void __page_table_check_zero(struct page *page, unsigned int order); -void __page_table_check_pte_clear(struct mm_struct *mm, pte_t pte); +void __page_table_check_pte_clear(struct mm_struct *mm, unsigned long addr, + pte_t pte); void __page_table_check_pmd_clear(struct mm_struct *mm, unsigned long addr, pmd_t pmd); void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr, @@ -45,12 +46,13 @@ static inline void page_table_check_free(struct page *page, unsigned int order) __page_table_check_zero(page, order); } -static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte) +static inline void page_table_check_pte_clear(struct mm_struct *mm, + unsigned long addr, pte_t pte) { if (static_branch_likely(&page_table_check_disabled)) return; - __page_table_check_pte_clear(mm, pte); + __page_table_check_pte_clear(mm, addr, pte); } static inline void page_table_check_pmd_clear(struct mm_struct *mm, @@ -119,7 +121,8 @@ static inline void page_table_check_free(struct page *page, unsigned int order) { } -static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte) +static inline void page_table_check_pte_clear(struct mm_struct *mm, + unsigned long addr, pte_t pte) { } diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 13e9336bf20e..3e7c2e260279 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -483,7 +483,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, { pte_t pte = ptep_get(ptep); pte_clear(mm, address, ptep); - page_table_check_pte_clear(mm, pte); + page_table_check_pte_clear(mm, address, pte); return pte; } #endif @@ -542,7 +542,7 @@ static inline void ptep_clear(struct mm_struct *mm, unsigned long addr, * No need for ptep_get_and_clear(): page table check doesn't care about * any bits that could have been set by HW concurrently. */ - page_table_check_pte_clear(mm, pte); + page_table_check_pte_clear(mm, addr, pte); } #ifdef CONFIG_GUP_GET_PXX_LOW_HIGH diff --git a/mm/page_table_check.c b/mm/page_table_check.c index e8c26b616aed..1c33439b9c0b 100644 --- a/mm/page_table_check.c +++ b/mm/page_table_check.c @@ -145,7 +145,8 @@ void __page_table_check_zero(struct page *page, unsigned int order) rcu_read_unlock(); } -void __page_table_check_pte_clear(struct mm_struct *mm, pte_t pte) +void __page_table_check_pte_clear(struct mm_struct *mm, unsigned long addr, + pte_t pte) { if (&init_mm == mm) return; @@ -206,7 +207,7 @@ void __page_table_check_ptes_set(struct mm_struct *mm, unsigned long addr, page_table_check_pte_flags(pte); for (i = 0; i < nr; i++) - __page_table_check_pte_clear(mm, ptep_get(ptep + i)); + __page_table_check_pte_clear(mm, addr + PAGE_SIZE * i, ptep_get(ptep + i)); if (pte_user_accessible_page(pte)) page_table_check_set(pte_pfn(pte), nr, pte_write(pte)); } @@ -268,7 +269,7 @@ void __page_table_check_pte_clear_range(struct mm_struct *mm, if (WARN_ON(!ptep)) return; for (i = 0; i < PTRS_PER_PTE; i++) { - __page_table_check_pte_clear(mm, ptep_get(ptep)); + __page_table_check_pte_clear(mm, addr, ptep_get(ptep)); addr += PAGE_SIZE; ptep++; } -- 2.49.0