KVM: selftests: s390x: Provide additional num-guest-pages adjustment
PATCH 1/1 KVM: selftests: s390x: Provide additional num-guest-pages adjustment
s390 requires 1M aligned guest sizes. Embedding the rounding in vm_adjust_num_guest_pages() allows us to remove it from a few other places.
--- tools/testing/selftests/kvm/demand_paging_test.c | 4 ---- tools/testing/selftests/kvm/dirty_log_test.c | 5 +---- tools/testing/selftests/kvm/include/kvm_util.h | 8 +++++++- 3 files changed, 8 insertions(+), 9 deletions(-)
tools/testing/selftests/kvm/demand_paging_test.c +0 -4
@@ -378,10 +378,6 @@ static void run_test(enum vm_guest_mode mode, bool use_uffd, guest_num_pages = (vcpus * vcpu_memory_bytes) / guest_page_size; guest_num_pages =vm_adjust_num_guest_pages (mode, guest_num_pages); -#ifdef __s390x__ -/* Round up to multiple of 1M (segment size) */ - guest_num_pages = (guest_num_pages +0xff ) & ~0xffUL ; -#endif /* * If there should be more memory in the guest test region than there * can be pages in the guest, it will definitely cause problems.
tools/testing/selftests/kvm/dirty_log_test.c +1 -4
@@ -296,10 +296,7 @@ static void run_test(enum vm_guest_mode mode, unsigned long iterations, guest_num_pages = (1ul << (DIRTY_MEM_BITS -vm_get_page_shift (vm))) +3 ; guest_num_pages =vm_adjust_num_guest_pages (mode, guest_num_pages); -#ifdef __s390x__ -/* Round up to multiple of 1M (segment size) */ - guest_num_pages = (guest_num_pages +0xff ) & ~0xffUL ; -#endif + host_page_size =getpagesize (); host_num_pages =vm_num_host_pages (mode, guest_num_pages);
tools/testing/selftests/kvm/include/kvm_util.h +7 -1
@@ -164,7 +164,13 @@ unsigned int vm_num_guest_pages(enum vm_guest_mode mode, unsigned int num_host_pstatic inline unsigned int vm_adjust_num_guest_pages (enum vm_guest_mode mode,unsigned int num_guest_pages) { -return vm_num_guest_pages (mode,vm_num_host_pages (mode, num_guest_pages)); +unsigned int n; + n =vm_num_guest_pages (mode,vm_num_host_pages (mode, num_guest_pages)); +#ifdef __s390x__ +/* s390 requires 1M aligned guest sizes */ + n = (n +255 ) & ~255 ; +#endif +return n; } struct kvm_userspace_memory_region *
Signature · 1 line
2.21.1
Quoted 5 lines · Andrew Jones
s390 requires 1M aligned guest sizes. Embedding the rounding in
vm_adjust_num_guest_pages()allows us to remove it from a few other places.Signed-off-by Andrew Jones <[email protected]>
Quoted 42 lines
--- tools/testing/selftests/kvm/demand_paging_test.c | 4 ---- tools/testing/selftests/kvm/dirty_log_test.c | 5 +---- tools/testing/selftests/kvm/include/kvm_util.h | 8 +++++++- 3 files changed, 8 insertions(+), 9 deletions(-)tools/testing/selftests/kvm/demand_paging_test.c +0
-4@@ -378,10 +378,6 @@ static void run_test(enum vm_guest_mode mode, bool use_uffd, guest_num_pages = (vcpus * vcpu_memory_bytes) / guest_page_size; guest_num_pages =vm_adjust_num_guest_pages (mode, guest_num_pages); -#ifdef __s390x__ -/* Round up to multiple of 1M (segment size) */ - guest_num_pages = (guest_num_pages +0xff ) & ~0xffUL ; -#endif /* * If there should be more memory in the guest test region than there * can be pages in the guest, it will definitely cause problems. tools/testing/selftests/kvm/dirty_log_test.c +1
-4@@ -296,10 +296,7 @@ static void run_test(enum vm_guest_mode mode, unsigned long iterations, guest_num_pages = (1ul << (DIRTY_MEM_BITS -vm_get_page_shift (vm))) +3 ; guest_num_pages =vm_adjust_num_guest_pages (mode, guest_num_pages); -#ifdef __s390x__ -/* Round up to multiple of 1M (segment size) */ - guest_num_pages = (guest_num_pages +0xff ) & ~0xffUL ; -#endif + host_page_size =getpagesize (); host_num_pages =vm_num_host_pages (mode, guest_num_pages);tools/testing/selftests/kvm/include/kvm_util.h +0
-0
tools/testing/selftests/kvm/include/kvm_util.h unsigned int vm_num_guest_pages(enum vm_guest_mode mode, unsigned int num_host_p · line 171
Quoted 9 lines
tools/testing/selftests/kvm/include/kvm_util.h +5
-1@@ -164,7 +164,13 @@ unsigned int vm_num_guest_pages(enum vm_guest_mode mode, unsigned int num_host_pstatic inline unsigned int vm_adjust_num_guest_pages (enum vm_guest_mode mode,unsigned int num_guest_pages) { -return vm_num_guest_pages (mode,vm_num_host_pages (mode, num_guest_pages)); +unsigned int n; + n =vm_num_guest_pages (mode,vm_num_host_pages (mode, num_guest_pages)); +#ifdef __s390x__ +/* s390 requires 1M aligned guest sizes */ + n = (n +255 ) & ~255 ;
255 vs. 0xff probably does not matter.
Quoted 6 lines
tools/testing/selftests/kvm/include/kvm_util.h +2
-0+#endif +return n; } struct kvm_userspace_memory_region *
Quoted 52 lines · Andrew Jones
s390 requires 1M aligned guest sizes. Embedding the rounding in
vm_adjust_num_guest_pages()allows us to remove it from a few other places.Signed-off-by Andrew Jones <[email protected]>--- tools/testing/selftests/kvm/demand_paging_test.c | 4 ---- tools/testing/selftests/kvm/dirty_log_test.c | 5 +---- tools/testing/selftests/kvm/include/kvm_util.h | 8 +++++++- 3 files changed, 8 insertions(+), 9 deletions(-)tools/testing/selftests/kvm/demand_paging_test.c +0
-4@@ -378,10 +378,6 @@ static void run_test(enum vm_guest_mode mode, bool use_uffd, guest_num_pages = (vcpus * vcpu_memory_bytes) / guest_page_size; guest_num_pages =vm_adjust_num_guest_pages (mode, guest_num_pages); -#ifdef __s390x__ -/* Round up to multiple of 1M (segment size) */ - guest_num_pages = (guest_num_pages +0xff ) & ~0xffUL ; -#endif /* * If there should be more memory in the guest test region than there * can be pages in the guest, it will definitely cause problems. tools/testing/selftests/kvm/dirty_log_test.c +1
-4@@ -296,10 +296,7 @@ static void run_test(enum vm_guest_mode mode, unsigned long iterations, guest_num_pages = (1ul << (DIRTY_MEM_BITS -vm_get_page_shift (vm))) +3 ; guest_num_pages =vm_adjust_num_guest_pages (mode, guest_num_pages); -#ifdef __s390x__ -/* Round up to multiple of 1M (segment size) */ - guest_num_pages = (guest_num_pages +0xff ) & ~0xffUL ; -#endif + host_page_size =getpagesize (); host_num_pages =vm_num_host_pages (mode, guest_num_pages);tools/testing/selftests/kvm/include/kvm_util.h +0
-1@@ -164,7 +164,13 @@ unsigned int vm_num_guest_pages(enum vm_guest_mode mode, unsigned int num_host_pstatic inline unsigned int vm_adjust_num_guest_pages (enum vm_guest_mode mode,unsigned int num_guest_pages) { -return vm_num_guest_pages (mode,vm_num_host_pages (mode, num_guest_pages));
tools/testing/selftests/kvm/include/kvm_util.h unsigned int vm_num_guest_pages(enum vm_guest_mode mode, unsigned int num_host_p · line 176
Quoted 10 lines
tools/testing/selftests/kvm/include/kvm_util.h +7
-0+unsigned int n; + n =vm_num_guest_pages (mode,vm_num_host_pages (mode, num_guest_pages)); +#ifdef __s390x__ +/* s390 requires 1M aligned guest sizes */ + n = (n +255 ) & ~255 ; +#endif +return n; } struct kvm_userspace_memory_region *
Queued, thanks.
Paolo