UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

[ Upstream commit 47e36f16c7846bf3627ff68525e02555c53dc99e ]

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>
Stable-dep-of: 3aff51464455 ("selftests/resctrl: Extend signal handler coverage to unmount on receiving signal")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Ilpo Järvinen 2023-09-04 12:53:34 +03:00 committed by Greg Kroah-Hartman
parent 5268d95c06
commit fd7a4c5556
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);
}
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 = {
.resctrl_val = MBA_STR,
@ -149,7 +149,7 @@ int mba_schemata_change(int cpu_no, char *bw_report, char **benchmark_cmd)
.mongrp = "m1",
.cpu_no = cpu_no,
.filename = RESULT_FILE_NAME,
.bw_report = bw_report,
.bw_report = "reads",
.setup = mba_setup
};
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);
}
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 = {
.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,
.cpu_no = cpu_no,
.filename = RESULT_FILE_NAME,
.bw_report = bw_report,
.bw_report = "reads",
.setup = mbm_setup
};
int ret;

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

@ -93,10 +93,10 @@ int perf_event_open(struct perf_event_attr *hw_event, pid_t pid, int cpu,
int group_fd, unsigned long flags);
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 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 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);
int get_cbm_mask(char *cache_type, char *cbm_mask);
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();
}
static void run_mbm_test(char **benchmark_cmd, size_t span,
int cpu_no, char *bw_report)
static void run_mbm_test(char **benchmark_cmd, size_t span, int cpu_no)
{
int res;
@ -90,7 +89,7 @@ static void run_mbm_test(char **benchmark_cmd, size_t span,
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");
if ((get_vendor() == ARCH_INTEL) && res)
ksft_print_msg("Intel MBM may be inaccurate when Sub-NUMA Clustering is enabled. Check BIOS configuration.\n");
@ -99,7 +98,7 @@ umount:
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;
@ -118,7 +117,7 @@ static void run_mba_test(char **benchmark_cmd, int cpu_no, char *bw_report)
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");
umount:
@ -179,9 +178,9 @@ umount:
int main(int argc, char **argv)
{
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];
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;
size_t span = 250 * MB;
bool cat_test = true;
@ -284,9 +283,6 @@ int main(int argc, char **argv)
benchmark_cmd[5] = NULL;
}
sprintf(bw_report, "reads");
sprintf(bm_type, "fill_buf");
if (!check_resctrlfs_support())
return ksft_exit_skip("resctrl FS does not exist. Enable X86_CPU_RESCTRL config option.\n");
@ -298,10 +294,10 @@ int main(int argc, char **argv)
ksft_set_plan(tests ? : 4);
if (mbm_test)
run_mbm_test(benchmark_cmd, span, cpu_no, bw_report);
run_mbm_test(benchmark_cmd, span, cpu_no);
if (mba_test)
run_mba_test(benchmark_cmd, cpu_no, bw_report);
run_mba_test(benchmark_cmd, cpu_no);
if (cmt_test)
run_cmt_test(benchmark_cmd, cpu_no);