KVM: selftests: Remove 1M alignment requirement for s390

Remove the 1M memslot alignment requirement for s390, since it is not
needed anymore.

Reviewed-by: Steffen Eiden <seiden@linux.ibm.com>
Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>

diff --git a/tools/testing/selftests/kvm/dirty_log_test.c b/tools/testing/selftests/kvm/dirty_log_test.c
index d58a641b0e6a79df38703aa8dccb24286f33aecb..7627b328f18a313d491ec373beea28cc700eaa0e 100644 (file)
--- a/tools/testing/selftests/kvm/dirty_log_test.c
+++ b/tools/testing/selftests/kvm/dirty_log_test.c
@@ -641,9 +641,6 @@ static void run_test(enum vm_guest_mode mode, void *arg)
        }
 
 #ifdef __s390x__
-       /* Align to 1M (segment size) */
-       guest_test_phys_mem = align_down(guest_test_phys_mem, 1 << 20);
-
        /*
         * The workaround in guest_code() to write all pages prior to the first
         * iteration isn't compatible with the dirty ring, as the dirty ring

diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h
index 8b39cb919f4fc429f422dccd4f7fff9c0d43fce4..f861242b4ae80627be7d78f6ec8fae2140c39f9c 100644 (file)
--- a/tools/testing/selftests/kvm/include/kvm_util.h
+++ b/tools/testing/selftests/kvm/include/kvm_util.h
@@ -1127,10 +1127,6 @@ vm_adjust_num_guest_pages(enum vm_guest_mode mode, unsigned int 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;
 }
 

diff --git a/tools/testing/selftests/kvm/kvm_page_table_test.c b/tools/testing/selftests/kvm/kvm_page_table_test.c
index dd8b12f626d3c0aadc2a48078270aac0a34ae2b5..c60a24a92829dbca1630a5dc70414d3c286d0246 100644 (file)
--- a/tools/testing/selftests/kvm/kvm_page_table_test.c
+++ b/tools/testing/selftests/kvm/kvm_page_table_test.c
@@ -261,9 +261,6 @@ static struct kvm_vm *pre_init_before_test(enum vm_guest_mode mode, void *arg)
                                       guest_page_size;
        else
                guest_test_phys_mem = p->phys_offset;
-#ifdef __s390x__
-       alignment = max(0x100000UL, alignment);
-#endif
        guest_test_phys_mem = align_down(guest_test_phys_mem, alignment);
 
        /* Set up the shared data structure test_args */

diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
index 1959bf556e88eaabe958804ec6f388785d9782bb..f5e076591c64bd69fae0e9f0ef94e2531c793ba3 100644 (file)
--- a/tools/testing/selftests/kvm/lib/kvm_util.c
+++ b/tools/testing/selftests/kvm/lib/kvm_util.c
@@ -985,7 +985,7 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,
        struct userspace_mem_region *region;
        size_t backing_src_pagesz = get_backing_src_pagesz(src_type);
        size_t mem_size = npages * vm->page_size;
-       size_t alignment;
+       size_t alignment = 1;
 
        TEST_REQUIRE_SET_USER_MEMORY_REGION2();
 
@@ -1039,13 +1039,6 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type,
        TEST_ASSERT(region != NULL, "Insufficient Memory");
        region->mmap_size = mem_size;
 
-#ifdef __s390x__
-       /* On s390x, the host address must be aligned to 1M (due to PGSTEs) */
-       alignment = 0x100000;
-#else
-       alignment = 1;
-#endif
-
        /*
         * When using THP mmap is not guaranteed to returned a hugepage aligned
         * address so we have to pad the mmap. Padding is not needed for HugeTLB

diff --git a/tools/testing/selftests/kvm/lib/memstress.c b/tools/testing/selftests/kvm/lib/memstress.c
index 557c0a0a56580c9705729d3209fcce501742522e..1ea735d66e1509e022ea6d914cfc498206a0cf10 100644 (file)
--- a/tools/testing/selftests/kvm/lib/memstress.c
+++ b/tools/testing/selftests/kvm/lib/memstress.c
@@ -196,10 +196,6 @@ struct kvm_vm *memstress_create_vm(enum vm_guest_mode mode, int nr_vcpus,
 
        args->gpa = (region_end_gfn - guest_num_pages - 1) * args->guest_page_size;
        args->gpa = align_down(args->gpa, backing_src_pagesz);
-#ifdef __s390x__
-       /* Align to 1M (segment size) */
-       args->gpa = align_down(args->gpa, 1 << 20);
-#endif
        args->size = guest_num_pages * args->guest_page_size;
        pr_info("guest physical test memory: [0x%lx, 0x%lx)\n",
                args->gpa, args->gpa + args->size);

diff --git a/tools/testing/selftests/kvm/pre_fault_memory_test.c b/tools/testing/selftests/kvm/pre_fault_memory_test.c
index 93e603d91311ccefd3079733ed1123b61233d459..f3de0386ba7b08e37b9230c0fdd07b99fbc8e837 100644 (file)
--- a/tools/testing/selftests/kvm/pre_fault_memory_test.c
+++ b/tools/testing/selftests/kvm/pre_fault_memory_test.c
@@ -175,11 +175,7 @@ static void __test_pre_fault_memory(unsigned long vm_type, bool private)
 
        alignment = guest_page_size = vm_guest_mode_params[VM_MODE_DEFAULT].page_size;
        gpa = (vm->max_gfn - TEST_NPAGES) * guest_page_size;
-#ifdef __s390x__
-       alignment = max(0x100000UL, guest_page_size);
-#else
        alignment = SZ_2M;
-#endif
        gpa = align_down(gpa, alignment);
        gva = gpa & ((1ULL << (vm->va_bits - 1)) - 1);
 

diff --git a/tools/testing/selftests/kvm/set_memory_region_test.c b/tools/testing/selftests/kvm/set_memory_region_test.c
index 7fe427ff9b38caf2f79edfe2808a0353dab58eea..a398dc3a8c4be124ac5a2d06f6dd664f00339462 100644 (file)
--- a/tools/testing/selftests/kvm/set_memory_region_test.c
+++ b/tools/testing/selftests/kvm/set_memory_region_test.c
@@ -413,14 +413,7 @@ static void test_add_max_memory_regions(void)
        uint32_t max_mem_slots;
        uint32_t slot;
        void *mem, *mem_aligned, *mem_extra;
-       size_t alignment;
-
-#ifdef __s390x__
-       /* On s390x, the host address must be aligned to 1M (due to PGSTEs) */
-       alignment = 0x100000;
-#else
-       alignment = 1;
-#endif
+       size_t alignment = 1;
 
        max_mem_slots = kvm_check_cap(KVM_CAP_NR_MEMSLOTS);
        TEST_ASSERT(max_mem_slots > 0,