From patchwork Thu Sep 1 19:52:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 12963188 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 3FE6EECAAD3 for ; Thu, 1 Sep 2022 19:53:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234546AbiIATxC (ORCPT ); Thu, 1 Sep 2022 15:53:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231936AbiIATxA (ORCPT ); Thu, 1 Sep 2022 15:53:00 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 130A348E90 for ; Thu, 1 Sep 2022 12:53:00 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id k13-20020a056902024d00b0066fa7f50b97so149495ybs.6 for ; Thu, 01 Sep 2022 12:53:00 -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; bh=aiiR1f5HT2KwdSEXkCHOjWutBiHpk8ptJjVqoHC6U8U=; b=aM5ik92ut913qOU6oSuspzsrwCODfgTfhuaqNFxPLylNOYm9AE4xxNcnZOczE6G9YQ di1JvRXcZqYMZKm9UX1GXcpQmPvMH3yIFRAiKL0jJdcGUmrsRY7DzmWLWKqXi27CQkgu 9Riqeio3R69bWLIqGjIni8ElKRtTjRLKNxLzVwh4phoaw6o0Z1waiPBCMFhAPRzNH/Sw V7M17F0K8651TmxGA9ItiKvzTxA7i34jiFboeC+1j1LiWHRUqI4s3wy/aEZly86QJy8l i7xSmIf4+4nx7DSLAscjGibyCq1O6ov6ICqTjHQc/W5GTW4d+KuhF5s21nP6fcbHmlve TMSA== 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; bh=aiiR1f5HT2KwdSEXkCHOjWutBiHpk8ptJjVqoHC6U8U=; b=wEGtycSG8I4iOuCxNrM5rj8wpbeKQQBZEkIQsuxe2wntSYwAYvLKQZuSL5XeBFD/ie wYIXF+A6Ae+1n1W8mOEjzGusHWhNiCwjgLGhjlSyv07k1/+mR6APnwWPfd/5b6WmQG/z 2C+4yI7daWUXwatgSp6RBaVykpcD7i4S39X5oWn9ZZRsOMoVOVZWAcNuuSxBfC39BqE0 EAapekTnRK2qEa5ySlXl5MInB692JNXXoUkOUT6kueVzXzJ2Gk4yosBLuEvy8B3a7lhq bW4ftEXnFQs4N3LOClLwVu53eXadr1Qa8prdqZvudkhYBzdtbBYwOUxggdpRx0Scz65Q uSYg== X-Gm-Message-State: ACgBeo34tTyCgoYLcIF/ELSBP+nWU3zo0bywJDoF2W1BNNXxKBr9NSuj QTrwnju8EShP9zUkp8wNDk/CTRprr0N9XvZ395svUw8KSSMikzeHTtbavpVonelAOx5SqtgtXW1 imKXxT66dBBJo7Uc/SQ1uDEGYw2jV+QDB0yGRQxeBr9BaO4PHk5xdfPI7LQaiWP+5BfuDSTM= X-Google-Smtp-Source: AA6agR7Mp2KEYFd1P3hMU3iGOC3mF/Vb6kHeg7hMMUydNjayESuuW8LtEhr+ggmwDZiv6boAM671t9Ee09le2bAblA== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:14ce]) (user=coltonlewis job=sendgmr) by 2002:a05:6902:120f:b0:6a1:f220:5ace with SMTP id s15-20020a056902120f00b006a1f2205acemr2565600ybu.141.1662061979310; Thu, 01 Sep 2022 12:52:59 -0700 (PDT) Date: Thu, 1 Sep 2022 19:52:35 +0000 In-Reply-To: <20220901195237.2152238-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20220901195237.2152238-1-coltonlewis@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220901195237.2152238-2-coltonlewis@google.com> Subject: [PATCH v3 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, 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 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 --- .../selftests/kvm/dirty_log_perf_test.c | 12 ++++++++++-- .../selftests/kvm/include/perf_test_util.h | 2 ++ .../testing/selftests/kvm/lib/perf_test_util.c | 18 +++++++++++++++++- 3 files changed, 29 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/lib/perf_test_util.c b/tools/testing/selftests/kvm/lib/perf_test_util.c index f989ff91f022..1292ed7d1193 100644 --- a/tools/testing/selftests/kvm/lib/perf_test_util.c +++ b/tools/testing/selftests/kvm/lib/perf_test_util.c @@ -36,6 +36,13 @@ static void (*vcpu_thread_fn)(struct perf_test_vcpu_args *); /* Set to true once all vCPU threads are up and running. */ static bool all_vcpu_threads_running; + +/* Park-Miller LCG using standard constants */ +static uint32_t perf_test_random(uint32_t seed) +{ + return (uint64_t)seed * 48271 % ((uint32_t)(1 << 31) - 1); +} + /* * Continuously write to the first 8 bytes of each page in the * specified region. @@ -47,6 +54,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); @@ -56,6 +64,7 @@ void perf_test_guest_code(uint32_t vcpu_id) while (true) { for (i = 0; i < pages; i++) { + rand = perf_test_random(rand); uint64_t addr = gva + (i * pta->guest_page_size); if (i % pta->wr_fract == 0) @@ -115,8 +124,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 +234,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); +} + uint64_t __weak perf_test_nested_pages(int nr_vcpus) { return 0; From patchwork Thu Sep 1 19:52:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 12963189 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 A1CE8C6FA81 for ; Thu, 1 Sep 2022 19:53:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234700AbiIATxD (ORCPT ); Thu, 1 Sep 2022 15:53:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234435AbiIATxC (ORCPT ); Thu, 1 Sep 2022 15:53:02 -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 18DF846217 for ; Thu, 1 Sep 2022 12:53:01 -0700 (PDT) Received: by mail-il1-x14a.google.com with SMTP id a4-20020a056e0208a400b002e4621942dfso91475ilt.0 for ; Thu, 01 Sep 2022 12:53:01 -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; bh=Rge06wV5FK7fxysd48Q9XgqgtxT13XVYQSdpPbtWqEM=; b=FuJg6K4a6I8uHuaABfr5TiSjJaPjt8alqI9JkI5PWHKVenay3vdP+l2iTwLKfubndh ZXlxj593RvsnAUY5C1LeNoien0sPLCdXiTlK9ESqOuh66h0s/hWGHvBHZPsYDKm56EZ0 JyU40UiLj/oBUEOC1ywOAC97Bh+ANcDiwYsh/NWygdEj8MWjN+Fzvawdkc6jVJJwrRBy nwB0Sxh60omCtk+IccrySHM4dgqh7lS8RLyNCpl+8dQd99Q0qLpl3JoxMnM2e5wuVCV8 smO0d9QZvSiZA63TGcRoETHJt4ttO1F7KIe9tzyyZqdqp+vuuL6udtgp3EqdNA9HPZ1i VVmg== 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; bh=Rge06wV5FK7fxysd48Q9XgqgtxT13XVYQSdpPbtWqEM=; b=wrAspQr8GEjb4nf4iL9ozZ0mazjgAWRWoUL/TSZwirmV5boo/9I9DNov8siOh6GKtk p+LAQxhjfiBE6RMuA5qg5ZxP2n8o2LO1BJRGCgfSYLG/9dj1emlaANNfSjQchKbsLwU9 pgziNs4a0lfVnhnPqLZd8T3qMAXN9//IqQ4lIbDZDqgPnJND4WJfF2PYFegRvfgxuLm+ KjWaB+BDabZ4TGTCzRlKTnuKCtHiuk1cL1KQHFSLiO+fxwBzZewB9DJO3tar/HbdjLjD 2QHuNrVDojsJeyJTnC8nwo7lV671Piv/MPEM5gsE/SYUH09Rh4+2XNMv2006RKJHEM2I ONIg== X-Gm-Message-State: ACgBeo0qb5vRnJLJ6c7diNfEf210jTRQUNoH430U3vz8vBfwI3d23qVk nKLCArpPPfHkyWpxW2+hZ4N4lMbgijzqFDl3ZmUkVScZwQ6zOs5ZVbUVwhXis7QLSW1vCANqSWw U1xSDG3UqK94FyUPsxQlnnAFtlYQ3vcr2mxY67snV8y12JHTy3fTZyDk19iiAdhhlxUdstH8= X-Google-Smtp-Source: AA6agR6kMrm0hKvKaJ+C4Jsf6TIZEV45sZTWwXc5QBZaqC8OcwYsOqgRSGPTllricCSP+3Y7E71mbimRmmzDjfT6xg== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:14ce]) (user=coltonlewis job=sendgmr) by 2002:a05:6638:491b:b0:34c:e5f:9ce1 with SMTP id cx27-20020a056638491b00b0034c0e5f9ce1mr4497636jab.222.1662061980462; Thu, 01 Sep 2022 12:53:00 -0700 (PDT) Date: Thu, 1 Sep 2022 19:52:36 +0000 In-Reply-To: <20220901195237.2152238-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20220901195237.2152238-1-coltonlewis@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220901195237.2152238-3-coltonlewis@google.com> Subject: [PATCH v3 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, 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 percent writes. Signed-off-by: Colton Lewis --- .../selftests/kvm/access_tracking_perf_test.c | 2 +- .../selftests/kvm/dirty_log_perf_test.c | 28 ++++++++++--------- .../selftests/kvm/include/perf_test_util.h | 4 +-- .../selftests/kvm/lib/perf_test_util.c | 10 +++---- 4 files changed, 23 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..c9441f8354be 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,7 @@ 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); + perf_test_set_write_percent(vm, p->write_percent); 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); @@ -341,7 +341,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 +358,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 +365,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 +379,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 +394,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 +414,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': + perf_test_args.write_percent = atoi(optarg); + TEST_ASSERT(perf_test_args.write_percent >= 0 + && perf_test_args.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..52c450eb6b9b 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; + int 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 1292ed7d1193..be6176faaf8e 100644 --- a/tools/testing/selftests/kvm/lib/perf_test_util.c +++ b/tools/testing/selftests/kvm/lib/perf_test_util.c @@ -64,10 +64,10 @@ void perf_test_guest_code(uint32_t vcpu_id) while (true) { for (i = 0; i < pages; i++) { - rand = perf_test_random(rand); uint64_t addr = gva + (i * pta->guest_page_size); + rand = perf_test_random(rand); - if (i % pta->wr_fract == 0) + if (rand % 100 < pta->write_percent) *(uint64_t *)addr = 0x0123456789ABCDEF; else READ_ONCE(*(uint64_t *)addr); @@ -125,7 +125,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); /* @@ -228,9 +228,9 @@ 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; + perf_test_args.write_percent = write_percent; sync_global_to_guest(vm, perf_test_args); } From patchwork Thu Sep 1 19:52:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 12963190 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 81783C6FA82 for ; Thu, 1 Sep 2022 19:53:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234728AbiIATxE (ORCPT ); Thu, 1 Sep 2022 15:53:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231936AbiIATxD (ORCPT ); Thu, 1 Sep 2022 15:53:03 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 673494A120 for ; Thu, 1 Sep 2022 12:53:02 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-33dc390f26cso235842537b3.9 for ; Thu, 01 Sep 2022 12:53: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; bh=iNEYnc/ArzpTNoN95ptZ7A54YqbTfQJC2l461/+3kwI=; b=rClcVHJaHeAEnoKEMecWgYYJ6mkW6qyp0typJCX8rrFKXEBDE84SudvjN/c2sYgx0T ceOLwsYkvb2Awgz3ITTqUUoc7LuLL0jo4QSrGVxegUOIxsZ/P0REC5w5mdA7SjscZji/ wJy6skqmRgqbgankdGhPeFF0eDpC8rpWd68vxAHzFtSop8wZ6KxfRcHmSv74DLHvaMO6 D/6yw3zBi/T5z1QAdPkPUGQva588OYSxhj1Z5B5Rdf2cpjqXMjSW+Pmj4woksPVSPtG8 h/9VlbhvAAODisDiFaiu0NIsRauM6PS8R4ceyKW0h3phj9RPvA8mDEThoabbyiz7JXc9 bpoA== 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; bh=iNEYnc/ArzpTNoN95ptZ7A54YqbTfQJC2l461/+3kwI=; b=fiOFeQmFrZVGt80bTAWMWV7WV4XBad+ndwl46VcAGq5A7fyc/tCykRDGyKPio1UY+d 04tl54XpkUW1/UE+Ckd7UoSm3rqnHSy4V644GS1TMMeHCB2XwFrOy/Q0GTJ8KxmJkBIn 1BhJRTUcRLHw0322LH5qGJky/j9hHgmlKYXEz1B42p2kFemtXmRmDyxcHiBf8X1W4eQX ef/nPdcCagnhp0QquaeRwJHg4Lytln5/YotIMna3pFP4D+TlTt8VF1ePGlXzxnQyMg+h JFUatXQD2kQxE+7edvCXYWr+BNmik39n5UhAWLpYZDR6A/0gzlpzI4yjdS9Mjy9d8tNk 5MJw== X-Gm-Message-State: ACgBeo2M+6G9feSRSQoLa/PDAQk53h2simLbr0uqSR47Fj8YtGp0Dncs 4O6ZP0rV2ZBwxYeTAXV3euhxYTvnU4hGX6yMYUsDhGLzEWObFy56GKoT/VA7ND5pd0NcwwUVh1B t4NJlnHxTd8DPpqmtbvCutzKeN5N93A2ukL8+HBqWRCUXSfDio80Zf/i8+gLHEaL+z+rXpLc= X-Google-Smtp-Source: AA6agR7XlrJBP4xc+2FMWxZIeX9uZDcKe/FOGryvm3N+vvZ6LnvhC+zjkPMNvmP5/HBgK1fzpw/sG4+BPml+eEEg3A== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:14ce]) (user=coltonlewis job=sendgmr) by 2002:a0d:e5c3:0:b0:329:bd79:63c with SMTP id o186-20020a0de5c3000000b00329bd79063cmr24794471ywe.56.1662061981601; Thu, 01 Sep 2022 12:53:01 -0700 (PDT) Date: Thu, 1 Sep 2022 19:52:37 +0000 In-Reply-To: <20220901195237.2152238-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20220901195237.2152238-1-coltonlewis@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220901195237.2152238-4-coltonlewis@google.com> Subject: [PATCH v3 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, 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. Signed-off-by: Colton Lewis --- .../testing/selftests/kvm/dirty_log_perf_test.c | 12 ++++++++++-- .../selftests/kvm/include/perf_test_util.h | 2 ++ tools/testing/selftests/kvm/lib/perf_test_util.c | 16 +++++++++++++++- 3 files changed, 27 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 c9441f8354be..631b3883ed12 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) @@ -269,6 +270,9 @@ 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); + /* Set random access here, after population phase. */ + perf_test_set_random_access(vm, p->random_access); + while (iteration < p->iterations) { /* * Incrementing the iteration number will start the vCPUs @@ -339,10 +343,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" @@ -394,8 +399,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 52c450eb6b9b..380c31375b60 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 be6176faaf8e..c6123b75d5e3 100644 --- a/tools/testing/selftests/kvm/lib/perf_test_util.c +++ b/tools/testing/selftests/kvm/lib/perf_test_util.c @@ -53,6 +53,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; @@ -64,7 +65,14 @@ 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); + rand = perf_test_random(rand); + + if (pta->random_access) + addr = gva + + ((rand % pages) * pta->guest_page_size); + else + addr = gva + (i * pta->guest_page_size); + rand = perf_test_random(rand); if (rand % 100 < pta->write_percent) @@ -240,6 +248,12 @@ void perf_test_set_random_seed(struct kvm_vm *vm, uint32_t random_seed) sync_global_to_guest(vm, perf_test_args); } +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); +} + uint64_t __weak perf_test_nested_pages(int nr_vcpus) { return 0;