Commit df079910 authored by Sean Christopherson's avatar Sean Christopherson
Browse files

KVM: selftests: Replace "u64 gpa" with "gpa_t" throughout 

Use gpa_t instead of u64 for obvious declarations of GPA variables.

No functional change intended.

Link: https://patch.msgid.link/20260420212004.3938325-18-seanjc@google.com


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

tools/testing/selftests/kvm/guest_memfd_test.c

+1 −1
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static void test_guest_memfd_guest(void) 
	 * the guest's code, stack, and page tables, and low memory contains

	 * the PCI hole and other MMIO regions that need to be avoided.

	 */

	const u64 gpa = SZ_4G;

	const gpa_t gpa = SZ_4G;

	const int slot = 1;



	struct kvm_vcpu *vcpu;

tools/testing/selftests/kvm/include/kvm_util.h

+13 −13
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ struct kvm_vm { 
	gpa_t ucall_mmio_addr;

	gva_t handlers;

	u32 dirty_ring_size;

	u64 gpa_tag_mask;

	gpa_t gpa_tag_mask;



	/*

	 * "mmu" is the guest's stage-1, with a short name because the vast
@@ -418,7 +418,7 @@ static inline void vm_enable_cap(struct kvm_vm *vm, u32 cap, u64 arg0) 
	vm_ioctl(vm, KVM_ENABLE_CAP, &enable_cap);

}



static inline void vm_set_memory_attributes(struct kvm_vm *vm, u64 gpa,

static inline void vm_set_memory_attributes(struct kvm_vm *vm, gpa_t gpa,

					    u64 size, u64 attributes)

{

	struct kvm_memory_attributes attr = {
@@ -439,28 +439,28 @@ static inline void vm_set_memory_attributes(struct kvm_vm *vm, u64 gpa, 
}





static inline void vm_mem_set_private(struct kvm_vm *vm, u64 gpa,

static inline void vm_mem_set_private(struct kvm_vm *vm, gpa_t gpa,

				      u64 size)

{

	vm_set_memory_attributes(vm, gpa, size, KVM_MEMORY_ATTRIBUTE_PRIVATE);

}



static inline void vm_mem_set_shared(struct kvm_vm *vm, u64 gpa,

static inline void vm_mem_set_shared(struct kvm_vm *vm, gpa_t gpa,

				     u64 size)

{

	vm_set_memory_attributes(vm, gpa, size, 0);

}



void vm_guest_mem_fallocate(struct kvm_vm *vm, u64 gpa, u64 size,

void vm_guest_mem_fallocate(struct kvm_vm *vm, gpa_t gpa, u64 size,

			    bool punch_hole);



static inline void vm_guest_mem_punch_hole(struct kvm_vm *vm, u64 gpa,

static inline void vm_guest_mem_punch_hole(struct kvm_vm *vm, gpa_t gpa,

					   u64 size)

{

	vm_guest_mem_fallocate(vm, gpa, size, true);

}



static inline void vm_guest_mem_allocate(struct kvm_vm *vm, u64 gpa,

static inline void vm_guest_mem_allocate(struct kvm_vm *vm, gpa_t gpa,

					 u64 size)

{

	vm_guest_mem_fallocate(vm, gpa, size, false);
@@ -685,21 +685,21 @@ static inline int vm_create_guest_memfd(struct kvm_vm *vm, u64 size, 
}



void vm_set_user_memory_region(struct kvm_vm *vm, u32 slot, u32 flags,

			       u64 gpa, u64 size, void *hva);

			       gpa_t gpa, u64 size, void *hva);

int __vm_set_user_memory_region(struct kvm_vm *vm, u32 slot, u32 flags,

				u64 gpa, u64 size, void *hva);

				gpa_t gpa, u64 size, void *hva);

void vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags,

				u64 gpa, u64 size, void *hva,

				gpa_t gpa, u64 size, void *hva,

				u32 guest_memfd, u64 guest_memfd_offset);

int __vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags,

				 u64 gpa, u64 size, void *hva,

				 gpa_t gpa, u64 size, void *hva,

				 u32 guest_memfd, u64 guest_memfd_offset);



void vm_userspace_mem_region_add(struct kvm_vm *vm,

				 enum vm_mem_backing_src_type src_type,

				 u64 gpa, u32 slot, u64 npages, u32 flags);

				 gpa_t gpa, u32 slot, u64 npages, u32 flags);

void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,

		u64 gpa, u32 slot, u64 npages, u32 flags,

		gpa_t gpa, u32 slot, u64 npages, u32 flags,

		int guest_memfd_fd, u64 guest_memfd_offset);



#ifndef vm_arch_has_protected_memory

tools/testing/selftests/kvm/include/memstress.h

+2 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#define MEMSTRESS_MEM_SLOT_INDEX	1



struct memstress_vcpu_args {

	u64 gpa;

	gpa_t gpa;

	gva_t gva;

	u64 pages;
@@ -32,7 +32,7 @@ struct memstress_vcpu_args { 
struct memstress_args {

	struct kvm_vm *vm;

	/* The starting address and size of the guest test region. */

	u64 gpa;

	gpa_t gpa;

	u64 size;

	u64 guest_page_size;

	u32 random_seed;

tools/testing/selftests/kvm/include/x86/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -1400,12 +1400,12 @@ u64 kvm_hypercall(u64 nr, u64 a0, u64 a1, u64 a2, u64 a3); 
u64 __xen_hypercall(u64 nr, u64 a0, void *a1);

void xen_hypercall(u64 nr, u64 a0, void *a1);



static inline u64 __kvm_hypercall_map_gpa_range(u64 gpa, u64 size, u64 flags)

static inline u64 __kvm_hypercall_map_gpa_range(gpa_t gpa, u64 size, u64 flags)

{

	return kvm_hypercall(KVM_HC_MAP_GPA_RANGE, gpa, size >> PAGE_SHIFT, flags, 0);

}



static inline void kvm_hypercall_map_gpa_range(u64 gpa, u64 size, u64 flags)

static inline void kvm_hypercall_map_gpa_range(gpa_t gpa, u64 size, u64 flags)

{

	u64 ret = __kvm_hypercall_map_gpa_range(gpa, size, flags);

tools/testing/selftests/kvm/lib/kvm_util.c

+7 −7
Original line number Diff line number Diff line
@@ -919,7 +919,7 @@ static void vm_userspace_mem_region_hva_insert(struct rb_root *hva_tree, 




int __vm_set_user_memory_region(struct kvm_vm *vm, u32 slot, u32 flags,

				u64 gpa, u64 size, void *hva)

				gpa_t gpa, u64 size, void *hva)

{

	struct kvm_userspace_memory_region region = {

		.slot = slot,
@@ -933,7 +933,7 @@ int __vm_set_user_memory_region(struct kvm_vm *vm, u32 slot, u32 flags, 
}



void vm_set_user_memory_region(struct kvm_vm *vm, u32 slot, u32 flags,

			       u64 gpa, u64 size, void *hva)

			       gpa_t gpa, u64 size, void *hva)

{

	int ret = __vm_set_user_memory_region(vm, slot, flags, gpa, size, hva);
@@ -946,7 +946,7 @@ void vm_set_user_memory_region(struct kvm_vm *vm, u32 slot, u32 flags, 
		       "KVM selftests now require KVM_SET_USER_MEMORY_REGION2 (introduced in v6.8)")



int __vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags,

				 u64 gpa, u64 size, void *hva,

				 gpa_t gpa, u64 size, void *hva,

				 u32 guest_memfd, u64 guest_memfd_offset)

{

	struct kvm_userspace_memory_region2 region = {
@@ -965,7 +965,7 @@ int __vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags, 
}



void vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags,

				u64 gpa, u64 size, void *hva,

				gpa_t gpa, u64 size, void *hva,

				u32 guest_memfd, u64 guest_memfd_offset)

{

	int ret = __vm_set_user_memory_region2(vm, slot, flags, gpa, size, hva,
@@ -978,7 +978,7 @@ void vm_set_user_memory_region2(struct kvm_vm *vm, u32 slot, u32 flags, 


/* FIXME: This thing needs to be ripped apart and rewritten. */

void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,

		u64 gpa, u32 slot, u64 npages, u32 flags,

		gpa_t gpa, u32 slot, u64 npages, u32 flags,

		int guest_memfd, u64 guest_memfd_offset)

{

	int ret;
@@ -1141,7 +1141,7 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, 


void vm_userspace_mem_region_add(struct kvm_vm *vm,

				 enum vm_mem_backing_src_type src_type,

				 u64 gpa, u32 slot, u64 npages, u32 flags)

				 gpa_t gpa, u32 slot, u64 npages, u32 flags)

{

	vm_mem_add(vm, src_type, gpa, slot, npages, flags, -1, 0);

}
@@ -1278,7 +1278,7 @@ void vm_guest_mem_fallocate(struct kvm_vm *vm, u64 base, u64 size, 
	const int mode = FALLOC_FL_KEEP_SIZE | (punch_hole ? FALLOC_FL_PUNCH_HOLE : 0);

	struct userspace_mem_region *region;

	u64 end = base + size;

	u64 gpa, len;

	gpa_t gpa, len;

	off_t fd_offset;

	int ret;