From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
Reinette Chatre <reinette.chatre@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>, Shuah Khan <shuah@kernel.org>
Cc: "Shaopeng Tan" <tan.shaopeng@jp.fujitsu.com>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH 12/22] selftests/resctrl: Remove test type checks from cat_val()
Date: Wed, 12 Apr 2023 16:21:12 +0300 [thread overview]
Message-ID: <20230412132122.29452-13-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20230412132122.29452-1-ilpo.jarvinen@linux.intel.com>
cat_val() is only used during CAT test but it checks for test type.
Remove test type checks and the unused else branch from cat_val().
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
tools/testing/selftests/resctrl/cache.c | 45 +++++++++++--------------
1 file changed, 20 insertions(+), 25 deletions(-)
diff --git a/tools/testing/selftests/resctrl/cache.c b/tools/testing/selftests/resctrl/cache.c
index a15f1f2715cd..6bc912de38be 100644
--- a/tools/testing/selftests/resctrl/cache.c
+++ b/tools/testing/selftests/resctrl/cache.c
@@ -232,36 +232,31 @@ int cat_val(struct resctrl_val_param *param)
if (ret)
return ret;
- if (!strncmp(resctrl_val, CAT_STR, sizeof(CAT_STR)))
- initialize_llc_perf();
+ initialize_llc_perf();
/* Test runs until the callback setup() tells the test to stop. */
while (1) {
- if (!strncmp(resctrl_val, CAT_STR, sizeof(CAT_STR))) {
- ret = param->setup(param);
- if (ret == END_OF_TESTS) {
- ret = 0;
- break;
- }
- if (ret < 0)
- break;
- ret = reset_enable_llc_perf(bm_pid, param->cpu_no);
- if (ret)
- break;
-
- if (run_fill_buf(param->span, memflush, operation, true)) {
- fprintf(stderr, "Error-running fill buffer\n");
- ret = -1;
- break;
- }
-
- sleep(1);
- ret = measure_cache_vals(param, bm_pid);
- if (ret)
- break;
- } else {
+ ret = param->setup(param);
+ if (ret == END_OF_TESTS) {
+ ret = 0;
break;
}
+ if (ret < 0)
+ break;
+ ret = reset_enable_llc_perf(bm_pid, param->cpu_no);
+ if (ret)
+ break;
+
+ if (run_fill_buf(param->span, memflush, operation, true)) {
+ fprintf(stderr, "Error-running fill buffer\n");
+ ret = -1;
+ break;
+ }
+
+ sleep(1);
+ ret = measure_cache_vals(param, bm_pid);
+ if (ret)
+ break;
}
return ret;
--
2.30.2
next prev parent reply other threads:[~2023-04-12 13:23 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-12 13:21 [PATCH 00/22] selftests/resctrl: Fixes, cleanups, and rewritten CAT test Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 01/22] selftests/resctrl: Add resctrl.h into build deps Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 02/22] selftests/resctrl: Check also too low values for CBM bits Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 03/22] selftests/resctrl: Make span unsigned long everywhere Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 04/22] selftests/resctrl: Express span in bytes Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 05/22] selftests/resctrl: Remove duplicated preparation for span arg Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 06/22] selftests/resctrl: Don't use variable argument list for ->setup() Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 07/22] selftests/resctrl: Remove "malloc_and_init_memory" param from run_fill_buf() Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 08/22] selftests/resctrl: Split run_fill_buf() to alloc, work, and dealloc helpers Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 09/22] selftests/resctrl: Remove start_buf local variable from buffer alloc func Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 10/22] selftests/resctrl: Don't pass test name to fill_buf Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 11/22] selftests/resctrl: Add flush_buffer() " Ilpo Järvinen
2023-04-12 13:21 ` Ilpo Järvinen [this message]
2023-04-12 13:21 ` [PATCH 13/22] selftests/resctrl: Refactor get_cbm_mask() Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 14/22] selftests/resctrl: Create cache_alloc_size() helper Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 15/22] selftests/resctrl: Replace count_bits with count_consecutive_bits() Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 16/22] selftests/resctrl: Exclude shareable bits from schemata in CAT test Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 17/22] selftests/resctrl: Pass the real number of tests to show_cache_info() Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 18/22] selftests/resctrl: Move CAT/CMT test global vars to func they are used Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 19/22] selftests/resctrl: Read in less obvious order to defeat prefetch optimizations Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 20/22] selftests/resctrl: Split measure_cache_vals() function Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 21/22] selftests/resctrl: Split show_cache_info() to test specific and generic parts Ilpo Järvinen
2023-04-12 13:21 ` [PATCH 22/22] selftests/resctrl: Rewrite Cache Allocation Technology (CAT) test Ilpo Järvinen
2023-04-13 10:12 ` Ilpo Järvinen
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=20230412132122.29452-13-ilpo.jarvinen@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=fenghua.yu@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=reinette.chatre@intel.com \
--cc=shuah@kernel.org \
--cc=tan.shaopeng@jp.fujitsu.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.