From patchwork Thu Sep 8 20:53:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 12970654 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 37B3AC54EE9 for ; Thu, 8 Sep 2022 20:54:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229842AbiIHUyy (ORCPT ); Thu, 8 Sep 2022 16:54:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229872AbiIHUyp (ORCPT ); Thu, 8 Sep 2022 16:54:45 -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 46D0432D98 for ; Thu, 8 Sep 2022 13:54:44 -0700 (PDT) Received: by mail-il1-x149.google.com with SMTP id o2-20020a056e0214c200b002eb8acbd27cso15909600ilk.22 for ; Thu, 08 Sep 2022 13:54:44 -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=ZBp+U7zOhTrMUahXkZ5O2g10dJiFCUffPqL7qG/mrv4=; b=T8khdWVxDMZRe+ZwuT2hw2gKpgyBZDgAiBySWx3kZplsbakHvq13mv5Stds8X9eAb1 67KATvYkVeJetAeX/TGoF4Zm9s1hoTnQB5ukU6IKqtN6JaSuivaMSovLBR0ztYDVoH7A GGpB9A4/dr5Up/Q0jTzGkN9+HfKWZwWc5PvWDz8RMDeabsDiRc28vykkZqF1AtvyGxY2 SmcmcWYYyj+l1FII/8+Scc2IyG+z9iFuDtJKdqdvEAR2R98E3xiVRyVW1RxVR0rJ62fx PWPg2q8yDEH2AoZFSCRUB4uC03/KxSOV8wT765I920289Lrexo03E29tzfP5KyK/aK6C oN6w== 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=ZBp+U7zOhTrMUahXkZ5O2g10dJiFCUffPqL7qG/mrv4=; b=wHkRuQm0N8wRFQHoD4e2m/pzFFmfKLo9cfbrWN6qbGhkksXPGxFL8wgcxsrxNZx3sy aYp/3r4MuWuVkIlKSjusELxG9YOS6qj7FjblgGXuU+r6vmyZjVMuAm0TGSGHMPI+mRoA V0u2wSjDLIgX/tqMC5Ap/YFGoOV3l9us6pChMf5eZy6TvZJfpp9X4KFSfS0mgYbdp6kh ppE71Or8N/xtGriO+Ge23B3l835EvmGf5bzAMBNt4rcB+VWTtsv9Rf3QSfp2vTrQJe4C gF3CmeToRF+sTL4rz+WIc/fU1bkLT8yJ5ffbKxwISNsAN1r1JuvdZmBQ9H4zq7SEV6eE kMMA== X-Gm-Message-State: ACgBeo3t3KnCX7quGheCkIdiQLdOJRUbeLWQ6tMq6UY5KCDQ6/5sxaSv JVqIv2xgLjAHl/OJ8p1G3Zj24OLfXrll17Y0BVRjkXACYPR+2SfioAD43qxI19jC09NSQri+/FO huFD+tfWzOqhgsZoxtGXFdaeeUrgrTqvunU8yZXLCNAtuRl9pTqDoUa736ElfcRG2ZjkLN4M= X-Google-Smtp-Source: AA6agR7L6NgBN8S9E7VGtNEX2bRxzNYjTIS61IU5PqL7rGbuXAUWc5Gijh0UsN0i2hGVm19I47S16WUUr95uVOfSmQ== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:14ce]) (user=coltonlewis job=sendgmr) by 2002:a6b:c343:0:b0:68a:b1d0:3ddf with SMTP id t64-20020a6bc343000000b0068ab1d03ddfmr5130125iof.0.1662670483642; Thu, 08 Sep 2022 13:54:43 -0700 (PDT) Date: Thu, 8 Sep 2022 20:53:46 +0000 In-Reply-To: <20220908205347.3284344-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20220908205347.3284344-1-coltonlewis@google.com> X-Mailer: git-send-email 2.37.2.789.g6183377224-goog Message-ID: <20220908205347.3284344-3-coltonlewis@google.com> Subject: [PATCH v4 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 --- .../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..6f2c14dd8a65 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); @@ -251,6 +250,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) perf_test_start_vcpu_threads(nr_vcpus, vcpu_worker); /* Allow the vCPUs to populate memory */ + perf_test_set_write_percent(vm, 100); pr_debug("Starting iteration %d - Populating\n", iteration); for (vcpu_id = 0; vcpu_id < nr_vcpus; vcpu_id++) { while (READ_ONCE(vcpu_last_completed_iteration[vcpu_id]) != @@ -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)