From patchwork Tue Feb 11 16:14:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Donnellan X-Patchwork-Id: 13969570 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 2AF2AC0219B for ; Tue, 11 Feb 2025 16:15:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ADEC228000E; Tue, 11 Feb 2025 11:15:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A8ED428000D; Tue, 11 Feb 2025 11:15:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8E22B28000E; Tue, 11 Feb 2025 11:15:13 -0500 (EST) 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 647E128000D for ; Tue, 11 Feb 2025 11:15:13 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id E369A80507 for ; Tue, 11 Feb 2025 16:15:12 +0000 (UTC) X-FDA: 83108163264.26.3585A8A Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by imf29.hostedemail.com (Postfix) with ESMTP id 8C2FE12001C for ; Tue, 11 Feb 2025 16:15:10 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=HHoMa0o8; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf29.hostedemail.com: domain of ajd@linux.ibm.com designates 148.163.158.5 as permitted sender) smtp.mailfrom=ajd@linux.ibm.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739290510; a=rsa-sha256; cv=none; b=zyVkAaLASWJJfM6v3KNr2agjh7a9OlBc6SFQujizEWSntbCgi2spNExMOHGQXjlTtzp2PE nTDJ93T0o6cFCCjNfi6qotolGmcBSErMwGOD3v5+MuswCmZgQ5fC5YSeIOlkb5u432vkGp 2WBRgGhs7+fY2WAvEa/YEMSXXdn5Mio= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=ibm.com header.s=pp1 header.b=HHoMa0o8; dmarc=pass (policy=none) header.from=ibm.com; spf=pass (imf29.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=1739290510; 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=Vexylm3S2G+6zB4jqKJH1X6/6o/BLe2jY6/fCFVF7SE=; b=LTNb4qlcrYhhoUSi5jiRZCm8fOlLqYkttE9G6UNWEu4spslaI0QZ1/8eCFb6hCiuKN4oNd iT/WsE3dOW2WZjE9EaPOijRD2tv9hsS+zV/htslgA/xdhiZ1/tsPA6O4JQ6p9Fb2iBs1Er 0xRFcJYaqbKoxlCEqdfAJiMQjI6LnRM= 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 51BFdbrn020762; Tue, 11 Feb 2025 16:15: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=Vexylm3S2G+6zB4jq KJH1X6/6o/BLe2jY6/fCFVF7SE=; b=HHoMa0o8VorS6wYw/bcrGX0TC6fDwjAjN vC2S4qbhpeaQNy2XNsA1YlEfrUmIdO4XkHwyMZMAlNFp/zmS01T9VGGxFJhZUxfm OTVCFChNCZq9G1BKTcbGdYVdQaGL06/CWQsgvIXft3nVbi/BiF/JoRKWyKXTs9kG 1hubV1pHmGh1xAKIJENBjxbusa/5se3e7y83tuIoRzPJ3a6d8UQjZIXIJVWxec5l RxzDgv4ylgWa9yHR4LOmq2P4Ke/GqtBsUvWdyQ9kQ/QYWsUQrxhFzoAZRl01rQQM 1OY+ATtaez12t69mpcJK805CxVFwqlKYi8C9BLyEN/6OSoc43u/OA== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 44r9cu85py-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Feb 2025 16:15:04 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 51BCjcLc021886; Tue, 11 Feb 2025 16:15:03 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 44phksm8d2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 11 Feb 2025 16:15:03 +0000 Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 51BGF1Y321365054 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 11 Feb 2025 16:15:02 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DCC8A20043; Tue, 11 Feb 2025 16:15:01 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 71C062004B; Tue, 11 Feb 2025 16:15:01 +0000 (GMT) Received: from ozlabs.au.ibm.com (unknown [9.63.197.14]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Tue, 11 Feb 2025 16:15:01 +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 20ABE600AE; Wed, 12 Feb 2025 03:14:55 +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 09/11] powerpc: mm: Implement *_user_accessible_page() for ptes Date: Wed, 12 Feb 2025 03:14:02 +1100 Message-ID: <20250211161404.850215-10-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-ORIG-GUID: vlGW9rIfjVbvenzIXU5vwx5D_ZYAnUeE X-Proofpoint-GUID: vlGW9rIfjVbvenzIXU5vwx5D_ZYAnUeE 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 spamscore=0 suspectscore=0 adultscore=0 impostorscore=0 phishscore=0 bulkscore=0 mlxlogscore=516 mlxscore=0 clxscore=1011 lowpriorityscore=0 malwarescore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.19.0-2501170000 definitions=main-2502110106 X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 8C2FE12001C X-Stat-Signature: c6ya9n4di3tzo1ihjkh5rty341ohftby X-Rspam-User: X-HE-Tag: 1739290510-85361 X-HE-Meta: U2FsdGVkX19+fcuNOOlL4mr6Bp2xI6U7l4MyYNzjWioxIrFMPS95pYe7B/ClNeXngxtWOFGe/ZgF6NGA6yCMvcYi7l9nHPfFabudRc5ym7pnRyeJ52i5/dlvI18TtQqV6/uecvec6DgUK/Jg8FhQFTw4E+gBz9mjsYRB75MPkDN/J0fCayvGE+AKTkiIIcf8LGNDKiR9LyEwZyr3vAkfhPkvMjHmK/j6+GMmlCdJT2Tw7FrsVvTeUgHbb+DJ/E6IFCNkwpLakIyoK7yKY2kEim9zZF6TRzs+dMWHEywnu4ZgMF81d/ac5YxKbxqqIdxfDFvGnPNlKBsEEK1o3bGfRGAEW5rIGlt/JO2mKA/YGt8j/0AkyZg672UHmN6T+rwSN+yooYQ0ZKQlj+R9/uqrZFQ9JpnP/CLvilM/VSmiXLtHtVAG8mcz/Krx8bnF/Jii97LznK+eS2qkq7YNG2RH5cwAKeROWgxPyb+Y44TOyz8XwHHTwvygEJs3e4Yqcx09mF5xWpKQQypk0069Et2UGDCHpOmuVA2i2O2gQqdCccGA60rnybogjpCG3fez5izDo3gkWduMiR/glPY+TlBtWyk7LKtT/j059LYnAu5GK62zt3XC5ouICllcyyBL2jxhIOC0ERERpfHzAJaesyM7Cu7O8b9uN07+XFp9RslQKZVOrjbczYNn0BSeAhthdqNrJq/PO4fYW0HuTNHZoTIOnlNTTwdjXGDjaKwFWPrQpjaAivoyYg26piZc03gT39EKG8S3oGUcoLFBePDkpmENTOUXy/8lVBGCcPbngSMYDdoMKcIYYQmVbRJkx+MuybQJGqBK6qbVpniKH5fqfApfUiYLr3La5rac2j479rmia3eahVGUm3ohNUw3kI3GyaMyzoDtXODxq0D4ClH+2NBOBXkA/WNx4/xFvaLBZO0EbMZ/ObVjeiIHWH9f7PcLdI9OomfPbozY5nv/3J7+dlH jbCE8nNV bosfTzs7Awi2QBRtQPHo36/xe9VTOPLpnWV3XvCAYdFBWgE99oQalPrJi+qeHyqRYJDmAfYL/RDR+2ETRCJV6o6nl32KZnVhRtL8mpigFKmJ+UcaiS20ace5IhXnTCUenNVcQ8bGlbLh6Ei/jBIa2H2Mq8MvdOzV88MEu/zigWZgx/bZiNJV2U3npqT6jbYmBC9YiajKYzywXcs45LdumzNDzpFFMP3zN7CMm96B80+hIX68wOchx8EgFBu9VDCe+CKcVxsPK6NIXxRRfkE5L+kk3dpdITjgg8Nzs1p/SB5k9g/EEDwDqAQ+ttjUgsECvRQzT97QcFlZY7DKod8HyspoX+dT/jJEFyrTXwZ8dFVvHROjJkE+Eg2g+v4bKBk60OsQdcRSY/X0mz8otwOmMaJcSyEHq3TIoDH5qSeI4krYPu8sI6Vlh/ct8RV5kh6aSA5BuQjYhOf5exWCSoEKMJvJGEA== 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 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 */