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 0AEE1C4167B for ; Thu, 7 Dec 2023 15:11:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 973176B0089; Thu, 7 Dec 2023 10:11:10 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 921F36B0096; Thu, 7 Dec 2023 10:11:10 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7E9396B009B; Thu, 7 Dec 2023 10:11:10 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 68B036B0089 for ; Thu, 7 Dec 2023 10:11:10 -0500 (EST) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 381771C080D for ; Thu, 7 Dec 2023 15:11:10 +0000 (UTC) X-FDA: 81540360300.26.E947EFA Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf28.hostedemail.com (Postfix) with ESMTP id 974BCC0025 for ; Thu, 7 Dec 2023 15:11:07 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of cmarinas@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=cmarinas@kernel.org; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1701961867; a=rsa-sha256; cv=none; b=kHEk4uyco3yWKjmZtTfdQR4TGthwnjhLoqU/CAM5sKHvbF/2qVHucZmhNdhxlJUFhKyNpz b0o1HFEI0G4WLBKdREnkdMQ+qJQfkhYdTXeBvt//MXlRi2IlDE2gJfA8O9pLexhegJqE/N FdvPLBr9MrLJqtqmON7dvgdE0ou1arM= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of cmarinas@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=cmarinas@kernel.org; dmarc=fail reason="SPF not aligned (relaxed), No valid DKIM" header.from=arm.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1701961867; 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-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cROe1A4guBt/UdUCr7LaL9rwY/NKX10kOYmcQsZVAWo=; b=Wtv7HEEWL41TETAxwqOcSdDJnCy9BtP3blDLfW2k0rSKJoAV+Qb93TRAJHB30+cak7xpmf OuUr42OXdIPrP1HpdLdO8sZhxWuCLVWzerqprTtAdma9O3r0MnA7uSQt2nFOMfijlS7Qu2 2eIXjQNqbkx1r2+9C65WocKeTQ7B71k= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id CFE40B827F7; Thu, 7 Dec 2023 15:11:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1AAFCC433C7; Thu, 7 Dec 2023 15:11:01 +0000 (UTC) Date: Thu, 7 Dec 2023 15:10:58 +0000 From: Catalin Marinas To: Joey Gouly Cc: linux-arm-kernel@lists.infradead.org, akpm@linux-foundation.org, aneesh.kumar@linux.ibm.com, broonie@kernel.org, dave.hansen@linux.intel.com, maz@kernel.org, oliver.upton@linux.dev, shuah@kernel.org, will@kernel.org, kvmarm@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org, James Morse , Suzuki K Poulose , Zenghui Yu Subject: Re: [PATCH v3 09/25] arm64: define VM_PKEY_BIT* for arm64 Message-ID: References: <20231124163510.1835740-1-joey.gouly@arm.com> <20231124163510.1835740-10-joey.gouly@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20231124163510.1835740-10-joey.gouly@arm.com> X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 974BCC0025 X-Stat-Signature: 9k848y5n38rbsrfi7zh8g3r479cnra85 X-HE-Tag: 1701961867-413988 X-HE-Meta: U2FsdGVkX18H/5khVg1oaI9qkR9U+5NECUjKirJ1eZWi6HHDrYhvSl20Dv+h5PR+V3rlFFhx9v7woB0x2XtZKcfBhYNhfTFW4q5DtL3hUiDY63Vyz1SFlWyqgbbRn1ptvB/Q8baiq+gNiAmldQe1BnJyYvp5tre3cbINksL8cUSGsUhpqs3gWeGQK+1g6mIH4VkOPDWe9QO+eCQ9DFYBf3SyY8r5Vet6CQndT+KqoINQQ0jTobZc7ar/iEkQmdRN2XWQwjq738NSDxTJv9l7fe3NRpg3tnc/oi99uAr+P2rcsZ3PZqJFRZOVs7xEiq3f5GyKobYjn2011hBElRTkKAFQ7ikwzfzUtRgBrjzJWgyQsGTTomzAOQho8OMUfLekeVDKOrh3RCr3ooccxBojg//sHP/Q1Mb9jKb+74nJE5f+fA5NBz2r5o7wAQoNzFVtQsvNb8W+D61Ifo8wSv5i28NgwKxackGInhGKIJcooqr4jYScNGRVcGodhNlMZouGjmexlCBWzuyaSIacUwA9ujHhcVCEPRImJFpiKrr+QHFetnUFkYHJRLkaZmQAuCVWHYSv/XdsxN4mCwvbBKXlhIDxFViS3qCBvWJlqfIjJ2ua/3KOoljnyPVR43vaWOtSNAhfZMGWMf3MKO4LUWMBaQWko+VAy2NCLS50e78QSTGFSsUCUPEGf+C+HbuHm3oMw7oPQnIHkcm+Vw3JDG9vdHDGrD6Z6v9dP2HrnaepYkZVAy+e9ziH2370ixWjWt887Oy5h3585cn1vxqXjUscULei2vU+g+GsIPhILeP02zx395S6nKGxqWqmB6Lc+6G3KqnzfEinU8jwQ4eQXatWZU8L8Xp9YKiQFWNBzU4KHZuktUk5c++MdBgugnDM+afknorEb4NXARRnQrOdgv2JA8IKIkTq469a8iuQUCW/bik9nHka27Rbir5/Yak2SRgM6HvHs4HIz41l7wokOEu Lg6kdl9M JmNXsD8ER+VrFcParxF7mNWRAySaZRIwn9Bc1YpwXoeMDZ6uiFctRbIp79e1qin9brJP7dCu+9SY8K+cnsvMLaB71bnWnHLe1d9noqAtu6ALXJOGZzeYvH+WqUJ9zqnGz9D++isrPQ0r/sjP+LycyJx2fYrNpRJO7548UODV79QkosNemzdRwyKaaTSLwQt8F+XE292X4vYPJuhS3jA5+3J46E0G4xz9WSPG/Ui8LlU4tOHQoFo6e4p5lVcQDA5D82pasiQHvaBgmGp0wygsVSQ9Q72DHM96iCyd/w3tG7Neyx7Md04trw4ZNNUTtyM5JULlm9Cg9AiW5vHTt+eVfbQ0ZSxRTaIqvGenFu11tFDW+gT8= 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: On Fri, Nov 24, 2023 at 04:34:54PM +0000, Joey Gouly wrote: > arch/arm64/include/asm/mman.h | 8 +++++++- > arch/arm64/include/asm/page.h | 10 ++++++++++ > arch/arm64/mm/mmap.c | 9 +++++++++ > arch/powerpc/include/asm/page.h | 11 +++++++++++ > arch/x86/include/asm/page.h | 10 ++++++++++ > fs/proc/task_mmu.c | 2 ++ > include/linux/mm.h | 13 ------------- > 7 files changed, 49 insertions(+), 14 deletions(-) It might be worth splitting out the powerpc/x86/generic parts into a separate patch. > diff --git a/arch/arm64/include/asm/mman.h b/arch/arm64/include/asm/mman.h > index 5966ee4a6154..ecb2d18dc4d7 100644 > --- a/arch/arm64/include/asm/mman.h > +++ b/arch/arm64/include/asm/mman.h > @@ -7,7 +7,7 @@ > #include > > static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot, > - unsigned long pkey __always_unused) > + unsigned long pkey) > { > unsigned long ret = 0; > > @@ -17,6 +17,12 @@ static inline unsigned long arch_calc_vm_prot_bits(unsigned long prot, > if (system_supports_mte() && (prot & PROT_MTE)) > ret |= VM_MTE; > > +#if defined(CONFIG_ARCH_HAS_PKEYS) > + ret |= pkey & 0x1 ? VM_PKEY_BIT0 : 0; > + ret |= pkey & 0x2 ? VM_PKEY_BIT1 : 0; > + ret |= pkey & 0x4 ? VM_PKEY_BIT2 : 0; > +#endif Is there anywhere that rejects pkey & 8 on arm64? Because with 128-bit PTEs, if we ever support them, we can have 4-bit pkeys. > #define arch_calc_vm_prot_bits(prot, pkey) arch_calc_vm_prot_bits(prot, pkey) > diff --git a/arch/arm64/include/asm/page.h b/arch/arm64/include/asm/page.h > index 2312e6ee595f..aabfda2516d2 100644 > --- a/arch/arm64/include/asm/page.h > +++ b/arch/arm64/include/asm/page.h > @@ -49,6 +49,16 @@ int pfn_is_map_memory(unsigned long pfn); > > #define VM_DATA_DEFAULT_FLAGS (VM_DATA_FLAGS_TSK_EXEC | VM_MTE_ALLOWED) > > +#if defined(CONFIG_ARCH_HAS_PKEYS) > +/* A protection key is a 3-bit value */ > +# define VM_PKEY_SHIFT VM_HIGH_ARCH_BIT_2 > +# define VM_PKEY_BIT0 VM_HIGH_ARCH_2 > +# define VM_PKEY_BIT1 VM_HIGH_ARCH_3 > +# define VM_PKEY_BIT2 VM_HIGH_ARCH_4 > +# define VM_PKEY_BIT3 0 > +# define VM_PKEY_BIT4 0 > +#endif I think we should start from VM_HIGH_ARCH_BIT_0 and just move the VM_MTE, VM_MTE_ALLOWED to VM_HIGH_ARCH_BIT_{4,5}. > diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h > index e5fcc79b5bfb..a5e75ec333ad 100644 > --- a/arch/powerpc/include/asm/page.h > +++ b/arch/powerpc/include/asm/page.h > @@ -330,6 +330,17 @@ static inline unsigned long kaslr_offset(void) > } > > #include > + > +#if defined(CONFIG_ARCH_HAS_PKEYS) > +# define VM_PKEY_SHIFT VM_HIGH_ARCH_BIT_0 > +/* A protection key is a 5-bit value */ > +# define VM_PKEY_BIT0 VM_HIGH_ARCH_0 > +# define VM_PKEY_BIT1 VM_HIGH_ARCH_1 > +# define VM_PKEY_BIT2 VM_HIGH_ARCH_2 > +# define VM_PKEY_BIT3 VM_HIGH_ARCH_3 > +# define VM_PKEY_BIT4 VM_HIGH_ARCH_4 > +#endif /* CONFIG_ARCH_HAS_PKEYS */ > + > #endif /* __ASSEMBLY__ */ > > #endif /* _ASM_POWERPC_PAGE_H */ > diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h > index d18e5c332cb9..b770db1a21e7 100644 > --- a/arch/x86/include/asm/page.h > +++ b/arch/x86/include/asm/page.h > @@ -87,5 +87,15 @@ static __always_inline u64 __is_canonical_address(u64 vaddr, u8 vaddr_bits) > > #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA > > +#if defined(CONFIG_ARCH_HAS_PKEYS) > +# define VM_PKEY_SHIFT VM_HIGH_ARCH_BIT_0 > +/* A protection key is a 4-bit value */ > +# define VM_PKEY_BIT0 VM_HIGH_ARCH_0 > +# define VM_PKEY_BIT1 VM_HIGH_ARCH_1 > +# define VM_PKEY_BIT2 VM_HIGH_ARCH_2 > +# define VM_PKEY_BIT3 VM_HIGH_ARCH_3 > +# define VM_PKEY_BIT4 0 > +#endif /* CONFIG_ARCH_HAS_PKEYS */ Rather than moving these to arch code, we could instead keep the generic definitions with some additional CONFIG_ARCH_HAS_PKEYS_{3,4,5}BIT selected from the arch code. -- Catalin