From patchwork Wed Nov 2 16:00:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 13028316 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 F05ECC4332F for ; Wed, 2 Nov 2022 16:00:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230505AbiKBQAW (ORCPT ); Wed, 2 Nov 2022 12:00:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230132AbiKBQAR (ORCPT ); Wed, 2 Nov 2022 12:00:17 -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 CD0142A70A for ; Wed, 2 Nov 2022 09:00:15 -0700 (PDT) Received: by mail-il1-x149.google.com with SMTP id 15-20020a056e0220cf00b0030099e75602so11391819ilq.21 for ; Wed, 02 Nov 2022 09:00:15 -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:message-id:reply-to; bh=w+ebisBkWPJ5RfFeeP4pPr1G3UX4W/TiA76RvuNqNLA=; b=XoYuKuLxkAD2axLD7g3mm5M0/BmoY8FOTvqzKmUp0b/Vvt4kD/ctbK7UHxs875OEP9 h4aoaZDmPBd8F5BZZp4p8UljOXoHzb79rSy+mGFqwXsiuTZWSA4kKPi24zmuyQMxXx5e 2hXDKm4K49Ap4mlzzp18Kb+6Hl7KH5QSdN161NtkbIwWKEtHV4Tr6yY/4VuscKO0LEAd +9rjF8gw5zjjB5+YPsPVhSXjuyQFxeVivE0YkDeZ4VXeapkCm3+5+BDTnK4h2ksqAerM lDJvMLNjzoH9CdQcyqZulou6EOpXV8IOctSbyH9lKs3rCuvRsuV99k/FLda3cNnra5HO EXAA== 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:message-id:reply-to; bh=w+ebisBkWPJ5RfFeeP4pPr1G3UX4W/TiA76RvuNqNLA=; b=qgYnMhluoY6n3tTU6mSTJqeR7A8xJ7y1d7AEpCSqpgW+EZng5MTGbXZElySSM/gStH kNSBmhwrUERCajDCcp3HHLRmWwq2B6O4wp+8USPSaoSlWNAlR9ART2W1Tfkk6XATLIu3 iQb1JOpcajewOCAOcFdomI5q5oYvEikAXUIWBokXHR938IJdAn3Ta3HHSEOEN8s2YdXD /u8pHTymC18SVxTVW6A/AnJmxaQ4NSUD8dHEbrit75RymZwjt8pVfyER6RVd4RedDCjP a5i0hICSB8cD/A8roOFOLazeXD4Yd/69wKsNH5EH1kw2uuunhKs/JAIfw3yI+8ybMvGR eXuw== X-Gm-Message-State: ACrzQf2bPB+TXu7QDqpCOlyBazEYzO6bDW+P1hMyeAeoi2j9aYNRQN11 npl7AA8r/urtdKUCJ/cEo+6uVuwSTwQtCUfGcWQXd925OmpXNyx0iawXayy2wY/56eBigTaSNL0 LGXNlj9riAieuuh+X3fx9uR5oGd9oWvRMs6KIGAZ8Sj/u70ZlDXUM0NDVbtO52NT2o6EIRHU= X-Google-Smtp-Source: AMsMyM6zqOL1K//7aXhNXs8rhdxlChQl4VFyUXBU6xR8n3oPjWwm4mVAaWtqrFGQLlraR0U7LQqf9cObPcmop4hg6Q== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:14ce]) (user=coltonlewis job=sendgmr) by 2002:a6b:c3cd:0:b0:6a8:3ca0:dafa with SMTP id t196-20020a6bc3cd000000b006a83ca0dafamr16203473iof.193.1667404815211; Wed, 02 Nov 2022 09:00:15 -0700 (PDT) Date: Wed, 2 Nov 2022 16:00:04 +0000 In-Reply-To: <20221102160007.1279193-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20221102160007.1279193-1-coltonlewis@google.com> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog Message-ID: <20221102160007.1279193-2-coltonlewis@google.com> Subject: [PATCH v9 1/4] KVM: selftests: implement random number generator 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 generator for guest code to randomize parts of the test, making it less predictable and a more accurate reflection of reality. 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: Sean Christopherson Reviewed-by: David Matlack --- tools/testing/selftests/kvm/include/test_util.h | 7 +++++++ tools/testing/selftests/kvm/lib/test_util.c | 17 +++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/tools/testing/selftests/kvm/include/test_util.h b/tools/testing/selftests/kvm/include/test_util.h index befc754ce9b3..9e4f36a1a8b0 100644 --- a/tools/testing/selftests/kvm/include/test_util.h +++ b/tools/testing/selftests/kvm/include/test_util.h @@ -152,4 +152,11 @@ static inline void *align_ptr_up(void *x, size_t size) return (void *)align_up((unsigned long)x, size); } +struct guest_random_state { + uint32_t seed; +}; + +struct guest_random_state new_guest_random_state(uint32_t seed); +uint32_t guest_random_u32(struct guest_random_state *state); + #endif /* SELFTEST_KVM_TEST_UTIL_H */ diff --git a/tools/testing/selftests/kvm/lib/test_util.c b/tools/testing/selftests/kvm/lib/test_util.c index 6d23878bbfe1..c4d2749fb2c3 100644 --- a/tools/testing/selftests/kvm/lib/test_util.c +++ b/tools/testing/selftests/kvm/lib/test_util.c @@ -17,6 +17,23 @@ #include "test_util.h" +/* + * Random number generator that is usable from guest code. This is the + * Park-Miller LCG using standard constants. + */ + +struct guest_random_state new_guest_random_state(uint32_t seed) +{ + struct guest_random_state s = {.seed = seed}; + return s; +} + +uint32_t guest_random_u32(struct guest_random_state *state) +{ + state->seed = (uint64_t)state->seed * 48271 % ((uint32_t)(1 << 31) - 1); + return state->seed; +} + /* * Parses "[0-9]+[kmgt]?". */ From patchwork Wed Nov 2 16:00:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 13028317 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 EE6C0C4332F for ; Wed, 2 Nov 2022 16:00:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231140AbiKBQAY (ORCPT ); Wed, 2 Nov 2022 12:00:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230306AbiKBQAR (ORCPT ); Wed, 2 Nov 2022 12:00:17 -0400 Received: from mail-io1-xd4a.google.com (mail-io1-xd4a.google.com [IPv6:2607:f8b0:4864:20::d4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A24062197 for ; Wed, 2 Nov 2022 09:00:16 -0700 (PDT) Received: by mail-io1-xd4a.google.com with SMTP id w16-20020a6b4a10000000b006a5454c789eso14663280iob.20 for ; Wed, 02 Nov 2022 09:00:16 -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:message-id:reply-to; bh=JBK3THjfM00hK0Ybjyd8D/mGedv8JDwjrzgy5dwB9z4=; b=dbyGbrfAsVPTI9iGgH/v3lJgbF6lyQwv4R3CSgTCRB+aVUaCEPcg1nD3Xie/rvlR7d HTPTCdAAr/y8MugQRXbBLNrJATNub17S/vMyO9ma6rYzCHsoPcWF5Wa8BJiLdrN4msYr 4JzCXH/wlt27vs0sceY2lKc5052Q2IiPCmUHrhOxaX3AO7LkL/LpnrPmM+3SqoA6HDNe QS4kk89UswRVhODhg7ZiROMMSCiRkFx71w82IHmfVe/1A+yYR/kKAe/Lgj+tM2vAfATR 1R0z9YVqhmFQ8B4A8z28r3fisXiFU6awVpKqTrjzdTXDiiU/m4XXY3p1HzRFcYKaebai N7Ww== 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:message-id:reply-to; bh=JBK3THjfM00hK0Ybjyd8D/mGedv8JDwjrzgy5dwB9z4=; b=CEvJ0i1MGlQD5Sdu+xI+qGODfimTcaB3WIJjIw+8m12dDIRpsoYEs+G6I/fVVmoXjB f0c/2ad9TEYuORfIvWYUxC8g06++/sJIFTF8ObdHGexYmmmFt/Y2Z5KJMQzmphClB7qf XPPnFv5Oq6TFVA3jtkFvRVwYWG9e37YnSLYuhr+8+gP7e0bJaFfh3t0Ccl9BcZY5F6FF I+5iboJEIgSuBJ1CI6bzDPfwOEkWAjP83VjMpZMKBkUTavt9s03eQ5GSx9ogUr/2VWOz w7k2ZKa/ehBfcoUO/uzYwovWfitOIj1s2QANrf6ihb4VxktsCOcEOQ+foczA5rgcDN1d XwQg== X-Gm-Message-State: ACrzQf0++hhweyzn7zV09AhsR0aGOIa8HE4C1IDWuJCwkojFri0TSuAC qgItYzfTFWYnsCEvMzVrcAWNRgIfZ3FTQgSgN7HUjGobzEdWVRqpUzLcPl0n4/w14R148W/mVv2 dPq31dE3ZP+r1edBW3zQmdasA7w6udaXd1s+24c17p/SlTWJBTpRzdTLlphZ9giHq+el7K14= X-Google-Smtp-Source: AMsMyM4zfXEA1KKsNsALv/tZdGC6baN3Yw4J0cpPH6OSvdBdq2Zks9Erp+jcvZ4twbrjdx9FjGOh3cMTbEn/0Ny3MA== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:14ce]) (user=coltonlewis job=sendgmr) by 2002:a02:cf8f:0:b0:373:9526:ff08 with SMTP id w15-20020a02cf8f000000b003739526ff08mr17431866jar.298.1667404816007; Wed, 02 Nov 2022 09:00:16 -0700 (PDT) Date: Wed, 2 Nov 2022 16:00:05 +0000 In-Reply-To: <20221102160007.1279193-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20221102160007.1279193-1-coltonlewis@google.com> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog Message-ID: <20221102160007.1279193-3-coltonlewis@google.com> Subject: [PATCH v9 2/4] KVM: selftests: create -r argument to specify random seed 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 a -r argument to specify a random seed. If no argument is provided, the seed defaults to 1. The random seed is set with perf_test_set_random_seed() and must be set before guest_code runs to apply. Signed-off-by: Colton Lewis Reviewed-by: Sean Christopherson --- tools/testing/selftests/kvm/dirty_log_perf_test.c | 12 ++++++++++-- tools/testing/selftests/kvm/include/perf_test_util.h | 2 ++ tools/testing/selftests/kvm/lib/perf_test_util.c | 6 ++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/kvm/dirty_log_perf_test.c b/tools/testing/selftests/kvm/dirty_log_perf_test.c index f99e39a672d3..c97a5e455699 100644 --- a/tools/testing/selftests/kvm/dirty_log_perf_test.c +++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c @@ -132,6 +132,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) @@ -225,6 +226,9 @@ static void run_test(enum vm_guest_mode mode, void *arg) p->slots, p->backing_src, p->partition_vcpu_memory_access); + /* If no argument provided, random seed will be 1. */ + pr_info("Random seed: %u\n", p->random_seed); + perf_test_set_random_seed(vm, p->random_seed ? p->random_seed : 1); perf_test_set_wr_fract(vm, p->wr_fract); guest_num_pages = (nr_vcpus * guest_percpu_mem_size) >> vm->page_shift; @@ -352,7 +356,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", @@ -380,6 +384,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"); @@ -406,7 +411,7 @@ int main(int argc, char *argv[]) guest_modes_append_default(); - while ((opt = getopt(argc, argv, "eghi:p:m:nb:f:v:os:x:")) != -1) { + while ((opt = getopt(argc, argv, "eghi:p:m:nb:f:v:or:s:x:")) != -1) { switch (opt) { case 'e': /* 'e' is for evil. */ @@ -442,6 +447,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 eaa88df0555a..f1050fd42d10 100644 --- a/tools/testing/selftests/kvm/include/perf_test_util.h +++ b/tools/testing/selftests/kvm/include/perf_test_util.h @@ -35,6 +35,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. */ @@ -52,6 +53,7 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int nr_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 9618b37c66f7..0bb0659b9a0d 100644 --- a/tools/testing/selftests/kvm/lib/perf_test_util.c +++ b/tools/testing/selftests/kvm/lib/perf_test_util.c @@ -229,6 +229,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; From patchwork Wed Nov 2 16:00:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 13028319 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 58516C433FE for ; Wed, 2 Nov 2022 16:00:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231158AbiKBQA2 (ORCPT ); Wed, 2 Nov 2022 12:00:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39474 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230222AbiKBQAS (ORCPT ); Wed, 2 Nov 2022 12:00:18 -0400 Received: from mail-io1-xd4a.google.com (mail-io1-xd4a.google.com [IPv6:2607:f8b0:4864:20::d4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 96BA02C108 for ; Wed, 2 Nov 2022 09:00:17 -0700 (PDT) Received: by mail-io1-xd4a.google.com with SMTP id n23-20020a056602341700b00689fc6dbfd6so14436151ioz.8 for ; Wed, 02 Nov 2022 09:00:17 -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:message-id:reply-to; bh=2NSz2J2sab68LtkPmC+v+ZsP/7tXhLhAVB/Asurj7c4=; b=SsClpNQViWdfyG14ZshlEfjZxZRGHinXGrfKcl1YBvX4gheCJ4rPeY4+ON9GTb7EY8 AsB4F7RUq7hXeVZVaJ/Qw3tgBE7DE77ftxyksgjDFfI2mwd9LhlvxDT67159epJJlDPe vV3XvuoewASiX0TjCLwanOhSYn4yml3O420SfzlK1FMzc7+cbAUiSDu9C6tWpaM6nkwq raTK7XG4KLPa80nNwthz6Rw8VMBQiytCt0m72xttt5UYqEecP87CTFT3ybciZ/ynRTF+ kCye+T8s6+3Sx3/vpfV8yWTRQYmqoGh1Ur5tHsQ5SJZr6jVlmfpoLfe2sPfCxZPW8ZC1 YqQw== 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:message-id:reply-to; bh=2NSz2J2sab68LtkPmC+v+ZsP/7tXhLhAVB/Asurj7c4=; b=VXd5s3bw4dwJUnAC3IH00/u4EOaFioxVaC2ku5CRoQyattKzDHmU4W769GgduuFHdY duNt0eBlggegXdQqxYS9O7AlSWhEMdnAey0O+1MBCooDR6nmAwON6rDQ1+03gSdK2/1/ GLowRH9wHLnqnZEeIJWQBvjr1S5ST8KWJXEsNJx0gaQ5m/oWUnJUqpeCbNhDhVBMMDge 1n5bRL49p/htkA9j/mvk0GsY/3RrSe1PEQ5PRszOB9lq/o7/kkmoThhxMa07FXyvUA9J GuZx7FX+hjVvALdIFomeR7qfWHnmSGWLMDCElVmt3krOxuowws9GgESF4HT++vJxalOa fx9A== X-Gm-Message-State: ACrzQf0dpoChzBfIfVzfuM6sPQkGMHCD48br22GsGiAHIaFklbXfxbs2 OoSaVDuuf/MTJFt31oxHmmp0vEc/ptqsKEmw2fgZSuwIV7H5inGZgW9MhQWdvVHsc6SjZWbDYik tUVNmqgHUNnvvszUhkrQ7ESuHkXlQQtPdVB4bJFxxXCI/KNMTzjw4eAb+WRtvH+ssw27+BsA= X-Google-Smtp-Source: AMsMyM5TYxgbxTY6X0W2aChpKjvOpG/8TEbqrWP5ysPQ1MAeGjQmONVzFQfvCssndkCI+CgRVt4ul0kLw33E3NhpFQ== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:14ce]) (user=coltonlewis job=sendgmr) by 2002:a05:6638:388c:b0:370:cb35:edfd with SMTP id b12-20020a056638388c00b00370cb35edfdmr16274609jav.181.1667404817024; Wed, 02 Nov 2022 09:00:17 -0700 (PDT) Date: Wed, 2 Nov 2022 16:00:06 +0000 In-Reply-To: <20221102160007.1279193-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20221102160007.1279193-1-coltonlewis@google.com> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog Message-ID: <20221102160007.1279193-4-coltonlewis@google.com> Subject: [PATCH v9 3/4] 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% writes. Population always uses 100% writes to ensure all memory is actually populated and not just mapped to the zero page. The prevents expensive copy-on-write faults from occurring during the dirty memory iterations below, which would pollute the performance results. Signed-off-by: Colton Lewis Reviewed-by: David Matlack --- .../selftests/kvm/access_tracking_perf_test.c | 2 +- .../selftests/kvm/dirty_log_perf_test.c | 38 ++++++++++++------- .../selftests/kvm/include/perf_test_util.h | 4 +- .../selftests/kvm/lib/perf_test_util.c | 12 +++--- 4 files changed, 35 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 76c583a07ea2..3e16d5bd7856 100644 --- a/tools/testing/selftests/kvm/access_tracking_perf_test.c +++ b/tools/testing/selftests/kvm/access_tracking_perf_test.c @@ -279,7 +279,7 @@ static void run_iteration(struct kvm_vm *vm, int nr_vcpus, const char *descripti static void access_memory(struct kvm_vm *vm, int nr_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, nr_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 c97a5e455699..0d0240041acf 100644 --- a/tools/testing/selftests/kvm/dirty_log_perf_test.c +++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c @@ -128,10 +128,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; }; @@ -229,7 +229,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) /* If no argument provided, random seed will be 1. */ pr_info("Random seed: %u\n", p->random_seed); perf_test_set_random_seed(vm, p->random_seed ? p->random_seed : 1); - 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->page_shift; guest_num_pages = vm_adjust_num_guest_pages(mode, guest_num_pages); @@ -252,6 +252,14 @@ static void run_test(enum vm_guest_mode mode, void *arg) for (i = 0; i < nr_vcpus; i++) vcpu_last_completed_iteration[i] = -1; + /* + * Use 100% writes during the population phase to ensure all + * memory is actually populated and not just mapped to the zero + * page. The prevents expensive copy-on-write faults from + * occurring during the dirty memory iterations below, which + * would pollute the performance results. + */ + perf_test_set_write_percent(vm, 100); perf_test_start_vcpu_threads(nr_vcpus, vcpu_worker); /* Allow the vCPUs to populate memory */ @@ -273,6 +281,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 @@ -357,7 +367,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); @@ -377,10 +387,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"); @@ -388,6 +394,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); } @@ -397,10 +408,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, }; int opt; @@ -411,7 +422,7 @@ int main(int argc, char *argv[]) guest_modes_append_default(); - while ((opt = getopt(argc, argv, "eghi:p:m:nb:f:v:or:s:x:")) != -1) { + while ((opt = getopt(argc, argv, "eghi:p:m:nb:v:or:s:x:w:")) != -1) { switch (opt) { case 'e': /* 'e' is for evil. */ @@ -434,10 +445,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 f1050fd42d10..845165001ec8 100644 --- a/tools/testing/selftests/kvm/include/perf_test_util.h +++ b/tools/testing/selftests/kvm/include/perf_test_util.h @@ -36,7 +36,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; @@ -52,7 +52,7 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int nr_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 0bb0659b9a0d..92b47f71a0a5 100644 --- a/tools/testing/selftests/kvm/lib/perf_test_util.c +++ b/tools/testing/selftests/kvm/lib/perf_test_util.c @@ -49,6 +49,8 @@ void perf_test_guest_code(uint32_t vcpu_idx) uint64_t gva; uint64_t pages; int i; + struct guest_random_state rand_state = + new_guest_random_state(pta->random_seed + vcpu_idx); gva = vcpu_args->gva; pages = vcpu_args->pages; @@ -60,7 +62,7 @@ void perf_test_guest_code(uint32_t vcpu_idx) for (i = 0; i < pages; i++) { uint64_t addr = gva + (i * pta->guest_page_size); - if (i % pta->wr_fract == 0) + if (guest_random_u32(&rand_state) % 100 < pta->write_percent) *(uint64_t *)addr = 0x0123456789ABCDEF; else READ_ONCE(*(uint64_t *)addr); @@ -121,7 +123,7 @@ struct kvm_vm *perf_test_create_vm(enum vm_guest_mode mode, int nr_vcpus, pr_info("Testing guest mode: %s\n", vm_guest_mode_string(mode)); /* By default vCPUs will write to memory. */ - pta->wr_fract = 1; + pta->write_percent = 100; /* * Snapshot the non-huge page size. This is used by the guest code to @@ -223,10 +225,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 Wed Nov 2 16:00:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colton Lewis X-Patchwork-Id: 13028318 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 37D57C4332F for ; Wed, 2 Nov 2022 16:00:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231153AbiKBQA0 (ORCPT ); Wed, 2 Nov 2022 12:00:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230427AbiKBQAT (ORCPT ); Wed, 2 Nov 2022 12:00:19 -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 5228E2C134 for ; Wed, 2 Nov 2022 09:00:18 -0700 (PDT) Received: by mail-il1-x14a.google.com with SMTP id s15-20020a056e02216f00b00300d14ba82bso1537931ilv.5 for ; Wed, 02 Nov 2022 09:00:18 -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:message-id:reply-to; bh=NUyMNnyD6Vd9kmq5WeePMbPGyZVCujZMExzub8EbTbU=; b=YqOPubMkKPWJJ/e3faDypXJGO3b4lCjBI/3C8q8uJ+RJbtshzDb7Bnrgg/y+eDV5vN NqKJJCm8NmnrHcOig/T9gf9tOFVQdmp2h02puzQpuaKeU4PeNczi24ysB5yXsXRMWnoQ 9S0Tcf1WN4qcccxZhO7pzVuw+ozSNrucziBhlG0Z1a1ax4+2YL3yFE3uZs7/auYcy598 UvDAfNsuK3rUHWfhsi7tqTaDuWS5sVGwKKk9mYaxDNRL+xAxmMuam5LHbSR9UJAGXrmF DT0Zg2WoRFYsA7l5u6niwa/ETl0BoiG82yC+r6sIpT5URozLof2XKIJjxGb8p8SJUFTY i6Gw== 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:message-id:reply-to; bh=NUyMNnyD6Vd9kmq5WeePMbPGyZVCujZMExzub8EbTbU=; b=6tjzAJCwb/r84UHIZwr6/0BWGh/V31QrxppkWrAJ8wUebfMtsQpvGkigWfXmR4dtJT BeBVKhihB8J6QwcrzyGD6398fpqnQ1w3OymdzY/lkzqZthaSrCE2U0Eb6RJAZEi1MVlc PLf/e6ENokGA+Khn7E6LzL9q9IIyVwl2JekoepZeJYolKTg1zDLpRWcDIxsoM7YrLGPa Xi8eavZ0X09OT5magIu7M6zurS/x8ppBNTwg6i8gZfnNjTEaqxDr4iksKO2MjRliRdP7 lgBp2knQtZuPbMA1b6WMjdURLhPsZbhZHYSNkKzRS5Vo6jVGj1xxOpDiFGYg0lPy5/2V +Miw== X-Gm-Message-State: ACrzQf26INsaSYBgheqSLS5FM+Ll2XY/1mEwCmyjGIhEueQ0QcsTn3ON f0eBVbW5eui/t8ruYeX2TpwVIFNLY2KQerH2HtRJhsmgZnBwbqfUO5qKpgik16jPgRuiyA1+m3R 55Tn6cTeis2Fnyx4WFnbgVwYcP28duey8YB9CC57kQmGCf5WJSH2NbbkSRgJ8CVcExx+3F58= X-Google-Smtp-Source: AMsMyM4n/1opFc5Ke/R+WJu3Mj6/h0tA49JogeuQjy+R16Aj5BAHfRiNDyEFEfLQhkTssnpb94A8cVWYsCEVRVX5zA== X-Received: from coltonlewis-kvm.c.googlers.com ([fda3:e722:ac3:cc00:2b:ff92:c0a8:14ce]) (user=coltonlewis job=sendgmr) by 2002:a02:9982:0:b0:364:6be:dbd6 with SMTP id a2-20020a029982000000b0036406bedbd6mr16631019jal.311.1667404818010; Wed, 02 Nov 2022 09:00:18 -0700 (PDT) Date: Wed, 2 Nov 2022 16:00:07 +0000 In-Reply-To: <20221102160007.1279193-1-coltonlewis@google.com> Mime-Version: 1.0 References: <20221102160007.1279193-1-coltonlewis@google.com> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog Message-ID: <20221102160007.1279193-5-coltonlewis@google.com> Subject: [PATCH v9 4/4] 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. This includes the possibility that the same pages may be hit multiple times during an iteration or not at all. Population has random access as false to ensure all pages will be touched by population and avoid page faults in late dirty memory that would pollute the test results. Signed-off-by: Colton Lewis Reviewed-by: David Matlack --- 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 0d0240041acf..065961943b3d 100644 --- a/tools/testing/selftests/kvm/dirty_log_perf_test.c +++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c @@ -133,6 +133,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) @@ -260,6 +261,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) * would pollute the performance results. */ 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 */ @@ -282,6 +284,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) { /* @@ -365,10 +368,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" @@ -422,8 +426,11 @@ int main(int argc, char *argv[]) guest_modes_append_default(); - while ((opt = getopt(argc, argv, "eghi:p:m:nb:v:or:s:x:w:")) != -1) { + while ((opt = getopt(argc, argv, "aeghi:p:m:nb:v:or:s:x:w:")) != -1) { switch (opt) { + case 'a': + p.random_access = true; + break; case 'e': /* 'e' is for evil. */ run_vcpus_while_disabling_dirty_logging = true; diff --git a/tools/testing/selftests/kvm/include/perf_test_util.h b/tools/testing/selftests/kvm/include/perf_test_util.h index 845165001ec8..3d0b75ea866a 100644 --- a/tools/testing/selftests/kvm/include/perf_test_util.h +++ b/tools/testing/selftests/kvm/include/perf_test_util.h @@ -40,6 +40,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]; }; @@ -54,6 +55,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 92b47f71a0a5..137be359b09e 100644 --- a/tools/testing/selftests/kvm/lib/perf_test_util.c +++ b/tools/testing/selftests/kvm/lib/perf_test_util.c @@ -48,6 +48,8 @@ void perf_test_guest_code(uint32_t vcpu_idx) struct perf_test_vcpu_args *vcpu_args = &pta->vcpu_args[vcpu_idx]; uint64_t gva; uint64_t pages; + uint64_t addr; + uint64_t page; int i; struct guest_random_state rand_state = new_guest_random_state(pta->random_seed + vcpu_idx); @@ -60,7 +62,12 @@ void perf_test_guest_code(uint32_t vcpu_idx) while (true) { for (i = 0; i < pages; i++) { - uint64_t addr = gva + (i * pta->guest_page_size); + if (pta->random_access) + page = guest_random_u32(&rand_state) % pages; + else + page = i; + + addr = gva + (page * pta->guest_page_size); if (guest_random_u32(&rand_state) % 100 < pta->write_percent) *(uint64_t *)addr = 0x0123456789ABCDEF; @@ -237,6 +244,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;