From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CFEFB71737 for ; Mon, 15 Apr 2024 13:43:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713188639; cv=none; b=E2j08yVVUF1QQdh5XdIwx8/MZkgDFNcAyih7LCU9QEq0Bo+hvBnscL6tBxZW5RgP4S5qEopRZz0ghJS0dTiaZEA0rR8QuNNIehkzQFgd7VBlk3pvjHlM848QorOE+p/i0WY+gfgaMFWB3/w3dj50dOitq/FY4v7jI0dPXO97CyA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713188639; c=relaxed/simple; bh=wiZZBUwFBfFJ8JX5HoSa5Tz8CCR776e4YmB5I1+UeZQ=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=iTnhgn1eZhSM8/pKnHamY+qqf9QfGuc3fxgnrEyljn7MBDexcy+eiwpOhCr0T7rQmHzALMegSzjdya9h2kINEY6sogjecWAq1cwX6jtDEem8EslDMaztLUIjxqcMfsE/X2mAlbIZetIXeN+OZtwiuTHW+yNN9bm4oY5fbJMkSOs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com; spf=pass smtp.mailfrom=ventanamicro.com; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b=b0OWRApy; arc=none smtp.client-ip=209.85.128.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ventanamicro.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ventanamicro.com header.i=@ventanamicro.com header.b="b0OWRApy" Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-41882c16930so786905e9.2 for ; Mon, 15 Apr 2024 06:43:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1713188634; x=1713793434; darn=lists.linux.dev; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=oBlw086cFKfVgD6m6+KXW8B1bVXOlMOqtJCrOvRcQ7k=; b=b0OWRApyoeBcCl9K2S+GVXr/+wrJ09nM8uiqnapbyV4IsPoIGqUThx1PGSCUDRgFpO rKdsUyNUPdhUmPg2W1ZmZJ7sBbDuqqSnl7Ll8RQYN7FSfoLP5XpJvTDljJsNBV+wMhkb bdpRYG9sNGSgmRJP1tu2/YDpD7IO2xUnNcFKwMnjBNxe8Z3DOk0+56X3Hmf1EZCdM9z1 bH4wge7c9gN+4XHhdfI3xgRwk/jBu054IOVTyasJGYeVG7ItN9XILYTSIu/qeNKxv7Ts z03oU7bwsvpA3jE/OBnu1p8KjpTKw9rNnU7I7Xw9ek/YA7PrGHtDxVfZ6Qln1I76PRxy NZWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713188634; x=1713793434; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=oBlw086cFKfVgD6m6+KXW8B1bVXOlMOqtJCrOvRcQ7k=; b=dlux5j6uxcMohJNIuqNf1NQletxpzgSHZLrqeBx3GbuJ/GxBGUF5FL5BbmRD/AmbZt WIQc9Wdks35U4Qm6Kzee/0NFw9evLOO6e2pNoHdRud1dhM18lp/W5YulT2tV7657B58q LyPKIoVdU7lDx+iEyV/nEe8yysVAv0LUL2gORagrKCOWC76vHOU+4RYsSAZHWYFQwkUg iQYWj89jFcvhX8usOmYqPtOw0ErbkI90KuhF7XD6G9LqMm/MNEHaIFxMG7sD8LlOmzCg Y8BDSBcsqkTkSM82s6AlKxgJfum9HcFPo8EKNNhsJSjyWaxUBbELrU8FiQ1qbFOpGkjH pfqg== X-Forwarded-Encrypted: i=1; AJvYcCVQEGberJ2pRQyAaOUTVbvwNyNDOtAXubBXZMzcxlUhmErBIPl+YeYdpI5L8XciVa6TOk33JGnB/vTZY2PxLS0hpbuJVfpd3fUE2r4vL2o= X-Gm-Message-State: AOJu0Yz77VhK23/FZrQyDs/78kMDd5OFEkm636UV6e/BytulIL/Ay4VK 1fIi/pKH1S5vvbkA9hUTpaX39Fl/yDEcj5OVYMutVxmLa/4oo2B4F6vtkLsStxY= X-Google-Smtp-Source: AGHT+IFSJX/JAylOq7lyfTWV1n1rGtpOd6txYa80kvU3cra08zVigOgalF/jjTxDvlEfsaeWSmIeIQ== X-Received: by 2002:a05:600c:4ecb:b0:418:2d69:d978 with SMTP id g11-20020a05600c4ecb00b004182d69d978mr4057431wmq.10.1713188633673; Mon, 15 Apr 2024 06:43:53 -0700 (PDT) Received: from localhost (cst2-173-16.cust.vodafone.cz. [31.30.173.16]) by smtp.gmail.com with ESMTPSA id l23-20020a05600c1d1700b004163ee3922csm19555595wms.38.2024.04.15.06.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 06:43:53 -0700 (PDT) Date: Mon, 15 Apr 2024 15:43:52 +0200 From: Andrew Jones To: Atish Patra Cc: linux-kernel@vger.kernel.org, Ajay Kaher , Albert Ou , Alexandre Ghiti , Alexey Makhalov , Anup Patel , Atish Patra , Broadcom internal kernel review list , Conor Dooley , Juergen Gross , kvm-riscv@lists.infradead.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-riscv@lists.infradead.org, Mark Rutland , Palmer Dabbelt , Paolo Bonzini , Paul Walmsley , Shuah Khan , virtualization@lists.linux.dev, Will Deacon , x86@kernel.org Subject: Re: [PATCH v6 24/24] KVM: riscv: selftests: Add commandline option for SBI PMU test Message-ID: <20240415-8b9ad5a7e968b1808e99e3da@orel> References: <20240411000752.955910-1-atishp@rivosinc.com> <20240411000752.955910-25-atishp@rivosinc.com> Precedence: bulk X-Mailing-List: virtualization@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240411000752.955910-25-atishp@rivosinc.com> On Wed, Apr 10, 2024 at 05:07:52PM -0700, Atish Patra wrote: > SBI PMU test comprises of multiple tests and user may want to run > only a subset depending on the platform. The most common case would > be to run all to validate all the tests. However, some platform may > not support all events or all ISA extensions. > > The commandline option allows user to disable particular test if they > want to. > > Suggested-by: Andrew Jones > Signed-off-by: Atish Patra > --- > .../selftests/kvm/riscv/sbi_pmu_test.c | 77 ++++++++++++++++--- > 1 file changed, 68 insertions(+), 9 deletions(-) > > diff --git a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c > index 0fd9b76ae838..57025b07a403 100644 > --- a/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c > +++ b/tools/testing/selftests/kvm/riscv/sbi_pmu_test.c > @@ -33,6 +33,16 @@ static unsigned long counter_mask_available; > > static bool illegal_handler_invoked; > > +enum sbi_pmu_test_id { > + SBI_PMU_TEST_BASIC = 0, > + SBI_PMU_TEST_EVENTS, > + SBI_PMU_TEST_SNAPSHOT, > + SBI_PMU_TEST_OVERFLOW, > + SBI_PMU_TEST_MAX, > +}; > + > +static int disabled_test_id = SBI_PMU_TEST_MAX; I think we should allow specifying '-d' multiple times in case a user wants to disable more than one type of test. So we should set a bit in this variable instead of assigning it. We could also flip it around. If the user uses '-e' to enable test type then only type will be run, but then we'd probably want to allow multiple '-e' too so it doesn't gain anything. > + > unsigned long pmu_csr_read_num(int csr_num) > { > #define switchcase_csr_read(__csr_num, __val) {\ > @@ -608,19 +618,68 @@ static void test_vm_events_overflow(void *guest_code) > test_vm_destroy(vm); > } > > -int main(void) > +static void test_print_help(char *name) > { > - test_vm_basic_test(test_pmu_basic_sanity); > - pr_info("SBI PMU basic test : PASS\n"); > + pr_info("Usage: %s [-h] [-d ]\n", name); > + pr_info("\t-d: Test to disable. Available tests are 'basic', 'events', 'snapshot', 'overflow'\n"); > + pr_info("\t-h: print this help screen\n"); > +} > > - test_vm_events_test(test_pmu_events); > - pr_info("SBI PMU event verification test : PASS\n"); > +static bool parse_args(int argc, char *argv[]) > +{ > + int opt; > + > + while ((opt = getopt(argc, argv, "hd:")) != -1) { > + switch (opt) { > + case 'd': > + if (!strncmp("basic", optarg, 5)) > + disabled_test_id = SBI_PMU_TEST_BASIC; > + else if (!strncmp("events", optarg, 6)) > + disabled_test_id = SBI_PMU_TEST_EVENTS; > + else if (!strncmp("snapshot", optarg, 8)) > + disabled_test_id = SBI_PMU_TEST_SNAPSHOT; > + else if (!strncmp("overflow", optarg, 8)) > + disabled_test_id = SBI_PMU_TEST_OVERFLOW; > + else > + goto done; > + break; > + break; Extra 'break' > + case 'h': > + default: > + goto done; > + } > + } > > - test_vm_events_snapshot_test(test_pmu_events_snaphost); > - pr_info("SBI PMU event verification with snapshot test : PASS\n"); > + return true; > +done: > + test_print_help(argv[0]); > + return false; > +} > > - test_vm_events_overflow(test_pmu_events_overflow); > - pr_info("SBI PMU event verification with overflow test : PASS\n"); > +int main(int argc, char *argv[]) > +{ > + if (!parse_args(argc, argv)) > + exit(KSFT_SKIP); > + > + if (disabled_test_id != SBI_PMU_TEST_BASIC) { > + test_vm_basic_test(test_pmu_basic_sanity); > + pr_info("SBI PMU basic test : PASS\n"); > + } > + > + if (disabled_test_id != SBI_PMU_TEST_EVENTS) { > + test_vm_events_test(test_pmu_events); > + pr_info("SBI PMU event verification test : PASS\n"); > + } > + > + if (disabled_test_id != SBI_PMU_TEST_SNAPSHOT) { > + test_vm_events_snapshot_test(test_pmu_events_snaphost); > + pr_info("SBI PMU event verification with snapshot test : PASS\n"); > + } > + > + if (disabled_test_id != SBI_PMU_TEST_OVERFLOW) { > + test_vm_events_overflow(test_pmu_events_overflow); > + pr_info("SBI PMU event verification with overflow test : PASS\n"); > + } > > return 0; > } > -- > 2.34.1 > Thanks, drew