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 B9F32C369A2 for ; Fri, 11 Apr 2025 05:44:37 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A013628016F; Fri, 11 Apr 2025 01:44:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4178B28016E; Fri, 11 Apr 2025 01:44:17 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F10C8280170; Fri, 11 Apr 2025 01:44:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 957AE28016F for ; Fri, 11 Apr 2025 01:44:16 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B23A5C1D4F for ; Fri, 11 Apr 2025 05:44:16 +0000 (UTC) X-FDA: 83320672512.05.A62BFDC Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf21.hostedemail.com (Postfix) with ESMTP id 985171C0004 for ; Fri, 11 Apr 2025 05:44:14 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=VRV1+Gwr; spf=pass (imf21.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=1744350254; 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=s+kFO1j4CuuVN2ExOiuIcwimXdG3sLyxYQDL55lbFnQ=; b=SHwhe7Vfjr1nlavtGPojmTsWAS2lY+qrQhLuCbIYGDEVYxtDc2BR6CZd4y1fampSRIUALH GGibN3VJklbv/vgYC2njWg3H3J2Iam797tSs2FGHPwuxDQcNMPrfrcsrbSV904zleuhFPG fEOWcHSSZXTSAep0LyQgiKawczC9vEI= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=VRV1+Gwr; spf=pass (imf21.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=1744350254; a=rsa-sha256; cv=none; b=wgkdgPxvVEtYrH3MitM/bTWfkxTk+lCZZjH2rttdHx0czlcxNaK3akNQ61CfkqCHrkS9gv m8BqSPJRVQg7suW4peuWYWwrdBUTRSGOqcrxHf9f65Zt5Vq+tvJbSA4ck3CnBfm0cyLdKT KPChphjs0rS0GBL87sv+biQbffpJ1Tg= 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 53AKckkI012320; Fri, 11 Apr 2025 05:44:06 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=s+kFO1j4CuuVN2ExO iuIcwimXdG3sLyxYQDL55lbFnQ=; b=VRV1+GwrfS2d7bC7O7ry3u2I80ePjWGV6 FDeuPTRtGhjB5ualk/J92XbQePEqXWXiNJ30l6mmMW80w2EI+cy9lJsjZifRlTYU K399NDge/wenRxKdO6llDqWsKmPM8CeAgbPzlXZ3TDMHe7hniw6Y2o8vcIqjI+FO AZDacvnsthTLEhI9R1gT9ANB59pc0QCixJGgvJFELQLauHVyqs4XqFmvqXRXqpod 5aBSZZo0Xuf8NShzP5AmbIujn3hEal2pPVU3J+Oyo5GqoUUjwsF1ZT3DQHlo8bHH BAj1n0j3qHAGNVv8us6Jcs0de4wWTi9z16Zygw/YAD/JwWq+lpH+A== 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 45xn719q9j-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Apr 2025 05:44:06 +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 53B4xdmP011077; Fri, 11 Apr 2025 05:44:05 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 45uf801q0y-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Apr 2025 05:44:05 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 53B5i3bM47317490 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Apr 2025 05:44:03 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C711E2004D; Fri, 11 Apr 2025 05:44:03 +0000 (GMT) Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0400720040; Fri, 11 Apr 2025 05:44:03 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.63.197.14]) by smtpav04.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 11 Apr 2025 05:44:02 +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 6897E60AC4; 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 06/11] mm/page_table_check: Reinstate address parameter in [__]page_table_check_pte_clear() Date: Fri, 11 Apr 2025 15:43:49 +1000 Message-ID: <20250411054354.511145-7-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: wwxV_qZD7ZWvMggdghnMvZKkY6zAUjta X-Proofpoint-GUID: wwxV_qZD7ZWvMggdghnMvZKkY6zAUjta 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=750 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: 985171C0004 X-Rspamd-Server: rspam05 X-Rspam-User: X-Stat-Signature: iy1n6snungh45xcfjf4oxki646k84pcm X-HE-Tag: 1744350254-305465 X-HE-Meta: U2FsdGVkX1/kCBHUmPTUGqtC3HRZpLxlOedWEdG1gp7/M8YwXm95zwTSXT0G1QuKo071Og6LAOH4wchKdtBHXdUhKc0qIdh5BOP7ihqt5MPemdzT2WwIWcQ249/AIJgei7j0mzL31OGi+1V4vfkG1I8wbo9/V7nwI+lU7DBmd4mD4zv4aVwlQQ/lbpmT0CZoTG5GBwQqMA/mX1o3x85P/73WrFp/CpkftmM9f01S6awUCpZ6WYau0ftwyc7KihN3FHvXkn8zEJeHucN4o/iJOilX7VioCnwcbwh/eRQFPVGXKCCJyln/qMkHjKflRLxuKL4onTBrdJX9cKfxHjYn2j4duCJAJUb1zwgXBGIfNCJun1nsrf/1KZUcXxptWzQQ90PhSlhauLupficjrSZ+k52cVKthBUvJFeXaRVpB6sNRXZAN/5ygSTcPq+DtRDNQjUzdn8ZXd685aAjYvmoDXAJY2RmSPjx0FeEVMrHdUBWVK0nd2y9egpCzyHFudbKzQthL9pOi2t7J1IdmB534DXruaF7YPnpt5FDBuc7QuPyypddAod1Ov5GRJbNWm6ftfVe1D8x3A7WoPQmVuXfIHSlK6CDmFEatthZjaOdEEymAXxshhTOxwlI6rSJClUMt61gG46x4IUjEmSv4FQBjBrPaUoBtu8Tm+Bm4bmqz4iU266opLVu0G7S5oNVRy2vTSki6F8MKtX5mp1tmPIvhXp8Ld4GbbFY4txLRONYM5TdlVqACXLHU02jlbOS35432zXjWp/GXx9G+gP+/1+ABbzyOuQX4i/9PwCFrqgyt/x6R5bNbPZ+OfQlBJgJ8Ho7moA6xxv27q96Mcg9JSBnZ0+g/nnRVEv64pwQpw+B9NxATkzOEI+wWjocN72+byLDbe5B7slQXjy5qpRP5wMQNC1UqsbaMq2XIAlOlYpsM6RD/nGMg4wzFo4a5vgstPT2+bFOHt9I6WMBhv8a3zHp UdcoscVv 6LaAFXIoYYWK6mxO4+kgkyQFDMB30wZC5LXoZcgjLEpLBULGaIlSHgmVw1OWT4eFsFd1Zvzp3zJChGE/gaUg7wl2IJl+etcWVT/9FA1CoGzkNpBv296Ojz/4AkTOMDYPjHr4+oPYu+FxMN68U7ObCS8FwnV24ebPqv9GDadko/g8dP7JWZ36JEVIfIjdP2MwQCk9xI9Uw9whnEz9D+p2Npc3VCcbx2P2xU/U9OHNfHvSCyzVO0uJ4wQav08A+vC50KNL8ty3neFgZP447wpDajTnBQJ1SPgWoghNyrskrQzdmDOfVHqaW2vmYjo3VVrKtTPNxMvKE5nIWPumFOZ8l2d35Pdzw/7mjlRio 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 aa232204c468 ("mm/page_table_check: remove unused parameter in [__]page_table_check_pte_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 [ajd: rebase and fix additional occurrence] Signed-off-by: Andrew Donnellan --- v13: fix an additional occurrence --- arch/arm64/include/asm/pgtable.h | 2 +- arch/riscv/include/asm/pgtable.h | 2 +- arch/x86/include/asm/pgtable.h | 4 ++-- include/linux/page_table_check.h | 11 +++++++---- include/linux/pgtable.h | 4 ++-- mm/page_table_check.c | 7 ++++--- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index 3ccebb6c090e..c1b079470f38 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -1306,7 +1306,7 @@ static inline pte_t __ptep_get_and_clear(struct mm_struct *mm, { pte_t pte = __pte(xchg_relaxed(&pte_val(*ptep), 0)); - page_table_check_pte_clear(mm, pte); + page_table_check_pte_clear(mm, address, pte); return pte; } diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index beafa053a768..c938ca241a56 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -605,7 +605,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, { pte_t pte = __pte(atomic_long_xchg((atomic_long_t *)ptep, 0)); - page_table_check_pte_clear(mm, pte); + page_table_check_pte_clear(mm, address, pte); return pte; } diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index c385ba804fda..6f6c314ae95b 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1318,7 +1318,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) { pte_t pte = native_ptep_get_and_clear(ptep); - page_table_check_pte_clear(mm, pte); + page_table_check_pte_clear(mm, addr, pte); return pte; } @@ -1334,7 +1334,7 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, * care about updates and native needs no locking */ pte = native_local_ptep_get_and_clear(ptep); - page_table_check_pte_clear(mm, pte); + page_table_check_pte_clear(mm, addr, pte); } else { pte = ptep_get_and_clear(mm, addr, ptep); } diff --git a/include/linux/page_table_check.h b/include/linux/page_table_check.h index 0a6ebfa46a31..48721a4a2b84 100644 --- a/include/linux/page_table_check.h +++ b/include/linux/page_table_check.h @@ -14,7 +14,8 @@ extern struct static_key_true page_table_check_disabled; 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_pte_clear(struct mm_struct *mm, unsigned long addr, + pte_t pte); void __page_table_check_pmd_clear(struct mm_struct *mm, unsigned long addr, pmd_t pmd); void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr, @@ -45,12 +46,13 @@ static inline void page_table_check_free(struct page *page, unsigned int order) __page_table_check_zero(page, order); } -static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte) +static inline void page_table_check_pte_clear(struct mm_struct *mm, + unsigned long addr, pte_t pte) { if (static_branch_likely(&page_table_check_disabled)) return; - __page_table_check_pte_clear(mm, pte); + __page_table_check_pte_clear(mm, addr, pte); } static inline void page_table_check_pmd_clear(struct mm_struct *mm, @@ -121,7 +123,8 @@ static inline void page_table_check_free(struct page *page, unsigned int order) { } -static inline void page_table_check_pte_clear(struct mm_struct *mm, pte_t pte) +static inline void page_table_check_pte_clear(struct mm_struct *mm, + unsigned long addr, pte_t pte) { } diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 52553aaa2039..e91fd1486558 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -483,7 +483,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, { pte_t pte = ptep_get(ptep); pte_clear(mm, address, ptep); - page_table_check_pte_clear(mm, pte); + page_table_check_pte_clear(mm, address, pte); return pte; } #endif @@ -542,7 +542,7 @@ static inline void ptep_clear(struct mm_struct *mm, unsigned long addr, * No need for ptep_get_and_clear(): page table check doesn't care about * any bits that could have been set by HW concurrently. */ - page_table_check_pte_clear(mm, pte); + page_table_check_pte_clear(mm, addr, pte); } #ifdef CONFIG_GUP_GET_PXX_LOW_HIGH diff --git a/mm/page_table_check.c b/mm/page_table_check.c index 9a6cfea0c1d4..9a4e2b522243 100644 --- a/mm/page_table_check.c +++ b/mm/page_table_check.c @@ -145,7 +145,8 @@ void __page_table_check_zero(struct page *page, unsigned int order) rcu_read_unlock(); } -void __page_table_check_pte_clear(struct mm_struct *mm, pte_t pte) +void __page_table_check_pte_clear(struct mm_struct *mm, unsigned long addr, + pte_t pte) { if (&init_mm == mm) return; @@ -206,7 +207,7 @@ void __page_table_check_ptes_set(struct mm_struct *mm, unsigned long addr, page_table_check_pte_flags(pte); for (i = 0; i < nr; i++) - __page_table_check_pte_clear(mm, ptep_get(ptep + i)); + __page_table_check_pte_clear(mm, addr, ptep_get(ptep + i)); if (pte_user_accessible_page(pte)) page_table_check_set(pte_pfn(pte), nr, pte_write(pte)); } @@ -264,7 +265,7 @@ void __page_table_check_pte_clear_range(struct mm_struct *mm, if (WARN_ON(!ptep)) return; for (i = 0; i < PTRS_PER_PTE; i++) { - __page_table_check_pte_clear(mm, ptep_get(ptep)); + __page_table_check_pte_clear(mm, addr, ptep_get(ptep)); addr += PAGE_SIZE; ptep++; } -- 2.49.0