linux-kselftest.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Fenghua Yu <fenghua.yu@intel.com>
To: "Shuah Khan" <shuah@kernel.org>,
	"Reinette Chatre" <reinette.chatre@intel.com>,
	"Tony Luck" <tony.luck@intel.com>,
	"Babu Moger" <babu.moger@amd.com>,
	"James Morse" <james.morse@arm.com>,
	"Borislav Petkov" <bp@alien8.de>,
	"Thomas Gleixner" <tglx@linutronix.de>,
	"Ravi V Shankar" <ravi.v.shankar@intel.com>
Cc: "linux-kselftest" <linux-kselftest@vger.kernel.org>,
	"linux-kernel" <linux-kernel@vger.kernel.org>,
	Fenghua Yu <fenghua.yu@intel.com>
Subject: [PATCH v3 13/21] selftests/resctrl: Don't hard code value of "no_of_bits" variable
Date: Tue, 20 Oct 2020 23:51:18 +0000	[thread overview]
Message-ID: <20201020235126.1871815-14-fenghua.yu@intel.com> (raw)
In-Reply-To: <20201020235126.1871815-1-fenghua.yu@intel.com>

Cache related tests (like CAT and CMT) depend on a variable called
no_of_bits to run. no_of_bits defines the number of contiguous bits
that should be set in the CBM mask and a user can pass a value for
no_of_bits using -n command line argument. If a user hasn't passed any
value, it defaults to 5 (randomly chosen value).

Hard coding no_of_bits to 5 will make the cache tests fail to run on
systems that support maximum cbm mask that is less than or equal to 5 bits.
Hence, don't hard code no_of_bits value.

If a user passes a value for "no_of_bits" using -n option, use it.
Otherwise, no_of_bits is equal to half of the maximum number of bits in
the cbm mask.

Please note that CMT test is still hard coded to 5 bits. It will change in
subsequent patches that change CMT test.

Fixes: 790bf585b0ee ("selftests/resctrl: Add Cache Allocation Technology (CAT) selftest")
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
---
 tools/testing/selftests/resctrl/cat_test.c      | 5 ++++-
 tools/testing/selftests/resctrl/resctrl_tests.c | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/tools/testing/selftests/resctrl/cat_test.c b/tools/testing/selftests/resctrl/cat_test.c
index 5da43767b973..1bce84e23783 100644
--- a/tools/testing/selftests/resctrl/cat_test.c
+++ b/tools/testing/selftests/resctrl/cat_test.c
@@ -151,7 +151,10 @@ int cat_perf_miss_val(int cpu_no, int n, char *cache_type)
 	/* Get max number of bits from default-cabm mask */
 	count_of_bits = count_bits(long_mask);
 
-	if (n < 1 || n > count_of_bits - 1) {
+	if (!n)
+		n = count_of_bits / 2;
+
+	if (n > count_of_bits - 1) {
 		printf("Invalid input value for no_of_bits n!\n");
 		printf("Please Enter value in range 1 to %d\n",
 		       count_of_bits - 1);
diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c
index f4867a81eee6..5c217d0228f4 100644
--- a/tools/testing/selftests/resctrl/resctrl_tests.c
+++ b/tools/testing/selftests/resctrl/resctrl_tests.c
@@ -57,7 +57,7 @@ void tests_cleanup(void)
 int main(int argc, char **argv)
 {
 	bool has_ben = false, mbm_test = true, mba_test = true, cmt_test = true;
-	int res, c, cpu_no = 1, span = 250, argc_new = argc, i, no_of_bits = 5;
+	int res, c, cpu_no = 1, span = 250, argc_new = argc, i, no_of_bits = 0;
 	char *benchmark_cmd[BENCHMARK_ARGS], bw_report[64], bm_type[64];
 	char benchmark_cmd_area[BENCHMARK_ARGS][BENCHMARK_ARG_SIZE];
 	int ben_ind, ben_count;
@@ -106,6 +106,10 @@ int main(int argc, char **argv)
 			break;
 		case 'n':
 			no_of_bits = atoi(optarg);
+			if (no_of_bits <= 0) {
+				printf("Bail out! invalid argument for no_of_bits\n");
+				return -1;
+			}
 			break;
 		case 'h':
 			cmd_help();
@@ -188,7 +192,7 @@ int main(int argc, char **argv)
 		printf("# Starting CMT test ...\n");
 		if (!has_ben)
 			sprintf(benchmark_cmd[5], "%s", "cmt");
-		res = cmt_resctrl_val(cpu_no, no_of_bits, benchmark_cmd);
+		res = cmt_resctrl_val(cpu_no, 5, benchmark_cmd);
 		printf("%sok CMT: test\n", res ? "not " : "");
 		cmt_test_cleanup();
 		tests_run++;
-- 
2.29.0


  parent reply	other threads:[~2020-10-20 23:51 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-20 23:51 [PATCH v3 00/21] Miscellaneous fixes for resctrl selftests Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 01/21] selftests/resctrl: Rename CQM test as CMT test Fenghua Yu
2020-10-27 20:55   ` Shuah Khan
2020-10-20 23:51 ` [PATCH v3 02/21] selftests/resctrl: Fix typo Fenghua Yu
2020-10-27 20:56   ` Shuah Khan
2020-10-20 23:51 ` [PATCH v3 03/21] selftests/resctrl: Fix typo in help text Fenghua Yu
2020-10-27 20:58   ` Shuah Khan
2020-10-20 23:51 ` [PATCH v3 04/21] selftests/resctrl: Declare global variables as extern Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 05/21] selftests/resctrl: Return if resctrl file system is not supported Fenghua Yu
2020-10-27 21:34   ` Shuah Khan
2020-10-20 23:51 ` [PATCH v3 06/21] selftests/resctrl: Check for resctrl mount point only if resctrl FS is supported Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 07/21] selftests/resctrl: Use resctrl/info for feature detection Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 08/21] selftests/resctrl: Ensure sibling CPU is not same as original CPU Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 09/21] selftests/resctrl: Fix missing options "-n" and "-p" Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 10/21] selftests/resctrl: Fix MBA/MBM results reporting format Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 11/21] selftests/resctrl: Abort running tests if not root user Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 12/21] selftests/resctrl: Enable gcc checks to detect buffer overflows Fenghua Yu
2020-10-20 23:51 ` Fenghua Yu [this message]
2020-10-20 23:51 ` [PATCH v3 14/21] selftests/resctrl: Modularize resctrl test suite main() function Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 15/21] selftests/resctrl: Skip the test if requested resctrl feature is not supported Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 16/21] selftests/resctrl: Umount resctrl FS only if mounted Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 17/21] selftests/resctrl: Unmount resctrl FS after running all tests Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 18/21] selftests/resctrl: Fix incorrect parsing of iMC counters Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 19/21] selftests/resctrl: Fix checking for < 0 for unsigned values Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 20/21] selftests/resctrl: Fix unnecessary usage of global variables Fenghua Yu
2020-10-20 23:51 ` [PATCH v3 21/21] selftests/resctrl: Don't use global variable for capacity bitmask (CBM) Fenghua Yu
2020-10-28  0:46 ` [PATCH v3 00/21] Miscellaneous fixes for resctrl selftests Shuah Khan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201020235126.1871815-14-fenghua.yu@intel.com \
    --to=fenghua.yu@intel.com \
    --cc=babu.moger@amd.com \
    --cc=bp@alien8.de \
    --cc=james.morse@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=ravi.v.shankar@intel.com \
    --cc=reinette.chatre@intel.com \
    --cc=shuah@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=tony.luck@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).