From patchwork Tue Feb 11 16:13:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 13969565 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 DFE77C021A2 for ; Tue, 11 Feb 2025 16:14:56 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DEDA8280005; Tue, 11 Feb 2025 11:14:53 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D9E78280001; Tue, 11 Feb 2025 11:14:53 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA2C8280005; Tue, 11 Feb 2025 11:14:53 -0500 (EST) 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 9ABCD280001 for ; Tue, 11 Feb 2025 11:14:53 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 56703160584 for ; Tue, 11 Feb 2025 16:14:52 +0000 (UTC) X-FDA: 83108162424.11.8194E2D Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf20.hostedemail.com (Postfix) with ESMTP id 0DECC1C0020 for ; Tue, 11 Feb 2025 16:14:49 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=a33UVj84; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf20.hostedemail.com: domain of ajd@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=ajd@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739290490; a=rsa-sha256; cv=none; b=J5TjwowijAcRjipJMY3ELtpHEFrWy5eApbqWpwLsBk0rDIzKi4BHImOVQeTR0ZCiG+UVkW dUJOxOh4fxg0tGY2xUgky4ADWbOTMbPIuD6wmBx9RnFrRzk5O3t3yXoEwxKQsVskAiNocm Hpf9tNvQZdAmsDaidvKF0BL269rmZyQ= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=a33UVj84; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf20.hostedemail.com: domain of ajd@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=ajd@linux.ibm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739290490; 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=cOJ/idVVi4I+VLd6I1wuyddjlEKwOnj76qUNXKgrS20=; b=eFy5pSTceiC4eX60XguAC+W0hOfzjdL6EpLfMJcHUyqwteNZVSLgbftn/q8Ph121s8PeTm N14sFBIAYK3dcZl70dYgn0x6e6156MnYOjjqMgAYOGzVtWjvqTDa0/Z6StK2u0OCRSp6gX bK6EowRNoLoBb8CoJwMUyv3RRZjtFOo= Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 51BFdWVF020597; Tue, 11 Feb 2025 16:14:46 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=cOJ/idVVi4I+VLd6I 1wuyddjlEKwOnj76qUNXKgrS20=; b=a33UVj84qwnewyiJlZiznhJDn5pprJXYS jn+/LhwGhNvfu1dUkv8PDPCjU13piKvxlDqX2+x5Ku9kUUpipSGvEXOp35g13la/ udt0TT8joq7M/pT9niT1xzoa46PQJ4QTTreIl6d1cNzqLjtrjO7i1GUEKhnLzaTG 1Gl5teJrTuqMHwXvwTI3FzqQqiVkiOPB1gqjIP+X8t2p4sFSCPG3THC2ibUCk3vK tn3+7nCGJf0voWA6lBUx0//ttIlVWJsyK1ldYHKfzrLXAzcm4T4perz55i78TrWg WymfwbAzhu93sXsi55dCVZnAkioB6L/cxVZXvrkaPEgg8ienMX07Q== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 44r9cu85ns-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Feb 2025 16:14:45 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 51BExDJs028735; Tue, 11 Feb 2025 16:14:45 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 44pma1kpsf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Feb 2025 16:14:45 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 51BGEhT141156968 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Feb 2025 16:14:43 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 86F7C2004E; Tue, 11 Feb 2025 16:14:43 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B8B9F2004D; Tue, 11 Feb 2025 16:14:42 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.63.197.14]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 11 Feb 2025 16:14:42 +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 7F0D86013D; Wed, 12 Feb 2025 03:14:38 +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 04/11] mm/page_table_check: Reinstate address parameter in [__]page_table_check_pud_clear() Date: Wed, 12 Feb 2025 03:13:57 +1100 Message-ID: <20250211161404.850215-5-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-ORIG-GUID: tjPDSFhAazrBNbpzNDvfJsZceKEWPyxT X-Proofpoint-GUID: tjPDSFhAazrBNbpzNDvfJsZceKEWPyxT 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 spamscore=0 suspectscore=0 adultscore=0 impostorscore=0 phishscore=0 bulkscore=0 mlxlogscore=947 mlxscore=0 clxscore=1015 lowpriorityscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502110106 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 0DECC1C0020 X-Stat-Signature: sqb94hcayc5mnapf4sotj6e34wdsrdg5 X-Rspam-User: X-HE-Tag: 1739290489-236057 X-HE-Meta: U2FsdGVkX19ad71XYuN5iACDNDcU+QFh2XyJM31lY13mo3PjMTIBjcRQ4mtlSeCctRK8ul6OV67wdFlcaFrdI8NDp7owV9Jah4DnpCocFrgVa+5FoBpsh+TNpd8GyMuwfimLDkxluMZmitYGU5TwXZuWgfwggFxQSto/maduCN86tPcRUeAA7eQdBcJ0Z84kDY05RabqIkhzcVwv6erHf44aUAacI7LR+DFkWSnU91KmRKd/qu5sqXrpY6IQQsGZxCMnSusRnIOwS8lNaFs/rpa2Te2Dy7EdmwFqXEY5thBtDm8PlOA4D/LigyciRTBumJ6RPxMgwUu71fmgEcajNSiNm/JFLB4bU+NHx1Ph7vBmlvwSJjGdmrgU9Z+WLky5OxznsglYsI+ThJnjqCr4QU25+EuVgXhjscW6QsQJwyC5mjRIcAE/Ix3yes6Hk46olEOc9BufsY/GPvdR803JMkuzrtkzHfUyta12BN2jqJh1Klu/vUnSczyiy0SxbWUPyuhbik4gVZyznK8s/31yQc87/k0LLZCteslEIpfIM0FtwoLSCuRz9dFh5rvd146HAvEeAnyfJJQYmppE0cgIe208vP4U2ZwI38YVgGU+mC514MVW5FZLW7x1mCUB0ne6dr7vVb1Uv9SYy0wAOrfAPt9zBjl4htLRxzDVwgh4BUeNn+J6hlnBScZwhyoq9EXWdR5OGnH9628LCbfsLv4ak7xn1Q96Nzke4kYBx3DZ/tfCQkegAKa/IF4R+B52141AuRbvZCks+pglP7Ul0KEKC5pgoTqFmw92VgbZ5DtbszWBGVbkXi2R+w21Rk1/m/DDTGaZepwmGJifJEXEF4vvpH8ZEmlP3vICq0tND3f2nMGex8I3F6iafUXD2Yj1JXp+TA/CUblhKjOE+BvgXUYiZRCwWuAsVBOzMrrNlqHvr/ehqOiXHOp08pr+5KnBDLmHgffpsL2DlvnPakDdeWX wwnTnqDz lEHyC5h3atrpOTtOuNAL5dVvQtN2/CQ2yi88a1mBAGWRjADU2JCSAHa6N0ojf8SOyEOQLot8WVyQgQXvUk9BsNoiC7Jp52SdJQWmD10tRnbcUbx9b/GWyFbwsHwjvo0Am/ErXfl4yU3gead8gJxJrMVQUmJZohmL1PLgZGjMI7HlAyf+qKmXw1Q0o4Phj3+Onq6WCXKlU/rUyJr0z6Z7JxYKdVGxjqy9ErXvxvXTO6wTmRl6Sn/hsWnGswZmbMPvXSc+tecoN/y19aCF6UGxPF4EWiH7sUvlWZZvEjmrBd3cFEIaNyyG6yIVM7HN4QJ5UX6rF+bYYD6JvNRA50qUPV34ApjZagQYOOcpzfwaNaPybN7xu8iUUxYvzxCFjR1BESwVFO0su59vHerLW7FlAfXTsZyxc8Awm3rmRc9N1+/uPmgmawR0Y8MOtd8CWDDmL8gRBmbCfSho9vXik1IFWWOVhPw== 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 931c38e16499 ("mm/page_table_check: remove unused parameter in [__]page_table_check_pud_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. Signed-off-by: Rohan McLure Reviewed-by: Pasha Tatashin Signed-off-by: Andrew Donnellan --- arch/x86/include/asm/pgtable.h | 2 +- include/linux/page_table_check.h | 11 +++++++---- include/linux/pgtable.h | 2 +- mm/page_table_check.c | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 366cdb9d75d9..5ec052ef07ff 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1398,7 +1398,7 @@ static inline pud_t pudp_huge_get_and_clear(struct mm_struct *mm, { pud_t pud = native_pudp_get_and_clear(pudp); - page_table_check_pud_clear(mm, pud); + page_table_check_pud_clear(mm, addr, pud); return pud; } diff --git a/include/linux/page_table_check.h b/include/linux/page_table_check.h index 9243c920ed02..d01a00ffc1f9 100644 --- a/include/linux/page_table_check.h +++ b/include/linux/page_table_check.h @@ -16,7 +16,8 @@ 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_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_pud_clear(struct mm_struct *mm, unsigned long addr, + pud_t pud); void __page_table_check_ptes_set(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte, unsigned int nr); void __page_table_check_pmd_set(struct mm_struct *mm, unsigned long addr, @@ -59,12 +60,13 @@ static inline void page_table_check_pmd_clear(struct mm_struct *mm, pmd_t pmd) __page_table_check_pmd_clear(mm, pmd); } -static inline void page_table_check_pud_clear(struct mm_struct *mm, pud_t pud) +static inline void page_table_check_pud_clear(struct mm_struct *mm, + unsigned long addr, pud_t pud) { if (static_branch_likely(&page_table_check_disabled)) return; - __page_table_check_pud_clear(mm, pud); + __page_table_check_pud_clear(mm, addr, pud); } static inline void page_table_check_ptes_set(struct mm_struct *mm, @@ -125,7 +127,8 @@ static inline void page_table_check_pmd_clear(struct mm_struct *mm, pmd_t pmd) { } -static inline void page_table_check_pud_clear(struct mm_struct *mm, pud_t pud) +static inline void page_table_check_pud_clear(struct mm_struct *mm, + unsigned long addr, pud_t pud) { } diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 2b25dd17ec67..e41cf0622aa4 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -648,7 +648,7 @@ static inline pud_t pudp_huge_get_and_clear(struct mm_struct *mm, pud_t pud = *pudp; pud_clear(pudp); - page_table_check_pud_clear(mm, pud); + page_table_check_pud_clear(mm, address, pud); return pud; } diff --git a/mm/page_table_check.c b/mm/page_table_check.c index 959e11e1af24..7c2f3f93e377 100644 --- a/mm/page_table_check.c +++ b/mm/page_table_check.c @@ -182,7 +182,8 @@ void __page_table_check_pmd_clear(struct mm_struct *mm, pmd_t pmd) } EXPORT_SYMBOL(__page_table_check_pmd_clear); -void __page_table_check_pud_clear(struct mm_struct *mm, pud_t pud) +void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr, + pud_t pud) { if (&init_mm == mm) return; @@ -256,7 +257,7 @@ void __page_table_check_pud_set(struct mm_struct *mm, unsigned long addr, if (&init_mm == mm) return; - __page_table_check_pud_clear(mm, *pudp); + __page_table_check_pud_clear(mm, addr, *pudp); if (pud_user_accessible_page(pud)) { page_table_check_set(pud_pfn(pud), PUD_SIZE >> PAGE_SHIFT, pud_write(pud));