From patchwork Fri Apr 11 05:43:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 14047581 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 C98ACC369A2 for ; Fri, 11 Apr 2025 05:44:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 81AD128016D; Fri, 11 Apr 2025 01:44:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 21A3F28016E; 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 A5BAF28015B; Fri, 11 Apr 2025 01:44:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 600B528016C for ; Fri, 11 Apr 2025 01:44:15 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6E646BA1D5 for ; Fri, 11 Apr 2025 05:44:15 +0000 (UTC) X-FDA: 83320672470.21.132C5A5 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf17.hostedemail.com (Postfix) with ESMTP id 1CE4640005 for ; Fri, 11 Apr 2025 05:44:12 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=MIZHCN8E; 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=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=ViHXqHRkbZL7yFIbfxUafURAiGrT/fpY01+3QbhiZ5w=; b=MpjBvmp6eF8H8THWAHJUu2ubEiMcCYSkIbXnVmkf9f48iwQLT2mNKxTepqr4JjhBb9u1er qqMyxaoe0nFSEet0bkaH0YlxyacbgTz5Ba7+LkwheARVIIG0s5Vn31W4fRaQafc69JpK2E NOt/SUP2QIVRuX9ENAVNw0zmWdsiYl4= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=MIZHCN8E; 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=1744350253; a=rsa-sha256; cv=none; b=vuNDq1ffoYpz4vc1x7MvRe4PkaBmrnwCfRFJHRuU1VsA+udEiBUd3kGB/fB3PAyUkNgSsB 2QSPn4iU/x3L8N89kPOgL0FSSbDSTnPSnUzkoRCi/JH/qnWXq14XpFmj9hbkx9cJiZZwUz fbF/oXy7PsAzJPeeHmKq4cIEfruzMf4= Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53AM3dmN010696; Fri, 11 Apr 2025 05:44:05 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=ViHXqHRkbZL7yFIbf xUafURAiGrT/fpY01+3QbhiZ5w=; b=MIZHCN8E8e/kafKVRj1LBnAes+9sv461O EM6aRe0z+IpulIWeaZSMK84/sxTUOkugBXcJAxzLhadAyViEgppG++vBfJbnRSzc Cup4/GJlUyjjLDMUe8tf4zn5/pqZhMiK1kzzL16CC7+9/o/+hVctvX82CGiJSsrd 1zpkDHP6TH5A+AaUYASuWw+zJlRYFd+JF4XVhAXk1hrLKNEk7PQIH4Ua/oUmyWyX cAe5MBQULN4xg+kS6p5WCbuqe6tV/FvKA49gaZPul29UvElPi/YPLb88cfRD52I/ aOncUeRLJjmNUIw9VD2nzJcH5FfFqVzpV5xsYzxToL4XLs9xB+ddw== 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 45xfdqkxwr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Apr 2025 05:44:05 +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 53B1bNkJ025562; Fri, 11 Apr 2025 05:44:03 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 45ugbm9gwm-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 53B5i1bn49283504 (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 975182004B; 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 BF2EE20040; 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 4F337603DA; 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 03/11] mm/page_table_check: Provide addr parameter to page_table_check_pte_set() Date: Fri, 11 Apr 2025 15:43:46 +1000 Message-ID: <20250411054354.511145-4-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 X-TM-AS-GCONF: 00 X-Proofpoint-GUID: PV-S7xATQ_V8KU--at4haRF1iutrjscO X-Proofpoint-ORIG-GUID: PV-S7xATQ_V8KU--at4haRF1iutrjscO 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 malwarescore=0 suspectscore=0 mlxscore=0 priorityscore=1501 adultscore=0 phishscore=0 mlxlogscore=758 impostorscore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504110038 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 1CE4640005 X-Stat-Signature: ufg1jod4yqokqhqppzubns98o59npspm X-HE-Tag: 1744350252-300460 X-HE-Meta: U2FsdGVkX195wyDZRCjsDi6gED7KRLv+EF+oiO8MBE52XX23uxQi1/ziWgViwPo7EgZitYYtmq9dOWKBP2EEvHsxyJMdIveZdleVVVuKyRc47EhgtbR9sgkgU1mxicrBMdct7W319z66FH+IiehTea4O90tHj7Apke0Ivf/Sp5ID4f5Nldpr7/aOWyDaELp4ahaREaV4UMF2cJB4W8g6j3BRHKTlMOmGNZ1OF1YlieXvSu5KF/KcrOS7bJ84w/96fTlRzchfc/LvsB28rNLKZNyMfQUXuTSxn7W5Cv9LPHucjyF1Z5JvLx954Q1Yc8qYtbHI3tSyT4koqtcD6HxoizOt3M30G17SVzAGC7ndrFCZwrHUWvH77t/TRwVtNdZy9ZsnTBB6FE+pG1oW8KQLb1AGXQisLQfZXgjcvOAUuyIuKywyedRdCUNKWdwQYVInWdjWCq2z9JAvymHaY6y/CVskjYiIzqTdkU68aEktph7k9CcmkOtfPkiGgKTQiPpXqGarHzIsFFiM4Rm0lUhVLKm9EKleXCG7ZnxdFkz23PvgIDxMgWBKW0CJ8SxsafEqJJQHmqcLOLOjO0Xd3VELJDdfcNCNMSYHQCCo22JFIWr9+sLwOmKiD15QAIBEpkV191G3aJl1GG7Tno0giG/R3kPuakXAcTlX8rCUF3xV6tva7vPix9lr/o9hG1tz4P29F9+DxPEA6woznZ+aJb+/n/AMGZwu/fmMS13qXaYdgJZ89ZnmUAKMfzX443yGd1lrW5BPPkBKqo8Nn5OPwBL8pfjz69NW2RkxzC4+KmGiIHU7Ml+UtTrSHoWtuQOhUxQPs2TIR+VowmXrT/WIfJOLksCGh4RcenNFDqrjn28amMHDhRg3Cg+bnFS7f4v1X6x2G4JcmGXUSltP1FBN/Z08M9pGBmwIWMJpETgmqW50kYb0YKg+S6rHgYV7gT7J3frSyC20n9tF8VUam21DjOi XGceHcXo sqFR9AWSaUBQqDJZ2l/uBMFItKkQ40J2zLUEzWm6f749zUI+tzoIqj0esgdX+D8okjf4g/IAkmZKQUnKizadtTjC4QhmtUHkjN1nMwtiZ55xHYUD/3+UGZPrheYyyj3Drfu4tK6s3KIjIld7YhR+L3pzeNSuFHLlSH4/1eEmnFMoOWDIzU9x4SMtClJZnP9Eu8tw92n7ZBWmg/LagwqTTsKEBmSagRLqSvHsql21/3daNC24895VCHgwv0WDcR9I7nLqyUSRzM9sYM1plwkCQUjuVZ1zUlsnHGzPn8qA0MxwREnWU+QrA5kc3IPHazH99TAfhu5S54113k65TDiUfmJ3bKrS7F613w98+ X-Bogosity: Ham, tests=bogofilter, spamicity=0.000012, 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 To provide support for powerpc platforms, provide an addr parameter to the page_table_check_pte_set() routine. This parameter is needed on some powerpc platforms which do not encode whether a mapping is for user or kernel in the pte. On such platforms, this can be inferred form the addr parameter. Signed-off-by: Rohan McLure Reviewed-by: Pasha Tatashin [ajd: rebase] Signed-off-by: Andrew Donnellan --- arch/arm64/include/asm/pgtable.h | 2 +- arch/riscv/include/asm/pgtable.h | 2 +- include/linux/page_table_check.h | 12 +++++++----- include/linux/pgtable.h | 2 +- mm/page_table_check.c | 4 ++-- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 54801131ba21..6410c3583ca0 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -427,7 +427,7 @@ static inline void __set_ptes(struct mm_struct *mm, unsigned long __always_unused addr, pte_t *ptep, pte_t pte, unsigned int nr) { - page_table_check_ptes_set(mm, ptep, pte, nr); + page_table_check_ptes_set(mm, addr, ptep, pte, nr); __sync_cache_and_tags(pte, nr); for (;;) { diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 32d172e8cdde..d348186f4731 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -574,7 +574,7 @@ static inline void __set_pte_at(struct mm_struct *mm, pte_t *ptep, pte_t pteval) static inline void set_ptes(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pteval, unsigned int nr) { - page_table_check_ptes_set(mm, ptep, pteval, nr); + page_table_check_ptes_set(mm, addr, ptep, pteval, nr); for (;;) { __set_pte_at(mm, ptep, pteval); diff --git a/include/linux/page_table_check.h b/include/linux/page_table_check.h index 5855d690c48a..9243c920ed02 100644 --- a/include/linux/page_table_check.h +++ b/include/linux/page_table_check.h @@ -17,8 +17,8 @@ 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_ptes_set(struct mm_struct *mm, pte_t *ptep, pte_t pte, - unsigned int nr); +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, pmd_t *pmdp, pmd_t pmd); void __page_table_check_pud_set(struct mm_struct *mm, unsigned long addr, @@ -68,12 +68,13 @@ static inline void page_table_check_pud_clear(struct mm_struct *mm, pud_t pud) } static inline void page_table_check_ptes_set(struct mm_struct *mm, - pte_t *ptep, pte_t pte, unsigned int nr) + unsigned long addr, pte_t *ptep, + pte_t pte, unsigned int nr) { if (static_branch_likely(&page_table_check_disabled)) return; - __page_table_check_ptes_set(mm, ptep, pte, nr); + __page_table_check_ptes_set(mm, addr, ptep, pte, nr); } static inline void page_table_check_pmd_set(struct mm_struct *mm, @@ -129,7 +130,8 @@ static inline void page_table_check_pud_clear(struct mm_struct *mm, pud_t pud) } static inline void page_table_check_ptes_set(struct mm_struct *mm, - pte_t *ptep, pte_t pte, unsigned int nr) + unsigned long addr, pte_t *ptep, + pte_t pte, unsigned int nr) { } diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index e2b705c14945..d7400a6ac604 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -289,7 +289,7 @@ static inline pte_t pte_advance_pfn(pte_t pte, unsigned long nr) static inline void set_ptes(struct mm_struct *mm, unsigned long addr, pte_t *ptep, pte_t pte, unsigned int nr) { - page_table_check_ptes_set(mm, ptep, pte, nr); + page_table_check_ptes_set(mm, addr, ptep, pte, nr); for (;;) { set_pte(ptep, pte); diff --git a/mm/page_table_check.c b/mm/page_table_check.c index 5c2349ab718e..9bd5c5f09001 100644 --- a/mm/page_table_check.c +++ b/mm/page_table_check.c @@ -193,8 +193,8 @@ static inline void page_table_check_pte_flags(pte_t pte) WARN_ON_ONCE(swap_cached_writable(pte_to_swp_entry(pte))); } -void __page_table_check_ptes_set(struct mm_struct *mm, pte_t *ptep, pte_t pte, - unsigned int nr) +void __page_table_check_ptes_set(struct mm_struct *mm, unsigned long addr, + pte_t *ptep, pte_t pte, unsigned int nr) { unsigned int i;