Replace hardcoded slot 1 assignments with TEST_MEM_SLOT_BASE This prepares tests for reserving slot 1 for library use.
Signed-off-by: Tharit Tangkijwanichakul <[email protected]> --- tools/testing/selftests/kvm/arm64/hypercalls.c | 3 ++- tools/testing/selftests/kvm/arm64/sea_to_user.c | 2 +- tools/testing/selftests/kvm/arm64/stage2_block_transitions.c | 2 +- tools/testing/selftests/kvm/arm64/vgic_its_save.c | 2 +- tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c | 2 +- tools/testing/selftests/kvm/dirty_log_test.c | 2 +- tools/testing/selftests/kvm/guest_memfd_test.c | 2 +- tools/testing/selftests/kvm/include/kvm_util.h | 1 + tools/testing/selftests/kvm/kvm_page_table_test.c | 2 +- tools/testing/selftests/kvm/mmu_stress_test.c | 2 +- tools/testing/selftests/kvm/riscv/sbi_pmu_test.c | 3 ++- tools/testing/selftests/kvm/steal_time.c | 3 ++- tools/testing/selftests/kvm/x86/nested_dirty_log_test.c | 2 +- tools/testing/selftests/kvm/x86/nested_vmsave_vmload_test.c | 2 +- 14 files changed, 17 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/kvm/arm64/hypercalls.c b/tools/testing/selftests/kvm/arm64/hypercalls.c index 391e2ba58b0b..ff7c21738a96 100644 --- a/tools/testing/selftests/kvm/arm64/hypercalls.c +++ b/tools/testing/selftests/kvm/arm64/hypercalls.c @@ -191,7 +191,8 @@ static void steal_time_init(struct kvm_vcpu *vcpu) unsigned int gpages; gpages = vm_calc_num_guest_pages(VM_MODE_DEFAULT, STEAL_TIME_SIZE); - vm_userspace_mem_region_add(vcpu->vm, VM_MEM_SRC_ANONYMOUS, ST_GPA_BASE, 1, gpages, 0); + vm_userspace_mem_region_add(vcpu->vm, VM_MEM_SRC_ANONYMOUS, ST_GPA_BASE, + TEST_MEM_SLOT_BASE, gpages, 0); vcpu_device_attr_set(vcpu, KVM_ARM_VCPU_PVTIME_CTRL, KVM_ARM_VCPU_PVTIME_IPA, &st_ipa); diff --git a/tools/testing/selftests/kvm/arm64/sea_to_user.c b/tools/testing/selftests/kvm/arm64/sea_to_user.c index d4af6e0eed28..bb552debc61c 100644 --- a/tools/testing/selftests/kvm/arm64/sea_to_user.c +++ b/tools/testing/selftests/kvm/arm64/sea_to_user.c @@ -323,7 +323,7 @@ static struct kvm_vm *vm_create_with_sea_handler(struct kvm_vcpu **vcpu) /*vm=*/vm, /*src_type=*/src_type, /*gpa=*/start_gpa, - /*slot=*/1, + /*slot=*/TEST_MEM_SLOT_BASE, /*npages=*/num_guest_pages, /*flags=*/0); diff --git a/tools/testing/selftests/kvm/arm64/stage2_block_transitions.c b/tools/testing/selftests/kvm/arm64/stage2_block_transitions.c index 5fd47f4ada1f..0e23d7b55782 100644 --- a/tools/testing/selftests/kvm/arm64/stage2_block_transitions.c +++ b/tools/testing/selftests/kvm/arm64/stage2_block_transitions.c @@ -41,7 +41,7 @@ #include "test_util.h" #include "ucall.h" -#define DATA_SLOT 1 +#define DATA_SLOT TEST_MEM_SLOT_BASE #define TEST_GVA 0xc0000000UL #define BLOCK_SIZE SZ_2M diff --git a/tools/testing/selftests/kvm/arm64/vgic_its_save.c b/tools/testing/selftests/kvm/arm64/vgic_its_save.c index 864da01539f3..e858a4aa741d 100644 --- a/tools/testing/selftests/kvm/arm64/vgic_its_save.c +++ b/tools/testing/selftests/kvm/arm64/vgic_its_save.c @@ -29,7 +29,7 @@ #include "ucall.h" #include "vgic.h" -#define TEST_MEMSLOT_INDEX 1 +#define TEST_MEMSLOT_INDEX TEST_MEM_SLOT_BASE /* All three ITS table entry sizes are 8 bytes in ABI 0. */ #define ESZ 8 diff --git a/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c b/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c index 9a69c439a0f8..1d5c56481053 100644 --- a/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c +++ b/tools/testing/selftests/kvm/arm64/vgic_lpi_stress.c @@ -18,7 +18,7 @@ #include "ucall.h" #include "vgic.h" -#define TEST_MEMSLOT_INDEX 1 +#define TEST_MEMSLOT_INDEX TEST_MEM_SLOT_BASE #define GIC_LPI_OFFSET 8192 diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c index af5eb0334a74..75084fe3bec6 100644 --- a/tools/testing/selftests/kvm/dirty_log_test.c +++ b/tools/testing/selftests/kvm/dirty_log_test.c @@ -26,7 +26,7 @@ #define PAGE_SHIFT_4K 12 /* The memory slot index to track dirty pages */ -#define TEST_MEM_SLOT_INDEX 1 +#define TEST_MEM_SLOT_INDEX TEST_MEM_SLOT_BASE /* Default guest test virtual memory offset */ #define DEFAULT_GUEST_TEST_MEM 0xc0000000 diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing/selftests/kvm/guest_memfd_test.c index 2233d871a38f..231bfe238e31 100644 --- a/tools/testing/selftests/kvm/guest_memfd_test.c +++ b/tools/testing/selftests/kvm/guest_memfd_test.c @@ -510,7 +510,7 @@ static void test_guest_memfd_guest(void) * the PCI hole and other MMIO regions that need to be avoided. */ const gpa_t gpa = SZ_4G; - const int slot = 1; + const int slot = TEST_MEM_SLOT_BASE; struct kvm_vcpu *vcpu; struct kvm_vm *vm; diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index 5a7a455b5387..759d604d44ce 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -30,6 +30,7 @@ #define KVM_DEV_PATH "/dev/kvm" #define KVM_MAX_VCPUS 512 +#define TEST_MEM_SLOT_BASE 1 #define NSEC_PER_SEC 1000000000L diff --git a/tools/testing/selftests/kvm/kvm_page_table_test.c b/tools/testing/selftests/kvm/kvm_page_table_test.c index 974813ea8953..f18720109319 100644 --- a/tools/testing/selftests/kvm/kvm_page_table_test.c +++ b/tools/testing/selftests/kvm/kvm_page_table_test.c @@ -20,7 +20,7 @@ #include "guest_modes.h" #include "ucall_common.h" -#define TEST_MEM_SLOT_INDEX 1 +#define TEST_MEM_SLOT_INDEX TEST_MEM_SLOT_BASE /* Default size(1GB) of the memory for testing */ #define DEFAULT_TEST_MEM_SIZE (1 << 30) diff --git a/tools/testing/selftests/kvm/mmu_stress_test.c b/tools/testing/selftests/kvm/mmu_stress_test.c index 741e343962ed..b965a8b9d214 100644 --- a/tools/testing/selftests/kvm/mmu_stress_test.c +++ b/tools/testing/selftests/kvm/mmu_stress_test.c @@ -273,7 +273,7 @@ int main(int argc, char *argv[]) * 1gb-3gb,but it's simpler to skip straight to 4gb. */ const u64 start_gpa = SZ_4G; - const int first_slot = 1; + const int first_slot = TEST_MEM_SLOT_BASE; struct timespec time_start, time_run1, time_reset, time_run2, time_ro, time_rw; u64 max_gpa, gpa, slot_size, max_mem, i; diff --git a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c index 20388f0b959d..6abd74870e01 100644 --- a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c +++ b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c @@ -605,7 +605,8 @@ static void test_vm_events_test(void *guest_code) static void test_vm_setup_snapshot_mem(struct kvm_vm *vm, struct kvm_vcpu *vcpu) { /* PMU Snapshot requires single page only */ - vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, PMU_SNAPSHOT_GPA_BASE, 1, 1, 0); + vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, PMU_SNAPSHOT_GPA_BASE, + TEST_MEM_SLOT_BASE, 1, 0); /* PMU_SNAPSHOT_GPA_BASE is identity mapped */ virt_map(vm, PMU_SNAPSHOT_GPA_BASE, PMU_SNAPSHOT_GPA_BASE, 1); diff --git a/tools/testing/selftests/kvm/steal_time.c b/tools/testing/selftests/kvm/steal_time.c index 785d19f9ee8f..e386580ef540 100644 --- a/tools/testing/selftests/kvm/steal_time.c +++ b/tools/testing/selftests/kvm/steal_time.c @@ -509,7 +509,8 @@ static struct kvm_vm *vm_create_steal_time(u32 nr_vcpus, void *guest_code, /* Create a VM and an identity mapped memslot for the steal time structure */ vm = vm_create_with_vcpus(nr_vcpus, guest_code, vcpus); gpages = vm_calc_num_guest_pages(VM_MODE_DEFAULT, STEAL_TIME_SIZE * nr_vcpus); - vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, ST_GPA_BASE, 1, gpages, 0); + vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, ST_GPA_BASE, + TEST_MEM_SLOT_BASE, gpages, 0); virt_map(vm, ST_GPA_BASE, ST_GPA_BASE, gpages); return vm; diff --git a/tools/testing/selftests/kvm/x86/nested_dirty_log_test.c b/tools/testing/selftests/kvm/x86/nested_dirty_log_test.c index 26b474bf1353..e86d625b3e89 100644 --- a/tools/testing/selftests/kvm/x86/nested_dirty_log_test.c +++ b/tools/testing/selftests/kvm/x86/nested_dirty_log_test.c @@ -16,7 +16,7 @@ #include "vmx.h" /* The memory slot index to track dirty pages */ -#define TEST_MEM_SLOT_INDEX 1 +#define TEST_MEM_SLOT_INDEX TEST_MEM_SLOT_BASE /* * Allocate four pages total. Two pages are used to verify that the KVM marks diff --git a/tools/testing/selftests/kvm/x86/nested_vmsave_vmload_test.c b/tools/testing/selftests/kvm/x86/nested_vmsave_vmload_test.c index a130759f39a1..4bc57e5e40e3 100644 --- a/tools/testing/selftests/kvm/x86/nested_vmsave_vmload_test.c +++ b/tools/testing/selftests/kvm/x86/nested_vmsave_vmload_test.c @@ -17,7 +17,7 @@ * interpreted as a direct L1 GPA or translated using NPT as an L2 GPA, depends * on which VMCB is accessed. */ -#define TEST_MEM_SLOT_INDEX 1 +#define TEST_MEM_SLOT_INDEX TEST_MEM_SLOT_BASE #define TEST_MEM_PAGES 2 #define TEST_MEM_BASE 0xc0000000 -- 2.53.0
