* [PATCH v2 0/2] KVM: arm64: Fix inverted E2H0 check for HCR_EL2.NV1
@ 2026-11-17 20:45 Colton Lewis
2026-11-17 20:45 ` [PATCH v2 1/2] " Colton Lewis
2026-11-17 20:45 ` [PATCH v2 2/2] KVM: arm64: selftests: Verify HCR_EL2.NV1 is RES0 when E2H0 is NI_NV1 Colton Lewis
0 siblings, 2 replies; 5+ messages in thread
From: Colton Lewis @ 2026-11-17 20:45 UTC (permalink / raw)
To: Marc Zyngier, Oliver Upton
Cc: Leonardo Bras, Joey Gouly, Suzuki K Poulose, Zenghui Yu,
Fuad Tabba, kvmarm, linux-arm-kernel, kvm, linux-kernel,
Colton Lewis
When commit b2a324ff01fe ("KVM: arm64: Use HCR_EL2 feature map to drive
fixed-value bits") migrated HCR_EL2 fixed-bit masking to hcr_feat_map,
feat_nv2_e2h0_ni() was written as !kvm_has_feat(kvm, FEAT_E2H0). Because
ID_AA64MMFR4_EL1.E2H0 is a signed 4-bit field where IMP is 0, NI is -1,
and NI_NV1 is -2, !kvm_has_feat(kvm, FEAT_E2H0) tests E2H0 < 0 and
returns true for NI_NV1 (-2), leaving HCR_EL2.NV1 writable instead of
RES0 for VHE-only nested guests (and conversely treating HCR_EL2.NV1 as
RES0 when E2H0 is IMP).
Patch 1 restores the check to kvm_has_feat(kvm, ID_AA64MMFR4_EL1, E2H0,
NI) (E2H0 >= -1) so that HCR_EL2.NV1 is implemented for IMP and NI and
forced to RES0 for NI_NV1, and renames the helper from
feat_nv2_e2h0_ni() to feat_nv2_nv1_not_res0().
Patch 2 extends the arm64 hello_el2 selftest to verify via
KVM_SET_ONE_REG and KVM_GET_ONE_REG that HCR_EL2.E2H remains RES1 and
HCR_EL2.NV1 remains RES0 when E2H0 is NI_NV1.
Changes in v2:
- Rename feat_nv2_e2h0_ni() to feat_nv2_nv1_not_res0() to match the
condition it checks (Leonardo).
- Drop the guest EL2 MSR/MRS HCR_EL2 check in hello_el2, as RESx
read-back from the guest is not architecturally guaranteed to return
the effective value and ID_AA64MMFR4_EL1 reads do not necessarily
trap without FEAT_FGT (Marc).
- Link to v1: https://lore.kernel.org/r/20261116200418.3535619-1-coltonlewis@google.com
Colton Lewis (2):
KVM: arm64: Fix inverted E2H0 check for HCR_EL2.NV1
KVM: arm64: selftests: Verify HCR_EL2.NV1 is RES0 when E2H0 is NI_NV1
arch/arm64/kvm/config.c | 7 ++++---
tools/testing/selftests/kvm/arm64/hello_el2.c | 8 ++++++++
2 files changed, 12 insertions(+), 3 deletions(-)
base-commit: aebb7274476403040d582c61478df8f4a7bf9cd3
--
2.56.1.750.gf70dc682cf-goog
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2 1/2] KVM: arm64: Fix inverted E2H0 check for HCR_EL2.NV1 2026-11-17 20:45 [PATCH v2 0/2] KVM: arm64: Fix inverted E2H0 check for HCR_EL2.NV1 Colton Lewis @ 2026-11-17 20:45 ` Colton Lewis 2026-11-17 22:46 ` Oliver Upton 2026-11-17 20:45 ` [PATCH v2 2/2] KVM: arm64: selftests: Verify HCR_EL2.NV1 is RES0 when E2H0 is NI_NV1 Colton Lewis 1 sibling, 1 reply; 5+ messages in thread From: Colton Lewis @ 2026-11-17 20:45 UTC (permalink / raw) To: Marc Zyngier, Oliver Upton Cc: Leonardo Bras, Joey Gouly, Suzuki K Poulose, Zenghui Yu, Fuad Tabba, kvmarm, linux-arm-kernel, kvm, linux-kernel, Colton Lewis ID_AA64MMFR4_EL1.E2H0 is a signed 4-bit field where: - 0b0000 (IMP, 0): FEAT_E2H0 is implemented. - 0b1111 (NI, -1): FEAT_E2H0 is not implemented, except HCR_EL2.NV1 is implemented. - 0b1110 (NI_NV1, -2): Neither HCR_EL2.E2H == 0 nor HCR_EL2.NV1 is implemented, and HCR_EL2.NV1 is RES0. Prior to commit b2a324ff01fe ("KVM: arm64: Use HCR_EL2 feature map to drive fixed-value bits"), kvm_init_nv_sysregs() marked HCR_EL2.NV1 as RES0 when !kvm_has_feat(kvm, ID_AA64MMFR4_EL1, E2H0, NI), i.e., when the signed E2H0 field is less than NI (-1), which matches NI_NV1 (-2). When converting HCR_EL2 to the feature map, feat_nv2_e2h0_ni() was written as !kvm_has_feat(kvm, FEAT_E2H0), where FEAT_E2H0 checks E2H0 >= IMP (0). This inverted the condition: feat_nv2_e2h0_ni() evaluates to true when E2H0 < 0 (including NI_NV1), leaving HCR_EL2.NV1 writable instead of RES0 for VHE-only nested guests where KVM advertises ID_AA64MMFR4_EL1.E2H0 = NI_NV1. Check kvm_has_feat(kvm, ID_AA64MMFR4_EL1, E2H0, NI) so that HCR_EL2.NV1 is treated as implemented only when E2H0 is IMP or NI, and forced to RES0 when E2H0 is NI_NV1. Rename the helper from feat_nv2_e2h0_ni() to feat_nv2_nv1_not_res0() to clearly reflect what it tests. Fixes: b2a324ff01fe ("KVM: arm64: Use HCR_EL2 feature map to drive fixed-value bits") Signed-off-by: Colton Lewis <coltonlewis@google.com> --- arch/arm64/kvm/config.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kvm/config.c b/arch/arm64/kvm/config.c index adaf26ab93b85..a975ac73ed876 100644 --- a/arch/arm64/kvm/config.c +++ b/arch/arm64/kvm/config.c @@ -256,9 +256,10 @@ static bool feat_nv2(struct kvm *kvm) kvm_has_feat(kvm, ID_AA64MMFR2_EL1, NV, NV2)); } -static bool feat_nv2_e2h0_ni(struct kvm *kvm) +static bool feat_nv2_nv1_not_res0(struct kvm *kvm) { - return feat_nv2(kvm) && !kvm_has_feat(kvm, FEAT_E2H0); + return feat_nv2(kvm) && + kvm_has_feat(kvm, ID_AA64MMFR4_EL1, E2H0, NI); } static bool feat_rasv1p1(struct kvm *kvm) @@ -1034,7 +1035,7 @@ static const struct reg_bits_to_feat_map hcr_feat_map[] = { HCR_EL2_NV2 | HCR_EL2_NV, feat_nv2), - NEEDS_FEAT(HCR_EL2_NV1, feat_nv2_e2h0_ni), /* Missing from JSON */ + NEEDS_FEAT(HCR_EL2_NV1, feat_nv2_nv1_not_res0), /* Missing from JSON */ NEEDS_FEAT(HCR_EL2_API | HCR_EL2_APK, feat_pauth), -- 2.56.1.750.gf70dc682cf-goog ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2] KVM: arm64: Fix inverted E2H0 check for HCR_EL2.NV1 2026-11-17 20:45 ` [PATCH v2 1/2] " Colton Lewis @ 2026-11-17 22:46 ` Oliver Upton 0 siblings, 0 replies; 5+ messages in thread From: Oliver Upton @ 2026-11-17 22:46 UTC (permalink / raw) To: Colton Lewis Cc: Marc Zyngier, Leonardo Bras, Joey Gouly, Suzuki K Poulose, Zenghui Yu, Fuad Tabba, kvmarm, linux-arm-kernel, kvm, linux-kernel On Tue, Nov 17, 2026 at 08:45:34PM +0000, Colton Lewis wrote: > ID_AA64MMFR4_EL1.E2H0 is a signed 4-bit field where: > - 0b0000 (IMP, 0): FEAT_E2H0 is implemented. > - 0b1111 (NI, -1): FEAT_E2H0 is not implemented, except HCR_EL2.NV1 > is implemented. > - 0b1110 (NI_NV1, -2): Neither HCR_EL2.E2H == 0 nor HCR_EL2.NV1 is > implemented, and HCR_EL2.NV1 is RES0. > > Prior to commit b2a324ff01fe ("KVM: arm64: Use HCR_EL2 feature map to > drive fixed-value bits"), kvm_init_nv_sysregs() marked HCR_EL2.NV1 as > RES0 when !kvm_has_feat(kvm, ID_AA64MMFR4_EL1, E2H0, NI), i.e., when the > signed E2H0 field is less than NI (-1), which matches NI_NV1 (-2). > > When converting HCR_EL2 to the feature map, feat_nv2_e2h0_ni() was > written as !kvm_has_feat(kvm, FEAT_E2H0), where FEAT_E2H0 checks > E2H0 >= IMP (0). This inverted the condition: feat_nv2_e2h0_ni() > evaluates to true when E2H0 < 0 (including NI_NV1), leaving HCR_EL2.NV1 > writable instead of RES0 for VHE-only nested guests where KVM advertises > ID_AA64MMFR4_EL1.E2H0 = NI_NV1. > > Check kvm_has_feat(kvm, ID_AA64MMFR4_EL1, E2H0, NI) so that HCR_EL2.NV1 > is treated as implemented only when E2H0 is IMP or NI, and forced to > RES0 when E2H0 is NI_NV1. Rename the helper from feat_nv2_e2h0_ni() to > feat_nv2_nv1_not_res0() to clearly reflect what it tests. > > Fixes: b2a324ff01fe ("KVM: arm64: Use HCR_EL2 feature map to drive fixed-value bits") > Signed-off-by: Colton Lewis <coltonlewis@google.com> > --- > arch/arm64/kvm/config.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/kvm/config.c b/arch/arm64/kvm/config.c > index adaf26ab93b85..a975ac73ed876 100644 > --- a/arch/arm64/kvm/config.c > +++ b/arch/arm64/kvm/config.c > @@ -256,9 +256,10 @@ static bool feat_nv2(struct kvm *kvm) > kvm_has_feat(kvm, ID_AA64MMFR2_EL1, NV, NV2)); > } > > -static bool feat_nv2_e2h0_ni(struct kvm *kvm) > +static bool feat_nv2_nv1_not_res0(struct kvm *kvm) > { > - return feat_nv2(kvm) && !kvm_has_feat(kvm, FEAT_E2H0); > + return feat_nv2(kvm) && > + kvm_has_feat(kvm, ID_AA64MMFR4_EL1, E2H0, NI); > } This could benefit from a comment, because testing for NI as a feature is very misleading. Also, I don't why this needs to spill onto another line. /* * The E2H0 field is a 'negative' feature field, where a value * of -1 implies FEAT_E2H0 is not implemented but does not * restrict the use of HCR_EL2.NV1. */ return feat_nv2(kvm) && kvm_has_feat(kvm, ID_AA64MMFR4_EL1, E2H0, NI); Thanks, Oliver ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 2/2] KVM: arm64: selftests: Verify HCR_EL2.NV1 is RES0 when E2H0 is NI_NV1 2026-11-17 20:45 [PATCH v2 0/2] KVM: arm64: Fix inverted E2H0 check for HCR_EL2.NV1 Colton Lewis 2026-11-17 20:45 ` [PATCH v2 1/2] " Colton Lewis @ 2026-11-17 20:45 ` Colton Lewis 2026-11-17 22:49 ` Oliver Upton 1 sibling, 1 reply; 5+ messages in thread From: Colton Lewis @ 2026-11-17 20:45 UTC (permalink / raw) To: Marc Zyngier, Oliver Upton Cc: Leonardo Bras, Joey Gouly, Suzuki K Poulose, Zenghui Yu, Fuad Tabba, kvmarm, linux-arm-kernel, kvm, linux-kernel, Colton Lewis In a VHE-only EL2 guest (KVM_ARM_VCPU_HAS_EL2 without KVM_ARM_VCPU_HAS_EL2_E2H0), KVM advertises ID_AA64MMFR4_EL1.E2H0 as NI_NV1, making HCR_EL2.E2H RES1 and HCR_EL2.NV1 RES0. Extend hello_el2 to attempt clearing HCR_EL2.E2H and setting HCR_EL2.NV1 from userspace via KVM_SET_ONE_REG, verifying that HCR_EL2.E2H remains RES1 and HCR_EL2.NV1 is masked to RES0. Signed-off-by: Colton Lewis <coltonlewis@google.com> --- tools/testing/selftests/kvm/arm64/hello_el2.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/testing/selftests/kvm/arm64/hello_el2.c b/tools/testing/selftests/kvm/arm64/hello_el2.c index bbe6862c6ab16..5910497f8fbe4 100644 --- a/tools/testing/selftests/kvm/arm64/hello_el2.c +++ b/tools/testing/selftests/kvm/arm64/hello_el2.c @@ -45,6 +45,7 @@ int main(void) struct kvm_vcpu *vcpu; struct kvm_vm *vm; struct ucall uc; + u64 hcr; TEST_REQUIRE(kvm_check_cap(KVM_CAP_ARM_EL2)); @@ -66,6 +67,13 @@ int main(void) TEST_FAIL("Unhandled ucall: %ld\n", uc.cmd); } + hcr = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_HCR_EL2)); + vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_HCR_EL2), + (hcr & ~HCR_EL2_E2H) | HCR_EL2_NV1); + hcr = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_HCR_EL2)); + TEST_ASSERT(hcr & HCR_EL2_E2H, "HCR_EL2.E2H should be RES1"); + TEST_ASSERT(!(hcr & HCR_EL2_NV1), "HCR_EL2.NV1 should be RES0"); + kvm_vm_free(vm); return 0; } -- 2.56.1.750.gf70dc682cf-goog ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2] KVM: arm64: selftests: Verify HCR_EL2.NV1 is RES0 when E2H0 is NI_NV1 2026-11-17 20:45 ` [PATCH v2 2/2] KVM: arm64: selftests: Verify HCR_EL2.NV1 is RES0 when E2H0 is NI_NV1 Colton Lewis @ 2026-11-17 22:49 ` Oliver Upton 0 siblings, 0 replies; 5+ messages in thread From: Oliver Upton @ 2026-11-17 22:49 UTC (permalink / raw) To: Colton Lewis Cc: Marc Zyngier, Leonardo Bras, Joey Gouly, Suzuki K Poulose, Zenghui Yu, Fuad Tabba, kvmarm, linux-arm-kernel, kvm, linux-kernel On Tue, Nov 17, 2026 at 08:45:35PM +0000, Colton Lewis wrote: > In a VHE-only EL2 guest (KVM_ARM_VCPU_HAS_EL2 without > KVM_ARM_VCPU_HAS_EL2_E2H0), KVM advertises ID_AA64MMFR4_EL1.E2H0 as > NI_NV1, making HCR_EL2.E2H RES1 and HCR_EL2.NV1 RES0. > > Extend hello_el2 to attempt clearing HCR_EL2.E2H and setting HCR_EL2.NV1 > from userspace via KVM_SET_ONE_REG, verifying that HCR_EL2.E2H remains > RES1 and HCR_EL2.NV1 is masked to RES0. > > Signed-off-by: Colton Lewis <coltonlewis@google.com> > --- > tools/testing/selftests/kvm/arm64/hello_el2.c | 8 ++++++++ > 1 file changed, 8 insertions(+) > > diff --git a/tools/testing/selftests/kvm/arm64/hello_el2.c b/tools/testing/selftests/kvm/arm64/hello_el2.c > index bbe6862c6ab16..5910497f8fbe4 100644 > --- a/tools/testing/selftests/kvm/arm64/hello_el2.c > +++ b/tools/testing/selftests/kvm/arm64/hello_el2.c > @@ -45,6 +45,7 @@ int main(void) > struct kvm_vcpu *vcpu; > struct kvm_vm *vm; > struct ucall uc; > + u64 hcr; > > TEST_REQUIRE(kvm_check_cap(KVM_CAP_ARM_EL2)); > > @@ -66,6 +67,13 @@ int main(void) > TEST_FAIL("Unhandled ucall: %ld\n", uc.cmd); > } > > + hcr = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_HCR_EL2)); > + vcpu_set_reg(vcpu, KVM_ARM64_SYS_REG(SYS_HCR_EL2), > + (hcr & ~HCR_EL2_E2H) | HCR_EL2_NV1); > + hcr = vcpu_get_reg(vcpu, KVM_ARM64_SYS_REG(SYS_HCR_EL2)); > + TEST_ASSERT(hcr & HCR_EL2_E2H, "HCR_EL2.E2H should be RES1"); > + TEST_ASSERT(!(hcr & HCR_EL2_NV1), "HCR_EL2.NV1 should be RES0"); > + Again, comment would be helpful for why this is done from userspace, i.e. the RESx as seen from the guest POV is stateful but the value is ignored. Thanks, Oliver ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-11-17 22:50 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2026-11-17 20:45 [PATCH v2 0/2] KVM: arm64: Fix inverted E2H0 check for HCR_EL2.NV1 Colton Lewis 2026-11-17 20:45 ` [PATCH v2 1/2] " Colton Lewis 2026-11-17 22:46 ` Oliver Upton 2026-11-17 20:45 ` [PATCH v2 2/2] KVM: arm64: selftests: Verify HCR_EL2.NV1 is RES0 when E2H0 is NI_NV1 Colton Lewis 2026-11-17 22:49 ` Oliver Upton
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox