From patchwork Fri Apr 11 05:43:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 14047583 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 6597FC36010 for ; Fri, 11 Apr 2025 05:44:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 14FBB28016C; Fri, 11 Apr 2025 01:44:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id B0602280171; Fri, 11 Apr 2025 01:44:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 80D2E280169; Fri, 11 Apr 2025 01:44:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 2AA2B28016F for ; Fri, 11 Apr 2025 01:44:16 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 2409B121DCC for ; Fri, 11 Apr 2025 05:44:16 +0000 (UTC) X-FDA: 83320672512.11.755E93A Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf11.hostedemail.com (Postfix) with ESMTP id 04B1340002 for ; Fri, 11 Apr 2025 05:44:13 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=Xzo9kQpD; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf11.hostedemail.com: domain of ajd@linux.ibm.com designates 148.163.158.5 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=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=p4yJq0aYnv4rdnPPZ+QCyk8Ri1R4Uf81hFUvSC5siyY=; b=DIaPFSlPplsOOeCAUZ94uz7U1oz+g8w9AHhegxXiOnlDzAVYmxgIcPQiQYcyw3HVUbCvo3 ucMZeyEU2Dti9D4nozuwHrfADFYoqxGi52K0x8oxbu+7gifFnzpA3ZlmXU4k5DQFZCGOuI A7FLDmlO2QCmkyHzYz+FCGNypRAOW0Q= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744350254; a=rsa-sha256; cv=none; b=EJB4W7zjqpz8oYC+abDGf8UD9wzcrvxzHL5BkICUD1rFro6VLvz1+sPmkmQDljPLN03y2O 7VushV0DHN07SF9unt8QHqZ1YMimeyNlur1L4wP/l70CzkPdvoB/pLHYBtRRjvb/5T0Fpg Z0bkVg23/kloGFTEJzJNrr+09uJKJcM= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=Xzo9kQpD; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf11.hostedemail.com: domain of ajd@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=ajd@linux.ibm.com 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 53AKcsBq013067; Fri, 11 Apr 2025 05:44:07 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=p4yJq0aYnv4rdnPPZ +QCyk8Ri1R4Uf81hFUvSC5siyY=; b=Xzo9kQpD48tNVAfWndsWH7GTFkZy4Mf2t PV0w3f9WJ1lq1HiiVhO58W4Yf/J/SRKS+/g4bSXiKiehkKBFLvYfHJ8pK7SiXITh f93SAMMipCPUifpjMa0DtWP4/Gg1UNPxH/DHR8oD3AA8qPnBvMDd/hoaZ+PKi679 UMgSShdIGAcI3wy45hlZjycuv7Y6DjrGkvS1AuJXfvM6VxIPCfaReifydDBKyCZC oSyTWOaF7e6YiJ55+mmNliJjTjstNU2pmp55JRiB7pagsgMqvbWQaEMMcaIstESh 1rK1BBZGOmXi4+npAUjzIiBq0S3dmp4gFWDNfZj7G4WrEpMpzsDpg== 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 45xn719q9k-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 53B4a7ec011518; Fri, 11 Apr 2025 05:44:06 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 45uf801q10-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Apr 2025 05:44:06 +0000 Received: from smtpav04.fra02v.mail.ibm.com (smtpav04.fra02v.mail.ibm.com [10.20.54.103]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 53B5i4Wt32244444 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Apr 2025 05:44:04 GMT Received: from smtpav04.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F00C620040; 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 25E5420043; 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:03 +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 6DD0660429; 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 07/11] mm: Provide address parameter to p{te,md,ud}_user_accessible_page() Date: Fri, 11 Apr 2025 15:43:50 +1000 Message-ID: <20250411054354.511145-8-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-ORIG-GUID: PPAIzmoPFIwh1tDYI_fevQiOmW5Aj34k X-Proofpoint-GUID: PPAIzmoPFIwh1tDYI_fevQiOmW5Aj34k 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=888 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-Server: rspam07 X-Rspamd-Queue-Id: 04B1340002 X-Stat-Signature: z15ob5sq5a7rwu7yzbt8shb7if8j77y5 X-Rspam-User: X-HE-Tag: 1744350253-869027 X-HE-Meta: U2FsdGVkX1+H2IqUke08I9hee1NZBrYPI+cvud2gxOhPY/JdAziXXzVk8C9Zb0K5X0+eif6XENw66p/piF9VGgXG/j26zy/edNjjlUJX696jUfCvion80m4/RLPUVcTHSVgHWvsqFM4frlFGn7nF//hG5D38VIR73Q2xZqH7cYVhCS0wt8tx5WppUgKAi2/wAnDm/XXRIcnk3+1r+L2QqmTeqKNIANI+bROfT+jjQJ454vBZv7o2wqQQ1Ya6x4s0BIaVK00bTwLqtiV6FFG3ELoYcvx2JTrrw1IuHmaVRDo0fVCiOPvoY9/tIuH4XdHAxHR5mOYxjW75SAjc1TJQulorWJ52E9M+zRCNSoqLyKRkmQuBKoRUlMiLWoluzDjNjrsWV47vOS28W83Gs59Y9CggD1okLs6odgY+1tYp3bVQISGquuD+KHOt5MzK2nqPedJMlNsvB95Rn4S+NG1iMM9i7Y2gGIqSQlBbiyxdNrQsHTKywg2cqIBnlfR3NUDG0p8qIdnNw6wqzPh1nQA/Hl+F/8Jkcxza8VeDDPjMGOM3Ju0pnQEkFVzW7X9NADv7b5A9cLqYNSuySiF6WiFvYMdY2EA7V6KAK8DaP2PZaOnL+K896UtQsUzE0EU9PfPa/OyCRclALxKfUyEEp9BbjdS+jnpIrEdDCDNfP0MIckhrMCqzqYu1M7q59/bvALn7xa9HPlnAy2dhyvTojUAqpV1h3kTvbW71hLDqgeSq8gE56+Hwgz24XZoYIW92GVtdLUADyQ9v8yVEfgWmXjw7eScEvodqcfBZSKDtd8IXEbtNewdgL5GvSHva9l/dsGrusuydIXokuTSK/AzD84a9bPtpV2Sa0xg9hUtRzHworQO1oewgo82TF46v4bXWJpWqD6miq8xz8i8/S2nrmyWPO/wPGRINAg5ecyI6XNGq6jUWKO7bOuvS2Toqs0dziEEv2CLqNN0qucG0AFWepwm duYBSg/k QSyL03zi4VAw2PcmZceoioXwpKfDzC3XDJdsPcLbmV3CJvKEezK8lpSppcE233Pp/Fj2QvFYvogjvWoGXFzvouNMTNsjntr23ghQ8A2ZFTgMMFeM/gbxIdt81kPdFVDh+oyLSVHBzTvWD6seDi0607q507Dx4K8NxKwTJeK9dlXF0nx6o9P7NtCR65cjGKtEVLDHYXMZzLEqTGSdqcw+O4ymJKmLiAjf4xFeKhD8Tbe82NbXJM2aRbPrwjW1gwlMRA8oRhWtyAXn3S4qb8xYs2Q84uG2IJf097Gb1e6+687W3t3+iMVf5x5+UhUU+coulxBxqm6ei0G/vd/gQ/dF0uRdIsQJn5c31Puyg 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 On several powerpc platforms, a page table entry may not imply whether the relevant mapping is for userspace or kernelspace. Instead, such platforms infer this by the address which is being accessed. Add an additional address argument to each of these routines in order to provide support for page table check on powerpc. Signed-off-by: Rohan McLure Reviewed-by: Pasha Tatashin [ajd: rebase on arm64 changes] Signed-off-by: Andrew Donnellan --- arch/arm64/include/asm/pgtable.h | 6 +++--- arch/riscv/include/asm/pgtable.h | 6 +++--- arch/x86/include/asm/pgtable.h | 6 +++--- mm/page_table_check.c | 12 ++++++------ 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index c1b079470f38..1a2b5c49293d 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -1233,17 +1233,17 @@ static inline int pgd_devmap(pgd_t pgd) #endif #ifdef CONFIG_PAGE_TABLE_CHECK -static inline bool pte_user_accessible_page(pte_t pte) +static inline bool pte_user_accessible_page(pte_t pte, unsigned long addr) { return pte_valid(pte) && (pte_user(pte) || pte_user_exec(pte)); } -static inline bool pmd_user_accessible_page(pmd_t pmd) +static inline bool pmd_user_accessible_page(pmd_t pmd, unsigned long addr) { return pmd_valid(pmd) && !pmd_table(pmd) && (pmd_user(pmd) || pmd_user_exec(pmd)); } -static inline bool pud_user_accessible_page(pud_t pud) +static inline bool pud_user_accessible_page(pud_t pud, unsigned long addr) { return pud_valid(pud) && !pud_table(pud) && (pud_user(pud) || pud_user_exec(pud)); } diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index c938ca241a56..260b77da33b8 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -836,17 +836,17 @@ static inline void set_pud_at(struct mm_struct *mm, unsigned long addr, } #ifdef CONFIG_PAGE_TABLE_CHECK -static inline bool pte_user_accessible_page(pte_t pte) +static inline bool pte_user_accessible_page(pte_t pte, unsigned long addr) { return pte_present(pte) && pte_user(pte); } -static inline bool pmd_user_accessible_page(pmd_t pmd) +static inline bool pmd_user_accessible_page(pmd_t pmd, unsigned long addr) { return pmd_leaf(pmd) && pmd_user(pmd); } -static inline bool pud_user_accessible_page(pud_t pud) +static inline bool pud_user_accessible_page(pud_t pud, unsigned long addr) { return pud_leaf(pud) && pud_user(pud); } diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 6f6c314ae95b..ea6294b605a3 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -1751,17 +1751,17 @@ static inline bool arch_has_hw_nonleaf_pmd_young(void) #endif #ifdef CONFIG_PAGE_TABLE_CHECK -static inline bool pte_user_accessible_page(pte_t pte) +static inline bool pte_user_accessible_page(pte_t pte, unsigned long addr) { return (pte_val(pte) & _PAGE_PRESENT) && (pte_val(pte) & _PAGE_USER); } -static inline bool pmd_user_accessible_page(pmd_t pmd) +static inline bool pmd_user_accessible_page(pmd_t pmd, unsigned long addr) { return pmd_leaf(pmd) && (pmd_val(pmd) & _PAGE_PRESENT) && (pmd_val(pmd) & _PAGE_USER); } -static inline bool pud_user_accessible_page(pud_t pud) +static inline bool pud_user_accessible_page(pud_t pud, unsigned long addr) { return pud_leaf(pud) && (pud_val(pud) & _PAGE_PRESENT) && (pud_val(pud) & _PAGE_USER); } diff --git a/mm/page_table_check.c b/mm/page_table_check.c index 9a4e2b522243..799e0673551d 100644 --- a/mm/page_table_check.c +++ b/mm/page_table_check.c @@ -151,7 +151,7 @@ void __page_table_check_pte_clear(struct mm_struct *mm, unsigned long addr, if (&init_mm == mm) return; - if (pte_user_accessible_page(pte)) { + if (pte_user_accessible_page(pte, addr)) { page_table_check_clear(pte_pfn(pte), PAGE_SIZE >> PAGE_SHIFT); } } @@ -163,7 +163,7 @@ void __page_table_check_pmd_clear(struct mm_struct *mm, unsigned long addr, if (&init_mm == mm) return; - if (pmd_user_accessible_page(pmd)) { + if (pmd_user_accessible_page(pmd, addr)) { page_table_check_clear(pmd_pfn(pmd), PMD_SIZE >> PAGE_SHIFT); } } @@ -175,7 +175,7 @@ void __page_table_check_pud_clear(struct mm_struct *mm, unsigned long addr, if (&init_mm == mm) return; - if (pud_user_accessible_page(pud)) { + if (pud_user_accessible_page(pud, addr)) { page_table_check_clear(pud_pfn(pud), PUD_SIZE >> PAGE_SHIFT); } } @@ -208,7 +208,7 @@ void __page_table_check_ptes_set(struct mm_struct *mm, unsigned long addr, for (i = 0; i < nr; i++) __page_table_check_pte_clear(mm, addr, ptep_get(ptep + i)); - if (pte_user_accessible_page(pte)) + if (pte_user_accessible_page(pte, addr)) page_table_check_set(pte_pfn(pte), nr, pte_write(pte)); } EXPORT_SYMBOL(__page_table_check_ptes_set); @@ -230,7 +230,7 @@ void __page_table_check_pmd_set(struct mm_struct *mm, unsigned long addr, page_table_check_pmd_flags(pmd); __page_table_check_pmd_clear(mm, addr, *pmdp); - if (pmd_user_accessible_page(pmd)) { + if (pmd_user_accessible_page(pmd, addr)) { page_table_check_set(pmd_pfn(pmd), PMD_SIZE >> PAGE_SHIFT, pmd_write(pmd)); } @@ -244,7 +244,7 @@ void __page_table_check_pud_set(struct mm_struct *mm, unsigned long addr, return; __page_table_check_pud_clear(mm, addr, *pudp); - if (pud_user_accessible_page(pud)) { + if (pud_user_accessible_page(pud, addr)) { page_table_check_set(pud_pfn(pud), PUD_SIZE >> PAGE_SHIFT, pud_write(pud)); }