Commit 28b2dced authored by Yosry Ahmed's avatar Yosry Ahmed Committed by Sean Christopherson
Browse files

KVM: selftests: Stop hardcoding PAGE_SIZE in x86 selftests 



Use PAGE_SIZE instead of 4096.

Signed-off-by: default avatarYosry Ahmed <yosry.ahmed@linux.dev>
Link: https://patch.msgid.link/20251021074736.1324328-9-yosry.ahmed@linux.dev


Signed-off-by: default avatarSean Christopherson <seanjc@google.com>
parent 3c40777f

tools/testing/selftests/kvm/x86/hyperv_features.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}

tools/testing/selftests/kvm/x86/hyperv_ipi.c

+9 −9
Original line number Diff line number Diff line
@@ -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]);

tools/testing/selftests/kvm/x86/sev_smoke_test.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

tools/testing/selftests/kvm/x86/state_test.c

+1 −1
Original line number Diff line number Diff line
@@ -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));

tools/testing/selftests/kvm/x86/userspace_io_test.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}