lkml.org 
[lkml]   [2022]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v8 4/7] KVM: selftests: Use SZ_1G from sizes.h in max_guest_memory_test.c
    From
    Replace size_1gb defined in max_guest_memory_test.c with the SZ_1G from
    linux/sizes.h header file.

    Signed-off-by: Vipin Sharma <vipinsh@google.com>
    ---
    .../selftests/kvm/max_guest_memory_test.c | 16 ++++++++--------
    1 file changed, 8 insertions(+), 8 deletions(-)

    diff --git a/tools/testing/selftests/kvm/max_guest_memory_test.c b/tools/testing/selftests/kvm/max_guest_memory_test.c
    index 1595b73dc09a..8056dc5831b5 100644
    --- a/tools/testing/selftests/kvm/max_guest_memory_test.c
    +++ b/tools/testing/selftests/kvm/max_guest_memory_test.c
    @@ -11,6 +11,7 @@
    #include <linux/bitmap.h>
    #include <linux/bitops.h>
    #include <linux/atomic.h>
    +#include <linux/sizes.h>

    #include "kvm_util.h"
    #include "test_util.h"
    @@ -162,8 +163,7 @@ int main(int argc, char *argv[])
    * just below the 4gb boundary. This test could create memory at
    * 1gb-3gb,but it's simpler to skip straight to 4gb.
    */
    - const uint64_t size_1gb = (1 << 30);
    - const uint64_t start_gpa = (4ull * size_1gb);
    + const uint64_t start_gpa = SZ_4G;
    const int first_slot = 1;

    struct timespec time_start, time_run1, time_reset, time_run2;
    @@ -180,13 +180,13 @@ int main(int argc, char *argv[])
    * are quite common for x86, requires changing only max_mem (KVM allows
    * 32k memslots, 32k * 2gb == ~64tb of guest memory).
    */
    - slot_size = 2 * size_1gb;
    + slot_size = SZ_2G;

    max_slots = kvm_check_cap(KVM_CAP_NR_MEMSLOTS);
    TEST_ASSERT(max_slots > first_slot, "KVM is broken");

    /* All KVM MMUs should be able to survive a 128gb guest. */
    - max_mem = 128 * size_1gb;
    + max_mem = 128ull * SZ_1G;

    calc_default_nr_vcpus();

    @@ -197,11 +197,11 @@ int main(int argc, char *argv[])
    TEST_ASSERT(nr_vcpus > 0, "number of vcpus must be >0");
    break;
    case 'm':
    - max_mem = atoi_paranoid(optarg) * size_1gb;
    + max_mem = 1ull * atoi_paranoid(optarg) * SZ_1G;
    TEST_ASSERT(max_mem > 0, "memory size must be >0");
    break;
    case 's':
    - slot_size = atoi_paranoid(optarg) * size_1gb;
    + slot_size = 1ull * atoi_paranoid(optarg) * SZ_1G;
    TEST_ASSERT(slot_size > 0, "slot size must be >0");
    break;
    case 'H':
    @@ -245,7 +245,7 @@ int main(int argc, char *argv[])

    #ifdef __x86_64__
    /* Identity map memory in the guest using 1gb pages. */
    - for (i = 0; i < slot_size; i += size_1gb)
    + for (i = 0; i < slot_size; i += SZ_1G)
    __virt_pg_map(vm, gpa + i, gpa + i, PG_LEVEL_1G);
    #else
    for (i = 0; i < slot_size; i += vm->page_size)
    @@ -260,7 +260,7 @@ int main(int argc, char *argv[])
    vcpus = NULL;

    pr_info("Running with %lugb of guest memory and %u vCPUs\n",
    - (gpa - start_gpa) / size_1gb, nr_vcpus);
    + (gpa - start_gpa) / SZ_1G, nr_vcpus);

    rendezvous_with_vcpus(&time_start, "spawning");
    rendezvous_with_vcpus(&time_run1, "run 1");
    --
    2.38.1.273.g43a17bfeac-goog
    \
     
     \ /
      Last update: 2022-11-03 00:38    [W:6.845 / U:0.068 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site