From patchwork Fri Sep 9 12:42:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 12971722 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DC5F5ECAAD3 for ; Fri, 9 Sep 2022 12:43:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231660AbiIIMnH (ORCPT ); Fri, 9 Sep 2022 08:43:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51164 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231504AbiIIMnE (ORCPT ); Fri, 9 Sep 2022 08:43:04 -0400 Received: from mail-il1-x149.google.com (mail-il1-x149.google.com [IPv6:2607:f8b0:4864:20::149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E88EDE22AA for ; Fri, 9 Sep 2022 05:43:02 -0700 (PDT) Received: by mail-il1-x149.google.com with SMTP id c7-20020a056e020bc700b002e59be6ce85so1125170ilu.12 for ; Fri, 09 Sep 2022 05:43:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=+cGIHyyO/TObOL7RYYQROdZlDl2AFQdBqWIubWPNzGw=; b=L/IAeuC6iOYy/ATBkN+2mrAZ0AeQVgwkX07qBYe6mgpQI1vzc9krJCvnnDElBR7484 sYwqJ0IJxawovSovUOc3efEcEfUOP7MzAwxDSlJPxHTO5Vi0r21pGGsM32b98u7HNQ8K HD69NcySu7nkfDzfPBA4ZZK85Zqs6sf/5qx1PW77nAWsFaO+srTamdk85rwh1n95b1O3 9qIXMkADLPUtDzjDXVrLWlKov1wsYzBIFiOQj52Ch6H79m5yS+KB+CCyv1MBVY88hsHv PGC4vRS2fKDXEeRnVcCgZJw1kBcmj6ttY/ezacMm7M8jhG7JqQBuCZo9rfPd8ltvk18X AGxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=+cGIHyyO/TObOL7RYYQROdZlDl2AFQdBqWIubWPNzGw=; b=e6LuJF2Ur5pFAEB2gbeuVyM/eRMB+PkTOq8h4MBQRqQiOWCRFvcHifBWEGVGDCc6Nn E+Ef5WqmkKORjUqQyPktJti32JHcu1rW6bvomJ6A+Q2oFpw8nnc7Lu13kHa1R4MfMKhz +hRxzcNFKhP5rEOdLWC2rEZNdbVlG522a/cqMXEzKEHys+VRfKooBz6k3sWuiLEht8C5 QR098MhDDj0HaYRGx6xtBqihSOGhAR2p47e5JfuDAfHlfX036G0hY3Woys66BBKQuTRo 5PnHjyurP31ltWLVbmWTW4CdZ0lVzLXBcg9AzKYm8yrfqxXnClSZTVQvGQjGsr1k5278 3Z7g== X-Gm-Message-State: ACgBeo1iNvdnfBSTLineWJio6klhkcO4KR1+TeYMpMbR4WyW0Ji5eNEb WSF5KVE6jjBdOBh9Y8oKl+bTdiRhfTU660rCjOWLYNtaHPuE5SuHWeElEC3lj+AUBhgS2H/K0Q2 YeEM1+zF0x/xkgAuX9QhMk/p1AbujmiHCC2Berui+g5Zn7UmqW/pKRd133lcdpRxGfZXbSlc= X-Google-Smtp-Source: AA6agR40+uxXYn6e0ajQyeoeGxbQyG+VOqh5t35xj8Fm0v0JswBLy7rYc98ItA5pJqUpVUAxpfQIpoem3XstmrL13g== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:14ce]) (user=coltonlewis job=sendgmr) by 2002:a6b:6219:0:b0:689:7d47:4fe8 with SMTP id f25-20020a6b6219000000b006897d474fe8mr6325926iog.39.1662727382214; Fri, 09 Sep 2022 05:43:02 -0700 (PDT) Date: Fri, 9 Sep 2022 12:42:58 +0000 In-Reply-To: <20220909124300.3409187-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20220909124300.3409187-1-coltonlewis@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220909124300.3409187-2-coltonlewis@google.com> Subject: [PATCH v5 1/3] KVM: selftests: implement random number generation for guest code From: Colton Lewis To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, maz@kernel.org, dmatlack@google.com, seanjc@google.com, oupton@google.com, ricarkol@google.com, andrew.jones@linux.dev, Colton Lewis Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Implement random number generation for guest code to randomize parts of the test, making it less predictable and a more accurate reflection of reality. Create a -r argument to specify a random seed. If no argument is provided, the seed defaults to the current Unix timestamp. The random seed is set with perf_test_set_random_seed() and must be set before guest_code runs to apply. The random number generator chosen is the Park-Miller Linear Congruential Generator, a fancy name for a basic and well-understood random number generator entirely sufficient for this purpose. Each vCPU calculates its own seed by adding its index to the seed provided. Signed-off-by: Colton Lewis Reviewed-by: Ricardo Koller --- tools/testing/selftests/kvm/dirty_log_perf_test.c | 12 ++++++++++-- tools/testing/selftests/kvm/include/perf_test_util.h | 2 ++ tools/testing/selftests/kvm/include/test_util.h | 2 ++ tools/testing/selftests/kvm/lib/perf_test_util.c | 11 ++++++++++- tools/testing/selftests/kvm/lib/test_util.c | 9 +++++++++ 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/dirty_log_perf_test.c b/tools/testing/selftests/kvm/dirty_log_perf_test.c index d60a34cdfaee..2f91acd94130 100644 --- a/tools/testing/selftests/kvm/dirty_log_perf_test.c +++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c @@ -126,6 +126,7 @@ struct test_params { bool partition_vcpu_memory_access; enum vm_mem_backing_src_type backing_src; int slots; + uint32_t random_seed; }; static void toggle_dirty_logging(struct kvm_vm *vm, int slots, bool enable) @@ -220,6 +221,8 @@ static void run_test(enum vm_guest_mode mode, void *arg) p->slots, p->backing_src, p->partition_vcpu_memory_access); + pr_info("Random seed: %u\n", p->random_seed); + perf_test_set_random_seed(vm, p->random_seed); perf_test_set_wr_fract(vm, p->wr_fract); guest_num_pages = (nr_vcpus * guest_percpu_mem_size) >> vm_get_page_shift(vm); @@ -337,7 +340,7 @@ static void help(char *name) { puts(""); printf("usage: %s [-h] [-i iterations] [-p offset] [-g] " - "[-m mode] [-n] [-b vcpu bytes] [-v vcpus] [-o] [-s mem type]" + "[-m mode] [-n] [-b vcpu bytes] [-v vcpus] [-o] [-r random seed ] [-s mem type]" "[-x memslots]\n", name); puts(""); printf(" -i: specify iteration counts (default: %"PRIu64")\n", @@ -362,6 +365,7 @@ static void help(char *name) printf(" -v: specify the number of vCPUs to run.\n"); printf(" -o: Overlap guest memory accesses instead of partitioning\n" " them into a separate region of memory for each vCPU.\n"); + printf(" -r: specify the starting random seed.\n"); backing_src_help("-s"); printf(" -x: Split the memory region into this number of memslots.\n" " (default: 1)\n"); @@ -378,6 +382,7 @@ int main(int argc, char *argv[]) .partition_vcpu_memory_access = true, .backing_src = DEFAULT_VM_MEM_SRC, .slots = 1, + .random_seed = time(NULL), }; int opt; @@ -388,7 +393,7 @@ int main(int argc, char *argv[]) guest_modes_append_default(); - while ((opt = getopt(argc, argv, "ghi:p:m:nb:f:v:os:x:")) != -1) { + while ((opt = getopt(argc, argv, "ghi:p:m:nb:f:v:or:s:x:")) != -1) { switch (opt) { case 'g': dirty_log_manual_caps = 0; @@ -421,6 +426,9 @@ int main(int argc, char *argv[]) case 'o': p.partition_vcpu_memory_access = false; break; + case 'r': + p.random_seed = atoi(optarg); + break; case 's': p.backing_src = parse_backing_src_type(optarg); break; diff --git a/tools/testing/selftests/kvm/include/perf_test_util.h b/tools/testing/selftests/kvm/include/perf_test_util.h index d822cb670f1c..f18530984b42 100644 --- a/tools/testing/selftests/kvm/include/perf_test_util.h +++ b/tools/testing/selftests/kvm/include/perf_test_util.h @@ -34,6 +34,7 @@ struct perf_test_args { uint64_t gpa; uint64_t size; uint64_t guest_page_size; + uint32_t random_seed; int wr_fract; /* Run vCPUs in L2 instead of L1, if the architecture supports it. */ @@ -51,6 +52,7 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int vcpus, void perf_test_destroy_vm(struct kvm_vm *vm); void perf_test_set_wr_fract(struct kvm_vm *vm, int wr_fract); +void perf_test_set_random_seed(struct kvm_vm *vm, uint32_t random_seed); void perf_test_start_vcpu_threads(int vcpus, void (*vcpu_fn)(struct perf_test_vcpu_args *)); void perf_test_join_vcpu_threads(int vcpus); diff --git a/tools/testing/selftests/kvm/include/test_util.h b/tools/testing/selftests/kvm/include/test_util.h index 99e0dcdc923f..2dd286bcf46f 100644 --- a/tools/testing/selftests/kvm/include/test_util.h +++ b/tools/testing/selftests/kvm/include/test_util.h @@ -143,4 +143,6 @@ static inline void *align_ptr_up(void *x, size_t size) return (void *)align_up((unsigned long)x, size); } +void guest_random(uint32_t *seed); + #endif /* SELFTEST_KVM_TEST_UTIL_H */ diff --git a/tools/testing/selftests/kvm/lib/perf_test_util.c b/tools/testing/selftests/kvm/lib/perf_test_util.c index f989ff91f022..4d9c7d7693d9 100644 --- a/tools/testing/selftests/kvm/lib/perf_test_util.c +++ b/tools/testing/selftests/kvm/lib/perf_test_util.c @@ -47,6 +47,7 @@ void perf_test_guest_code(uint32_t vcpu_id) uint64_t gva; uint64_t pages; int i; + uint32_t rand = pta->random_seed + vcpu_id; /* Make sure vCPU args data structure is not corrupt. */ GUEST_ASSERT(vcpu_args->vcpu_id == vcpu_id); @@ -57,6 +58,7 @@ void perf_test_guest_code(uint32_t vcpu_id) while (true) { for (i = 0; i < pages; i++) { uint64_t addr = gva + (i * pta->guest_page_size); + guest_random(&rand); if (i % pta->wr_fract == 0) *(uint64_t *)addr = 0x0123456789ABCDEF; @@ -115,8 +117,9 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int vcpus, pr_info("Testing guest mode: %s\n", vm_guest_mode_string(mode)); - /* By default vCPUs will write to memory. */ + /* Set perf_test_args defaults. */ pta->wr_fract = 1; + pta->random_seed = time(NULL); /* * Snapshot the non-huge page size. This is used by the guest code to @@ -224,6 +227,12 @@ void perf_test_set_wr_fract(struct kvm_vm *vm, int wr_fract) sync_global_to_guest(vm, perf_test_args); } +void perf_test_set_random_seed(struct kvm_vm *vm, uint32_t random_seed) +{ + perf_test_args.random_seed = random_seed; + sync_global_to_guest(vm, perf_test_args.random_seed); +} + uint64_t __weak perf_test_nested_pages(int nr_vcpus) { return 0; diff --git a/tools/testing/selftests/kvm/lib/test_util.c b/tools/testing/selftests/kvm/lib/test_util.c index 6d23878bbfe1..28c895743abe 100644 --- a/tools/testing/selftests/kvm/lib/test_util.c +++ b/tools/testing/selftests/kvm/lib/test_util.c @@ -17,6 +17,15 @@ #include "test_util.h" +/* + * Random number generator that is usable from guest code. This is the + * Park-Miller LCG using standard constants. + */ +void guest_random(uint32_t *seed) +{ + *seed = (uint64_t)*seed * 48271 % ((uint32_t)(1 << 31) - 1); +} + /* * Parses "[0-9]+[kmgt]?". */ From patchwork Fri Sep 9 12:42:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 12971723 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5407EECAAA1 for ; Fri, 9 Sep 2022 12:43:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229715AbiIIMnI (ORCPT ); Fri, 9 Sep 2022 08:43:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231312AbiIIMnF (ORCPT ); Fri, 9 Sep 2022 08:43:05 -0400 Received: from mail-il1-x149.google.com (mail-il1-x149.google.com [IPv6:2607:f8b0:4864:20::149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F219EBD283 for ; Fri, 9 Sep 2022 05:43:03 -0700 (PDT) Received: by mail-il1-x149.google.com with SMTP id o2-20020a056e0214c200b002eb8acbd27cso1127466ilk.22 for ; Fri, 09 Sep 2022 05:43:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=BMjKG2as0qOSM/SLj3SEmTF/TkVf+vK3g2yJY2fFR98=; b=bvlWVbDHbsxtZKjoySifdX++pIzQFA5pnfEdamliSst6RqC0cOcqMd3zhVPFqQFMVG kWVCVsyAkjpbBTxJcpj9uZwyxgfRfJFcKdhF2sAPxpdCWM2RSN+yLukULGQOTKQqv6a5 VfhKswtFSg6efZrKu/AO5PXYbQkabR1dwxbr2Js2lU08nP41CCL4kbISz6j9775oRvm2 foiaBX0wty6uj8vdEy0Kus8Aw8HbFCN3VRNN84X6XEHes1j9pKE9G0m43cYxa/Cci7Ir Dvcn+30mJsOzeiZsNUMbo+cUD0xLrG2iRTneOJ77TiKG57j0159/+cJ9nnAw+tkN8dAT ibnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=BMjKG2as0qOSM/SLj3SEmTF/TkVf+vK3g2yJY2fFR98=; b=l+MS0ZkU58D0IBo29vgKqMr1Zhd51+bKlXDnKTbRxlvqHzbjONwwYixE9svPz8wIPR ZpkMMIYg00lXtkdWyQ/PYqWyAJzVqecTzkRpk+u/zHTbSVazjAsA+GNWlnfjklg/5wKJ tFYcamCXKrnr8A2l2WI7Tmg2suZMKI8HtYoP47sEI3h586mGI+VaV/iQqK9U6r7dSGlh 7jTmx/Vq0K3G9gK8JImVwvVvncPpvUZz+ahT/TjmY0FdYJ3QDPUe6tCVa08cHbFfry7N l/pml6o2GDBetYPY0wZOZ7Bf0qg16zn4vcld7fpegxa+LJBin2Ei25YviDC2EAMKWADm 11zA== X-Gm-Message-State: ACgBeo1P5WcdeGTCVUfVUPygj+yo0kCt5s3Bvyu8JIPtGA03KInRFkri ixclPxV9/3gbJS5IiJjMkoonSGMRCb0lL1xeC/A2syqLzdvXqP4MLCzJP75JvsL+FgAs7TUhoBJ gbbXUw34uuwjjG+uuPn4YiJeDtgyTNuYRKlkXyfz1nm0zcxDNR3wosIRBRaOb2KbvESF8Thg= X-Google-Smtp-Source: AA6agR7eZl4INC5kiqnPUf6noZQ8hiTzzdfUcxUxtFd8aQb/kQhDeATzkl5v78WQpJlz9qa9/u1rjoX3htS3e859VA== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:14ce]) (user=coltonlewis job=sendgmr) by 2002:a05:6638:25d3:b0:34a:1590:6b8a with SMTP id u19-20020a05663825d300b0034a15906b8amr7439403jat.303.1662727383402; Fri, 09 Sep 2022 05:43:03 -0700 (PDT) Date: Fri, 9 Sep 2022 12:42:59 +0000 In-Reply-To: <20220909124300.3409187-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20220909124300.3409187-1-coltonlewis@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220909124300.3409187-3-coltonlewis@google.com> Subject: [PATCH v5 2/3] KVM: selftests: randomize which pages are written vs read From: Colton Lewis To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, maz@kernel.org, dmatlack@google.com, seanjc@google.com, oupton@google.com, ricarkol@google.com, andrew.jones@linux.dev, Colton Lewis Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Randomize which pages are written vs read using the random number generator. Change the variable wr_fract and associated function calls to write_percent that now operates as a percentage from 0 to 100 where X means each page has an X% chance of being written. Change the -f argument to -w to reflect the new variable semantics. Keep the same default of 100% writes. Population always uses 100% writes. Signed-off-by: Colton Lewis Reviewed-by: Ricardo Koller Reviewed-by: David Matlack --- .../selftests/kvm/access_tracking_perf_test.c | 2 +- .../selftests/kvm/dirty_log_perf_test.c | 30 +++++++++++-------- .../selftests/kvm/include/perf_test_util.h | 4 +-- .../selftests/kvm/lib/perf_test_util.c | 10 +++---- 4 files changed, 25 insertions(+), 21 deletions(-) diff --git a/tools/testing/selftests/kvm/access_tracking_perf_test.c b/tools/testing/selftests/kvm/access_tracking_perf_test.c index d8909032317a..d86046ef3a0b 100644 --- a/tools/testing/selftests/kvm/access_tracking_perf_test.c +++ b/tools/testing/selftests/kvm/access_tracking_perf_test.c @@ -274,7 +274,7 @@ static void run_iteration(struct kvm_vm *vm, int vcpus, const char *description) static void access_memory(struct kvm_vm *vm, int vcpus, enum access_type access, const char *description) { - perf_test_set_wr_fract(vm, (access == ACCESS_READ) ? INT_MAX : 1); + perf_test_set_write_percent(vm, (access == ACCESS_READ) ? 0 : 100); iteration_work = ITERATION_ACCESS_MEMORY; run_iteration(vm, vcpus, description); } diff --git a/tools/testing/selftests/kvm/dirty_log_perf_test.c b/tools/testing/selftests/kvm/dirty_log_perf_test.c index 2f91acd94130..c2ad299b3760 100644 --- a/tools/testing/selftests/kvm/dirty_log_perf_test.c +++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c @@ -122,10 +122,10 @@ static void vcpu_worker(struct perf_test_vcpu_args *vcpu_args) struct test_params { unsigned long iterations; uint64_t phys_offset; - int wr_fract; bool partition_vcpu_memory_access; enum vm_mem_backing_src_type backing_src; int slots; + uint32_t write_percent; uint32_t random_seed; }; @@ -223,7 +223,6 @@ static void run_test(enum vm_guest_mode mode, void *arg) pr_info("Random seed: %u\n", p->random_seed); perf_test_set_random_seed(vm, p->random_seed); - perf_test_set_wr_fract(vm, p->wr_fract); guest_num_pages = (nr_vcpus * guest_percpu_mem_size) >> vm_get_page_shift(vm); guest_num_pages = vm_adjust_num_guest_pages(mode, guest_num_pages); @@ -248,6 +247,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) for (vcpu_id = 0; vcpu_id < nr_vcpus; vcpu_id++) vcpu_last_completed_iteration[vcpu_id] = -1; + perf_test_set_write_percent(vm, 100); perf_test_start_vcpu_threads(nr_vcpus, vcpu_worker); /* Allow the vCPUs to populate memory */ @@ -269,6 +269,8 @@ static void run_test(enum vm_guest_mode mode, void *arg) pr_info("Enabling dirty logging time: %ld.%.9lds\n\n", ts_diff.tv_sec, ts_diff.tv_nsec); + perf_test_set_write_percent(vm, p->write_percent); + while (iteration < p->iterations) { /* * Incrementing the iteration number will start the vCPUs @@ -341,7 +343,7 @@ static void help(char *name) puts(""); printf("usage: %s [-h] [-i iterations] [-p offset] [-g] " "[-m mode] [-n] [-b vcpu bytes] [-v vcpus] [-o] [-r random seed ] [-s mem type]" - "[-x memslots]\n", name); + "[-x memslots] [-w percentage]\n", name); puts(""); printf(" -i: specify iteration counts (default: %"PRIu64")\n", TEST_HOST_LOOP_N); @@ -358,10 +360,6 @@ static void help(char *name) printf(" -b: specify the size of the memory region which should be\n" " dirtied by each vCPU. e.g. 10M or 3G.\n" " (default: 1G)\n"); - printf(" -f: specify the fraction of pages which should be written to\n" - " as opposed to simply read, in the form\n" - " 1/.\n" - " (default: 1 i.e. all pages are written to.)\n"); printf(" -v: specify the number of vCPUs to run.\n"); printf(" -o: Overlap guest memory accesses instead of partitioning\n" " them into a separate region of memory for each vCPU.\n"); @@ -369,6 +367,11 @@ static void help(char *name) backing_src_help("-s"); printf(" -x: Split the memory region into this number of memslots.\n" " (default: 1)\n"); + printf(" -w: specify the percentage of pages which should be written to\n" + " as an integer from 0-100 inclusive. This is probabalistic,\n" + " so -w X means each page has an X%% chance of writing\n" + " and a (100-X)%% chance of reading.\n" + " (default: 100 i.e. all pages are written to.)\n"); puts(""); exit(0); } @@ -378,10 +381,10 @@ int main(int argc, char *argv[]) int max_vcpus = kvm_check_cap(KVM_CAP_MAX_VCPUS); struct test_params p = { .iterations = TEST_HOST_LOOP_N, - .wr_fract = 1, .partition_vcpu_memory_access = true, .backing_src = DEFAULT_VM_MEM_SRC, .slots = 1, + .write_percent = 100, .random_seed = time(NULL), }; int opt; @@ -393,7 +396,7 @@ int main(int argc, char *argv[]) guest_modes_append_default(); - while ((opt = getopt(argc, argv, "ghi:p:m:nb:f:v:or:s:x:")) != -1) { + while ((opt = getopt(argc, argv, "ghi:p:m:nb:v:or:s:x:w:")) != -1) { switch (opt) { case 'g': dirty_log_manual_caps = 0; @@ -413,10 +416,11 @@ int main(int argc, char *argv[]) case 'b': guest_percpu_mem_size = parse_size(optarg); break; - case 'f': - p.wr_fract = atoi(optarg); - TEST_ASSERT(p.wr_fract >= 1, - "Write fraction cannot be less than one"); + case 'w': + p.write_percent = atoi(optarg); + TEST_ASSERT(p.write_percent >= 0 + && p.write_percent <= 100, + "Write percentage must be between 0 and 100"); break; case 'v': nr_vcpus = atoi(optarg); diff --git a/tools/testing/selftests/kvm/include/perf_test_util.h b/tools/testing/selftests/kvm/include/perf_test_util.h index f18530984b42..f93f2ea7c6a3 100644 --- a/tools/testing/selftests/kvm/include/perf_test_util.h +++ b/tools/testing/selftests/kvm/include/perf_test_util.h @@ -35,7 +35,7 @@ struct perf_test_args { uint64_t size; uint64_t guest_page_size; uint32_t random_seed; - int wr_fract; + uint32_t write_percent; /* Run vCPUs in L2 instead of L1, if the architecture supports it. */ bool nested; @@ -51,7 +51,7 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int vcpus, bool partition_vcpu_memory_access); void perf_test_destroy_vm(struct kvm_vm *vm); -void perf_test_set_wr_fract(struct kvm_vm *vm, int wr_fract); +void perf_test_set_write_percent(struct kvm_vm *vm, uint32_t write_percent); void perf_test_set_random_seed(struct kvm_vm *vm, uint32_t random_seed); void perf_test_start_vcpu_threads(int vcpus, void (*vcpu_fn)(struct perf_test_vcpu_args *)); diff --git a/tools/testing/selftests/kvm/lib/perf_test_util.c b/tools/testing/selftests/kvm/lib/perf_test_util.c index 4d9c7d7693d9..12a3597be1f9 100644 --- a/tools/testing/selftests/kvm/lib/perf_test_util.c +++ b/tools/testing/selftests/kvm/lib/perf_test_util.c @@ -60,7 +60,7 @@ void perf_test_guest_code(uint32_t vcpu_id) uint64_t addr = gva + (i * pta->guest_page_size); guest_random(&rand); - if (i % pta->wr_fract == 0) + if (rand % 100 < pta->write_percent) *(uint64_t *)addr = 0x0123456789ABCDEF; else READ_ONCE(*(uint64_t *)addr); @@ -118,7 +118,7 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int vcpus, pr_info("Testing guest mode: %s\n", vm_guest_mode_string(mode)); /* Set perf_test_args defaults. */ - pta->wr_fract = 1; + pta->write_percent = 100; pta->random_seed = time(NULL); /* @@ -221,10 +221,10 @@ void perf_test_destroy_vm(struct kvm_vm *vm) kvm_vm_free(vm); } -void perf_test_set_wr_fract(struct kvm_vm *vm, int wr_fract) +void perf_test_set_write_percent(struct kvm_vm *vm, uint32_t write_percent) { - perf_test_args.wr_fract = wr_fract; - sync_global_to_guest(vm, perf_test_args); + perf_test_args.write_percent = write_percent; + sync_global_to_guest(vm, perf_test_args.write_percent); } void perf_test_set_random_seed(struct kvm_vm *vm, uint32_t random_seed) From patchwork Fri Sep 9 12:43:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 12971724 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BC03C6FA82 for ; Fri, 9 Sep 2022 12:43:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231631AbiIIMnK (ORCPT ); Fri, 9 Sep 2022 08:43:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231590AbiIIMnG (ORCPT ); Fri, 9 Sep 2022 08:43:06 -0400 Received: from mail-il1-x14a.google.com (mail-il1-x14a.google.com [IPv6:2607:f8b0:4864:20::14a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C69F109D3F for ; Fri, 9 Sep 2022 05:43:05 -0700 (PDT) Received: by mail-il1-x14a.google.com with SMTP id a12-20020a92c54c000000b002f146fd423dso1108041ilj.19 for ; Fri, 09 Sep 2022 05:43:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date; bh=MGTz4V3aYmu5Ny1o3UC5sIQZoHtez2zS7W5OlREpVM8=; b=RFMJxwY+77Tb5oFy19vNK3wYlIEkTdfGVACeb1W/t2UfDzpyOpXwITCJxcjqSMJSvx 1aTj9gAIUNVhqzq49Aqkpznd1WJsvEt66zx0WuICQsbajGYOPav0at6R2eZHRzchuFuq n3bX10/Q3rA4r4OTNbWLbfllXvDbUp/0/3DF1reu2jEAPS6T6IWGLpz75S6vTvAr7fq1 BBLWICI+R+QV6tSHhDMYPwAwMxhpyO0ZYoo9YDnWI6MmvrORUPFDZlYSuXkt2Ft3DQfW h7pNsFwbhN0DWUHkr/4neGkDWz45IFCJOtJ9vEnoUlFKKtp+kTFkN+EUM4cBLVPDcsrX g6/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date; bh=MGTz4V3aYmu5Ny1o3UC5sIQZoHtez2zS7W5OlREpVM8=; b=vS/VQwjHtYSktuT2hST7H6nHaFLQWdjupPR75OLHnDvnoxtUqlSUWjawlW3c3bzE9R Rkg9WqrnMuyytEsXcNxH1sUwL76JQw0uTqOxTynv6QdMzBQVpi6jpAQ6Kh+b/TK/0z50 Ki4N5lHX72aBI7VEUKsHJWYgJatScWUSdIRrpcRHUNLCYP8jZxIEhdLa0Mu585yyeHoO rkFUjYVyGk2blgqZKYk80rVQmqTUrG0ZJ7SpMQXxpOT5VOxqYVbR6cuE3DRiuE2cjPMv IIumydTLVpndvkLNN+RUMW22jpsbIR28jtY4Cf4mzPJFvHna9j37f9xDt6lFK4CMqoUo mefg== X-Gm-Message-State: ACgBeo1La/D7cuT5hMHXrIxM4GXaA3P5qorl1klknRdLnhi7kd7JIgCz qAeBT7/TLIRGrMdFyUsrzdiuISKZfm6Y1x/vxEVyqB6l6NIxnx651JGklJf3l91MuSEft6pmQhb CKEmZ/sUMFOSYxs0dDaf3UwkWAzVBR7+PQZvgZJ9uKRnxhjSgY0NvkvfwdNRLEaDBtOsigB8= X-Google-Smtp-Source: AA6agR7kKIEDaBNgC++hs12/nX8lBcS0Tw+PO9/sfW+49RkJ0oMv2sWBMuRF1X3IIuIFFApEdH5FwFr5dNES+oR1tw== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:14ce]) (user=coltonlewis job=sendgmr) by 2002:a05:6602:2f09:b0:689:8993:6052 with SMTP id q9-20020a0566022f0900b0068989936052mr6825747iow.114.1662727384465; Fri, 09 Sep 2022 05:43:04 -0700 (PDT) Date: Fri, 9 Sep 2022 12:43:00 +0000 In-Reply-To: <20220909124300.3409187-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20220909124300.3409187-1-coltonlewis@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220909124300.3409187-4-coltonlewis@google.com> Subject: [PATCH v5 3/3] KVM: selftests: randomize page access order From: Colton Lewis To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, maz@kernel.org, dmatlack@google.com, seanjc@google.com, oupton@google.com, ricarkol@google.com, andrew.jones@linux.dev, Colton Lewis Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Create the ability to randomize page access order with the -a argument, including the possibility that the same pages may be hit multiple times during an iteration or not at all. Population sets random access to false. Signed-off-by: Colton Lewis Reviewed-by: Ricardo Koller --- tools/testing/selftests/kvm/dirty_log_perf_test.c | 11 +++++++++-- .../selftests/kvm/include/perf_test_util.h | 2 ++ tools/testing/selftests/kvm/lib/perf_test_util.c | 15 ++++++++++++++- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/kvm/dirty_log_perf_test.c b/tools/testing/selftests/kvm/dirty_log_perf_test.c index c2ad299b3760..3639d5f95033 100644 --- a/tools/testing/selftests/kvm/dirty_log_perf_test.c +++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c @@ -127,6 +127,7 @@ struct test_params { int slots; uint32_t write_percent; uint32_t random_seed; + bool random_access; }; static void toggle_dirty_logging(struct kvm_vm *vm, int slots, bool enable) @@ -248,6 +249,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) vcpu_last_completed_iteration[vcpu_id] = -1; perf_test_set_write_percent(vm, 100); + perf_test_set_random_access(vm, false); perf_test_start_vcpu_threads(nr_vcpus, vcpu_worker); /* Allow the vCPUs to populate memory */ @@ -270,6 +272,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) ts_diff.tv_sec, ts_diff.tv_nsec); perf_test_set_write_percent(vm, p->write_percent); + perf_test_set_random_access(vm, p->random_access); while (iteration < p->iterations) { /* @@ -341,10 +344,11 @@ static void run_test(enum vm_guest_mode mode, void *arg) static void help(char *name) { puts(""); - printf("usage: %s [-h] [-i iterations] [-p offset] [-g] " + printf("usage: %s [-h] [-a] [-i iterations] [-p offset] [-g] " "[-m mode] [-n] [-b vcpu bytes] [-v vcpus] [-o] [-r random seed ] [-s mem type]" "[-x memslots] [-w percentage]\n", name); puts(""); + printf(" -a: access memory randomly rather than in order.\n"); printf(" -i: specify iteration counts (default: %"PRIu64")\n", TEST_HOST_LOOP_N); printf(" -g: Do not enable KVM_CAP_MANUAL_DIRTY_LOG_PROTECT2. This\n" @@ -396,8 +400,11 @@ int main(int argc, char *argv[]) guest_modes_append_default(); - while ((opt = getopt(argc, argv, "ghi:p:m:nb:v:or:s:x:w:")) != -1) { + while ((opt = getopt(argc, argv, "aghi:p:m:nb:v:or:s:x:w:")) != -1) { switch (opt) { + case 'a': + p.random_access = true; + break; case 'g': dirty_log_manual_caps = 0; break; diff --git a/tools/testing/selftests/kvm/include/perf_test_util.h b/tools/testing/selftests/kvm/include/perf_test_util.h index f93f2ea7c6a3..d9664a31e01c 100644 --- a/tools/testing/selftests/kvm/include/perf_test_util.h +++ b/tools/testing/selftests/kvm/include/perf_test_util.h @@ -39,6 +39,7 @@ struct perf_test_args { /* Run vCPUs in L2 instead of L1, if the architecture supports it. */ bool nested; + bool random_access; struct perf_test_vcpu_args vcpu_args[KVM_MAX_VCPUS]; }; @@ -53,6 +54,7 @@ void perf_test_destroy_vm(struct kvm_vm *vm); void perf_test_set_write_percent(struct kvm_vm *vm, uint32_t write_percent); void perf_test_set_random_seed(struct kvm_vm *vm, uint32_t random_seed); +void perf_test_set_random_access(struct kvm_vm *vm, bool random_access); void perf_test_start_vcpu_threads(int vcpus, void (*vcpu_fn)(struct perf_test_vcpu_args *)); void perf_test_join_vcpu_threads(int vcpus); diff --git a/tools/testing/selftests/kvm/lib/perf_test_util.c b/tools/testing/selftests/kvm/lib/perf_test_util.c index 12a3597be1f9..ce657fa92f05 100644 --- a/tools/testing/selftests/kvm/lib/perf_test_util.c +++ b/tools/testing/selftests/kvm/lib/perf_test_util.c @@ -46,6 +46,7 @@ void perf_test_guest_code(uint32_t vcpu_id) struct perf_test_vcpu_args *vcpu_args = &pta->vcpu_args[vcpu_id]; uint64_t gva; uint64_t pages; + uint64_t addr; int i; uint32_t rand = pta->random_seed + vcpu_id; @@ -57,7 +58,13 @@ void perf_test_guest_code(uint32_t vcpu_id) while (true) { for (i = 0; i < pages; i++) { - uint64_t addr = gva + (i * pta->guest_page_size); + guest_random(&rand); + + if (pta->random_access) + addr = gva + ((rand % pages) * pta->guest_page_size); + else + addr = gva + (i * pta->guest_page_size); + guest_random(&rand); if (rand % 100 < pta->write_percent) @@ -233,6 +240,12 @@ void perf_test_set_random_seed(struct kvm_vm *vm, uint32_t random_seed) sync_global_to_guest(vm, perf_test_args.random_seed); } +void perf_test_set_random_access(struct kvm_vm *vm, bool random_access) +{ + perf_test_args.random_access = random_access; + sync_global_to_guest(vm, perf_test_args.random_access); +} + uint64_t __weak perf_test_nested_pages(int nr_vcpus) { return 0;