KVM: arm64: selftests: Add support for GICv2 on v3
Marc Zyngier
maintainerPATCH 1/1 KVM: arm64: selftests: Add support for GICv2 on v3
The current vgic_init test wrongly assumes that the host cannot multiple versions of the GIC architecture, while v2 emulation on v3 has almost always been supported (it was supported before the standalone v3 emulation).
Tweak the test to support multiple GIC incarnations.
--- tools/testing/selftests/kvm/aarch64/vgic_init.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
tools/testing/selftests/kvm/aarch64/vgic_init.c +8 -5
@@ -670,7 +670,7 @@ int test_kvm_device(uint32_t gic_dev_type)if (!_kvm_create_device (v.vm, other, true, &fd)) { ret =_kvm_create_device (v.vm, other, false, &fd); -TEST_ASSERT (ret && errno ==EINVAL , +TEST_ASSERT (ret && (errno ==EINVAL || errno ==EEXIST ),"create GIC device while other version exists" ); }
@@ -698,6 +698,7 @@ int main(int ac, char **av) {int ret;int pa_bits; +int cnt_impl =0 ; pa_bits = vm_guest_mode_params[VM_MODE_DEFAULT ].pa_bits; max_phys_size =1ULL << pa_bits;
@@ -706,17 +707,19 @@ int main(int ac, char **av)if (!ret) {pr_info ("Running GIC_v3 tests.\n" );run_tests (KVM_DEV_TYPE_ARM_VGIC_V3 ); -return 0 ; + cnt_impl++; } ret =test_kvm_device (KVM_DEV_TYPE_ARM_VGIC_V2 );if (!ret) {pr_info ("Running GIC_v2 tests.\n" );run_tests (KVM_DEV_TYPE_ARM_VGIC_V2 ); -return 0 ; + cnt_impl++; } -print_skip ("No GICv2 nor GICv3 support" ); -exit (KSFT_SKIP ); +if (!cnt_impl) { +print_skip ("No GICv2 nor GICv3 support" ); +exit (KSFT_SKIP ); + }return 0 ; }
Signature · 1 line
2.34.1
Hi Marc,
Quoted 4 lines · Marc Zyngier
The current
vgic_inittest wrongly assumes that the host cannot multiple versions of the GIC architecture, while v2 emulation on v3 has almost always been supported (it was supported before the standalone v3 emulation).
Thanks for the fix. This was my mistake (also I was taking too long to send the fix).
Quoted 3 lines
Tweak the test to support multiple GIC incarnations.
Nit. You could add a fixes tag:
Quoted 53 lines
Signed-off-by Marc Zyngier <[email protected]>--- tools/testing/selftests/kvm/aarch64/vgic_init.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)tools/testing/selftests/kvm/aarch64/vgic_init.c +8
-5@@ -670,7 +670,7 @@ int test_kvm_device(uint32_t gic_dev_type)if (!_kvm_create_device (v.vm, other, true, &fd)) { ret =_kvm_create_device (v.vm, other, false, &fd); -TEST_ASSERT (ret && errno ==EINVAL , +TEST_ASSERT (ret && (errno ==EINVAL || errno ==EEXIST ),"create GIC device while other version exists" ); }@@ -698,6 +698,7 @@ int main(int ac, char **av) {int ret;int pa_bits; +int cnt_impl =0 ; pa_bits = vm_guest_mode_params[VM_MODE_DEFAULT ].pa_bits; max_phys_size =1ULL << pa_bits;@@ -706,17 +707,19 @@ int main(int ac, char **av)if (!ret) {pr_info ("Running GIC_v3 tests.\n" );run_tests (KVM_DEV_TYPE_ARM_VGIC_V3 ); -return 0 ; + cnt_impl++; } ret =test_kvm_device (KVM_DEV_TYPE_ARM_VGIC_V2 );if (!ret) {pr_info ("Running GIC_v2 tests.\n" );run_tests (KVM_DEV_TYPE_ARM_VGIC_V2 ); -return 0 ; + cnt_impl++; } -print_skip ("No GICv2 nor GICv3 support" ); -exit (KSFT_SKIP ); +if (!cnt_impl) { +print_skip ("No GICv2 nor GICv3 support" ); +exit (KSFT_SKIP ); + }return 0 ; }Signature · 1 line
2.34.1
_______________________________________________
kvmarm mailing list
[email protected]
https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Quoted 6 lines · Marc Zyngier
The current
vgic_inittest wrongly assumes that the host cannot multiple versions of the GIC architecture, while v2 emulation on v3 has almost always been supported (it was supported before the standalone v3 emulation).Tweak the test to support multiple GIC incarnations.
Applied to next, thanks!
[1/1] KVM: arm64: selftests: Add support for GICv2 on v3
commit: 6a4f7fcd750497cb2fa870f799e8b23270bec6e3
Cheers,
M.
Signature · 6 lines
Marc Zyngier <[email protected]> _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm