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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CB908C3DA7F for ; Thu, 1 Aug 2024 10:55:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=G8zwKo1vJeCXVNcPUIO30V+QA++T8zr8IARn3SXYY4Y=; b=izXPFXDetAVQNb/+Dn5YeFYk0Y IyPyS03v+S2hWXCxDefM1Z9Z2QTl6Bsg5A66s/ufve3sEGGXrDIwsWFkNgeAyS6lq4oBPmStHd43q cz94Ou/chhQ0vvy+c6N18TRT5g8wBZX2kno9w43f8K5qqx88p6KyKqN8CFO/xlP4s8mQRK0a4lMcZ eLA68M2k2FXEk5U1UpORtbwP78qa+yv0Vmp6E51ruB576FkVeoInMd8OfUcAElzp3Jh0W6iFnoGb3 g3ndQQd1aoejlDaoRsTXzz4CF/QZ7tBgq937jStMHwJ7jj2vT+q0rd+XQF9NRdOuAitaxfsKOZIUP eJ8lo/5A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZTTF-00000004p1J-0kmR; Thu, 01 Aug 2024 10:55:45 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sZTSi-00000004oqZ-27rt for linux-arm-kernel@lists.infradead.org; Thu, 01 Aug 2024 10:55:15 +0000 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 39A931007; Thu, 1 Aug 2024 03:55:37 -0700 (PDT) Received: from e124191.cambridge.arm.com (e124191.cambridge.arm.com [10.1.197.45]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 0C9023F5A1; Thu, 1 Aug 2024 03:55:07 -0700 (PDT) Date: Thu, 1 Aug 2024 11:55:02 +0100 From: Joey Gouly To: Dave Martin 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: <20240801105502.GA841837@e124191.cambridge.arm.com> 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: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240801_035512_669062_FC4DD044 X-CRM114-Status: GOOD ( 22.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Jul 25, 2024 at 04:49:50PM +0100, Dave Martin wrote: > 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? Yeah, (gcc 13.2) produces good code here (this is do_mprotect_pkey after removing a lot of branching): and w0, w0, #0x7 orr x1, x1, x0, lsl #32 > > > > +#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