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: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH v2 2/9] selftests/resctrl: Move ->setup() call outside of test specific branches
Date: Wed, 15 Feb 2023 15:05:58 +0200 [thread overview]
Message-ID: <20230215130605.31583-3-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20230215130605.31583-1-ilpo.jarvinen@linux.intel.com>
resctrl_val() function is called only by MBM, MBA, and CMT tests which
means the else branch is never used.
Both test branches call param->setup().
Remove the unused else branch and place the ->setup() call outside of
the test specific branches reducing code duplication.
Co-developed-by: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
tools/testing/selftests/resctrl/resctrl_val.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/selftests/resctrl/resctrl_val.c
index b32b96356ec7..787546a52849 100644
--- a/tools/testing/selftests/resctrl/resctrl_val.c
+++ b/tools/testing/selftests/resctrl/resctrl_val.c
@@ -734,29 +734,22 @@ int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param)
/* Test runs until the callback setup() tells the test to stop. */
while (1) {
+ ret = param->setup(1, param);
+ if (ret) {
+ ret = 0;
+ break;
+ }
+
if (!strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR)) ||
!strncmp(resctrl_val, MBA_STR, sizeof(MBA_STR))) {
- ret = param->setup(1, param);
- if (ret) {
- ret = 0;
- break;
- }
-
ret = measure_vals(param, &bw_resc_start);
if (ret)
break;
} else if (!strncmp(resctrl_val, CMT_STR, sizeof(CMT_STR))) {
- ret = param->setup(1, param);
- if (ret) {
- ret = 0;
- break;
- }
sleep(1);
ret = measure_cache_vals(param, bm_pid);
if (ret)
break;
- } else {
- break;
}
}
--
2.30.2
next prev parent reply other threads:[~2023-02-15 13:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-15 13:05 [PATCH v2 0/9] selftests/resctrl: Fixes to error handling logic and cleanups Ilpo Järvinen
2023-02-15 13:05 ` [PATCH v2 1/9] selftests/resctrl: Return NULL if malloc_and_init_memory() did not alloc mem Ilpo Järvinen
2023-03-15 23:59 ` Reinette Chatre
2023-02-15 13:05 ` Ilpo Järvinen [this message]
2023-03-16 0:01 ` [PATCH v2 2/9] selftests/resctrl: Move ->setup() call outside of test specific branches Reinette Chatre
2023-02-15 13:05 ` [PATCH v2 3/9] selftests/resctrl: Allow ->setup() to return errors Ilpo Järvinen
2023-03-16 0:02 ` Reinette Chatre
2023-02-15 13:06 ` [PATCH v2 4/9] selftests/resctrl: Check for return value after write_schemata() Ilpo Järvinen
2023-03-16 0:02 ` Reinette Chatre
2023-02-15 13:06 ` [PATCH v2 5/9] selftests/resctrl: Replace obsolete memalign() with posix_memalign() Ilpo Järvinen
2023-03-16 0:02 ` Reinette Chatre
2023-02-15 13:06 ` [PATCH v2 6/9] selftests/resctrl: Change initialize_llc_perf() return type to void Ilpo Järvinen
2023-03-16 0:03 ` Reinette Chatre
2023-02-15 13:06 ` [PATCH v2 7/9] selftests/resctrl: Change name from CBM_MASK_PATH to INFO_PATH Ilpo Järvinen
2023-03-16 0:03 ` Reinette Chatre
2023-02-15 13:06 ` [PATCH v2 8/9] selftests/resctrl: Use remount_resctrlfs() consistently with boolean Ilpo Järvinen
2023-03-16 15:57 ` Reinette Chatre
2023-02-15 13:06 ` [PATCH v2 9/9] selftests/resctrl: Correct get_llc_perf() param in function comment Ilpo Järvinen
2023-03-16 0:04 ` Reinette Chatre
2023-03-16 10:21 ` Ilpo Järvinen
2023-03-16 16:01 ` [PATCH v2 0/9] selftests/resctrl: Fixes to error handling logic and cleanups Reinette Chatre
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=20230215130605.31583-3-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 \
/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
all inboxes | Powered by JetHome®