KVM: selftests: Use "gpa" and "gva" for local variable names in pre-fault test
Sean Christopherson
reviewerPATCH 1/1 KVM: selftests: Use "gpa" and "gva" for local variable names in pre-fault test
Rename guest_test_{phys,virt}_mem to g{p,v}a in the pre-fault memory test to shorten line lengths and to use standard terminology.
No functional change intended.
--- .../selftests/kvm/pre_fault_memory_test.c | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-)
tools/testing/selftests/kvm/pre_fault_memory_test.c +12 -15
@@ -161,6 +161,7 @@ static void pre_fault_memory(struct kvm_vcpu *vcpu, u64 base_gpa, u64 offset,static void __test_pre_fault_memory (unsigned long vm_type,bool private) { +uint64_t gpa, gva, alignment, guest_page_size;const struct vm_shape shape = { .mode =VM_MODE_DEFAULT , .type = vm_type,
@@ -170,35 +171,31 @@ static void __test_pre_fault_memory(unsigned long vm_type, bool private)struct kvm_vm *vm;struct ucall uc; -uint64_t guest_test_phys_mem; -uint64_t guest_test_virt_mem; -uint64_t alignment, guest_page_size; - vm =vm_create_shape_with_one_vcpu (shape, &vcpu, guest_code); alignment = guest_page_size = vm_guest_mode_params[VM_MODE_DEFAULT ].page_size; - guest_test_phys_mem = (vm->max_gfn -TEST_NPAGES ) * guest_page_size; + gpa = (vm->max_gfn -TEST_NPAGES ) * guest_page_size;#ifdef __s390x__ alignment =max (0x100000UL , guest_page_size);#else alignment =SZ_2M ;#endif - guest_test_phys_mem =align_down (guest_test_phys_mem, alignment); - guest_test_virt_mem = guest_test_phys_mem & ((1ULL << (vm->va_bits -1 )) -1 ); + gpa =align_down (gpa, alignment); + gva = gpa & ((1ULL << (vm->va_bits -1 )) -1 ); -vm_userspace_mem_region_add (vm,VM_MEM_SRC_ANONYMOUS , - guest_test_phys_mem,TEST_SLOT ,TEST_NPAGES , +vm_userspace_mem_region_add (vm,VM_MEM_SRC_ANONYMOUS , gpa, +TEST_SLOT ,TEST_NPAGES , private ?KVM_MEM_GUEST_MEMFD :0 ); -virt_map (vm, guest_test_virt_mem, guest_test_phys_mem,TEST_NPAGES ); +virt_map (vm, gva, gpa,TEST_NPAGES );if (private) -vm_mem_set_private (vm, guest_test_phys_mem,TEST_SIZE ); +vm_mem_set_private (vm, gpa,TEST_SIZE ); -pre_fault_memory (vcpu, guest_test_phys_mem,0 ,SZ_2M ,0 , private); -pre_fault_memory (vcpu, guest_test_phys_mem,SZ_2M ,PAGE_SIZE *2 ,PAGE_SIZE , private); -pre_fault_memory (vcpu, guest_test_phys_mem,TEST_SIZE ,PAGE_SIZE ,PAGE_SIZE , private); +pre_fault_memory (vcpu, gpa,0 ,SZ_2M ,0 , private); +pre_fault_memory (vcpu, gpa,SZ_2M ,PAGE_SIZE *2 ,PAGE_SIZE , private); +pre_fault_memory (vcpu, gpa,TEST_SIZE ,PAGE_SIZE ,PAGE_SIZE , private); -vcpu_args_set (vcpu,1 , guest_test_virt_mem); +vcpu_args_set (vcpu,1 , gva);vcpu_run (vcpu); run = vcpu->run;
base-commit: efcebc8f7aeeba15feb1a5bde70af74d96bf1a76
Signature · 1 line
2.51.0.710.ga91ca5db03-goog
Quoted 39 lines · Sean Christopherson
Rename guest_test_{phys,virt}_mem to g{p,v}a in the pre-fault memory test to shorten line lengths and to use standard terminology.
No functional change intended.
Cc Yan Zhao <[email protected]>Signed-off-by Sean Christopherson <[email protected]>--- .../selftests/kvm/pre_fault_memory_test.c | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-)tools/testing/selftests/kvm/pre_fault_memory_test.c +2
-5@@ -161,6 +161,7 @@ static void pre_fault_memory(struct kvm_vcpu *vcpu, u64 base_gpa, u64 offset,static void __test_pre_fault_memory (unsigned long vm_type,bool private) { +uint64_t gpa, gva, alignment, guest_page_size;const struct vm_shape shape = { .mode =VM_MODE_DEFAULT , .type = vm_type,@@ -170,35 +171,31 @@ static void __test_pre_fault_memory(unsigned long vm_type, bool private)struct kvm_vm *vm;struct ucall uc; -uint64_t guest_test_phys_mem; -uint64_t guest_test_virt_mem; -uint64_t alignment, guest_page_size; - vm =vm_create_shape_with_one_vcpu (shape, &vcpu, guest_code); alignment = guest_page_size = vm_guest_mode_params[VM_MODE_DEFAULT ].page_size; - guest_test_phys_mem = (vm->max_gfn -TEST_NPAGES ) * guest_page_size; + gpa = (vm->max_gfn -TEST_NPAGES ) * guest_page_size;#ifdef __s390x__ alignment =max (0x100000UL , guest_page_size);#else
tools/testing/selftests/kvm/pre_fault_memory_test.c static void __test_pre_fault_memory(unsigned long vm_type, bool private) · line 186
Quoted 10 lines
tools/testing/selftests/kvm/pre_fault_memory_test.c +3
-4alignment =SZ_2M ;#endif - guest_test_phys_mem =align_down (guest_test_phys_mem, alignment); - guest_test_virt_mem = guest_test_phys_mem & ((1ULL << (vm->va_bits -1 )) -1 ); + gpa =align_down (gpa, alignment); + gva = gpa & ((1ULL << (vm->va_bits -1 )) -1 ); - vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, - guest_test_phys_mem, TEST_SLOT, TEST_NPAGES, + vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, gpa,
Wrap at 80 characters?
Quoted 8 lines
tools/testing/selftests/kvm/pre_fault_memory_test.c +3
-2+TEST_SLOT ,TEST_NPAGES , private ? KVM_MEM_GUEST_MEMFD : 0); -virt_map (vm, guest_test_virt_mem, guest_test_phys_mem,TEST_NPAGES ); +virt_map (vm, gva, gpa,TEST_NPAGES );if (private) -vm_mem_set_private (vm, guest_test_phys_mem,TEST_SIZE ); +vm_mem_set_private (vm, gpa,TEST_SIZE );
tools/testing/selftests/kvm/pre_fault_memory_test.c static void __test_pre_fault_memory(unsigned long vm_type, bool private) · line 198
Quoted 10 lines
tools/testing/selftests/kvm/pre_fault_memory_test.c +4
-4-pre_fault_memory (vcpu, guest_test_phys_mem,0 ,SZ_2M ,0 , private); -pre_fault_memory (vcpu, guest_test_phys_mem,SZ_2M ,PAGE_SIZE *2 ,PAGE_SIZE , private); -pre_fault_memory (vcpu, guest_test_phys_mem,TEST_SIZE ,PAGE_SIZE ,PAGE_SIZE , private); +pre_fault_memory (vcpu, gpa,0 ,SZ_2M ,0 , private); +pre_fault_memory (vcpu, gpa,SZ_2M ,PAGE_SIZE *2 ,PAGE_SIZE , private); +pre_fault_memory (vcpu, gpa,TEST_SIZE ,PAGE_SIZE ,PAGE_SIZE , private); -vcpu_args_set (vcpu,1 , guest_test_virt_mem); +vcpu_args_set (vcpu,1 , gva);
Should we cleanup guest_code() as below?
-static void guest_code(uint64_t base_gpa)
+static void guest_code(uint64_t base_gva)
{
volatile uint64_t val __used;
int i;
for (i = 0; i < TEST_NPAGES; i++) {- uint64_t *src = (uint64_t *)(base_gpa + i * PAGE_SIZE);
+ uint64_t *src = (uint64_t *)(base_gva + i * PAGE_SIZE);
val = *src;
}Quoted 9 lines
tools/testing/selftests/kvm/pre_fault_memory_test.c +0
-0vcpu_run (vcpu); run = vcpu->run;base-commit:
efcebc8f7aeeba15feb1a5bde70af74d96bf1a76Signature · 1 line
2.51.0.710.ga91ca5db03-goog
Sean Christopherson
reviewerQuoted 6 lines · Yan Zhao
Quoted 5 lines · Sean Christopherson
tools/testing/selftests/kvm/pre_fault_memory_test.c +2
-2- guest_test_phys_mem =align_down (guest_test_phys_mem, alignment); - guest_test_virt_mem = guest_test_phys_mem & ((1ULL << (vm->va_bits -1 )) -1 ); + gpa =align_down (gpa, alignment); + gva = gpa & ((1ULL << (vm->va_bits -1 )) -1 );
Quoted 6 lines
tools/testing/selftests/kvm/pre_fault_memory_test.c static void __test_pre_fault_memory(unsigned long vm_type, bool private) · line 186
Quoted 3 lines
tools/testing/selftests/kvm/pre_fault_memory_test.c +1
-2- vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, - guest_test_phys_mem, TEST_SLOT, TEST_NPAGES, + vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, gpa,Wrap at 80 characters?
tools/testing/selftests/kvm/pre_fault_memory_test.c static void __test_pre_fault_memory(unsigned long vm_type, bool private) · line 187
Quoted 1 line
tools/testing/selftests/kvm/pre_fault_memory_test.c +1
-0+ TEST_SLOT, TEST_NPAGES,
Hmm, yeah. Probably this?
vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, gpa, TEST_SLOT, TEST_NPAGES, private ? KVM_MEM_GUEST_MEMFD : 0);
which I like more than:
vm_userspace_mem_region_add(vm, VM_MEM_SRC_ANONYMOUS, gpa, TEST_SLOT, TEST_NPAGES, private ? KVM_MEM_GUEST_MEMFD : 0);
Quoted 21 lines
Quoted 7 lines
tools/testing/selftests/kvm/pre_fault_memory_test.c +2
-2private ? KVM_MEM_GUEST_MEMFD : 0); -virt_map (vm, guest_test_virt_mem, guest_test_phys_mem,TEST_NPAGES ); +virt_map (vm, gva, gpa,TEST_NPAGES );if (private) -vm_mem_set_private (vm, guest_test_phys_mem,TEST_SIZE ); +vm_mem_set_private (vm, gpa,TEST_SIZE );tools/testing/selftests/kvm/pre_fault_memory_test.c static void __test_pre_fault_memory(unsigned long vm_type, bool private) · line 198
Quoted 10 lines
tools/testing/selftests/kvm/pre_fault_memory_test.c +4
-4-pre_fault_memory (vcpu, guest_test_phys_mem,0 ,SZ_2M ,0 , private); -pre_fault_memory (vcpu, guest_test_phys_mem,SZ_2M ,PAGE_SIZE *2 ,PAGE_SIZE , private); -pre_fault_memory (vcpu, guest_test_phys_mem,TEST_SIZE ,PAGE_SIZE ,PAGE_SIZE , private); +pre_fault_memory (vcpu, gpa,0 ,SZ_2M ,0 , private); +pre_fault_memory (vcpu, gpa,SZ_2M ,PAGE_SIZE *2 ,PAGE_SIZE , private); +pre_fault_memory (vcpu, gpa,TEST_SIZE ,PAGE_SIZE ,PAGE_SIZE , private); -vcpu_args_set (vcpu,1 , guest_test_virt_mem); +vcpu_args_set (vcpu,1 , gva);Should we cleanup
guest_code()as below?(quoted diff) +1
-1-static void guest_code(uint64_t base_gpa) +static void guest_code(uint64_t base_gva)
Review
Quoted 10 lines
(quoted diff) +1
-1{ volatile uint64_t val __used; int i; for (i = 0; i < TEST_NPAGES; i++) { - uint64_t *src = (uint64_t *)(base_gpa + i * PAGE_SIZE); + uint64_t *src = (uint64_t *)(base_gva + i * PAGE_SIZE); val = *src; }
Yah, no reason not to (lot's of tests assume GPA==GVA, but that's not a good reason to be deliberately confusing).
Sean Christopherson
reviewerQuoted 4 lines · Sean Christopherson
Rename guest_test_{phys,virt}_mem to g{p,v}a in the pre-fault memory test to shorten line lengths and to use standard terminology.
No functional change intended.
Applied to kvm-x86 selftests, thanks!
[1/1] KVM: selftests: Use "gpa" and "gva" for local variable names in pre-fault test
https://github.com/kvm-x86/linux/commit/9e4ce7a89e0b
Yan Zhao
Reviewed-byQuoted 13 lines · Sean Christopherson
Quoted 4 lines · Sean Christopherson
Rename guest_test_{phys,virt}_mem to g{p,v}a in the pre-fault memory test to shorten line lengths and to use standard terminology.
No functional change intended.
Applied to kvm-x86 selftests, thanks!
[1/1] KVM: selftests: Use "gpa" and "gva" for local variable names in pre-fault test
https://github.com/kvm-x86/linux/commit/9e4ce7a89e0b