Re: [PATCH v1 1/2] KVM: arm64: Fix inverted E2H0 check for HCR_EL2.NV1

From: Leonardo Bras

Date: Tue Nov 17 2026 - 12:21:54 EST


On Mon, Nov 16, 2026 at 08:04:17PM +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) in
> feat_nv2_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.
>
> Fixes: b2a324ff01fe ("KVM: arm64: Use HCR_EL2 feature map to drive fixed-value bits")
> Signed-off-by: Colton Lewis <coltonlewis@xxxxxxxxxx>
> ---
> arch/arm64/kvm/config.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm64/kvm/config.c b/arch/arm64/kvm/config.c
> index adaf26ab93b85..b4f555d39f54a 100644
> --- a/arch/arm64/kvm/config.c
> +++ b/arch/arm64/kvm/config.c
> @@ -258,7 +258,8 @@ static bool feat_nv2(struct kvm *kvm)
>
> static bool feat_nv2_e2h0_ni(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)
> --
> 2.56.1.750.gf70dc682cf-goog
>

Hi Colton,

I just read the code that uses feat_nv2_e2h0_ni(). IIUC if it returns
false, we get HCR_EL2.NV1 to be RES0. Otherwise it's writable.

The change you suggest is returning (ID_AA64MMFR4_EL1.E2H0 >= -1), which
would return false in the case of NI_NV1 (-2), and make the field RES0 only
in that case.

I think it does make sense, but maybe we should also change the name of the
helper from feat_nv2_e2h0_ni() to something that reflects what is being
tested now. feat_nv2_e2h0_imp_or_ni() would be confuse, and maybe
feat_nv2_e2h0_not_ni_nv1() would be as well.

Maybe feat_nv2_e2h0_not_res0(). What do you think?

Thanks!
Leo