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 DDCD9C77B7C for ; Wed, 25 Jun 2025 06:39:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7B9FA6B00A8; Wed, 25 Jun 2025 02:39:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 76A936B00B7; Wed, 25 Jun 2025 02:39:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 65A026B00B8; Wed, 25 Jun 2025 02:39:12 -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 536026B00A8 for ; Wed, 25 Jun 2025 02:39:12 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 017A41A18B7 for ; Wed, 25 Jun 2025 06:39:11 +0000 (UTC) X-FDA: 83592970902.11.EF7630A Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf18.hostedemail.com (Postfix) with ESMTP id C53721C0005 for ; Wed, 25 Jun 2025 06:39:09 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=pYYiZ1MD; spf=pass (imf18.hostedemail.com: domain of ajd@linux.ibm.com designates 148.163.158.5 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=1750833549; 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=38JUqnmMvQ5EuRM069Y/fd06J//BHQwkg7HugjQcG2I=; b=yGc4+kBDK+qWI0k9h0hF+ErqKR3yr18vmHfCCFnvfigaOcsyl9pBUiH8lxrIoNAI3hAxK/ f0rH7xRT2QjIl4nX1NCHM835d8VxR3ySfwix1UUjXOPS8gFFDhfsZZmK32GYB4OFfT0n6y YCTIJPUXdMTIkEneRH3ipyGQgKylCG8= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=pYYiZ1MD; spf=pass (imf18.hostedemail.com: domain of ajd@linux.ibm.com designates 148.163.158.5 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=1750833549; a=rsa-sha256; cv=none; b=1rnZ1k3DKv0Xg6zrj0fyIB1fju2XvTNYj4p4MzMyeHzKxldEF2FMGgzcQ96z87foORWfLI obaz/FTGPXz+SK57JXVVgVYI7BigRgD8z6zQtMKOhc++8axWxTzjqPtaxHKzKRat23jwvg MFfoi8hHKm4IvKsJZ3iRLotEJ83uvSg= 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 55P2O5Zt008193; Wed, 25 Jun 2025 06:39: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=38JUqnmMvQ5EuRM06 9Y/fd06J//BHQwkg7HugjQcG2I=; b=pYYiZ1MDMq/9NG1mbqLUAZ7E9B8k2x46/ EYXBq3xhKLKvhf3TAlQxMinoXLWyG4JiFG+ZscZGtH8RdPg6OXJpPIAqqpJhCuqy Gn3zHsX+s4Es0h26syAF/AuanmXg3i0mdQLbvh+d6OmVG04Lss8YKvpDdr3wRPlo ZYrmpErmgZgTfknYVmGMmCIxiwSId6djPskEQh3DhQ6urdNkLDRPpI+4mGVoQdnp 2CudTe0lCSCWxGF8v5TSl4PTgETspvgibWQ1RgS3qxV8jrPUea/8nRLMYq8gYvwk hJITJepDZ0eqDddWVTFXKQRS/XpnhRhOpFE4fWbf2QOuaaJJNdLTA== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 47dj5twg3p-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Jun 2025 06:39:03 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 55P32mdp003989; Wed, 25 Jun 2025 06:39:02 GMT Received: from smtprelay02.wdc07v.mail.ibm.com ([172.16.1.69]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 47e99kqq4x-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 25 Jun 2025 06:39:02 +0000 Received: from smtpav02.dal12v.mail.ibm.com (smtpav02.dal12v.mail.ibm.com [10.241.53.101]) by smtprelay02.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 55P6d19o26870340 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Jun 2025 06:39:02 GMT Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B178B588F2; Wed, 25 Jun 2025 06:39:01 +0000 (GMT) Received: from smtpav02.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 093DA588E2; Wed, 25 Jun 2025 06:38:57 +0000 (GMT) Received: from jarvis.ozlabs.ibm.com.com (unknown [9.36.18.35]) by smtpav02.dal12v.mail.ibm.com (Postfix) with ESMTP; Wed, 25 Jun 2025 06:38:51 +0000 (GMT) From: Andrew Donnellan To: linuxppc-dev@lists.ozlabs.org, pasha.tatashin@soleen.com, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, x86@kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, sweettea-kernel@dorminy.me, christophe.leroy@csgroup.eu, mingo@kernel.org Subject: [PATCH v15 06/13] mm/page_table_check: Reinstate address parameter in [__]page_table_check_pud_clear() Date: Wed, 25 Jun 2025 16:37:46 +1000 Message-ID: <20250625063753.77511-7-ajd@linux.ibm.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250625063753.77511-1-ajd@linux.ibm.com> References: <20250625063753.77511-1-ajd@linux.ibm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: Z47N1cbQhimo-l2AzNSEI6V8jfUK-36n X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNjI1MDA0NSBTYWx0ZWRfX5aJ1GyCyt+lF RNkSPUbQAiFCg2w9HFwZ5wnxrZBEiDB324ljkSwuZE0PRfCiUY/GGBiiyH96909WjzSdwylTxrt 2mBtYPLlhRZgyXo0yWqmx9Nzb3hBvDmKn7XJaLlFIvwmRlsciigeO/dKefMvl842D8uVxg6ITlW bv9XUKhVFLmihfIGOAirKO9H6IksjWFEVbREh4YIseKDnYGUtN2692uDui3PW+jopomfpP7syed z9GqcqQTtP3U5dOSKo5XsdLB3wDmPGRapnJfLpuvph+nsOa8013fUGkNuSNl9Liu2iDTXljHweI 0+NvTFNh3iEFdkGwMUqUcI632Dc023XL0CUz9ECN8Y0Bv0LGiRQJ7fv2svvL/C0bGrwj7LsIn7z +qSBD8bpE9cPw0AIMeXo5kS3zcFX33mYIZ+r3HqaZtc035AOTdwOOAvDVsIN7vegF6BqV1G9 X-Authority-Analysis: v=2.4 cv=MshS63ae c=1 sm=1 tr=0 ts=685b9987 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=6IFa9wvqVegA:10 a=VnNF1IyMAAAA:8 a=7ipKWUHlAAAA:8 a=VwQbUJbxAAAA:8 a=ocrGMPNeQj1hKc7Dx3AA:9 a=gpc5p9EgBqZVLdJeV_V1:22 X-Proofpoint-GUID: Z47N1cbQhimo-l2AzNSEI6V8jfUK-36n X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.1.7,FMLib:17.12.80.40 definitions=2025-06-25_01,2025-06-23_07,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 bulkscore=0 lowpriorityscore=0 spamscore=0 mlxlogscore=916 impostorscore=0 clxscore=1011 phishscore=0 malwarescore=0 suspectscore=0 adultscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505280000 definitions=main-2506250045 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: C53721C0005 X-Stat-Signature: bbsdcj7br6umzyexk61osggydr8aibqi X-Rspam-User: X-HE-Tag: 1750833549-225678 X-HE-Meta: U2FsdGVkX19qQ8NM3/qvSKSUD2h1D8apFJNganaBQrdVM+qzTpFPFB9Ki9ZZC/sU6n210GouizQXv+4W+ryUEGoR710mgECxJ56YNWSVBJ2nZnAM8E0MG/TuwvFFrpPYTVczdfMZf1FEnNQBsiQALguCw6n422PxXvqQA+79QnNS+tFFTPQn4zgpOD4UOHlVIlZ/BIzzLl/lPfsqJcSQ4jfHHq8sTOZkg0+0mqKS0N8I8ChwEabuEqGenj/X/LzWkfhx5kZYqmf/rTHn+2mcX7usu2HNcyLLtZy7Jq1hieL7coh9Va4+FJab5H3bFDzYqFpuZ9j06Jrpofb2oUjwklLMQ4MpmK36LUwJpVaLcuxM7UQ5F9F1R+u6KTQERSCw5Fq0Le53+Tgvpm0hdrYowbzEOt9+qskTEi5SHNBjABM8+7YLnwGF1aG8STIP7cjQzsooT2fzLwyL3+/hciJYTHd6ZJdoGaVz1IZwXobxnpgM8+v6F0XbMY6hbZCQKwcvRNBcicVgDoDVqPYtz3uYuSXoNrnlQ8ebrq12cRTLm0Vy86XpLVN6b3tMD9mpdJ1CpfKTCJK0k6TcrHnYO7KObtE8AMuiSXji7L8KMPU5+0Jx3hCaAZAFGTr/kXYAJySicw5/v100yaKWPQI+lAX0ZVKkftY+wGfoG3dVYOZPDz3Huc+5gGcDHTjsJZrcCrkOgOYrzhIUJBoNbGo1CCjdLyIC7hQHyt4mcffRT5EsfNu4CpOrMxAxkKBfDRWBrLH9ItHSquZGsoMnse8Y948N41xsQ7MNCwY4pERXi5RUyBYbzZTiuHeHkLA/IIcVX7i+k99favt4ZnVOrFB5ZMrqV7GmlpKvjbTz3d9NAYqvEr712B/tthjLsQnwsLj0wdYIaq/Hx6cwbjA0d6wkafTDB2lFQedmV54v47yqfeszm3JX7n8yfzQNjyrbF+c+ldVJzCEsfgq51MSuf+2MV5q GfVIjL9p SNTuWVjCjHHc5DqS/KJ2zwTaJ5NXbpP4UVGYKEmMsNdSEBEngZlxFZh+CWoN1C1dbKevOKOJZ/Mb37gVce23BrdLYiCBbj5yb2igEtjRY1MWjmRggySg7OHs+TX7E0ggQzvgcwI4jz6nSFJ9Whm6vRZemhxPcQM7H63Y8ie9o8+Ef5hMI7cMxM5JKKbJbNlZFmnr/CctA/q8rs8ynj4HKkOoKIxIMwNQrTVkVWm/LUx07+flAguf6OgTGI+Weo6OUGSO5DmVsoEdPYjF9rNqNk649pZz5PW8uIw9rxbV9bfz4AenoQ+k9EV65keRNdjKgF5pBrCCfUWiEIGG8MoUBJA6349qK9EijLuDi/7+JS0lphjOAOo8oS/CbBo/flpZArYQicwQnYeW8tKaa1kT68OHwzCuQnwozBlog+FOjipgdIxtomcLDVI6Qx7rO6HDT7dg8yD32iOjaaPw= 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. [ajd@linux.ibm.com: rebase on arm64 changes] Signed-off-by: Rohan McLure Reviewed-by: Pasha Tatashin Acked-by: Ingo Molnar # x86 Signed-off-by: Andrew Donnellan --- v15: rebase --- arch/arm64/include/asm/pgtable.h | 2 +- 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 +++-- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 383c01f9cae9..72ccbd810b13 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -1398,7 +1398,7 @@ static inline pte_t __ptep_get_and_clear_anysz(struct mm_struct *mm, break; #ifndef __PAGETABLE_PMD_FOLDED case PUD_SIZE: - page_table_check_pud_clear(mm, pte_pud(pte)); + page_table_check_pud_clear(mm, address, pte_pud(pte)); break; #endif default: diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 995ca7e6e0e9..4d6da32e77a6 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1376,7 +1376,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 66e109238416..808cc3a48c28 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_pmds_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, @@ -123,7 +125,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 d06b5fec9540..765451864de3 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 0957767a2940..bd1242087a35 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; @@ -246,7 +247,7 @@ void __page_table_check_puds_set(struct mm_struct *mm, unsigned long addr, return; for (i = 0; i < nr; i++) - __page_table_check_pud_clear(mm, *(pudp + i)); + __page_table_check_pud_clear(mm, addr + PUD_SIZE * i, *(pudp + i)); if (pud_user_accessible_page(pud)) page_table_check_set(pud_pfn(pud), stride * nr, pud_write(pud)); } -- 2.49.0