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 36555C55164 for ; Thu, 30 Jul 2026 07:11:46 +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:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=6Wkw5ZKNMjRbwNS1o7cxYnLYMeMkPTyLGWptsJzKzSw=; b=bT0r/hRTFTQKujnDNdLyd+z2+G wTiI5sGi7mWCK2iPcnSgbCQ3f/rzyHK1WInoaXBRiGiHaOodHsEBFlmQlJhNeFShZoVgavFxYi6Vu vOQUFsg6B7XPAwvliN8dQxhNAgpXKGSxEM5yDS9KgeP31Q3AAKHMfVritM2MIvDaIAJ0BGFBYILTR A1h7E+hpsmTn8IhL1iVo2CmCKuMHe5dUKsnLViTrCgfHv9RIPwKHkZqXthfW5/sfLnwmu4CR6l1o7 VmBJKJ9kuUI2x2x25d6RIaigWd9lfkgAjq0UMolI6Pyomz8jO93A7TKu5a4EizXr/yfZ2QInIe9ef uZuKkbbQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wpKvY-00000009gfv-3zwz; Thu, 30 Jul 2026 07:11:36 +0000 Received: from sea.source.kernel.org ([2600:3c0a:e001:78e:0:1991:8:25]) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wpKuq-00000009gLw-3dAK for linux-arm-kernel@lists.infradead.org; Thu, 30 Jul 2026 07:10:52 +0000 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by sea.source.kernel.org (Postfix) with ESMTP id 8EC0643FB0; Thu, 30 Jul 2026 07:10:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 714611F01558; Thu, 30 Jul 2026 07:10:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785395452; bh=6Wkw5ZKNMjRbwNS1o7cxYnLYMeMkPTyLGWptsJzKzSw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JVdcIrX8Eh9DHVwN4ZrwthhwTorvNfqjACLChcsBSqXXhJ7hKqFRg2KVhVcN22v7n hG3Dxs0ERoSaT5X3lnOWR7c8AK4ylautjUJGGkmTDr39YHh6FyYqv5s7rDnHexgrOU 7D7O3pJV++bvBJdYHwpdd1qJJjvg+hSNttnsqUNwlprnT6VEMCpOhxHmH9neKwWyUb fslduP0k+Do47rVjnSQR0mFPzGI74oIlPzNJec8CKVToE2DQRvTdRDe9JETTFXyhbC RQR+TbXBaMP0IHiNEUqo8lnwdrrh/KEAPNLck62uKvRPJ0ThC7S68RdNqt+xTZ3qbg Hj4GXPwDd2TYA== 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.98.2) (envelope-from ) id 1wpKuo-0000000AOpW-3Ac4; Thu, 30 Jul 2026 07:10:50 +0000 From: Marc Zyngier To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org Cc: Steffen Eiden , Joey Gouly , Suzuki K Poulose , Oliver Upton , Zenghui Yu , Yao Yuan , Wei-Lin Chang , Vladimir Murzin Subject: [PATCH v4 11/29] KVM: arm64: Expose FEAT_NV2p1 to NV guests Date: Thu, 30 Jul 2026 08:10:04 +0100 Message-ID: <20260730071022.296811-12-maz@kernel.org> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260730071022.296811-1-maz@kernel.org> References: <20260730071022.296811-1-maz@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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, seiden@linux.ibm.com, joey.gouly@arm.com, suzuki.poulose@arm.com, oupton@kernel.org, yuzenghui@huawei.com, yaoyuan@linux.alibaba.com, weilin.chang@arm.com, vladimir.murzin@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-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 Since NV2p1 is reducing the number of traps, it is valuable to expose it to NV guests. Do so. Reviewed-by: Yuan Yao Signed-off-by: Marc Zyngier --- arch/arm64/kvm/nested.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kvm/nested.c b/arch/arm64/kvm/nested.c index dfb96edbdc43c..35a1c42ad3f84 100644 --- a/arch/arm64/kvm/nested.c +++ b/arch/arm64/kvm/nested.c @@ -1728,7 +1728,7 @@ u64 limit_nv_id_reg(struct kvm *kvm, u32 reg, u64 val) * You get EITHER * * - FEAT_VHE without FEAT_E2H0 - * - FEAT_NV limited to FEAT_NV2 + * - FEAT_NV limited to FEAT_NV2(p1) * - HCR_EL2.NV1 being RES0 * * OR @@ -1740,7 +1740,11 @@ u64 limit_nv_id_reg(struct kvm *kvm, u32 reg, u64 val) if (test_bit(KVM_ARM_VCPU_HAS_EL2_E2H0, kvm->arch.vcpu_features)) { val = 0; } else { - val = SYS_FIELD_PREP_ENUM(ID_AA64MMFR4_EL1, NV_frac, NV2_ONLY); + val &= ID_AA64MMFR4_EL1_NV_frac; + if (cpus_have_final_cap(ARM64_HAS_NV2P1)) + val = ID_REG_LIMIT_FIELD_ENUM(val, ID_AA64MMFR4_EL1, NV_frac, NV2P1); + else + val = SYS_FIELD_PREP_ENUM(ID_AA64MMFR4_EL1, NV_frac, NV2_ONLY); val |= SYS_FIELD_PREP_ENUM(ID_AA64MMFR4_EL1, E2H0, NI_NV1); } break; -- 2.47.3