diff options
| author |   Paolo Bonzini <pbonzini@redhat.com> | 2022-10-22 03:32:23 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-10-22 03:32:23 -0400 |
| commit | 5834816829e6b80871d8ee1c3d173e0259a02d1f (patch) | |
| tree | c500b4d85cc48f84265573e74c97f34861bcf7a6 /tools/testing | |
| parent | Linux 6.1-rc1 (diff) | |
| parent | KVM: selftests: Fix number of pages for memory slot in memslot_modification_stress_test (diff) | |
| download | linux-dev-5834816829e6b80871d8ee1c3d173e0259a02d1f.tar.xz linux-dev-5834816829e6b80871d8ee1c3d173e0259a02d1f.zip | |
Merge tag 'kvmarm-fixes-6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD
KVM/arm64 fixes for 6.1, take #1
- Fix for stage-2 invalidation holding the VM MMU lock
for too long by limiting the walk to the largest
block mapping size
- Enable stack protection and branch profiling for VHE
- Two selftest fixes
Diffstat (limited to 'tools/testing')
| -rw-r--r-- | tools/testing/selftests/kvm/aarch64/vgic_init.c | 4 | ||||
| -rw-r--r-- | tools/testing/selftests/kvm/memslot_modification_stress_test.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/testing/selftests/kvm/aarch64/vgic_init.c b/tools/testing/selftests/kvm/aarch64/vgic_init.c index e05ecb31823f..9c131d977a1b 100644 --- a/tools/testing/selftests/kvm/aarch64/vgic_init.c +++ b/tools/testing/selftests/kvm/aarch64/vgic_init.c @@ -662,8 +662,8 @@ int test_kvm_device(uint32_t gic_dev_type) : KVM_DEV_TYPE_ARM_VGIC_V2; if (!__kvm_test_create_device(v.vm, other)) { - ret = __kvm_test_create_device(v.vm, other); - TEST_ASSERT(ret && (errno == EINVAL || errno == EEXIST), + ret = __kvm_create_device(v.vm, other); + TEST_ASSERT(ret < 0 && (errno == EINVAL || errno == EEXIST), "create GIC device while other version exists"); } diff --git a/tools/testing/selftests/kvm/memslot_modification_stress_test.c b/tools/testing/selftests/kvm/memslot_modification_stress_test.c index 6ee7e1dde404..bb1d17a1171b 100644 --- a/tools/testing/selftests/kvm/memslot_modification_stress_test.c +++ b/tools/testing/selftests/kvm/memslot_modification_stress_test.c @@ -67,7 +67,7 @@ struct memslot_antagonist_args { static void add_remove_memslot(struct kvm_vm *vm, useconds_t delay, uint64_t nr_modifications) { - const uint64_t pages = 1; + uint64_t pages = max_t(int, vm->page_size, getpagesize()) / vm->page_size; uint64_t gpa; int i; |