From patchwork Mon Feb 26 10:06:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13571851 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 BC0BAC48BF6 for ; Mon, 26 Feb 2024 10:09:55 +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=EnlhB95+6a5nEa6pM1Y8uu94TqKnJEvhrJVu2azD25o=; b=0TggveF1AThuFj a7vb40O1TxkkSoEZ0ShLtDTLoQLFslKUNrOeGicSon8aXVn4rlVORYlLhowKOrK5RK+7wohyXXUu6 iWlUoozP9xCJtIPTMN9TUbpMqmib0T8++umJHI7vzWVOeSFnvg4M/71NfNFZpLJDnxuxR8P9zUfNe 0XQN0SQZvpm8Wmq3ygBkIX2M7nk4HRKgK52zjpoR3O1coE1IHorhar2b2wrMMkq8A3m7o8V1icqxW gXlJlsjGZV894pdoUakhri+VNorY26C88zfbrDjsOhYORR2mUNFtxPgf2XI1GEtLxryIkSlpBfHhR idLQIRPI5R8SoDa/K7zA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1reXvX-0000000HYQg-0bmA; Mon, 26 Feb 2024 10:09:39 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1reXuC-0000000HXkb-1X6G for linux-arm-kernel@bombadil.infradead.org; Mon, 26 Feb 2024 10:08:26 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=/WIwB460ZzJD+dsE4BnDPiSg8mBbSRDy9zqkG122bss=; b=UQGmt+Qa+7HN/XXK20W6hVluwa XTkLdNTmCv+p5/AX6k/u383B1OaJWfiQEo9h1pNLJlvlHk+ZvAZD3LmsjpYfVehpEJnCmPKl+rGgG OiWMMY0WTpSbT6e0M4CV1AQbmthAXYLeQc78eo5qsPWhOWOJ4RxxJOKbkocBcpK84oicd+q/HjH9D jUdDa/WZ6I/ELJp19rX/uCqdgoFRYdVqMZk323yVX0jcVuSYGef5N1tL9hweZtoPhLiLoyRII5/Bd RzKJPJTIOT9LZqBccNCybw5O7DsV8p4s9i8/8upEW3vBrzti23IOV0u1Aw3jaHuvHDsuv/m8pgFWS 6oJDMEWw==; Received: from sin.source.kernel.org ([2604:1380:40e1:4800::1]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1reXu1-0000000178F-1aE6 for linux-arm-kernel@lists.infradead.org; Mon, 26 Feb 2024 10:08:14 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 16EFDCE1362; Mon, 26 Feb 2024 10:07:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 540F6C433C7; Mon, 26 Feb 2024 10:07:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708942075; bh=vqA6TJBDRvY50fGHqcQfGVUDuzRuFzAfHui2TaG7QnU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lMOn0XltExc2h7i10govRfqq+qo3gmuW0DYCHDNd8vsv8pPFGQtJ+ONIL30ZFsEm+ XwFAQPaa2xi3GE8YMNoIPlkrHCQ9/9JrVMpyMFW8bRCE0qvkfjn+1a1C0JjRLVkHfC UkyxDoDoTBhQiwNGf7nV+5W0PhPYL9M5VP+yRr9pti/DPIvxfjE+LPVBy7Xva6n6zp WWnsQlxhFIUxn0jzmNXwLkpFAN+5HGTwxdxZ5yfNhAwyNrzyJ/QVFGNdyepB/us8rI wRD53YUbTOzbSHgSSo/Y4ovbivKPx6+eP2tGmK7TV6LXj+/K6pvZYitxXcxqAYXG9G mHAASDXVhSKBw== 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 1reXtk-006nQ5-Tq; Mon, 26 Feb 2024 10:07:50 +0000 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 , Will Deacon , Catalin Marinas Subject: [PATCH v2 13/13] KVM: arm64: nv: Advertise support for PAuth Date: Mon, 26 Feb 2024 10:06:01 +0000 Message-Id: <20240226100601.2379693-14-maz@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240226100601.2379693-1-maz@kernel.org> References: <20240226100601.2379693-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, 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-20240226_100807_015110_C5EEBDB0 X-CRM114-Status: GOOD ( 10.60 ) 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). Signed-off-by: Marc Zyngier Reviewed-by: Joey Gouly --- 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: