-3

tools/testing/selftests/kvm/dirty_log_test.c

reviewed

··· 641 641 } 642 642 643 643 #ifdef __s390x__ 644 644 - /* Align to 1M (segment size) */ 645 645 - guest_test_phys_mem = align_down(guest_test_phys_mem, 1 << 20); 646 646 - 647 644 /* 648 645 * The workaround in guest_code() to write all pages prior to the first 649 646 * iteration isn't compatible with the dirty ring, as the dirty ring

-4

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

reviewed

··· 1127 1127 { 1128 1128 unsigned int n; 1129 1129 n = vm_num_guest_pages(mode, vm_num_host_pages(mode, num_guest_pages)); 1130 1130 - #ifdef __s390x__ 1131 1131 - /* s390 requires 1M aligned guest sizes */ 1132 1132 - n = (n + 255) & ~255; 1133 1133 - #endif 1134 1130 return n; 1135 1131 } 1136 1132

-3

tools/testing/selftests/kvm/kvm_page_table_test.c

reviewed

··· 261 261 guest_page_size; 262 262 else 263 263 guest_test_phys_mem = p->phys_offset; 264 264 - #ifdef __s390x__ 265 265 - alignment = max(0x100000UL, alignment); 266 266 - #endif 267 264 guest_test_phys_mem = align_down(guest_test_phys_mem, alignment); 268 265 269 266 /* Set up the shared data structure test_args */

+1 -8

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

reviewed

··· 985 985 struct userspace_mem_region *region; 986 986 size_t backing_src_pagesz = get_backing_src_pagesz(src_type); 987 987 size_t mem_size = npages * vm->page_size; 988 988 - size_t alignment; 988 988 + size_t alignment = 1; 989 989 990 990 TEST_REQUIRE_SET_USER_MEMORY_REGION2(); 991 991 ··· 1038 1038 region = calloc(1, sizeof(*region)); 1039 1039 TEST_ASSERT(region != NULL, "Insufficient Memory"); 1040 1040 region->mmap_size = mem_size; 1041 1041 - 1042 1042 - #ifdef __s390x__ 1043 1043 - /* On s390x, the host address must be aligned to 1M (due to PGSTEs) */ 1044 1044 - alignment = 0x100000; 1045 1045 - #else 1046 1046 - alignment = 1; 1047 1047 - #endif 1048 1041 1049 1042 /* 1050 1043 * When using THP mmap is not guaranteed to returned a hugepage aligned

-4

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

reviewed

··· 196 196 197 197 args->gpa = (region_end_gfn - guest_num_pages - 1) * args->guest_page_size; 198 198 args->gpa = align_down(args->gpa, backing_src_pagesz); 199 199 - #ifdef __s390x__ 200 200 - /* Align to 1M (segment size) */ 201 201 - args->gpa = align_down(args->gpa, 1 << 20); 202 202 - #endif 203 199 args->size = guest_num_pages * args->guest_page_size; 204 200 pr_info("guest physical test memory: [0x%lx, 0x%lx)\n", 205 201 args->gpa, args->gpa + args->size);

-4

tools/testing/selftests/kvm/pre_fault_memory_test.c

reviewed

··· 175 175 176 176 alignment = guest_page_size = vm_guest_mode_params[VM_MODE_DEFAULT].page_size; 177 177 gpa = (vm->max_gfn - TEST_NPAGES) * guest_page_size; 178 178 - #ifdef __s390x__ 179 179 - alignment = max(0x100000UL, guest_page_size); 180 180 - #else 181 178 alignment = SZ_2M; 182 182 - #endif 183 179 gpa = align_down(gpa, alignment); 184 180 gva = gpa & ((1ULL << (vm->va_bits - 1)) - 1); 185 181

+1 -8

tools/testing/selftests/kvm/set_memory_region_test.c

reviewed

··· 413 413 uint32_t max_mem_slots; 414 414 uint32_t slot; 415 415 void *mem, *mem_aligned, *mem_extra; 416 416 - size_t alignment; 417 417 - 418 418 - #ifdef __s390x__ 419 419 - /* On s390x, the host address must be aligned to 1M (due to PGSTEs) */ 420 420 - alignment = 0x100000; 421 421 - #else 422 422 - alignment = 1; 423 423 - #endif 416 416 + size_t alignment = 1; 424 417 425 418 max_mem_slots = kvm_check_cap(KVM_CAP_NR_MEMSLOTS); 426 419 TEST_ASSERT(max_mem_slots > 0,