KVM: selftests: Stop hardcoding PAGE_SIZE in x86 selftests

Use PAGE_SIZE instead of 4096.

Signed-off-by: Yosry Ahmed <yosry.ahmed@linux.dev>
Link: https://patch.msgid.link/20251021074736.1324328-9-yosry.ahmed@linux.dev
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/tools/testing/selftests/kvm/x86/hyperv_features.c b/tools/testing/selftests/kvm/x86/hyperv_features.c
index 99d327084172f959f02ae86cfc5e122a4a42a783..130b9ce7e5ddd4f34bf83e94b33c209dfec45876 100644 (file)
--- a/tools/testing/selftests/kvm/x86/hyperv_features.c
+++ b/tools/testing/selftests/kvm/x86/hyperv_features.c
@@ -94,7 +94,7 @@ static void guest_hcall(vm_vaddr_t pgs_gpa, struct hcall_data *hcall)
 
        if (!(hcall->control & HV_HYPERCALL_FAST_BIT)) {
                input = pgs_gpa;
-               output = pgs_gpa + 4096;
+               output = pgs_gpa + PAGE_SIZE;
        } else {
                input = output = 0;
        }

diff --git a/tools/testing/selftests/kvm/x86/hyperv_ipi.c b/tools/testing/selftests/kvm/x86/hyperv_ipi.c
index 2b5b4bc6ef7ecb8c51876122ad287c8c134a36f0..ca61836c4e325a4c913749ca1dac565ad2fa80fe 100644 (file)
--- a/tools/testing/selftests/kvm/x86/hyperv_ipi.c
+++ b/tools/testing/selftests/kvm/x86/hyperv_ipi.c
@@ -102,7 +102,7 @@ static void sender_guest_code(void *hcall_page, vm_vaddr_t pgs_gpa)
        /* 'Slow' HvCallSendSyntheticClusterIpi to RECEIVER_VCPU_ID_1 */
        ipi->vector = IPI_VECTOR;
        ipi->cpu_mask = 1 << RECEIVER_VCPU_ID_1;
-       hyperv_hypercall(HVCALL_SEND_IPI, pgs_gpa, pgs_gpa + 4096);
+       hyperv_hypercall(HVCALL_SEND_IPI, pgs_gpa, pgs_gpa + PAGE_SIZE);
        nop_loop();
        GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_1] == ++ipis_expected[0]);
        GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_2] == ipis_expected[1]);
@@ -116,13 +116,13 @@ static void sender_guest_code(void *hcall_page, vm_vaddr_t pgs_gpa)
        GUEST_SYNC(stage++);
 
        /* 'Slow' HvCallSendSyntheticClusterIpiEx to RECEIVER_VCPU_ID_1 */
-       memset(hcall_page, 0, 4096);
+       memset(hcall_page, 0, PAGE_SIZE);
        ipi_ex->vector = IPI_VECTOR;
        ipi_ex->vp_set.format = HV_GENERIC_SET_SPARSE_4K;
        ipi_ex->vp_set.valid_bank_mask = 1 << 0;
        ipi_ex->vp_set.bank_contents[0] = BIT(RECEIVER_VCPU_ID_1);
        hyperv_hypercall(HVCALL_SEND_IPI_EX | (1 << HV_HYPERCALL_VARHEAD_OFFSET),
-                        pgs_gpa, pgs_gpa + 4096);
+                        pgs_gpa, pgs_gpa + PAGE_SIZE);
        nop_loop();
        GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_1] == ++ipis_expected[0]);
        GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_2] == ipis_expected[1]);
@@ -138,13 +138,13 @@ static void sender_guest_code(void *hcall_page, vm_vaddr_t pgs_gpa)
        GUEST_SYNC(stage++);
 
        /* 'Slow' HvCallSendSyntheticClusterIpiEx to RECEIVER_VCPU_ID_2 */
-       memset(hcall_page, 0, 4096);
+       memset(hcall_page, 0, PAGE_SIZE);
        ipi_ex->vector = IPI_VECTOR;
        ipi_ex->vp_set.format = HV_GENERIC_SET_SPARSE_4K;
        ipi_ex->vp_set.valid_bank_mask = 1 << 1;
        ipi_ex->vp_set.bank_contents[0] = BIT(RECEIVER_VCPU_ID_2 - 64);
        hyperv_hypercall(HVCALL_SEND_IPI_EX | (1 << HV_HYPERCALL_VARHEAD_OFFSET),
-                        pgs_gpa, pgs_gpa + 4096);
+                        pgs_gpa, pgs_gpa + PAGE_SIZE);
        nop_loop();
        GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_1] == ipis_expected[0]);
        GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_2] == ++ipis_expected[1]);
@@ -160,14 +160,14 @@ static void sender_guest_code(void *hcall_page, vm_vaddr_t pgs_gpa)
        GUEST_SYNC(stage++);
 
        /* 'Slow' HvCallSendSyntheticClusterIpiEx to both RECEIVER_VCPU_ID_{1,2} */
-       memset(hcall_page, 0, 4096);
+       memset(hcall_page, 0, PAGE_SIZE);
        ipi_ex->vector = IPI_VECTOR;
        ipi_ex->vp_set.format = HV_GENERIC_SET_SPARSE_4K;
        ipi_ex->vp_set.valid_bank_mask = 1 << 1 | 1;
        ipi_ex->vp_set.bank_contents[0] = BIT(RECEIVER_VCPU_ID_1);
        ipi_ex->vp_set.bank_contents[1] = BIT(RECEIVER_VCPU_ID_2 - 64);
        hyperv_hypercall(HVCALL_SEND_IPI_EX | (2 << HV_HYPERCALL_VARHEAD_OFFSET),
-                        pgs_gpa, pgs_gpa + 4096);
+                        pgs_gpa, pgs_gpa + PAGE_SIZE);
        nop_loop();
        GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_1] == ++ipis_expected[0]);
        GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_2] == ++ipis_expected[1]);
@@ -183,10 +183,10 @@ static void sender_guest_code(void *hcall_page, vm_vaddr_t pgs_gpa)
        GUEST_SYNC(stage++);
 
        /* 'Slow' HvCallSendSyntheticClusterIpiEx to HV_GENERIC_SET_ALL */
-       memset(hcall_page, 0, 4096);
+       memset(hcall_page, 0, PAGE_SIZE);
        ipi_ex->vector = IPI_VECTOR;
        ipi_ex->vp_set.format = HV_GENERIC_SET_ALL;
-       hyperv_hypercall(HVCALL_SEND_IPI_EX, pgs_gpa, pgs_gpa + 4096);
+       hyperv_hypercall(HVCALL_SEND_IPI_EX, pgs_gpa, pgs_gpa + PAGE_SIZE);
        nop_loop();
        GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_1] == ++ipis_expected[0]);
        GUEST_ASSERT(ipis_rcvd[RECEIVER_VCPU_ID_2] == ++ipis_expected[1]);

diff --git a/tools/testing/selftests/kvm/x86/sev_smoke_test.c b/tools/testing/selftests/kvm/x86/sev_smoke_test.c
index 77256c89bb8de0814a2ecbc64a72b191ec3b81e4..86ad1c7d068f29abec7f8c8dd62b12a4f7152222 100644 (file)
--- a/tools/testing/selftests/kvm/x86/sev_smoke_test.c
+++ b/tools/testing/selftests/kvm/x86/sev_smoke_test.c
@@ -104,7 +104,7 @@ static void test_sync_vmsa(uint32_t type, uint64_t policy)
        vm_sev_launch(vm, policy, NULL);
 
        /* This page is shared, so make it decrypted.  */
-       memset(hva, 0, 4096);
+       memset(hva, 0, PAGE_SIZE);
 
        vcpu_run(vcpu);
 

diff --git a/tools/testing/selftests/kvm/x86/state_test.c b/tools/testing/selftests/kvm/x86/state_test.c
index 141b7fc0c965b34b4876d94818c2c00f993cc386..f2c7a1c297e374fc5a6abc18e3837c00fc5bd965 100644 (file)
--- a/tools/testing/selftests/kvm/x86/state_test.c
+++ b/tools/testing/selftests/kvm/x86/state_test.c
@@ -141,7 +141,7 @@ static void __attribute__((__flatten__)) guest_code(void *arg)
 
        if (this_cpu_has(X86_FEATURE_XSAVE)) {
                uint64_t supported_xcr0 = this_cpu_supported_xcr0();
-               uint8_t buffer[4096];
+               uint8_t buffer[PAGE_SIZE];
 
                memset(buffer, 0xcc, sizeof(buffer));
 

diff --git a/tools/testing/selftests/kvm/x86/userspace_io_test.c b/tools/testing/selftests/kvm/x86/userspace_io_test.c
index 9481cbcf284f69b662a2f9f1a5fb3ff304ab0605..be7d72f3c029ffdceb91461e9bed2ea0773ad883 100644 (file)
--- a/tools/testing/selftests/kvm/x86/userspace_io_test.c
+++ b/tools/testing/selftests/kvm/x86/userspace_io_test.c
@@ -85,7 +85,7 @@ int main(int argc, char *argv[])
                        regs.rcx = 1;
                if (regs.rcx == 3)
                        regs.rcx = 8192;
-               memset((void *)run + run->io.data_offset, 0xaa, 4096);
+               memset((void *)run + run->io.data_offset, 0xaa, PAGE_SIZE);
                vcpu_regs_set(vcpu, &regs);
        }
 

diff --git a/tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c b/tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c
index fa512d033205fac8618bd32002bb8fa537d341ec..34a57fe747f64a4ca0674f481e8e75d9e12a5936 100644 (file)
--- a/tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c
+++ b/tools/testing/selftests/kvm/x86/vmx_dirty_log_test.c
@@ -122,15 +122,15 @@ static void test_vmx_dirty_log(bool enable_ept)
        if (enable_ept) {
                prepare_eptp(vmx, vm, 0);
                nested_map_memslot(vmx, vm, 0);
-               nested_map(vmx, vm, NESTED_TEST_MEM1, GUEST_TEST_MEM, 4096);
-               nested_map(vmx, vm, NESTED_TEST_MEM2, GUEST_TEST_MEM, 4096);
+               nested_map(vmx, vm, NESTED_TEST_MEM1, GUEST_TEST_MEM, PAGE_SIZE);
+               nested_map(vmx, vm, NESTED_TEST_MEM2, GUEST_TEST_MEM, PAGE_SIZE);
        }
 
        bmap = bitmap_zalloc(TEST_MEM_PAGES);
        host_test_mem = addr_gpa2hva(vm, GUEST_TEST_MEM);
 
        while (!done) {
-               memset(host_test_mem, 0xaa, TEST_MEM_PAGES * 4096);
+               memset(host_test_mem, 0xaa, TEST_MEM_PAGES * PAGE_SIZE);
                vcpu_run(vcpu);
                TEST_ASSERT_KVM_EXIT_REASON(vcpu, KVM_EXIT_IO);
 
@@ -153,9 +153,9 @@ static void test_vmx_dirty_log(bool enable_ept)
                        }
 
                        TEST_ASSERT(!test_bit(1, bmap), "Page 1 incorrectly reported dirty");
-                       TEST_ASSERT(host_test_mem[4096 / 8] == 0xaaaaaaaaaaaaaaaaULL, "Page 1 written by guest");
+                       TEST_ASSERT(host_test_mem[PAGE_SIZE / 8] == 0xaaaaaaaaaaaaaaaaULL, "Page 1 written by guest");
                        TEST_ASSERT(!test_bit(2, bmap), "Page 2 incorrectly reported dirty");
-                       TEST_ASSERT(host_test_mem[8192 / 8] == 0xaaaaaaaaaaaaaaaaULL, "Page 2 written by guest");
+                       TEST_ASSERT(host_test_mem[PAGE_SIZE*2 / 8] == 0xaaaaaaaaaaaaaaaaULL, "Page 2 written by guest");
                        break;
                case UCALL_DONE:
                        done = true;