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 X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F864C433E0 for ; Tue, 26 Jan 2021 13:33:55 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1E0C72247F for ; Tue, 26 Jan 2021 13:33:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 1E0C72247F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=GUeuAlhpFflLvcsMAmsvmB4FWMH+c8agBdcxL+YF7p8=; b=R4DCQYVaZdrn0YoXanPJUemTx fQ8CKg++AQcUqJv/NGKnBi1cOF2eCquUDHSkKYgg4oCT/EwuskNjsWsTDZxc9G9IxVsZXacC+/6D+ CCTCOCchLcaKDVWnF5nf+JvRDgY6qf7VDYwlk8KGq95r7YCgAfrVBJQGwmw7NKYDKZpEmUuaoVvuY JDE9aUigp0rNZAOWf8yUAu8Risa9ydrfaWPvasdt7drvdlWRXyR+D56OGxVuGZ8jAdg3OxtbPYyqq kwWeTS66dNxpdq+d6z6MlD4Tm/Nru1DzwOg5+x0Vp4fkyFExzWZlV+/ZeWs1hEf2prZYzHi7spMD5 eZuyuBMxg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4OS0-0000ar-R7; Tue, 26 Jan 2021 13:32:08 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l4ORy-0000a9-4d for linux-arm-kernel@lists.infradead.org; Tue, 26 Jan 2021 13:32:06 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2DB442247F; Tue, 26 Jan 2021 13:32:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611667925; bh=tFNVMBqMR3R8ZBvlWW7bbg0F8Yt3J8XmLJ81DkCus6M=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=o7q3VaDxYMGi2ixklydrOya7I+AAa+1SqRZ21RrbYeoYlzspfpljSU2enuL/GQyGG 7j3jl7o2GwsJBVHaTYLgIQkKZqzewigfm2DF5b0HDkQPZhJytyt2R0dOjGCp0xPuMe gVvwLMsLJ+xnwbm18XaL8JyYT1h/i6/LIWkCjbPkA1e6tFpB3LjWXJY/8rnbMhJDzl CMV8bbU8nTD1l+MRc1PUDRM3G9toLIqGjoA2ZBOObtZQYhI6pK4PYzJeZNjkZ6UOUg 1Fa+vYUUfXY4uNDMwJQVKAf5QwVQpa8aVfDhxuQOb7fpsSEexTHHee2Q9LNqOm7z+w marLhpONvRK0Q== Date: Tue, 26 Jan 2021 13:32:01 +0000 From: Will Deacon To: Daniel Kiss Subject: Re: [PATCH v2 2/2] arm64: Do not configure kernel's PTR_AUTH key when it not needed. Message-ID: <20210126133200.GG29702@willie-the-truck> References: <26513330-006C-4B28-9123-656CAEB70E1A@arm.com> <20201218115632.59067-1-daniel.kiss@arm.com> <20201218115632.59067-3-daniel.kiss@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201218115632.59067-3-daniel.kiss@arm.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210126_083206_317672_320012C8 X-CRM114-Status: GOOD ( 15.89 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Catalin.Marinas@arm.com, pcc@google.com, Ard.Biesheuvel@arm.com, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Dec 18, 2020 at 12:56:32PM +0100, Daniel Kiss wrote: > If the kernel is not compiled with CONFIG_ARM64_PTR_AUTH_KERNEL, > then no need to install dedicated key for the kernel, user's key > could be left enabled because no PACI/AUTI instructions are expected.. (same comment as before re commit message) > Signed-off-by: Daniel Kiss > --- > arch/arm64/include/asm/asm_pointer_auth.h | 53 +++++++++++++---------- > arch/arm64/include/asm/pointer_auth.h | 20 ++++++--- > arch/arm64/include/asm/processor.h | 2 + > arch/arm64/kernel/asm-offsets.c | 4 ++ > 4 files changed, 51 insertions(+), 28 deletions(-) > > diff --git a/arch/arm64/include/asm/asm_pointer_auth.h b/arch/arm64/include/asm/asm_pointer_auth.h > index 52dead2a8640..b2572a943f59 100644 > --- a/arch/arm64/include/asm/asm_pointer_auth.h > +++ b/arch/arm64/include/asm/asm_pointer_auth.h > @@ -39,27 +39,6 @@ alternative_if ARM64_HAS_GENERIC_AUTH > alternative_else_nop_endif > .endm > > - .macro __ptrauth_keys_install_kernel_nosync tsk, tmp1, tmp2, tmp3 > - mov \tmp1, #THREAD_KEYS_KERNEL > - add \tmp1, \tsk, \tmp1 > - ldp \tmp2, \tmp3, [\tmp1, #PTRAUTH_KERNEL_KEY_APIA] > - msr_s SYS_APIAKEYLO_EL1, \tmp2 > - msr_s SYS_APIAKEYHI_EL1, \tmp3 > - .endm > - > - .macro ptrauth_keys_install_kernel_nosync tsk, tmp1, tmp2, tmp3 > -alternative_if ARM64_HAS_ADDRESS_AUTH > - __ptrauth_keys_install_kernel_nosync \tsk, \tmp1, \tmp2, \tmp3 > -alternative_else_nop_endif > - .endm > - > - .macro ptrauth_keys_install_kernel tsk, tmp1, tmp2, tmp3 > -alternative_if ARM64_HAS_ADDRESS_AUTH > - __ptrauth_keys_install_kernel_nosync \tsk, \tmp1, \tmp2, \tmp3 > - isb > -alternative_else_nop_endif > - .endm > - > .macro __ptrauth_keys_init_cpu tsk, tmp1, tmp2, tmp3 > mrs \tmp1, id_aa64isar1_el1 > ubfx \tmp1, \tmp1, #ID_AA64ISAR1_APA_SHIFT, #8 > @@ -69,7 +48,9 @@ alternative_else_nop_endif > mrs \tmp2, sctlr_el1 > orr \tmp2, \tmp2, \tmp1 > msr sctlr_el1, \tmp2 > +#ifdef CONFIG_ARM64_PTR_AUTH_KERNEL > __ptrauth_keys_install_kernel_nosync \tsk, \tmp1, \tmp2, \tmp3 > +#endif > isb > .Lno_addr_auth\@: > .endm > @@ -82,17 +63,43 @@ alternative_else_nop_endif > .Lno_addr_auth\@: > .endm > > -#else /* CONFIG_ARM64_PTR_AUTH */ > +#else /* !CONFIG_ARM64_PTR_AUTH */ > > .macro ptrauth_keys_install_user tsk, tmp1, tmp2, tmp3 > .endm > > +#endif /* CONFIG_ARM64_PTR_AUTH */ > + > +#ifdef CONFIG_ARM64_PTR_AUTH_KERNEL > + .macro __ptrauth_keys_install_kernel_nosync tsk, tmp1, tmp2, tmp3 > + mov \tmp1, #THREAD_KEYS_KERNEL > + add \tmp1, \tsk, \tmp1 > + ldp \tmp2, \tmp3, [\tmp1, #PTRAUTH_KERNEL_KEY_APIA] > + msr_s SYS_APIAKEYLO_EL1, \tmp2 > + msr_s SYS_APIAKEYHI_EL1, \tmp3 > + .endm > + nit: can you please define these macros at the top of the file, so that they are defined before the macros which use them? Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel