From patchwork Tue May 28 10:06:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13676422 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 F4026C25B78 for ; Tue, 28 May 2024 10:07:11 +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=OkqmGwp5DNN2LQR/gcJJSZB3CtkuXgAD0zzSPt38jiY=; b=lpn4Rvl9Ssio/d T3B+4DT48EhzlinH2gTfWYv4Yg2XiDh4VIJ+ApU9YxbaGVpvB53aKnPQtO0SWe/I6KFYTy08J/YNJ Q7byTYZApwwyNr57M19bzNsjthGBb7hW5PfN+ZfT3zGuiAOnfZVL7YRNEGph+FZjw2FJv2wbrSnHK vpIoyCZWSeGUWolr2Kk31Wb8T2N0GYWfG9DAAxlTMe6ghrFNC7pH1n/YHnVyY7z0qRNm+LuN+2IDf uNOyAu1AY0Oq3KSHFM4eMutZajFDV3E9BD0wo027TtbTG7GxLHB6EtLKYY3YJfUVvaYaHpiFzqt6s Efl558g16SIjoBsKNLwg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sBtjP-000000009YQ-3Xqi; Tue, 28 May 2024 10:06:59 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sBtjG-000000009Us-1o6x for linux-arm-kernel@lists.infradead.org; Tue, 28 May 2024 10:06:51 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 9CB1461E43; Tue, 28 May 2024 10:06:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53F59C32781; Tue, 28 May 2024 10:06:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1716890809; bh=yLKxPsfVUrnjvhtPXA7gFp6zdgd0T66pRYoAQcmZlfY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t+FfRFRlmYNX3hiRUF2bFhYz9CLruH8MMvqdFJiTAxKxUz2pv0/6GcaBzGatxsOJ8 PQTeoEoqZZr9w0bJYNbOReZIOVwQOdfPQPM6oiZhdzbSkWY5HlrOHjoL/bgomblZRp NPUZP6o3KNQeKSssWxUBr5KSJcplwIYLs8o2oWrt7/bgA1R4BGMWMVZx0L6mrPiwsg RYkn6CaWY1j2IPuwkScUVMGN4P94U5IJcFTevsi8WiH5C9gJD7b92DqVws9IK1gSrZ XK8ElbzrrmPboh+gUyBHQt4QZCvke6JM2BSewNK/Ji5Dzy++U+Iw1obQyo1gJoe2O5 eJq5GaT0fiuWw== 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 1sBtjD-00GFdz-7C; Tue, 28 May 2024 11:06:47 +0100 From: Marc Zyngier To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Cc: James Morse , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Joey Gouly Subject: [PATCH 2/2] KVM: arm64: nv: Expose BTI and CSV_frac to a guest hypervisor Date: Tue, 28 May 2024 11:06:32 +0100 Message-Id: <20240528100632.1831995-3-maz@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240528100632.1831995-1-maz@kernel.org> References: <20240528100632.1831995-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, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, james.morse@arm.com, suzuki.poulose@arm.com, oliver.upton@linux.dev, yuzenghui@huawei.com, joey.gouly@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-20240528_030650_593996_84159C87 X-CRM114-Status: GOOD ( 11.51 ) 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 expose PAC to NV guests, we can also expose BTI (as the two as joined at the hip, due to some of the PAC instructions being landing pads). While we're at it, also propagate CSV_frac, which requires no particular emulation. Fixes: f4f6a95bac49 ("KVM: arm64: nv: Advertise support for PAuth") Signed-off-by: Marc Zyngier --- arch/arm64/kvm/nested.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index 6813c7c7f00a..bae8536cbf00 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c @@ -58,8 +58,10 @@ static u64 limit_nv_id_reg(u32 id, u64 val) break; case SYS_ID_AA64PFR1_EL1: - /* Only support SSBS */ - val &= NV_FTR(PFR1, SSBS); + /* Only support BTI, SSBS, CSV2_frac */ + val &= (NV_FTR(PFR1, BT) | + NV_FTR(PFR1, SSBS) | + NV_FTR(PFR1, CSV2_frac)); break; case SYS_ID_AA64MMFR0_EL1: