From patchwork Tue Feb 11 16:13:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 13969562 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 7B198C0219B for ; Tue, 11 Feb 2025 16:14:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1B75D6B008A; Tue, 11 Feb 2025 11:14:43 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 13FC86B008C; Tue, 11 Feb 2025 11:14:43 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EFB396B0092; Tue, 11 Feb 2025 11:14:42 -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 D44526B008A for ; Tue, 11 Feb 2025 11:14:42 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 833831C6929 for ; Tue, 11 Feb 2025 16:14:42 +0000 (UTC) X-FDA: 83108162004.12.640B2CA Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf17.hostedemail.com (Postfix) with ESMTP id 2DC2040014 for ; Tue, 11 Feb 2025 16:14:39 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=mr2lydJA; spf=pass (imf17.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=1739290480; 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=uZG7yaQ4bZBn0z1b8C7/uIuy1qMqjNuKx2nlIDWDzI4=; b=vJYaROcg9Fq/C7m2adEJpuX2yZHnRuffLh1fvQvCa9hVa6Vi2U7foLo091Cz2S4dHRp8ko 2btyayjhivYg+WMAwz8SDyqUSWS5UWPA4M4Qjr1GYs3xOGw41nDZyDgfNCS2+n1rXa0e18 rm4ktjYJ9oxfsqDYpkdQ5I7hXJi3Up4= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=mr2lydJA; spf=pass (imf17.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=1739290480; a=rsa-sha256; cv=none; b=rGFpkwCbyNQ3od+v0Vtsdz7uloIbCSA7YCEBYg0vrHnMrkN2KLI8ekDxtjMrv0JmpjyVTk /43qOxgxkEXKnxQeOD9I1SoKGgNxRSCNz9OvvzRKepfmj8S6YflsaXULTGOfKCrNtW+sS5 oi8gusOsQ+bMFJJPvDACPWZfqMEQVsc= 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 51B5OSTX027206; Tue, 11 Feb 2025 16:14:36 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=uZG7yaQ4bZBn0z1b8 C7/uIuy1qMqjNuKx2nlIDWDzI4=; b=mr2lydJAqkve28q4/0oCboUp/WD8Ywl1W ZceOxD0kFJJDvXos/977TT9JWmJzl2DVYZQFQrZ0Bbha6uyXD18tCTI7L4QdwETZ aOUYrP9uOy/ND/jZ+XUm0JgG2+GGNkWxga8MTZ1PQQ8D64DrNk6kFfMgeFMkPDb9 CrvfcgfSMCbcp4WdWGHfiXgzkr/C4qbFBbLYd7Uh0g26qqGpuB/Pfbm9haAuOgrY CDdIq4wcDBCd9mW22BMyOM1qGL8MxYLnD4XKUnR0sbmK5NpQkh+XHe1wkDfyhIeU KUp5pn6QBUxmAHBCCJLbhq5PTK7zhtf8LF+UYoy4IHi26wmb8g2tg== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 44r0c9aw17-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Feb 2025 16:14:36 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 51BCsjnj000914; Tue, 11 Feb 2025 16:14:35 GMT Received: from smtprelay03.fra02v.mail.ibm.com ([9.218.2.224]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 44pjkn43gg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Feb 2025 16:14:35 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay03.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 51BGEXgw58327362 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Feb 2025 16:14:33 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4C3B82004B; Tue, 11 Feb 2025 16:14:33 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 73A9C20043; Tue, 11 Feb 2025 16:14:32 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.63.197.14]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 11 Feb 2025 16:14:32 +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 2BA686013D; Wed, 12 Feb 2025 03:14:27 +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 01/11] mm/page_table_check: Reinstate address parameter in [__]page_table_check_pud_set() Date: Wed, 12 Feb 2025 03:13:54 +1100 Message-ID: <20250211161404.850215-2-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: Td-AQtqu0Ne9Ra4i8CxIxImgWQGK1w1V X-Proofpoint-GUID: Td-AQtqu0Ne9Ra4i8CxIxImgWQGK1w1V 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 clxscore=1011 bulkscore=0 impostorscore=0 lowpriorityscore=0 suspectscore=0 mlxlogscore=955 spamscore=0 mlxscore=0 phishscore=0 priorityscore=1501 adultscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502110106 X-Rspam-User: X-Rspamd-Queue-Id: 2DC2040014 X-Stat-Signature: sej8m5zpi5by9y1s7qfnmhjakfpw9dte X-Rspamd-Server: rspam03 X-HE-Tag: 1739290479-117569 X-HE-Meta: U2FsdGVkX1//GMoOEI5GSfMgZusHQCvIPwk6w1L06HenK37a4REUIKj3DGRCt5boY9SgsOsmXp6gl+9TKqkUgA5FJq3SMqCqvdVu5gUEFajY+vUdr54sJ/kOJ5HOHXePG5xMltzSyJ14Ic2aMh3E5YnY8aLwdCUy6mNywoBfmJ+XcxnH1NDrhi+56fFAONymRUm95NunzzcPDTJ+Ac30QBjrHnFpFv04luCqIVuFm6RTqWHeDlPtOQDY8/ch7CXuU17P3wA6vEfGZYsMoA+G2f0q9uzT7vMonow0Hd7GW7SqNPSQ5xYKydOT60k+1lSdzBKKmZN/S0xvSJvvpSp6CRI7B7IuZlHodl0jpe1RE2i3JQCnVjEcY+In544Igkp2eGVMgM2PzMxduEFKMmEwIIhxAAuEVtx+LJRkCc0a0Y3WXUtLHWrjOb2GPE4hAXSNXyJ7kLabmGlbl4r0soi7ZT7XX3O+iZxTA3vY+FNHljvGPOBO3rYSJpOjxuBh0NpTrWyRGTlJ7zbruPVia9v0Lk/DGLn3tlBkEdlHCiOI0wUHdFy+GSRKup3uKHkpC+XfjwDTCzLncGWN9pwMTnPTSFDPzDjU6d6+8N6Ti8M3EYXPWD6eWX/oKw+yRjJYyUU66DcJBJlGXW+C4UqKFXy9heeaHrvXdHNHWiJvawXoeyMJsIBCY8uD4fL9Q1GIKPbtELTLVA94vC9hoGuTqdp4TU5AfxxXw21ZyQ9K1Le4f3k1E4xOef4YB9snb/WjeNTKMpSQfa5w4BU2sk65aX98vhLzi0OXSTCpfxI/ViMXz6Im6DZGS1ioehRUUOKjbCKsNfcK1nQ3DSW75D4KsxdObI6uqEmahpIIcP8zAaM8mTv9p8ccHrs7e0cx9Du66gi1K751reUKsceG9ATfdRrfGS1VLWSNTCouQvyfzPGcRs+qAReo73cxzc69sNgkFZGG5ZXmjOUaLVZRIpleMl5 ZkgQ5ReI 3VpdGEg4CyXMk17eMwXOOlRWm1MWNew9QoNGrQ2zMeSydhkXhQrTVu2Po5+Sn41dXDXGbi+napj8h0MiCcVuitZnSNX5WvPGd7oWno8Fazwz3KnwFlmUfp3UUw+THkh/rdofevJjn79aE/ydMStlQSsrGhI5veB9TB40atyMPMZ1/lLXBWB84xv5jlpUYAFYEeQCI1JNm1CdRfGVMzRlpfVa/zNtK3TNhLe13RPf9+hZppM66MGZEZdDsKCcTzhE/9DfSNkEr4Beko6KLtQlU8xMeaCYBX8qf0+kXo7nyh0dOvAl3K+YNSkHu4FrpKzuDjh8j60bLFMDSailKOSnH6grOk2dDyPeqEGYo 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 --- arch/arm64/include/asm/pgtable.h | 2 +- arch/riscv/include/asm/pgtable.h | 2 +- arch/x86/include/asm/pgtable.h | 2 +- include/linux/page_table_check.h | 11 +++++++---- mm/page_table_check.c | 3 ++- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 0b2a2ad1b9e8..f77bbaf3cf7c 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -661,7 +661,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 050fdc49b5ad..1a9f1091bd5c 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -778,7 +778,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 593f10aabd45..e53674bb3814 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); } 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 509c6ef8de40..f14fef81c61d 100644 --- a/mm/page_table_check.c +++ b/mm/page_table_check.c @@ -249,7 +249,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;