mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-01 06:33:07 +00:00
Code Issues Releases Wiki Activity

selftests/resctrl: Remove bw_report and bm_type from main()

Browse source 
bw_report is always set to "reads" and bm_type is set to "fill_buf" but
is never used.

Set bw_report directly to "reads" in MBA/MBM test and remove bm_type.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Tested-by: Shaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
Reviewed-by: Shaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Reviewed-by: "Wieczor-Retman, Maciej" <maciej.wieczor-retman@intel.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
This commit is contained in:
Ilpo Järvinen 2023-09-04 12:53:34 +03:00 committed by Shuah Khan
parent 5eb6360eee
commit 47e36f16c7
4 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/testing/selftests/resctrl/mba_test.c
View file

@ -141,7 +141,7 @@ void mba_test_cleanup(void)
remove(RESULT_FILE_NAME); remove(RESULT_FILE_NAME);
} }
int mba_schemata_change(int cpu_no, char *bw_report, char **benchmark_cmd) int mba_schemata_change(int cpu_no, char **benchmark_cmd)
{ {
struct resctrl_val_param param = { struct resctrl_val_param param = {
.resctrl_val = MBA_STR, .resctrl_val = MBA_STR,
@ -149,7 +149,7 @@ int mba_schemata_change(int cpu_no, char *bw_report, char **benchmark_cmd)
.mongrp = "m1", .mongrp = "m1",
.cpu_no = cpu_no, .cpu_no = cpu_no,
.filename = RESULT_FILE_NAME, .filename = RESULT_FILE_NAME,
.bw_report = bw_report, .bw_report = "reads",
.setup = mba_setup .setup = mba_setup
}; };
int ret; int ret;

4
tools/testing/selftests/resctrl/mbm_test.c
View file

@ -109,7 +109,7 @@ void mbm_test_cleanup(void)
remove(RESULT_FILE_NAME); remove(RESULT_FILE_NAME);
} }
int mbm_bw_change(size_t span, int cpu_no, char *bw_report, char **benchmark_cmd) int mbm_bw_change(size_t span, int cpu_no, char **benchmark_cmd)
{ {
struct resctrl_val_param param = { struct resctrl_val_param param = {
.resctrl_val = MBM_STR, .resctrl_val = MBM_STR,
@ -118,7 +118,7 @@ int mbm_bw_change(size_t span, int cpu_no, char *bw_report, char **benchmark_cmd
.span = span, .span = span,
.cpu_no = cpu_no, .cpu_no = cpu_no,
.filename = RESULT_FILE_NAME, .filename = RESULT_FILE_NAME,
.bw_report = bw_report, .bw_report = "reads",
.setup = mbm_setup .setup = mbm_setup
}; };
int ret; int ret;

4
tools/testing/selftests/resctrl/resctrl.h
View file

@ -98,10 +98,10 @@ int perf_event_open(struct perf_event_attr *hw_event, pid_t pid, int cpu,
int group_fd, unsigned long flags); int group_fd, unsigned long flags);
int run_fill_buf(size_t span, int memflush, int op, bool once); int run_fill_buf(size_t span, int memflush, int op, bool once);
int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param); int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param);
int mbm_bw_change(size_t span, int cpu_no, char *bw_report, char **benchmark_cmd); int mbm_bw_change(size_t span, int cpu_no, char **benchmark_cmd);
void tests_cleanup(void); void tests_cleanup(void);
void mbm_test_cleanup(void); void mbm_test_cleanup(void);
int mba_schemata_change(int cpu_no, char *bw_report, char **benchmark_cmd); int mba_schemata_change(int cpu_no, char **benchmark_cmd);
void mba_test_cleanup(void); void mba_test_cleanup(void);
int get_cbm_mask(char *cache_type, char *cbm_mask); int get_cbm_mask(char *cache_type, char *cbm_mask);
int get_cache_size(int cpu_no, char *cache_type, unsigned long *cache_size); int get_cache_size(int cpu_no, char *cache_type, unsigned long *cache_size);

18
tools/testing/selftests/resctrl/resctrl_tests.c
View file

@ -70,8 +70,7 @@ void tests_cleanup(void)
cat_test_cleanup(); cat_test_cleanup();
} }
static void run_mbm_test(char **benchmark_cmd, size_t span, static void run_mbm_test(char **benchmark_cmd, size_t span, int cpu_no)
int cpu_no, char *bw_report)
{ {
int res; int res;
@ -88,7 +87,7 @@ static void run_mbm_test(char **benchmark_cmd, size_t span,
goto umount; goto umount;
} }
res = mbm_bw_change(span, cpu_no, bw_report, benchmark_cmd); res = mbm_bw_change(span, cpu_no, benchmark_cmd);
ksft_test_result(!res, "MBM: bw change\n"); ksft_test_result(!res, "MBM: bw change\n");
if ((get_vendor() == ARCH_INTEL) && res) if ((get_vendor() == ARCH_INTEL) && res)
ksft_print_msg("Intel MBM may be inaccurate when Sub-NUMA Clustering is enabled. Check BIOS configuration.\n"); ksft_print_msg("Intel MBM may be inaccurate when Sub-NUMA Clustering is enabled. Check BIOS configuration.\n");
@ -97,7 +96,7 @@ static void run_mbm_test(char **benchmark_cmd, size_t span,
umount_resctrlfs(); umount_resctrlfs();
} }
static void run_mba_test(char **benchmark_cmd, int cpu_no, char *bw_report) static void run_mba_test(char **benchmark_cmd, int cpu_no)
{ {
int res; int res;
@ -114,7 +113,7 @@ static void run_mba_test(char **benchmark_cmd, int cpu_no, char *bw_report)
goto umount; goto umount;
} }
res = mba_schemata_change(cpu_no, bw_report, benchmark_cmd); res = mba_schemata_change(cpu_no, benchmark_cmd);
ksft_test_result(!res, "MBA: schemata change\n"); ksft_test_result(!res, "MBA: schemata change\n");
umount: umount:
@ -174,9 +173,9 @@ static void run_cat_test(int cpu_no, int no_of_bits)
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
bool has_ben = false, mbm_test = true, mba_test = true, cmt_test = true; bool has_ben = false, mbm_test = true, mba_test = true, cmt_test = true;
char *benchmark_cmd[BENCHMARK_ARGS], bw_report[64], bm_type[64];
char benchmark_cmd_area[BENCHMARK_ARGS][BENCHMARK_ARG_SIZE]; char benchmark_cmd_area[BENCHMARK_ARGS][BENCHMARK_ARG_SIZE];
int c, cpu_no = 1, argc_new = argc, i, no_of_bits = 0; int c, cpu_no = 1, argc_new = argc, i, no_of_bits = 0;
char *benchmark_cmd[BENCHMARK_ARGS];
int ben_ind, ben_count, tests = 0; int ben_ind, ben_count, tests = 0;
size_t span = 250 * MB; size_t span = 250 * MB;
bool cat_test = true; bool cat_test = true;
@ -279,9 +278,6 @@ int main(int argc, char **argv)
benchmark_cmd[5] = NULL; benchmark_cmd[5] = NULL;
} }
sprintf(bw_report, "reads");
sprintf(bm_type, "fill_buf");
if (!check_resctrlfs_support()) if (!check_resctrlfs_support())
return ksft_exit_skip("resctrl FS does not exist. Enable X86_CPU_RESCTRL config option.\n"); return ksft_exit_skip("resctrl FS does not exist. Enable X86_CPU_RESCTRL config option.\n");
@ -293,10 +289,10 @@ int main(int argc, char **argv)
ksft_set_plan(tests ? : 4); ksft_set_plan(tests ? : 4);
if (mbm_test) if (mbm_test)
run_mbm_test(benchmark_cmd, span, cpu_no, bw_report); run_mbm_test(benchmark_cmd, span, cpu_no);
if (mba_test) if (mba_test)
run_mba_test(benchmark_cmd, cpu_no, bw_report); run_mba_test(benchmark_cmd, cpu_no);
if (cmt_test) if (cmt_test)
run_cmt_test(benchmark_cmd, cpu_no); run_cmt_test(benchmark_cmd, cpu_no);