From patchwork Fri Apr 11 05:43:52 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 14047584 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 10E54C36010 for ; Fri, 11 Apr 2025 05:44:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 615D3280170; Fri, 11 Apr 2025 01:44:17 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F41428016F; 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 DE43828016E; 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 76D9E280170 for ; Fri, 11 Apr 2025 01:44:16 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 90154C1D40 for ; Fri, 11 Apr 2025 05:44:16 +0000 (UTC) X-FDA: 83320672512.22.02B06B6 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by imf05.hostedemail.com (Postfix) with ESMTP id 43FA6100007 for ; Fri, 11 Apr 2025 05:44:14 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=cpzi7jHn; spf=pass (imf05.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=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=RRgLMuW9FBdfsLDbO418TaZTwPRgtX9fnAGKx+FMhHo=; b=ZDSgSHhuEBebGn+cok+Rn7EuvLe+Z+tvbqqIne72UTZPEPprWR4IblAi5Tih30Zy7F1iCx 0r0Ft43ZZ90l+3Y0kqspV9j7VjdQaiXhJMWAazvBLPEu1XHZAE63RSs4nUZmoihLxiUzPB YhCZ95rEPTRN5f4HWoHYIejYnffxoIc= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1744350254; a=rsa-sha256; cv=none; b=ZBhRFbVy3X9J7pZwMS7DXPMH1xSOpsUfWacKyPa4NW5Aza4TAC71zziBEz+ACYgeZpCIwV SuGCv3rbrzuPfevr6yjq9TliWo4NsXau8VfTudswCrS3RY0tsIh8qojWWrhs4K4Erx7k7B OnYnpfAOssd06MvvbvruOdyBLLj58dc= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=cpzi7jHn; spf=pass (imf05.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 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 53AMLidX010582; 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=RRgLMuW9FBdfsLDbO 418TaZTwPRgtX9fnAGKx+FMhHo=; b=cpzi7jHnFwlI5AGEiIGn1MZSZ1Z00RIvP gsU+nUo4gbYl2tppaWXB6VpJYbrx8nFGmRxIJ5R5OsxMNxhqShlFQVEdrlkjkcPh d/hP8+hfnQGGjcaUQoDR9/EUN4/z8vfLCdUbSqMqrhzmzVaqc829PS3OwXaM19BE X4WpP6aScb+rhA1R6LCW07mcAGjvmN+lGO0mjWPrn8cgjzH8/EzLkEut0TuuNjVN N82HD9V4WjQbnzc0ZU+DOOxkDJWU2xu1Upypz4D6GMcN65lIYB0NWxBmZXPIvd8E Cw6lcun+NnjXn0xZEje2a6DAHUCUn61Cpkd1NpmDHVNVK573qPH+A== 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 45xfdqkxwt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Apr 2025 05:44:07 +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 53B1qKSq017447; Fri, 11 Apr 2025 05:44:05 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 45uh2m1cvh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 11 Apr 2025 05:44:05 +0000 Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 53B5i4vw30015838 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 11 Apr 2025 05:44:04 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EE42520040; Fri, 11 Apr 2025 05:44:03 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2528D20049; Fri, 11 Apr 2025 05:44:03 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.63.197.14]) by smtpav06.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 81C9760AC7; 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 09/11] powerpc: mm: Implement *_user_accessible_page() for ptes Date: Fri, 11 Apr 2025 15:43:52 +1000 Message-ID: <20250411054354.511145-10-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-GUID: 8yWxrfJXEc3Tb8NWcx8LNkIxPXBoO1vS X-Proofpoint-ORIG-GUID: 8yWxrfJXEc3Tb8NWcx8LNkIxPXBoO1vS 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 malwarescore=0 suspectscore=0 mlxscore=0 priorityscore=1501 adultscore=0 phishscore=0 mlxlogscore=597 impostorscore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2502280000 definitions=main-2504110038 X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: 43FA6100007 X-Stat-Signature: mwn7b7rx3nm67iefbz6dkrpuynw4dipn X-HE-Tag: 1744350254-102195 X-HE-Meta: U2FsdGVkX1/lE4NOjyKtXN1JUrBRoQKfxDdoa1lIiOfKMUmP3BuQjM+p3k8y+9v0SdW2nPqiJSOIlXgL6SdPUDMwSqaqKFnOXNQ7k3as/nbgxm8Z1tz2XT3KVyVekiI/tqRC9vj3bLOWGOEZ2AeKOh6tU+OEO1m12bfiB0p8408244KXZfwntdzQwc2lNGLf+vMGtM6ZO4zJKADYsjEhmmrfWujI2ICyrDRCalQA46OdY+Q07UZiIaMyXwOcPgocJ22AfxqJ3aopLboCP6zKWDbsMEd1VfQaXGXv0FMF3WC6J3PDtl2h0bNU6gMp6NJsFV4JXB9XxmwrEzZFP0yuuoo8h34968zwakwJ6VHto3XEfTYOD+kUqEJ0syeB/BFjUrqUY1zW3zj2EgTIT2uMJB2Gw3xEzMfj6wRsbeRUbs8h15Lsw9Ro4TfUj9zwKEEXkDiWYnnyacuKkhLG2n4BUHl1sJItg8yZKqaD8DyVfworhyJJVoKs7rECRJMkd0bv4AddmgiLcARAUUX3Cmgh39oN7xEkSs0fczzN7YBClCfhBgr++kZ+9hNH3kUskz/opPaAREc3/ad+tp4VG3FnVYtyKf9fJFdYt96dMQhUPMSNNCRG+inX00R0McNTfycX/POJuAo4QACNY+ujkFxJhR6r4Bxfj1/wtCCLHVlEEvOhjuQAYIElKDX8cfelbrDkhhlEzemkpskT4ywHqdNvyOrvGmZ5XE/i4KDF0cAAW9h2ubj2ayrafTtfsW70LiXdHokb93DgfUVL2wy8VtjCOqNnGZ3Nu6k+9Q6QUJbUkxXNJds0gyjVzCZpEJWUeT2ea93EbyKt+tWHg5cNa6nlepSBRyxQm4k4y6XiqiCtibcwmzDmfvfDJdVtfSN2vuZRhWS0tf6Dgf0Nf91EPqhAidhtlBpKtMAJ5wD7Z1VV7SJc6GcLd9aYKNQcaBNdSdk+ZTP0rFOgi5BCOHfr1mM 6HK9ncqK vImbpuvyecMXBvh90lbrxzJmy1EViXlNQUyo1FspXYfFH0jp1g4YXWkI3pMkHEEcZu3JUNPIV0rjaD3dqRtancX07nbe9LK+NqhMZOyDL6NudAZusXoWKMo1fuaQUbCo25s/LSWrY1bOdonms2xORFGMlNLrarDAAyVjHXHfjX2BXLXodJu5LGQ4oZHMuXgDfd4sv7jHXVtY25FaegvuU1i7D/4WcWdi0mDiiOdMUkUjckjpxV969/5zhoCC7+20WFzYfxZfcRz56G3Y7DwxuhPNeYgra+Y3LgE0qDYmUJtL0gvSNmzG3Npg0wbkzoBWByda2AwlASeai4o3yWDYrvzDxLJKrWj2EN8FNBDyJrkHl8d11ViQoOAOXKC8wQ3ch+ZcuRgrzyA2VbagLhJVXfWbSNG44n0BP9clR2qrQXw0reN7751bRhDPUhQ5uisW00rAkqP50M52JPgUuQptAu1HHqIzWVt/5Bhg7 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000010, 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 Page table checking depends on architectures providing an implementation of p{te,md,ud}_user_accessible_page. With refactorisations made on powerpc/mm, the pte_access_permitted() and similar methods verify whether a userland page is accessible with the required permissions. Since page table checking is the only user of p{te,md,ud}_user_accessible_page(), implement these for all platforms, using some of the same preliminary checks taken by pte_access_permitted() on that platform. Since commit 8e9bd41e4ce1 ("powerpc/nohash: Replace pte_user() by pte_read()") pte_user() is no longer required to be present on all platforms as it may be equivalent to or implied by pte_read(). Hence implementations of pte_user_accessible_page() are specialised. Signed-off-by: Rohan McLure Reviewed-by: Pasha Tatashin [ajd: rebase and fix commit message] Signed-off-by: Andrew Donnellan --- arch/powerpc/include/asm/book3s/32/pgtable.h | 5 +++++ arch/powerpc/include/asm/book3s/64/pgtable.h | 17 +++++++++++++++++ arch/powerpc/include/asm/nohash/pgtable.h | 5 +++++ arch/powerpc/include/asm/pgtable.h | 8 ++++++++ 4 files changed, 35 insertions(+) diff --git a/arch/powerpc/include/asm/book3s/32/pgtable.h b/arch/powerpc/include/asm/book3s/32/pgtable.h index 42c3af90d1f0..a2305d850fc9 100644 --- a/arch/powerpc/include/asm/book3s/32/pgtable.h +++ b/arch/powerpc/include/asm/book3s/32/pgtable.h @@ -437,6 +437,11 @@ static inline bool pte_access_permitted(pte_t pte, bool write) return true; } +static inline bool pte_user_accessible_page(pte_t pte, unsigned long addr) +{ + return pte_present(pte) && !is_kernel_addr(addr); +} + /* Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to. * diff --git a/arch/powerpc/include/asm/book3s/64/pgtable.h b/arch/powerpc/include/asm/book3s/64/pgtable.h index 6d98e6f08d4d..754d4d525f0e 100644 --- a/arch/powerpc/include/asm/book3s/64/pgtable.h +++ b/arch/powerpc/include/asm/book3s/64/pgtable.h @@ -540,6 +540,11 @@ static inline bool pte_access_permitted(pte_t pte, bool write) return arch_pte_access_permitted(pte_val(pte), write, 0); } +static inline bool pte_user_accessible_page(pte_t pte, unsigned long addr) +{ + return pte_present(pte) && pte_user(pte); +} + /* * Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to. @@ -1431,5 +1436,17 @@ static inline bool is_pte_rw_upgrade(unsigned long old_val, unsigned long new_va return false; } +#define pmd_user_accessible_page pmd_user_accessible_page +static inline bool pmd_user_accessible_page(pmd_t pmd, unsigned long addr) +{ + return pmd_leaf(pmd) && pte_user_accessible_page(pmd_pte(pmd), addr); +} + +#define pud_user_accessible_page pud_user_accessible_page +static inline bool pud_user_accessible_page(pud_t pud, unsigned long addr) +{ + return pud_leaf(pud) && pte_user_accessible_page(pud_pte(pud), addr); +} + #endif /* __ASSEMBLY__ */ #endif /* _ASM_POWERPC_BOOK3S_64_PGTABLE_H_ */ diff --git a/arch/powerpc/include/asm/nohash/pgtable.h b/arch/powerpc/include/asm/nohash/pgtable.h index 8d1f0b7062eb..1c3dfe2d6cc1 100644 --- a/arch/powerpc/include/asm/nohash/pgtable.h +++ b/arch/powerpc/include/asm/nohash/pgtable.h @@ -243,6 +243,11 @@ static inline bool pte_access_permitted(pte_t pte, bool write) return true; } +static inline bool pte_user_accessible_page(pte_t pte, unsigned long addr) +{ + return pte_present(pte) && !is_kernel_addr(addr); +} + /* Conversion functions: convert a page and protection to a page entry, * and a page entry and page directory to the page they refer to. * diff --git a/arch/powerpc/include/asm/pgtable.h b/arch/powerpc/include/asm/pgtable.h index bb43e4f46367..3cae32c74fed 100644 --- a/arch/powerpc/include/asm/pgtable.h +++ b/arch/powerpc/include/asm/pgtable.h @@ -224,6 +224,14 @@ static inline int pud_pfn(pud_t pud) } #endif +#ifndef pmd_user_accessible_page +#define pmd_user_accessible_page(pmd, addr) false +#endif + +#ifndef pud_user_accessible_page +#define pud_user_accessible_page(pud, addr) false +#endif + #endif /* __ASSEMBLY__ */ #endif /* _ASM_POWERPC_PGTABLE_H */