From patchwork Tue Feb 11 16:13:56 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 13969563 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 0207BC0219B for ; Tue, 11 Feb 2025 16:14:51 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8BCC4280002; Tue, 11 Feb 2025 11:14:51 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 86C35280001; Tue, 11 Feb 2025 11:14:51 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 6E602280002; Tue, 11 Feb 2025 11:14:51 -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 50E18280001 for ; Tue, 11 Feb 2025 11:14:51 -0500 (EST) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 0CB7346F09 for ; Tue, 11 Feb 2025 16:14:51 +0000 (UTC) X-FDA: 83108162382.21.20A1A8F Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf14.hostedemail.com (Postfix) with ESMTP id AC280100009 for ; Tue, 11 Feb 2025 16:14:48 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b="RFTFB/us"; spf=pass (imf14.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=1739290488; a=rsa-sha256; cv=none; b=oUTNUBYVGmFg23+TlTuXzrmsR/FksL1pDSeeomHgMVvNYjUtiw8Q7xjb1cjcg3Vt/7cRJi RvxTlhqilF4VouF+YaEX899lXLT7jwyXz2Gv66dBOpMfTn/iZYE6fguvVDD34RoK0Se/T3 +VlTUGoud9tgxqnOqpXLAAhwryN6Zb4= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b="RFTFB/us"; spf=pass (imf14.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=1739290488; 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=80YUf/ywVjSGbesvwbJLhfkbTLis/xViQMBOegskX9w=; b=uDn43pYUzIhdioX3sGGkPLXSnTvvUqgrNbAwqIBrXxPhJm1j8qJ9+hMi8fhTsfWVw+lmJ+ mijC8h33MzLx1UeJ3xcCDVNQUeyicEVGns+Jn44GkSnRZpRVtVIisVrlyX5+eC8IE/6FXi pVOcyxTG5GGV2Ky57NQ2HhY9Iq1oJro= 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 51BB4IrT023714; Tue, 11 Feb 2025 16:14:43 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=80YUf/ywVjSGbesvw bJLhfkbTLis/xViQMBOegskX9w=; b=RFTFB/usUKYR41QCdmJNN8Wqr9C5ezgoB yrm+uirbh+ebWsyaj2+jPmvpRw8caN6Zt56OqiCgdQdLPU53s/UorBllR8KkT1SZ kuInfPZPA0hKymKlWspURvkjHKmyH78L6QhWNQuaGehdVg5UlXIO1gfCvcfO0fJ8 rUN8UzZ+/oqI5g7ZOjmwrnDpBZn07jsz114ou8bPQ8SMdGZwrAuB8sgtZJNZPzCQ 9Ap/jV42/ciK5AW6rFTcB8m7w/pd+OQ75ju+CxRRYaM79jxFMtJHjy8CUfmW0ubH qKQq76T/gwqPWP3HKUf1xGqsSM/JpfIEBM1zYwhAW7C4UJBsRq4/w== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 44qtkac2bq-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Feb 2025 16:14:42 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 51BEWNNa028687; Tue, 11 Feb 2025 16:14:41 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 44pma1kps5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Feb 2025 16:14:41 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 51BGEebr47317282 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Feb 2025 16:14:40 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 05EDA20040; Tue, 11 Feb 2025 16:14:40 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 394002004B; Tue, 11 Feb 2025 16:14:39 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.63.197.14]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 11 Feb 2025 16:14:39 +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 0957A600AE; Wed, 12 Feb 2025 03:14:34 +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 03/11] mm/page_table_check: Provide addr parameter to page_table_check_pte_set() Date: Wed, 12 Feb 2025 03:13:56 +1100 Message-ID: <20250211161404.850215-4-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-GUID: WnFAlpqnOaYlwekcppAuf1YDj6QbWgI5 X-Proofpoint-ORIG-GUID: WnFAlpqnOaYlwekcppAuf1YDj6QbWgI5 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 priorityscore=1501 mlxscore=0 phishscore=0 lowpriorityscore=0 clxscore=1011 malwarescore=0 spamscore=0 mlxlogscore=574 impostorscore=0 bulkscore=0 suspectscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502110106 X-Stat-Signature: bbjeezp85shw619t4db4yhtte4nikc85 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: AC280100009 X-Rspam-User: X-HE-Tag: 1739290488-405956 X-HE-Meta: U2FsdGVkX1/z5oEVv3qbCQeoQqUH/8zFBcLs55zl6mxOR/U83r034s8KCIDeq16M5AEv2KBnUqlq/hQvBaj04b4e/jS3P7TcrUd7VNhZDP7BS6eIrQxyMi9CJl8/ovYOe7+zeObqzJrXVg5giIuln+ZuI2k1n45aQRR9TG6vkkDzaQ54W7dnth0BGbDGQf+Mv50S81KNoVMqF8h0n8onFOm8a3nUCUwgb+6mBAHzo22ys8k948lrl8zVU39HhsxvdR9p6ogqwfbAwBgCivVm46gwdQxDR3D/PE704ERqT2dKwFbH2qH5AIthoaX0Cip5CfU0v4sSthqUPrHyEpvKsQ8uzITBPdmWt4wgOL/X2XordDrbLOs0XMF19QjRwJK6zIVX6cLVk2/xl92HBVYimUkE/hYNtBt9GDiDXMal4ZAVDkH3yhtTEEroi/fbmWnDBB7yrMuleHIe5kGsXll6MGcrv7XNoDYd9JEEtaLXJ/0/iS6aq7YGf6gvc4Rs8Y57NqVDOcUT4UI1LpEIlqxF3miQsw4yL37z7f/JYF1zklCg2aW27LjmY4PbykQsW8cImCxWqt2GbfNdOmHG29f5Q+Q6xYXnvMMc/m45AyKhurEbxqX3zk7Qj8KYvtIEWyxoR6nj32BjQ/GRjUIGPCEjpmKcC4/jX0E5hHQX1SVwedCt/CQz8vaLFyq1Z4IqvYN3jrVa+Uzl95/hlEOv4nKYc2d7itA/9++doU9hKMVw+PzDqhjpCr9zevBzxXXed5UOYfqD/qkQpDbsbgJPpzn6WiD3axP62p6849FM0l+UAb2Y14Y1KR7FNgiJ8nnv32mTAVFXd9Ah8hPrg9aixhXKPzWSK29rXI5bPzNeKEwiMPFnsNHLuih2DaFgr9nTq8mdTpJK4AD6y+kmanh3Hv+gYmXZK4AwSo6oK93Fz9xYV+IcY66XBNfgDiDmIVnQb8EGygXwst1woY+2tRwWrJ1 Ka3mm9ae HMn0ikDnaYWL6QGuE+UFz0rlOQFdG01AGm9DbopZHI0GflP+nJ/tiq0gNb7HZANDOaTiXKAPq72Ey519XCBhX+EtwWq3qE2RSuo1MEgVno+2EuX83PDn42mHW8VA1cfB+lEiX4nFqKrWVOnH84+FErmyUlQO/zE2xeE6dS5uvV2CVJk9+JMcM3GQXFAVAXRozPfltB0ldOlQfBxbMTL0bis/6Mk2tOku4SXOwMOlYi58w/Hvawa+xaHd0qnAqeyMyd1rZBe70LUgkP80q2BmMSO278mwOrEkeGjoo3MVwWrcT2TGWtkymKHGobF5/RD5FBOi1D6LwEx/iOi5XelHTZ7qoTDU5Cw+CqGBvDolIQprx/aEmc6CIPRoMpqwaYjd+YR1L+wCSj7+Z4qsBJuyyCvOBukHLn1+fwYUP7VYjuJu0+XD5e8HsbU2uXklFnvHTovImDU+C1sDkNKn8Fc2tOlrVY9EkVpYo0p0n X-Bogosity: Ham, tests=bogofilter, spamicity=0.000002, 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 0262d9e966f9..78f579812c0c 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -424,7 +424,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 bd4092b72258..9eb5f85dac82 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -562,7 +562,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 94d267d02372..2b25dd17ec67 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -285,7 +285,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); arch_enter_lazy_mmu_mode(); for (;;) { diff --git a/mm/page_table_check.c b/mm/page_table_check.c index 099719d6f788..959e11e1af24 100644 --- a/mm/page_table_check.c +++ b/mm/page_table_check.c @@ -209,8 +209,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;