From patchwork Thu Jun 1 18:42:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 102146 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp559098vqr; Thu, 1 Jun 2023 12:17:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7t0ZTGgKFE6u1Pcx6TNHNEd/DTqVhXhLGDLTNoMCj0eo1zFzpab97cS3aQPjZr2Y5Eh4VS X-Received: by 2002:a05:6a20:ce44:b0:111:c8a6:88ca with SMTP id id4-20020a056a20ce4400b00111c8a688camr6973268pzb.58.1685647078628; Thu, 01 Jun 2023 12:17:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685647078; cv=none; d=google.com; s=arc-20160816; b=rkmEHrSzNHyyLJ3Aj34/AuJYacapSoBe7tUFQLGSEoEsJ5v5knQePwd652ypL1c3aK KGAx74tyiXTTT1Z4PW9YUPGoUq3eQWbCuI0+UbEjIG2vGeOB6d+aryzPvFi8OBQwiGL4 U7Z19tC13dr8RD3OTlZ56Y2s6tTbfQJvvnL1X77UzBDTrzpi5PRjMR+kFgk62e/6QwuJ e8kUGHbbR1SMyjcsWuUCOY4QvUB2DQAzYCPN9XChHLtrFsJwVCktCQCS00aEsNVPCGdT 9oSOui8HGOsOc6HleXlSxlbOorksO9fqtf+AcAcL+JwhLOO3PPTsRuIPYqIwP7kM+Aaa jtBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=VWv8qJdIHUdzD1kuOVxtkf1lAHbXHShxABd30VkBVcA=; b=NDv8KrSviOgMrrv0PqORqGEdWrm95jnXIkoJOksZvDf67DaW+bbeEH1FdK1J/Q34yy idxbPJx+TOSI61uhfOlCw3yWkuOZXGzhuWMDoQqLK6C1MRDlYm/t5YNiCeqYGzm1+ZVG tcjku8X/K3m5WDJ38sjQI33bdAaOvluipDJ754YOhSktvs9yw9/4Gvd53RRiyJ/y+zmO cZErL94o1bk74XivLzLPSlgy2GjPuxOR/S8JNcOreBMAgiyMtlfe5/hKhBqM2xmzKwPM 8u8ZvFFngdQisQgAJe1LnzZKACLANEmmfEo8YUz19A4eUyxFf2eowpDF76NGEtmYsxcl catQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QRLc5ON3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q1-20020a63ae01000000b00534842e134fsi1989932pgf.272.2023.06.01.12.17.45; Thu, 01 Jun 2023 12:17:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=QRLc5ON3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232157AbjFASou (ORCPT + 99 others); Thu, 1 Jun 2023 14:44:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43292 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229554AbjFASos (ORCPT ); Thu, 1 Jun 2023 14:44:48 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D018E4 for ; Thu, 1 Jun 2023 11:44:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1685645043; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=VWv8qJdIHUdzD1kuOVxtkf1lAHbXHShxABd30VkBVcA=; b=QRLc5ON39HA36OA/DXTgqvm6k9nUXKChBCtsmme7NdsEOmAsR0RWlLIiOQW5btK32ixHuN u+5as5vF1BiNufKNSpbAFG70RTQ4R2jQYWWQpy0D1INucx6pU6RZdKf6Vk4VwPGVpucUfz BI2m9KutLBCWh0VridcGYReBF/kfxzc= Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-2-VtSVsrv4N6ay_s4TAAX8QQ-1; Thu, 01 Jun 2023 14:42:59 -0400 X-MC-Unique: VtSVsrv4N6ay_s4TAAX8QQ-1 Received: by mail-qv1-f70.google.com with SMTP id 6a1803df08f44-626204b0663so2538106d6.1 for ; Thu, 01 Jun 2023 11:42:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1685644978; x=1688236978; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=VWv8qJdIHUdzD1kuOVxtkf1lAHbXHShxABd30VkBVcA=; b=Up6cZkU2UxcCCEXI4qS+xn0KcD0yjgEaWHp7wzE4sZhwg4CGbvaumbYcZSy9FHdbIa 9lOzKW9VSPgWnO/lSxkpOHRGazydHZiD2pHwF7XnX06I69m5eThKghxDL8JscL+HLf+x Sa6VcN5Irgl2brRwj8whpJB9bAvhT6yNAezPNonmb6ETZljpBJekhRprpwToL66akVDP ngqhB+zDfHhm2oKtbU1k3WuCtaU/SkIAhbXbqK6/nDoquOWEWCOlANl3olHJZ4rb22Iz qAHRI/+c6uRrjdAa3nH15q9a4tlgiBL+IV6h4BDze52Rf8Ipb3RKYXepuWwaeLuR6Fgv ro9w== X-Gm-Message-State: AC+VfDwUOrFC8ZMhpavbtTcRqW/oicY/j8nF7RN4TSsARZhKinbt0tV1 NNau1EVC+881F2XL7qpyqN2AFYbZqPBF5TK/npRd0jQTM59fBkBkZ7rVoJtJdO6CG5V/8PVWBMn SnSSD8h1nrEi8vQe8AAkS9268+mrCrxh6PBGk/1OTsCFcRinnqPa90ZPrGVwKcUPFTZxXFBc0eI FN56YJKQ== X-Received: by 2002:ad4:5966:0:b0:61b:76dd:b643 with SMTP id eq6-20020ad45966000000b0061b76ddb643mr6769794qvb.4.1685644978255; Thu, 01 Jun 2023 11:42:58 -0700 (PDT) X-Received: by 2002:ad4:5966:0:b0:61b:76dd:b643 with SMTP id eq6-20020ad45966000000b0061b76ddb643mr6769776qvb.4.1685644977932; Thu, 01 Jun 2023 11:42:57 -0700 (PDT) Received: from x1n.redhat.com (bras-base-aurron9127w-grc-62-70-24-86-62.dsl.bell.ca. [70.24.86.62]) by smtp.gmail.com with ESMTPSA id w1-20020ac84d01000000b003f6a0fa022bsm7947063qtv.51.2023.06.01.11.42.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 11:42:57 -0700 (PDT) From: Peter Xu To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: James Houghton , peterx@redhat.com, Sean Christopherson , Anish Moorthy , Paolo Bonzini Subject: [PATCH v2] selftests/kvm: Allow specify physical cpu list in demand paging test Date: Thu, 1 Jun 2023 14:42:56 -0400 Message-Id: <20230601184256.180413-1-peterx@redhat.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764919039189585544?= X-GMAIL-MSGID: =?utf-8?q?1767529071330814007?= Mimic dirty log test to allow specify physical cpu pinning for vcpu threads. Put the help message into a general helper as suggested by Sean. Signed-off-by: Peter Xu --- tools/testing/selftests/kvm/demand_paging_test.c | 15 +++++++++++++-- tools/testing/selftests/kvm/dirty_log_perf_test.c | 12 +----------- .../testing/selftests/kvm/include/kvm_util_base.h | 1 + tools/testing/selftests/kvm/lib/kvm_util.c | 15 +++++++++++++++ 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/kvm/demand_paging_test.c b/tools/testing/selftests/kvm/demand_paging_test.c index bdb8e0748154..8581478ed4eb 100644 --- a/tools/testing/selftests/kvm/demand_paging_test.c +++ b/tools/testing/selftests/kvm/demand_paging_test.c @@ -220,7 +220,7 @@ static void run_test(enum vm_guest_mode mode, void *arg) static void help(char *name) { puts(""); - printf("usage: %s [-h] [-m vm_mode] [-u uffd_mode] [-a]\n" + printf("usage: %s [-h] [-m vm_mode] [-u uffd_mode] [-a] [-c cpu_list]\n" " [-d uffd_delay_usec] [-r readers_per_uffd] [-b memory]\n" " [-s type] [-v vcpus] [-o]\n", name); guest_modes_help(); @@ -229,6 +229,7 @@ static void help(char *name) printf(" -a: Use a single userfaultfd for all of guest memory, instead of\n" " creating one for each region paged by a unique vCPU\n" " Set implicitly with -o, and no effect without -u.\n"); + kvm_vcpu_pinning_help(); printf(" -d: add a delay in usec to the User Fault\n" " FD handler to simulate demand paging\n" " overheads. Ignored without -u.\n"); @@ -247,6 +248,7 @@ static void help(char *name) int main(int argc, char *argv[]) { int max_vcpus = kvm_check_cap(KVM_CAP_MAX_VCPUS); + const char *cpulist = NULL; struct test_params p = { .src_type = DEFAULT_VM_MEM_SRC, .partition_vcpu_memory_access = true, @@ -257,7 +259,7 @@ int main(int argc, char *argv[]) guest_modes_append_default(); - while ((opt = getopt(argc, argv, "ahom:u:d:b:s:v:r:")) != -1) { + while ((opt = getopt(argc, argv, "ac:hom:u:d:b:s:v:r:")) != -1) { switch (opt) { case 'm': guest_modes_cmdline(optarg); @@ -272,6 +274,9 @@ int main(int argc, char *argv[]) case 'a': p.single_uffd = true; break; + case 'c': + cpulist = optarg; + break; case 'd': p.uffd_delay = strtoul(optarg, NULL, 0); TEST_ASSERT(p.uffd_delay >= 0, "A negative UFFD delay is not supported."); @@ -309,6 +314,12 @@ int main(int argc, char *argv[]) TEST_FAIL("userfaultfd MINOR mode requires shared memory; pick a different -s"); } + if (cpulist) { + kvm_parse_vcpu_pinning(cpulist, memstress_args.vcpu_to_pcpu, + nr_vcpus); + memstress_args.pin_vcpus = true; + } + for_each_guest_mode(run_test, &p); return 0; diff --git a/tools/testing/selftests/kvm/dirty_log_perf_test.c b/tools/testing/selftests/kvm/dirty_log_perf_test.c index e9d6d1aecf89..a17d4ebebe55 100644 --- a/tools/testing/selftests/kvm/dirty_log_perf_test.c +++ b/tools/testing/selftests/kvm/dirty_log_perf_test.c @@ -402,17 +402,7 @@ static void help(char *name) " 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"); - printf(" -c: Pin tasks to physical CPUs. Takes a list of comma separated\n" - " values (target pCPU), one for each vCPU, plus an optional\n" - " entry for the main application task (specified via entry\n" - " ). If used, entries must be provided for all\n" - " vCPUs, i.e. pinning vCPUs is all or nothing.\n\n" - " E.g. to create 3 vCPUs, pin vCPU0=>pCPU22, vCPU1=>pCPU23,\n" - " vCPU2=>pCPU24, and pin the application task to pCPU50:\n\n" - " ./dirty_log_perf_test -v 3 -c 22,23,24,50\n\n" - " To leave the application task unpinned, drop the final entry:\n\n" - " ./dirty_log_perf_test -v 3 -c 22,23,24\n\n" - " (default: no pinning)\n"); + kvm_vcpu_pinning_help(); puts(""); exit(0); } diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index fbc2a79369b8..dc8afe64cfb7 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -734,6 +734,7 @@ struct kvm_vcpu *vm_recreate_with_one_vcpu(struct kvm_vm *vm); void kvm_pin_this_task_to_pcpu(uint32_t pcpu); void kvm_parse_vcpu_pinning(const char *pcpus_string, uint32_t vcpu_to_pcpu[], int nr_vcpus); +void kvm_vcpu_pinning_help(void); unsigned long vm_compute_max_gfn(struct kvm_vm *vm); unsigned int vm_calc_num_guest_pages(enum vm_guest_mode mode, size_t size); diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 8ec20ac33de0..5c9b9706f56a 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -489,6 +489,21 @@ static uint32_t parse_pcpu(const char *cpu_str, const cpu_set_t *allowed_mask) return pcpu; } +void kvm_vcpu_pinning_help(void) +{ + printf(" -c: Pin tasks to physical CPUs. Takes a list of comma separated\n" + " values (target pCPU), one for each vCPU, plus an optional\n" + " entry for the main application task (specified via entry\n" + " ). If used, entries must be provided for all\n" + " vCPUs, i.e. pinning vCPUs is all or nothing.\n\n" + " E.g. to create 3 vCPUs, pin vCPU0=>pCPU22, vCPU1=>pCPU23,\n" + " vCPU2=>pCPU24, and pin the application task to pCPU50:\n\n" + " ./dirty_log_perf_test -v 3 -c 22,23,24,50\n\n" + " To leave the application task unpinned, drop the final entry:\n\n" + " ./dirty_log_perf_test -v 3 -c 22,23,24\n\n" + " (default: no pinning)\n"); +} + void kvm_parse_vcpu_pinning(const char *pcpus_string, uint32_t vcpu_to_pcpu[], int nr_vcpus) {