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 63B5EC87FCF for ; Wed, 13 Aug 2025 06:27:30 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 01AF490003A; Wed, 13 Aug 2025 02:27:30 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EE6088E01B6; Wed, 13 Aug 2025 02:27:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DADC290003A; Wed, 13 Aug 2025 02:27:29 -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 C583F8E01B6 for ; Wed, 13 Aug 2025 02:27:29 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 9F39B116D49 for ; Wed, 13 Aug 2025 06:27:29 +0000 (UTC) X-FDA: 83770752618.14.FB5A5F1 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf21.hostedemail.com (Postfix) with ESMTP id 4BC941C000C for ; Wed, 13 Aug 2025 06:27:27 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=V5ik77HZ; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf21.hostedemail.com: domain of ajd@linux.ibm.com designates 148.163.156.1 as permitted sender) smtp.mailfrom=ajd@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1755066447; a=rsa-sha256; cv=none; b=QqqQiBoksV3rNv1LIdNFRo++W2H5bGIXWMPJEBlL5iH9HPzp/ccp6fDefSVEXowwJRN1GP CR2gRV26m4939K07kDQmSHb8nDRq3rfPC6/fX3x8wRs28MwKD8PziBZRkYhLMP5cc9Sr32 XHNDneGtIxCE7n5bp9hm3b+rKnfb/2U= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=V5ik77HZ; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf21.hostedemail.com: domain of ajd@linux.ibm.com designates 148.163.156.1 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=1755066447; 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=1Q5fgSl2we0xXrwBGTyZUI7uccF0sNxVpckpe5p+JPU=; b=PMUDftXejVUZ4PA3Ior88MytvtuQ0tO9V98aZxdDFROzM8RbByNqiH5+nZJXUhMv8jXeIj X4Q1sNc+4x+dzBBrfDCVCreL8Ab4nTeX1h39q6NmkAfmZVI38cW+6GAUdkVRAZNw51KVid Lz7xd3i3shReEiz+in48Rg+BwMuvbFM= Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 57CNQETU029436; Wed, 13 Aug 2025 06:27:22 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=1Q5fgSl2we0xXrwBG TyZUI7uccF0sNxVpckpe5p+JPU=; b=V5ik77HZ+ar+7vaCe6Q02TaShxsGXR0Vb VocHVVmLlHUfcMPHMPX2b62c2NoRwDbtl8CVVapNyU3WEnxQM2KZxBiFfh9rZKlw tz4AsFjc17UV2rrg6labBXVKnoklQfbpvxthDeXmpNtID7cCX6/PdPlx9pTi7fYO ONOIOLWdjgCCb2OOD1wTtQwTz+bK9S8GHmsp/3TrJO83j9O8yBSbkkW1PqKUqSLV WC9GD5TU6hmDo7ondkLfOpTQ2XquFa/ywfLJu0/NjJuUUBtINqI9XKtJ1oHdfM5n ORmPJx2J4XZq+ZsDSZzu/1MvlyT6JKNDyraJ1WEcecH3cbwMJUSnw== 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 48dwudax31-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Aug 2025 06:27:21 +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 57D2F7Y5026485; Wed, 13 Aug 2025 06:27:20 GMT Received: from smtprelay06.dal12v.mail.ibm.com ([172.16.1.8]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 48eh216565-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 13 Aug 2025 06:27:20 +0000 Received: from smtpav02.wdc07v.mail.ibm.com (smtpav02.wdc07v.mail.ibm.com [10.39.53.229]) by smtprelay06.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 57D6RIRd18678482 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 13 Aug 2025 06:27:19 GMT Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id BA14258061; Wed, 13 Aug 2025 06:27:18 +0000 (GMT) Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 316E058058; Wed, 13 Aug 2025 06:27:13 +0000 (GMT) Received: from jarvis.ozlabs.ibm.com.com (unknown [9.36.10.70]) by smtpav02.wdc07v.mail.ibm.com (Postfix) with ESMTP; Wed, 13 Aug 2025 06:27:12 +0000 (GMT) From: Andrew Donnellan To: linuxppc-dev@lists.ozlabs.org, linux-mm@kvack.org Cc: akpm@linux-foundation.org, x86@kernel.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, nicholas@linux.ibm.com, christophe.leroy@csgroup.eu, Rohan McLure Subject: [PATCH v16 05/13] mm/page_table_check: Provide addr parameter to page_table_check_ptes_set() Date: Wed, 13 Aug 2025 16:26:06 +1000 Message-ID: <20250813062614.51759-6-ajd@linux.ibm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250813062614.51759-1-ajd@linux.ibm.com> References: <20250813062614.51759-1-ajd@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwODEyMDIyNCBTYWx0ZWRfX8rW3e9+BYPJF YJdUU9mSLKt3GEbha9u0SuXkic0i9kxj8BVvnWT2zj6FN2r+46eAHeUxEgz5PqwLpYOM8sAfBWd AWW0Gzf1WS8H0n3pJQOj0RDKx7VOKvLp7rJfR/vhgdSMI6O1lz+SZ8pYUoGB5P06krpyOfqSK4/ FtoQgO34qaZRUgL9fyWfKJqcy13iwcF7SKyHpRNulVT8b0u7cvLZzYKJ0LkPCZFahaw5K50gD52 JDVU2f1jcVfFOfaN0Jf6VproJnN/iRUtMGr4TxMjF8GsBLnHotvpiWjwhUPBmZDucEg0yNNYs6y EXpofyOoKl3n5M4kRDvXkbDRwRI0H+dWUg6nT94582dOjL1PyCE8n3DO5B3pIJ8GhQuWm2iZ2Mq aIMNcIFL X-Authority-Analysis: v=2.4 cv=d/31yQjE c=1 sm=1 tr=0 ts=689c3049 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=2OwXVqhp2XgA:10 a=VnNF1IyMAAAA:8 a=7ipKWUHlAAAA:8 a=UVT5Uxx9rTNGLfuASP4A:9 a=gpc5p9EgBqZVLdJeV_V1:22 X-Proofpoint-GUID: M9yE0bCBJ46ZT8PFF3BKDB_gpOXpaHS9 X-Proofpoint-ORIG-GUID: M9yE0bCBJ46ZT8PFF3BKDB_gpOXpaHS9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-08-12_08,2025-08-11_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 suspectscore=0 impostorscore=0 priorityscore=1501 phishscore=0 spamscore=0 adultscore=0 bulkscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2507300000 definitions=main-2508120224 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 4BC941C000C X-Stat-Signature: 11hue8nk7kcnk43prbutfq4h9odshds3 X-HE-Tag: 1755066447-876851 X-HE-Meta: U2FsdGVkX1/xQD+amXyLLQvuCXsD6SxjtRB7QJWnc9o9flWgoArvm/ryyNeEJBlOZtnb1uD2+d4HfDxWJAiRmQ1kle0Sl/PdBEWA0FUvPUDA07M9A0kwFu0/wZsy9tClP5jSPsuSgNfpVfTdtu7iXZZd4pCwsKATsIQ6DikYgZh/1G0RQv/ZcOjBiA2qdaaO+YuyOHpsOCOXNpCextAqsQwIUxTye4XkhS7j7rv7M5ukKKELdVQU9zE5BQhTidIDfP37/WmQJWLMkKh+K6um7SZTRA+yxwk6Z1tCwIZCIf1nNf2ymZsS+yFmQ04pCNcM1AoeF8Zc9qARxIYYtuqBoOm3AgXj5pUH/MpQ8uQsCu+QoNZ2ypLmMOKr2eLyQpLLNKyshz8h9SnGsI4rNrf4QZozlSsRVKUNiON/wTn8/U2QVDgjNnACvFLL4MNaVlYn9v9cjrQEbgRDHlIAIN+UhdwEP5pJU3QdpRUPmImNPp9+oJCPaZ6oJCVd3dV+bWueNzYN4+HmHb5o2AUQfzQGDzArOOl6zC2XGOd1rfvAug0A3RrE6v1XpsXlhPSM4cYoTU9CglCsF09w6XwcFRPczCc2QoO1RimrgmYjLAxpB1/GIeWzOyruWKgLFVmbmmEjSYl2ig8uTwebXTNeIv1s7VpfTl8abU0oMsm2Uj2BKM1hBU8RcdIHwnfTcwW9YgQBryxd7a/F1Y6W2QExBM8MBEtC/AqZWsalbwGiRCBP433G0Kf51m/filqrjtzw9ePGt5OJJGeQMHl/mau8BTp1ztdip/reoT7Joh0OPgCmt5JGTuKrzAw1y6QV36FbJhZthyLW7ya08rJ/dfYVIvqS9ytGgUG2Zg8pDuxv0JfiGjA4QYzvIVggST3sUDE4JQSZeW3nErLwZQk1Db2eJBlheppb6YeRO1+NqiBHJGHo3QoSOk0hRwHfyrKoU4eoSB3HbvGeRWkUU0nhXCuJark 8RfLrplJ vQ+niHuwbY5VV5IYTa5ekKb/H7mOAITs+AaRTv/VigC4i549HmJZesQjhwwh4bMgB3Wc7pk3MI2+E40T5aZi7i50jIEcacgWy2F7yc5rNsTCR09lXfn/meX+cgt3AFK2VytuVcuY/LVoLwSkZQ9sO1SeTluTW4A8xJj0S8Ns3zKz5Xn/XmW57QsROihqekPa6yF/JIDjRd6dhuUyO5Yah0fCVKafQv/Pez4h3sIJS5GIOsfX0YnIvLBrEJ6Z7hSC4wnWXpcqA+ONXtZIiswnKGpeDXDhoGbArDfWLNxCGdLK8mhbjDw9PAe4ocYhUMYNu0ifeU+iIhsV4nFYa58369/IMCmBAT2UZCKJx 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 To provide support for powerpc platforms, provide an addr parameter to the __page_table_check_ptes_set() and page_table_check_ptes_set() routines. 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 from the addr parameter. [ajd@linux.ibm.com: rebase on arm64 + riscv changes, update commit message] Signed-off-by: Rohan McLure Reviewed-by: Pasha Tatashin Signed-off-by: Andrew Donnellan --- v15: rebase, amend commit message --- 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 9fe3af8b4cad..06ea6a4f300b 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -706,7 +706,7 @@ static inline void __set_ptes_anysz(struct mm_struct *mm, unsigned long addr, switch (pgsize) { case PAGE_SIZE: - page_table_check_ptes_set(mm, ptep, pte, nr); + page_table_check_ptes_set(mm, addr, ptep, pte, nr); break; case PMD_SIZE: page_table_check_pmds_set(mm, addr, (pmd_t *)ptep, diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 6e8c3d19f96a..2484c0788012 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -560,7 +560,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 cf7c28d8d468..66e109238416 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_pmds_set(struct mm_struct *mm, unsigned long addr, pmd_t *pmdp, pmd_t pmd, unsigned int nr); void __page_table_check_puds_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_pmds_set(struct mm_struct *mm, @@ -127,7 +128,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 4c035637eeb7..8aab3fa19c85 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 09258f2ad93f..0957767a2940 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; -- 2.50.1