Received: by 2002:a05:7412:bbc7:b0:fc:a2b0:25d7 with SMTP id kh7csp2355332rdb; Mon, 5 Feb 2024 04:14:14 -0800 (PST) X-Google-Smtp-Source: AGHT+IFVaVg6ttNeqwkK5n9vDw7K/3PMxIhfggagEGhMb2A/z6bxPbAOBUH6aMT6afF+/BjIe7ro X-Received: by 2002:a05:6214:2262:b0:68c:3d2a:47e7 with SMTP id gs2-20020a056214226200b0068c3d2a47e7mr7624303qvb.27.1707135254110; Mon, 05 Feb 2024 04:14:14 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707135254; cv=pass; d=google.com; s=arc-20160816; b=0cx5jk4vJKsIGI7U+k/y/kbzbh4k03o7wItHQ5i21LP1T/jRfbV/TusmINq45bCKSo BJUIh+uleMdKPSHCvbNE68Fnv/eV+kSOq6wCFFOUuCIAbGis/RCAddCHj0aEsjOrkBXI DzgOAlDTDYwLa1kYHu6rophbQsQsVtJPQQtbzulQUS1fCkLJ18AaeZriBwjBufET8qh1 XT0ttgJbFdGc1fb/6Zhs+vejdGD7f6GxBIVYSz2JfCj1c0BdIl5AzPIk0gqRtyuI6uJf cm81TJrevPKroEEAX/c2fkG9wD/grTTPxKk3avyumS95dNNZCfkxCPOZAq4OirP2cifJ /l/A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=SePm7hdaFAkvNmuFVzoNGPM41lR8bzEfn69biyLTEpM=; fh=VLeAso3zehYsdzlv9Y8XvYhtnM5EIqLddntCcNlPpPY=; b=YEs9R0BADrtDRMUfHb4ynwxuoGs2Bph5QrJ/CnSRc7O0fP/Npwqr/OYfBqCTc/4co+ lTXInPnXMJ0+iiBdgZnER5cF3ie4x6mYfWEA1T/2J522Cl64sFoqe75y0RJ9L5OH3u5A vO+/rugVIvq15p+T+RH2wXLrO6uF/GGU6zPEoDEP/Ukmg4vTDH1Kq187g0o3TTy2JsyZ qZP5+tDkk2ZegNsSBlI0PVDkmt30cs1lVBhPXZ9DX1ETgEZ1EofZWvVPGcdoko9bBkrZ N9KxlxodO1L9aN4R78pY23nBOcY2g8h06KsQVG/Al0r14kzGtPJp00lM1n0aXCVqehbh nLOg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TuawE8cq; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-52568-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52568-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Forwarded-Encrypted: i=1; AJvYcCWJ59BSYfUy7O7X3ijvY7FKWopECTO+2OdCZXlpU5HklyO+ekpO8jKcqPY8kTJEU6ZUWuP2mF7o5cufMhD6Cpq5pVbrQO0KvB/xbyPjMA== Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id q15-20020ad4434f000000b0067fae1fc6a5si8199986qvs.245.2024.02.05.04.14.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 05 Feb 2024 04:14:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-52568-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=TuawE8cq; arc=pass (i=1 spf=pass spfdomain=intel.com dkim=pass dkdomain=intel.com dmarc=pass fromdomain=intel.com); spf=pass (google.com: domain of linux-kernel+bounces-52568-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-52568-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id CAFDB1C225F2 for ; Mon, 5 Feb 2024 12:14:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 01CCD1CA83; Mon, 5 Feb 2024 12:08:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="TuawE8cq" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 766C41CA80; Mon, 5 Feb 2024 12:08:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.14 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707134885; cv=none; b=bXEivsYIkwCR+nIHF9bbyLc3mwVkdK2zhVoHGB6IGiGCzaNUS+idzgTWdaV32PYYXoig/9XeQZupnQzOaQw1BOwusDSxGxaP09z94I6AtmdIwH0fGJ1BHplcxeD01KqkZ1PQRfx5V5Zw3ZoORyLVNCoyImRWsOnwAsIOZJijbxg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707134885; c=relaxed/simple; bh=zZN4cETb3MBIZuAuJx/wxgse1CPcOB28R3CvbuhlFiM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TcNGdbfELvAKvK9kgOZ68VXYLg8VPS4KVdRsejb+CeICTfFVYA8UDM5G2zRv9PEG9ZEFgTZcuIPpD2EXMwLt+ZYmlrejNPyivl4LkZZe/OcRVmkMnv+v3ryrHBj2Nc7LIMPxU4T5YbjXRsQdBV8GxINAYiGItu+T+CwaLGinYL4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=TuawE8cq; arc=none smtp.client-ip=198.175.65.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707134884; x=1738670884; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=zZN4cETb3MBIZuAuJx/wxgse1CPcOB28R3CvbuhlFiM=; b=TuawE8cqB+Hh64Q2hBdKksBgr00skjf774CSXRD6SMHH78kx30af9ygf wREMBaux2JPPM5Al6LxsH53/vzgbyDmVO54iw9nVeb4jWhKTwMOH0M/8z XngY/1TGQ3CSpusMeJxtZHdmfvFmOjQpvw/5ZqlReF1hqRJhhlx7x3vZp 1er13fXXtFGc1CquT979XbxX8Frcf8z8/rEXE/yp0QGgPDnseNMx562qg FrelqCAxMX4AHeSUP57b4hHHIHWua5EFEgbmmnHRikF8QFr8c02yfVp5P hCv2hxW1rZzGLAUoyGIfXcircNTsUE/c+VUK5duUwqv59TNTVDVDtTviD w==; X-IronPort-AV: E=McAfee;i="6600,9927,10974"; a="4323077" X-IronPort-AV: E=Sophos;i="6.05,245,1701158400"; d="scan'208";a="4323077" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2024 04:08:03 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,245,1701158400"; d="scan'208";a="38121150" Received: from snestero-mobl.ger.corp.intel.com (HELO wieczorr-mobl1.intel.com) ([10.213.21.196]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Feb 2024 04:08:00 -0800 From: Maciej Wieczor-Retman To: fenghua.yu@intel.com, reinette.chatre@intel.com, shuah@kernel.org Cc: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, ilpo.jarvinen@linux.intel.com Subject: [PATCH v4 1/5] selftests/resctrl: Add test groups and name L3 CAT test L3_CAT Date: Mon, 5 Feb 2024 13:07:50 +0100 Message-ID: <4462d207c35c7d22875ab58be6aecb1a899d254f.1707130307.git.maciej.wieczor-retman@intel.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Ilpo Järvinen To select test to run -t parameter can be used. However, -t cat currently maps to L3 CAT test which will be confusing after more CAT related tests will be added. Allow selecting tests as groups and call L3 CAT test "L3_CAT", "CAT" group will enable all CAT related tests. Signed-off-by: Ilpo Järvinen Signed-off-by: Maciej Wieczor-Retman --- Changelog v3: - Expand group description in struct comment (Reinette). Changelog v2: - Move this patch from Ilpo's series here (Ilpo). tools/testing/selftests/resctrl/cat_test.c | 3 ++- tools/testing/selftests/resctrl/resctrl.h | 3 +++ tools/testing/selftests/resctrl/resctrl_tests.c | 16 +++++++++++----- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/resctrl/cat_test.c b/tools/testing/selftests/resctrl/cat_test.c index 24af8310288a..39fc9303b8e8 100644 --- a/tools/testing/selftests/resctrl/cat_test.c +++ b/tools/testing/selftests/resctrl/cat_test.c @@ -295,7 +295,8 @@ static int cat_run_test(const struct resctrl_test *test, const struct user_param } struct resctrl_test l3_cat_test = { - .name = "CAT", + .name = "L3_CAT", + .group = "CAT", .resource = "L3", .feature_check = test_resource_feature_check, .run_test = cat_run_test, diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h index c52eaf46f24d..a1462029998e 100644 --- a/tools/testing/selftests/resctrl/resctrl.h +++ b/tools/testing/selftests/resctrl/resctrl.h @@ -65,6 +65,8 @@ struct user_params { /* * resctrl_test: resctrl test definition * @name: Test name + * @group: Test group - a common name for tests that share some characteristic + * (e.g., L3 CAT test belongs to the CAT group). Can be NULL * @resource: Resource to test (e.g., MB, L3, L2, etc.) * @vendor_specific: Bitmask for vendor-specific tests (can be 0 for universal tests) * @disabled: Test is disabled @@ -73,6 +75,7 @@ struct user_params { */ struct resctrl_test { const char *name; + const char *group; const char *resource; unsigned int vendor_specific; bool disabled; diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c index 75fc49ba3efb..3044179ee6e9 100644 --- a/tools/testing/selftests/resctrl/resctrl_tests.c +++ b/tools/testing/selftests/resctrl/resctrl_tests.c @@ -65,11 +65,15 @@ static void cmd_help(void) printf("usage: resctrl_tests [-h] [-t test list] [-n no_of_bits] [-b benchmark_cmd [option]...]\n"); printf("\t-b benchmark_cmd [option]...: run specified benchmark for MBM, MBA and CMT\n"); printf("\t default benchmark is builtin fill_buf\n"); - printf("\t-t test list: run tests specified in the test list, "); + printf("\t-t test list: run tests/groups specified by the list, "); printf("e.g. -t mbm,mba,cmt,cat\n"); - printf("\t\tSupported tests:\n"); - for (i = 0; i < ARRAY_SIZE(resctrl_tests); i++) - printf("\t\t\t%s\n", resctrl_tests[i]->name); + printf("\t\tSupported tests (group):\n"); + for (i = 0; i < ARRAY_SIZE(resctrl_tests); i++) { + if (resctrl_tests[i]->group) + printf("\t\t\t%s (%s)\n", resctrl_tests[i]->name, resctrl_tests[i]->group); + else + printf("\t\t\t%s\n", resctrl_tests[i]->name); + } printf("\t-n no_of_bits: run cache tests using specified no of bits in cache bit mask\n"); printf("\t-p cpu_no: specify CPU number to run the test. 1 is default\n"); printf("\t-h: help\n"); @@ -199,7 +203,9 @@ int main(int argc, char **argv) bool found = false; for (i = 0; i < ARRAY_SIZE(resctrl_tests); i++) { - if (!strcasecmp(token, resctrl_tests[i]->name)) { + if (!strcasecmp(token, resctrl_tests[i]->name) || + (resctrl_tests[i]->group && + !strcasecmp(token, resctrl_tests[i]->group))) { if (resctrl_tests[i]->disabled) tests++; resctrl_tests[i]->disabled = false; -- 2.43.0