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 B9D2FC3DA64 for ; Thu, 25 Jul 2024 15:50:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4F3276B0088; Thu, 25 Jul 2024 11:50:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 47BE76B0089; Thu, 25 Jul 2024 11:50:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 31CF66B0092; Thu, 25 Jul 2024 11:50:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 143AC6B0088 for ; Thu, 25 Jul 2024 11:50:00 -0400 (EDT) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id ACDCA1C1211 for ; Thu, 25 Jul 2024 15:49:59 +0000 (UTC) X-FDA: 82378710918.10.01ACF1C Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf20.hostedemail.com (Postfix) with ESMTP id 15A461C0012 for ; Thu, 25 Jul 2024 15:49:57 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=none; spf=pass (imf20.hostedemail.com: domain of Dave.Martin@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=Dave.Martin@arm.com; dmarc=pass (policy=none) header.from=arm.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721922548; 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=ArRLjz7MM7fiGV8xlWJWM7vHjOZhJqcW4vU/tEb+ShU=; b=ith0Ld7Hb8b3KFIB5iG3NDOC7symuOb/vDGx4PZOQ+45OtIMZNll5plsYl9C2qsn8rKkBK 5Mkf7WyCh7YBc4d09rjYhPCrAtNG028n/7VqcgJd+QjH9ePmJkGATM9eD3lkDbgx0SkwZX BGvqq1JRPgNSoP5VoNCq3Ozx4E/9J7Y= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721922548; a=rsa-sha256; cv=none; b=8PLiUZAzDqrSx26r8SsO2mTByePq0n8stwHKs5AiX9hAb15tw7MV0x5W3hgGY4mlh6T2HY xPHr0p4F2iZugqWwEz1y+U7OdEdukZexwkw+0VM7hKHzHlP/Y6UAlPzKBEBlYePSxCaPoB wuTzQGQ6RxNtOmf++iZYVkzX/vj9Lvk= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=none; spf=pass (imf20.hostedemail.com: domain of Dave.Martin@arm.com designates 217.140.110.172 as permitted sender) smtp.mailfrom=Dave.Martin@arm.com; dmarc=pass (policy=none) header.from=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C05D41476; Thu, 25 Jul 2024 08:50:22 -0700 (PDT) Received: from e133380.arm.com (e133380.arm.com [10.1.197.55]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8FEB03F5A1; Thu, 25 Jul 2024 08:49:53 -0700 (PDT) Date: Thu, 25 Jul 2024 16:49:50 +0100 From: Dave Martin To: Joey Gouly Cc: linux-arm-kernel@lists.infradead.org, akpm@linux-foundation.org, aneesh.kumar@kernel.org, aneesh.kumar@linux.ibm.com, bp@alien8.de, broonie@kernel.org, catalin.marinas@arm.com, christophe.leroy@csgroup.eu, dave.hansen@linux.intel.com, hpa@zytor.com, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, maz@kernel.org, mingo@redhat.com, mpe@ellerman.id.au, naveen.n.rao@linux.ibm.com, npiggin@gmail.com, oliver.upton@linux.dev, shuah@kernel.org, szabolcs.nagy@arm.com, tglx@linutronix.de, will@kernel.org, x86@kernel.org, kvmarm@lists.linux.dev Subject: Re: [PATCH v4 13/29] arm64: convert protection key into vm_flags and pgprot values Message-ID: References: <20240503130147.1154804-1-joey.gouly@arm.com> <20240503130147.1154804-14-joey.gouly@arm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240503130147.1154804-14-joey.gouly@arm.com> X-Stat-Signature: 9cni4pguxoy3orqmcs8qk5ymyhe8s1in X-Rspamd-Queue-Id: 15A461C0012 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1721922597-907033 X-HE-Meta: U2FsdGVkX1/JlZMUpcF2VvrhSJi//QmE4rUAewamCts6BNNrfW8U2zhf73JZP7vIieHtZ7z0kpraPOzsPxj3pMO4lm8BC9G1m13t6Ms5dhT50F4o/7cJfid5S9ld7RLCUtk2KzsqK5DQ4P62QQTHZPyaEo7YO7KFFvcJGSIaTkIcgjBAF8DzAk3aIzrKNbud/2myAzp6n7quk+hXG5tYg7i/WGQR2rGXoXi6JRutcY03/bGyCVmANuwRdx/mLZFsel8oC8nBzbOcMd6pvJ7cdUnnAWnGRJSM5y0LyR5po7eYDTwSGvuewwsiK8s3tvEJQn2+3UmUI7wk8q6xDgFRA3gSkSwq+YFvdkXWMYpdaoO7DEyAFdJQHhAe4XUZWYTwiABn1FyoL7H2ZFIzZ4qLeGbng+BFo1Xwb24j46S+hrWmXPyx8pTCfAXktI7tV3XRRUgISIrlLbEhMmlCkE/O8q1HxTJ6rZ8I8v/jkBBci/BHQ9aj+sHPs7FVQp7LfEIQAJZGIx+XThMxx2Z1q2LnRIQ9hA211tGuhq8AFTkKI80+XGb7sBxd6iK525FIrouoJr1t//cfEbwst7hSANl0PaUmcy9UdRTDxDFACPuy5EgH2spv8gCDlw+Kz/1vFJMp6bsAtS6nNNJuGZPNk/wzrTu3uy/YF7op+n9xrt60TxXCkPdfUj56HwsXXN8uWLj5G20KYBrPlCXqZFIf0W/lrCbCByc2OcVlG4z4XxgIQ7h7PdCcxZwfqWp7S9b7oDFtDW7DujVjZCv8jPOWY6zsOZ/Ptf3vFZeeTY3d4jwb17AeJnAWaskriP8GGOXfZ5ZZvnW0/BOIR9SBMTtLuMsBuXlcbPWkEK9pcua+MULCi/ObPfOxTsQgYZgBjreciMqgJCmZyyvkiHEje0KJUcmUZYd8EoF1TIoF0LzI3WnZldV0uN8DM5YeIYlbRpbusuHS2eKlc6OxbgXeYKFMPLw RwMSCAZi NiUpt1kTmYJiXvk3coMoYPQ+LL25NScaGz4oIkNCQAt163uT+8ItTmpIgfCOkIaS8B1ASygEG0/nANeKuWbhGF1YY3ndx2na7ZocpuT8F0pbO3U9tZshuHJGcj7aRq+mAbC5CTQaszOmyyJCk4Le6eMbzEhrAWZ+miQgE6Kt08CEKVnX1VQQsyU0v2dfAE+daXXbQ2Jwh7Vu6gp59GhyBq+u6kVAR+ELO675ORdLM0dom7X5Z9L3KOEZCeIyEW+YCWIEjJb648+IaQNvj1cGjqSkYcjPDXvq1LEOmrf24/YLaotC7orCEQE6dvA== 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, May 03, 2024 at 02:01:31PM +0100, Joey Gouly wrote: > Modify arch_calc_vm_prot_bits() and vm_get_page_prot() such that the pkey > value is set in the vm_flags and then into the pgprot value. > > Signed-off-by: Joey Gouly > Cc: Catalin Marinas > Cc: Will Deacon > --- > arch/arm64/include/asm/mman.h | 8 +++++++- > arch/arm64/mm/mmap.c | 9 +++++++++ > 2 files changed, 16 insertions(+), 1 deletion(-) > > 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; Out of interest, is this as bad as it looks or does the compiler turn it into a shift and mask? > +#endif > + > return ret; > } > #define arch_calc_vm_prot_bits(prot, pkey) arch_calc_vm_prot_bits(prot, pkey) > diff --git a/arch/arm64/mm/mmap.c b/arch/arm64/mm/mmap.c > index 642bdf908b22..86eda6bc7893 100644 > --- a/arch/arm64/mm/mmap.c > +++ b/arch/arm64/mm/mmap.c > @@ -102,6 +102,15 @@ pgprot_t vm_get_page_prot(unsigned long vm_flags) > if (vm_flags & VM_MTE) > prot |= PTE_ATTRINDX(MT_NORMAL_TAGGED); > > +#ifdef CONFIG_ARCH_HAS_PKEYS > + if (vm_flags & VM_PKEY_BIT0) > + prot |= PTE_PO_IDX_0; > + if (vm_flags & VM_PKEY_BIT1) > + prot |= PTE_PO_IDX_1; > + if (vm_flags & VM_PKEY_BIT2) > + prot |= PTE_PO_IDX_2; > +#endif > + Ditto. At least we only have three bits to cope with either way. I'm guessing that these functions are not super-hot path. [...] Cheers ---Dave