Skip to content

Commit d5a012a

Browse files
Sticklyman1936Marc Zyngier
authored andcommitted
KVM: arm64: Enable nested for GICv5 host with FEAT_GCIE_LEGACY
Extend the NV check to pass for a GICv5 host that has FEAT_GCIE_LEGACY. The has_gcie_v3_compat flag is only set on GICv5 hosts (that explicitly support FEAT_GCIE_LEGACY), and hence the explicit check for a VGIC_V5 is omitted. As of this change, vGICv3-based VMs can run with nested on a compatible GICv5 host. Signed-off-by: Sascha Bischoff <sascha.bischoff@arm.com> Reviewed-by: Oliver Upton <oliver.upton@linux.dev> Signed-off-by: Marc Zyngier <maz@kernel.org>
1 parent 9664d58 commit d5a012a

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

arch/arm64/kvm/arm.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2315,8 +2315,9 @@ static int __init init_subsystems(void)
23152315
}
23162316

23172317
if (kvm_mode == KVM_MODE_NV &&
2318-
!(vgic_present && kvm_vgic_global_state.type == VGIC_V3)) {
2319-
kvm_err("NV support requires GICv3, giving up\n");
2318+
!(vgic_present && (kvm_vgic_global_state.type == VGIC_V3 ||
2319+
kvm_vgic_global_state.has_gcie_v3_compat))) {
2320+
kvm_err("NV support requires GICv3 or GICv5 with legacy support, giving up\n");
23202321
err = -EINVAL;
23212322
goto out;
23222323
}

0 commit comments

Comments
 (0)