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 C45E2C369A2 for ; Fri, 11 Apr 2025 05:44:23 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3BEB228015B; Fri, 11 Apr 2025 01:44:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D1789280169; Fri, 11 Apr 2025 01:44:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 98E2B28016A; Fri, 11 Apr 2025 01:44:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 3EA3128015B for ; Fri, 11 Apr 2025 01:44:15 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 58021141D23 for ; Fri, 11 Apr 2025 05:44:15 +0000 (UTC) X-FDA: 83320672470.22.BD39EB6 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf07.hostedemail.com (Postfix) with ESMTP id 3BFF240006 for ; Fri, 11 Apr 2025 05:44:13 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=KG5VtMqK; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf07.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=1744350253; a=rsa-sha256; cv=none; b=BRYy+5ax5ZScPYVH4CU0KSQBfyWoog+r/GWUnHEtSApeLRkTJOpRlsuMwzJUxZ4YjdAc/m ST4Zb0BkKcd92T+lP89kPnn5qV5HLAY8sZo6JKDikgtsL0vbGS1uCemzkvgxThIGvXQUt8 USQKoNqx7u5JUuOkXbL1Kj8WOh3/hXI= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=KG5VtMqK; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf07.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=1744350253; 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=dcyfNoMaMeFuUsOrXsuTzsUOU2I36vkpB6ZGMOiUSVQ=; b=JgbAUnBdkX1u2ZaMy6RNtSiEtd6SzKXaoDyimV8hb9iWaLTEXZg+/9rcePQ5ey93/R75J1 eKPyhGwLeaQCe9KgYW/1+WHsPOCRApKwecUX7TvWh+T00ctiel9obxsptUG1ccOPO+kwxH L3psPPdt25hTJcqLwISTs0cKiX46Rq0= Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53AKd1Ga013182; Fri, 11 Apr 2025 05:44:04 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=dcyfNoMaMeFuUsOrX suTzsUOU2I36vkpB6ZGMOiUSVQ=; b=KG5VtMqKDmxLoqY+DHxljzMEUau3c0rEc RTa+IJRZq7on9QCQP6nf8lQl7vUaGsPfEHV6m9NraaI2kmk92EQSXObllGVH1gc3 jyNtqOPsQ8tiJC/9AY+mtHB44dCTr6XgUusRVbZM2neGwTjerSYkfIV3ulXHuiaf Po/fvlm9I7E28Nm2OvgNatb65iJuDxVHoFFnApwWYMHpz3QN3jajMy03oPna5GxX cIw+HWB/bDfh+FbzSROvOfPSOw2DBusOJhKtEXFmPzouPjjbOSCv7Rt/qwb76DsW tD5o4XeZ8v+42Z+T9k3eTAipXg4CjRcTOdbQ3yphjKbdyTRosd6RA== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 45xn719q9e-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 (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 53B5hGDv011069; Fri, 11 Apr 2025 05:44:03 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 45uf801q0v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Apr 2025 05:44:03 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 53B5i1ED52691404 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Apr 2025 05:44:01 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A24C32004E; Fri, 11 Apr 2025 05:44:01 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C397020049; Fri, 11 Apr 2025 05:44:00 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.63.197.14]) by smtpav06.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 5E4CD603B6; 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 04/11] mm/page_table_check: Reinstate address parameter in [__]page_table_check_pud_clear() Date: Fri, 11 Apr 2025 15:43:47 +1000 Message-ID: <20250411054354.511145-5-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 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: GXBRqM5wvdH8tKIesfxfbzHbqf6PJeOD X-Proofpoint-GUID: GXBRqM5wvdH8tKIesfxfbzHbqf6PJeOD 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 bulkscore=0 clxscore=1015 impostorscore=0 mlxscore=0 adultscore=0 mlxlogscore=964 suspectscore=0 phishscore=0 priorityscore=1501 malwarescore=0 spamscore=0 lowpriorityscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504110038 X-Rspamd-Queue-Id: 3BFF240006 X-Stat-Signature: pm56uhupgupp6y3i6y9bcksm5x6agi83 X-Rspam-User: X-Rspamd-Server: rspam06 X-HE-Tag: 1744350253-302549 X-HE-Meta: U2FsdGVkX18uB5jyeuxtjG6z7ixNsjZIcNth5djq4+PFWgMnDK+NtFjzXuPTMe+tFd5vLaNNSpBkz/Ig3yhjZSgvHSPp/RgSEzVD3dgk5gykTJ3HB2Ty7XdxiRS8LckFQRR/XODlJzE4cTFpGl1SL0UdmPZbU3Kw/zEhgHHTTgN6IGw6QzhY1LrZLQOMCEWoYkqJR756zDTXshJkfdDGimcmW+0rC76ZjVQlbb1f5Mcwb0H5Buexq5eKlioBN35eguVpcV+Cb/eW0cBj9ujmCD/aLAx/4Ku3mL6agAAFV3mpmAxkQY4C5uRlkRpPINbqrQS0JKT25aAiz4RACUN9TsOASVpCrv1Z8FrLwYtxbjbJHigFdJATcZaMd4q/AdJENJothX2PjOoJKwENA2rELVz4yxw6HMgfoiP2Uf1zsO8hZnVfkSJCY/YjQMbagKVf9sUSrk2AMS3xwFoT22mvUOqocLGu6QM76UUtNLG+f0KICBVNGqZ4aAw/ITTrkExklTnEqHqV8coELPoGx7Y+tnAUBqF6QeZPhPJdsw4/NanfzuefA/mZKkX+LR3GUdQh6Y6SZF12I+riZKOtE00hzS5zxzjZdcvHO7ufUKf8gznqn7v3Kao6yFR6Pk7cFi4iZOageIHh48yvAdZAJlsV1twVxZhWqAdqisNzwC8xNzIHkxT5rd8jieZd8RXEN6n30Rhmie/ATKgUJLu7o5LliAlmB+kBcDFMqNlU2VSX40g+Tjs55IfMGU+altBDxZlSGD+jsg4KBJR8knv+0eKdC5nL29vXCXl5awbOp0EwOUOLyj5ity5v49v1OFERSiLIf5VpuPcX76Lrl1+ZjYn5XMeni64fGxCCj3iDgl38pT+MKv8G7mTsycP3U3CEwCzSIgBT9APzRuBv5SGvrsPdC0JPLR/MY5ZVeyRUnxl9OYT7XXEKHy+4hHpDJe7uTTrJ7UmG9YeCJcL3Bv9ZFkx EQI9kk9b HyXkneRVMu0/FK/iXPdfP7U4gNWUZcphu77RpcUr16o6izak2e9Yczfq8GKW753s0zf9JLrxEzB3Wsszo44Fe5oDCjxvVZea0PuauhXluDhRt2q6jIyoYL4H9xZPY8vu4jAK0mYF1lguUa39aQs1wjyDmsXn0xWxqQX00jHgudHYu6njvdDrdTreTWqdlIbIZsAsca5XiIt1V8tYPOd0BqsSEX2rGremP+jjaslLlnrgJyIXLcQpAKsnvcV6mnYymkrzaQ/MSWN1sgHGcTwhjBtX8DQ+KGra31jTB5xNlFR6T2AjhO2EwhcmM/URpIt1+UijkCXmLAQCHwYrbHzXLiFQumSoWaOTWb9iD 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 466836ead08d..5a71a884858e 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 d7400a6ac604..5cc978ef1330 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -650,7 +650,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 9bd5c5f09001..aad4b7e2194d 100644 --- a/mm/page_table_check.c +++ b/mm/page_table_check.c @@ -167,7 +167,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; @@ -240,7 +241,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)); -- 2.49.0