From patchwork Fri Apr 19 10:29:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13636256 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 100DFC4345F for ; Fri, 19 Apr 2024 11:31:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=N8AiL2IXTbfPcsvULXaN9cHCYPdora/TH4RjB8ttbkk=; b=Ot1qcBl22LIZ3Z aAnWRQOpGUW6vrBPcXvd3erMpYoTYcbwOe8FsiExwJGrN7cRNBm8bdEezyFaPBccts2mZJVr0Y2wv Qvx5AybU5nl2K+nZ0Ei6izmyhz7Ur4mY40Q8aiGG7VqoYj1Uvs9p1v0nxgbgpff5xPCrxbEQicoyA cpsduFGlzibTji0o3ODia9K39tpeHfAnLsuR+DD5W7LZxGjMfZRQ5UbaX07QavK3r4a6n6uLbFfjo Mr/IH0B4motJ6JuXu3Elpl9xrN40j0X6wynIT1IxGiggPmMPP8/aBfJoMYzFXFQWOqFjfnhNrYqRv mA/tpwP80stSa9fWj9eg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxmSn-00000005TAJ-3794; Fri, 19 Apr 2024 11:31:29 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rxlVE-00000005IrU-3qMa for linux-arm-kernel@lists.infradead.org; Fri, 19 Apr 2024 10:29:59 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 0EC766195F; Fri, 19 Apr 2024 10:29:54 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D03F7C2BD10; Fri, 19 Apr 2024 10:29:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1713522593; bh=fPLc3qnVR/fPZ7T4iKNF6Hx6H3w34KByeZbhDFUklq8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ebYp/sJG/Z5LQzPUd0RTiBK4UBUNHzokxAQq+7BWqofpMylN+zKlnUoeOam8+OD/S RczkYsGsDiXx1xge6RVRPcTfjMFOn9hMl00sWXGrVDH12+UeGq0eVFqg32sC1WGrw0 oCpTT9MS8D9G8g21iUX6aBX5EoAJaqZl75zxWayNymV1mskS8IOT/94lkzdzwMRf98 xQDOvFq88NhOPI53Z0khU/sK/Q2GcZOy4fHjHmW363dIMvyTCfcpvpYeGBJB0usNkP JAWjh8Ymcwm0p4o0YympCI971kqc4qyBQWT4voSPwNUqeZ8gLQG5aTk35e21mcUwsH ej0+Y5D9IxcEw== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rxlVA-00636W-3b; Fri, 19 Apr 2024 11:29:52 +0100 From: Marc Zyngier To: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Joey Gouly , Fuad Tabba , Mostafa Saleh , Will Deacon , Catalin Marinas Subject: [PATCH v4 14/15] KVM: arm64: nv: Advertise support for PAuth Date: Fri, 19 Apr 2024 11:29:34 +0100 Message-Id: <20240419102935.1935571-15-maz@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240419102935.1935571-1-maz@kernel.org> References: <20240419102935.1935571-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.linux.dev, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com, joey.gouly@arm.com, tabba@google.com, smostafa@google.com, will@kernel.org, catalin.marinas@arm.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240419_032957_211834_2A89C1FE X-CRM114-Status: GOOD ( 11.20 ) 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 Now that we (hopefully) correctly handle ERETAx, drop the masking of the PAuth feature (something that was not even complete, as APA3 and AGA3 were still exposed). Reviewed-by: Joey Gouly Signed-off-by: Marc Zyngier --- arch/arm64/kvm/nested.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index ced30c90521a..6813c7c7f00a 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c @@ -35,13 +35,9 @@ static u64 limit_nv_id_reg(u32 id, u64 val) break; case SYS_ID_AA64ISAR1_EL1: - /* Support everything but PtrAuth and Spec Invalidation */ + /* Support everything but Spec Invalidation */ val &= ~(GENMASK_ULL(63, 56) | - NV_FTR(ISAR1, SPECRES) | - NV_FTR(ISAR1, GPI) | - NV_FTR(ISAR1, GPA) | - NV_FTR(ISAR1, API) | - NV_FTR(ISAR1, APA)); + NV_FTR(ISAR1, SPECRES)); break; case SYS_ID_AA64PFR0_EL1: