| Message ID | 20230823131556.27617-6-ilpo.jarvinen@linux.intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | selftests/resctrl: Rework benchmark command handling | expand |
Hi Ilpo, On 8/23/2023 6:15 AM, Ilpo Järvinen wrote: ... > diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h > index bcd0d2060f81..32d23e665697 100644 > --- a/tools/testing/selftests/resctrl/resctrl.h > +++ b/tools/testing/selftests/resctrl/resctrl.h > @@ -6,6 +6,7 @@ > #include <math.h> > #include <errno.h> > #include <sched.h> > +#include <stdint.h> What does this header provide? > #include <stdlib.h> > #include <unistd.h> > #include <string.h> > @@ -38,6 +39,8 @@ > > #define END_OF_TESTS 1 > > +#define BENCHMARK_ARGS 64 > + > #define DEFAULT_SPAN (250 * MB) > > #define PARENT_EXIT(err_msg) \ > @@ -97,11 +100,11 @@ int write_bm_pid_to_resctrl(pid_t bm_pid, char *ctrlgrp, char *mongrp, > 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(int cpu_no, char **benchmark_cmd); > +int resctrl_val(const char * const *benchmark_cmd, struct resctrl_val_param *param); > +int mbm_bw_change(int cpu_no, const char * const *benchmark_cmd); > void tests_cleanup(void); > void mbm_test_cleanup(void); > -int mba_schemata_change(int cpu_no, char **benchmark_cmd); > +int mba_schemata_change(int cpu_no, const char *const *benchmark_cmd); Could you please use consistent spacing ("char * const" vs "char *const")? > 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); > @@ -111,7 +114,7 @@ void signal_handler_unregister(void); > int cat_val(struct resctrl_val_param *param, size_t span); > void cat_test_cleanup(void); > int cat_perf_miss_val(int cpu_no, int no_of_bits, char *cache_type); > -int cmt_resctrl_val(int cpu_no, int n, char **benchmark_cmd); > +int cmt_resctrl_val(int cpu_no, int n, const char * const *benchmark_cmd); > unsigned int count_bits(unsigned long n); > void cmt_test_cleanup(void); > int get_core_sibling(int cpu_no); > diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c > index d4ce8592466c..84a37bf67306 100644 > --- a/tools/testing/selftests/resctrl/resctrl_tests.c > +++ b/tools/testing/selftests/resctrl/resctrl_tests.c > @@ -10,9 +10,6 @@ > */ > #include "resctrl.h" > > -#define BENCHMARK_ARGS 64 > -#define BENCHMARK_ARG_SIZE 64 > - > static int detect_vendor(void) > { > FILE *inf = fopen("/proc/cpuinfo", "r"); > @@ -70,7 +67,7 @@ void tests_cleanup(void) > cat_test_cleanup(); > } > > -static void run_mbm_test(char **benchmark_cmd, int cpu_no) > +static void run_mbm_test(const char **benchmark_cmd, int cpu_no) > { > int res; > > @@ -96,7 +93,7 @@ static void run_mbm_test(char **benchmark_cmd, int cpu_no) > umount_resctrlfs(); > } > > -static void run_mba_test(char **benchmark_cmd, int cpu_no) > +static void run_mba_test(const char **benchmark_cmd, int cpu_no) > { > int res; > > @@ -120,7 +117,7 @@ static void run_mba_test(char **benchmark_cmd, int cpu_no) > umount_resctrlfs(); > } > > -static void run_cmt_test(char **benchmark_cmd, int cpu_no) > +static void run_cmt_test(const char **benchmark_cmd, int cpu_no) > { > int res; > Could you please elaborate why the above functions have "const char **" instead of "const char * const *"? > @@ -173,11 +170,13 @@ static void run_cat_test(int cpu_no, int no_of_bits) > int main(int argc, char **argv) > { > bool has_ben = false, mbm_test = true, mba_test = true, cmt_test = true; > - 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]; > + const char *benchmark_cmd[BENCHMARK_ARGS]; > int ben_ind, ben_count, tests = 0; > + char *span_str = NULL; > bool cat_test = true; > + char *skip_reason; > + int ret; > > for (i = 0; i < argc; i++) { > if (strcmp(argv[i], "-b") == 0) { > @@ -257,31 +256,31 @@ int main(int argc, char **argv) > ksft_exit_fail_msg("Too long benchmark command.\n"); > > /* Extract benchmark command from command line. */ > - for (i = ben_ind; i < argc; i++) { > - benchmark_cmd[i - ben_ind] = benchmark_cmd_area[i]; > - if (strlen(argv[i]) >= BENCHMARK_ARG_SIZE - 1) > - ksft_exit_fail_msg("Too long benchmark command argument.\n"); > - sprintf(benchmark_cmd[i - ben_ind], "%s", argv[i]); > - } > + for (i = 0; i < argc - ben_ind; i++) > + benchmark_cmd[i] = argv[i + ben_ind]; > benchmark_cmd[ben_count] = NULL; > } else { > /* If no benchmark is given by "-b" argument, use fill_buf. */ > - for (i = 0; i < 5; i++) > - benchmark_cmd[i] = benchmark_cmd_area[i]; > - > - strcpy(benchmark_cmd[0], "fill_buf"); > - sprintf(benchmark_cmd[1], "%u", DEFAULT_SPAN); > - strcpy(benchmark_cmd[2], "1"); > - strcpy(benchmark_cmd[3], "0"); > - strcpy(benchmark_cmd[4], "false"); > + benchmark_cmd[0] = "fill_buf"; > + ret = asprintf(&span_str, "%u", DEFAULT_SPAN); > + if (ret < 0) > + ksft_exit_fail_msg("Out of memory!\n"); > + benchmark_cmd[1] = span_str; > + benchmark_cmd[2] = "1"; > + benchmark_cmd[3] = "0"; > + benchmark_cmd[4] = "false"; > benchmark_cmd[5] = NULL; > } > > - if (!check_resctrlfs_support()) > - return ksft_exit_skip("resctrl FS does not exist. Enable X86_CPU_RESCTRL config option.\n"); > + if (!check_resctrlfs_support()) { > + skip_reason = "resctrl FS does not exist. Enable X86_CPU_RESCTRL config option.\n"; > + goto free_span; > + } > > - if (umount_resctrlfs()) > - return ksft_exit_skip("resctrl FS unmount failed.\n"); > + if (umount_resctrlfs()) { > + skip_reason = "resctrl FS unmount failed.\n"; > + goto free_span; > + } > > filter_dmesg(); > > @@ -299,5 +298,10 @@ int main(int argc, char **argv) > if (cat_test) > run_cat_test(cpu_no, no_of_bits); > > + free(span_str); > ksft_finished(); > + > +free_span: > + free(span_str); > + return ksft_exit_skip(skip_reason); > } This is a tricky one. If I understand correctly this goto target makes some assumptions about the state (no test plan created yet) and exit reason (it has to be skipped). A temporary variable is also thrown into the mix. Can this not be simplified by moving the snippet where benchmark_cmd[] is initialized to fill_buf to be just before the tests are run? Perhaps right before ksft_set_plan()? This may be an easier move to consider when the changes in patch 7 are taken into account. Reinette
On Tue, 29 Aug 2023, Reinette Chatre wrote: > On 8/23/2023 6:15 AM, Ilpo Järvinen wrote: > ... > > diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h > > index bcd0d2060f81..32d23e665697 100644 > > --- a/tools/testing/selftests/resctrl/resctrl.h > > +++ b/tools/testing/selftests/resctrl/resctrl.h > > @@ -97,11 +100,11 @@ int write_bm_pid_to_resctrl(pid_t bm_pid, char *ctrlgrp, char *mongrp, > > 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(int cpu_no, char **benchmark_cmd); > > +int resctrl_val(const char * const *benchmark_cmd, struct resctrl_val_param *param); > > +int mbm_bw_change(int cpu_no, const char * const *benchmark_cmd); > > void tests_cleanup(void); > > void mbm_test_cleanup(void); > > -int mba_schemata_change(int cpu_no, char **benchmark_cmd); > > +int mba_schemata_change(int cpu_no, const char *const *benchmark_cmd); > > Could you please use consistent spacing ("char * const" vs "char *const")? > > > @@ -120,7 +117,7 @@ static void run_mba_test(char **benchmark_cmd, int cpu_no) > > umount_resctrlfs(); > > } > > > > -static void run_cmt_test(char **benchmark_cmd, int cpu_no) > > +static void run_cmt_test(const char **benchmark_cmd, int cpu_no) > > { > > int res; > > > > Could you please elaborate why the above functions have > "const char **" instead of "const char * const *"? Thanks for the review! Sure. I'll make them consistent. > > @@ -173,11 +170,13 @@ static void run_cat_test(int cpu_no, int no_of_bits) > > int main(int argc, char **argv) > > { > > bool has_ben = false, mbm_test = true, mba_test = true, cmt_test = true; > > - 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]; > > + const char *benchmark_cmd[BENCHMARK_ARGS]; > > int ben_ind, ben_count, tests = 0; > > + char *span_str = NULL; > > bool cat_test = true; > > + char *skip_reason; > > + int ret; > > > > for (i = 0; i < argc; i++) { > > if (strcmp(argv[i], "-b") == 0) { > > @@ -257,31 +256,31 @@ int main(int argc, char **argv) > > ksft_exit_fail_msg("Too long benchmark command.\n"); > > > > /* Extract benchmark command from command line. */ > > - for (i = ben_ind; i < argc; i++) { > > - benchmark_cmd[i - ben_ind] = benchmark_cmd_area[i]; > > - if (strlen(argv[i]) >= BENCHMARK_ARG_SIZE - 1) > > - ksft_exit_fail_msg("Too long benchmark command argument.\n"); > > - sprintf(benchmark_cmd[i - ben_ind], "%s", argv[i]); > > - } > > + for (i = 0; i < argc - ben_ind; i++) > > + benchmark_cmd[i] = argv[i + ben_ind]; > > benchmark_cmd[ben_count] = NULL; > > } else { > > /* If no benchmark is given by "-b" argument, use fill_buf. */ > > - for (i = 0; i < 5; i++) > > - benchmark_cmd[i] = benchmark_cmd_area[i]; > > - > > - strcpy(benchmark_cmd[0], "fill_buf"); > > - sprintf(benchmark_cmd[1], "%u", DEFAULT_SPAN); > > - strcpy(benchmark_cmd[2], "1"); > > - strcpy(benchmark_cmd[3], "0"); > > - strcpy(benchmark_cmd[4], "false"); > > + benchmark_cmd[0] = "fill_buf"; > > + ret = asprintf(&span_str, "%u", DEFAULT_SPAN); > > + if (ret < 0) > > + ksft_exit_fail_msg("Out of memory!\n"); > > + benchmark_cmd[1] = span_str; > > + benchmark_cmd[2] = "1"; > > + benchmark_cmd[3] = "0"; > > + benchmark_cmd[4] = "false"; > > benchmark_cmd[5] = NULL; > > } > > > > - if (!check_resctrlfs_support()) > > - return ksft_exit_skip("resctrl FS does not exist. Enable X86_CPU_RESCTRL config option.\n"); > > + if (!check_resctrlfs_support()) { > > + skip_reason = "resctrl FS does not exist. Enable X86_CPU_RESCTRL config option.\n"; > > + goto free_span; > > + } > > > > - if (umount_resctrlfs()) > > - return ksft_exit_skip("resctrl FS unmount failed.\n"); > > + if (umount_resctrlfs()) { > > + skip_reason = "resctrl FS unmount failed.\n"; > > + goto free_span; > > + } > > > > filter_dmesg(); > > > > @@ -299,5 +298,10 @@ int main(int argc, char **argv) > > if (cat_test) > > run_cat_test(cpu_no, no_of_bits); > > > > + free(span_str); > > ksft_finished(); > > + > > +free_span: > > + free(span_str); > > + return ksft_exit_skip(skip_reason); > > } > > This is a tricky one. If I understand correctly this goto target makes > some assumptions about the state (no test plan created yet) and exit > reason (it has to be skipped). A temporary variable is also thrown into > the mix. So in the end the symmetry proved to be not as simple as was depicted earlier but "tricky"... I tried to warn about this and it's why I wished to avoid the allocation entirely. Without allocation, there would have not been need for the temporary variable nor adjusting the control flow with that label. > Can this not be simplified by moving the snippet where > benchmark_cmd[] is initialized to fill_buf to be just before the tests > are run? Perhaps right before ksft_set_plan()? So I throw a temporary variable into the mix (has_ben) to keep track when benchmark_cmd needs to be initialized to the default command? It doesn't play well with what I've in queue after this when user parameters are collected into a struct which is initialized to default value by a helper function before any argument processing. That is, initializing the parameters to defaults needs to be split before and after the parameter parsing code. > This may be an easier move to consider > when the changes in patch 7 are taken into account. Perhaps you could consider accepting my earlier approach which avoided the allocation entirely now that you've seen where this leads to? ...At least you should understand my reasoning for that on much deeper level now.
Hi Ilpo, On 8/30/2023 1:59 AM, Ilpo Järvinen wrote: > On Tue, 29 Aug 2023, Reinette Chatre wrote: >> This is a tricky one. If I understand correctly this goto target makes >> some assumptions about the state (no test plan created yet) and exit >> reason (it has to be skipped). A temporary variable is also thrown into >> the mix. > > So in the end the symmetry proved to be not as simple as was depicted > earlier but "tricky"... I tried to warn about this and it's why I wished > to avoid the allocation entirely. Without allocation, there would have not > been need for the temporary variable nor adjusting the control flow with > that label. hmmm ... I do not see why an allocation forces the use of a temporary variable and a change in control (more below). > >> Can this not be simplified by moving the snippet where >> benchmark_cmd[] is initialized to fill_buf to be just before the tests >> are run? Perhaps right before ksft_set_plan()? > > So I throw a temporary variable into the mix (has_ben) to keep track when > benchmark_cmd needs to be initialized to the default command? It doesn't > play well with what I've in queue after this when user parameters are > collected into a struct which is initialized to default value by a helper > function before any argument processing. That is, initializing the > parameters to defaults needs to be split before and after the parameter > parsing code. No new temporary variable is needed. Of course, I do not have insight into what is further down in your queue but based on this work I do think it can be simplified. Since code is easier to consider, the snippet below applies on top of this series and shows what I was proposing: diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c index ae9001ef7b0a..8033eabb9aa8 100644 --- a/tools/testing/selftests/resctrl/resctrl_tests.c +++ b/tools/testing/selftests/resctrl/resctrl_tests.c @@ -170,11 +170,10 @@ static void run_cat_test(int cpu_no, int no_of_bits) int main(int argc, char **argv) { bool mbm_test = true, mba_test = true, cmt_test = true; + const char *benchmark_cmd[BENCHMARK_ARGS] = {}; int c, cpu_no = 1, i, no_of_bits = 0; - const char *benchmark_cmd[BENCHMARK_ARGS]; char *span_str = NULL; bool cat_test = true; - char *skip_reason; int tests = 0; int ret; @@ -247,17 +246,6 @@ int main(int argc, char **argv) } } - /* If no benchmark is given by "-b" argument, use fill_buf. */ - benchmark_cmd[0] = "fill_buf"; - ret = asprintf(&span_str, "%u", DEFAULT_SPAN); - if (ret < 0) - ksft_exit_fail_msg("Out of memory!\n"); - benchmark_cmd[1] = span_str; - benchmark_cmd[2] = "1"; - benchmark_cmd[3] = "0"; - benchmark_cmd[4] = "false"; - benchmark_cmd[5] = NULL; - last_arg: ksft_print_header(); @@ -267,23 +255,30 @@ int main(int argc, char **argv) * 1. We write to resctrl FS * 2. We execute perf commands */ - if (geteuid() != 0) { - skip_reason = "Not running as root. Skipping...\n"; - goto free_span; - } + if (geteuid() != 0) + return ksft_exit_skip("Not running as root. Skipping...\n"); - if (!check_resctrlfs_support()) { - skip_reason = "resctrl FS does not exist. Enable X86_CPU_RESCTRL config option.\n"; - goto free_span; - } + if (!check_resctrlfs_support()) + return ksft_exit_skip("resctrl FS does not exist. Enable X86_CPU_RESCTRL config option.\n"); - if (umount_resctrlfs()) { - skip_reason = "resctrl FS unmount failed.\n"; - goto free_span; - } + if (umount_resctrlfs()) + return ksft_exit_skip("resctrl FS unmount failed.\n"); filter_dmesg(); + if (!benchmark_cmd[0]) { + /* If no benchmark is given by "-b" argument, use fill_buf. */ + benchmark_cmd[0] = "fill_buf"; + ret = asprintf(&span_str, "%u", DEFAULT_SPAN); + if (ret < 0) + ksft_exit_fail_msg("Out of memory!\n"); + benchmark_cmd[1] = span_str; + benchmark_cmd[2] = "1"; + benchmark_cmd[3] = "0"; + benchmark_cmd[4] = "false"; + benchmark_cmd[5] = NULL; + } + ksft_set_plan(tests ? : 4); if (mbm_test) @@ -300,8 +295,4 @@ int main(int argc, char **argv) free(span_str); ksft_finished(); - -free_span: - free(span_str); - return ksft_exit_skip(skip_reason); }
On Wed, 30 Aug 2023, Reinette Chatre wrote: > On 8/30/2023 1:59 AM, Ilpo Järvinen wrote: > > On Tue, 29 Aug 2023, Reinette Chatre wrote: > >> This is a tricky one. If I understand correctly this goto target makes > >> some assumptions about the state (no test plan created yet) and exit > >> reason (it has to be skipped). A temporary variable is also thrown into > >> the mix. > > > > So in the end the symmetry proved to be not as simple as was depicted > > earlier but "tricky"... I tried to warn about this and it's why I wished > > to avoid the allocation entirely. Without allocation, there would have not > > been need for the temporary variable nor adjusting the control flow with > > that label. > > hmmm ... I do not see why an allocation forces the use of a temporary > variable and a change in control (more below). > > >> Can this not be simplified by moving the snippet where > >> benchmark_cmd[] is initialized to fill_buf to be just before the tests > >> are run? Perhaps right before ksft_set_plan()? > > > > So I throw a temporary variable into the mix (has_ben) to keep track when > > benchmark_cmd needs to be initialized to the default command? It doesn't > > play well with what I've in queue after this when user parameters are > > collected into a struct which is initialized to default value by a helper > > function before any argument processing. That is, initializing the > > parameters to defaults needs to be split before and after the parameter > > parsing code. > > No new temporary variable is needed. Of course, I do not have insight into > what is further down in your queue but based on this work I do think it > can be simplified. Since code is easier to consider, the snippet below > applies on top of this series and shows what I was proposing: Okay, I'll use the approach you proposed. It'll prevent moving all initialization of the default values before the argument parsing code which I would have wanted to do (in a patch that is not part of this series but it's not an end of the world).
diff --git a/tools/testing/selftests/resctrl/cmt_test.c b/tools/testing/selftests/resctrl/cmt_test.c index 9d8e38e995ef..cf2f5e92dea6 100644 --- a/tools/testing/selftests/resctrl/cmt_test.c +++ b/tools/testing/selftests/resctrl/cmt_test.c @@ -68,14 +68,17 @@ void cmt_test_cleanup(void) remove(RESULT_FILE_NAME); } -int cmt_resctrl_val(int cpu_no, int n, char **benchmark_cmd) +int cmt_resctrl_val(int cpu_no, int n, const char * const *benchmark_cmd) { + const char * const *cmd = benchmark_cmd; + const char *new_cmd[BENCHMARK_ARGS]; unsigned long cache_size = 0; unsigned long long_mask; + char *span_str = NULL; char cbm_mask[256]; int count_of_bits; size_t span; - int ret; + int ret, i; if (!validate_resctrl_feature_request(CMT_STR)) return -1; @@ -111,12 +114,23 @@ int cmt_resctrl_val(int cpu_no, int n, char **benchmark_cmd) }; span = cache_size * n / count_of_bits; - if (strcmp(benchmark_cmd[0], "fill_buf") == 0) - sprintf(benchmark_cmd[1], "%zu", span); + + if (strcmp(cmd[0], "fill_buf") == 0) { + /* Duplicate the command to be able to replace span in it */ + for (i = 0; benchmark_cmd[i]; i++) + new_cmd[i] = benchmark_cmd[i]; + new_cmd[i] = NULL; + + ret = asprintf(&span_str, "%zu", span); + if (ret < 0) + return -1; + new_cmd[1] = span_str; + cmd = new_cmd; + } remove(RESULT_FILE_NAME); - ret = resctrl_val(benchmark_cmd, ¶m); + ret = resctrl_val(cmd, ¶m); if (ret) goto out; @@ -124,6 +138,7 @@ int cmt_resctrl_val(int cpu_no, int n, char **benchmark_cmd) out: cmt_test_cleanup(); + free(span_str); return ret; } diff --git a/tools/testing/selftests/resctrl/mba_test.c b/tools/testing/selftests/resctrl/mba_test.c index 094424d835d0..cf8284dadcb2 100644 --- a/tools/testing/selftests/resctrl/mba_test.c +++ b/tools/testing/selftests/resctrl/mba_test.c @@ -141,7 +141,7 @@ void mba_test_cleanup(void) remove(RESULT_FILE_NAME); } -int mba_schemata_change(int cpu_no, char **benchmark_cmd) +int mba_schemata_change(int cpu_no, const char * const *benchmark_cmd) { struct resctrl_val_param param = { .resctrl_val = MBA_STR, diff --git a/tools/testing/selftests/resctrl/mbm_test.c b/tools/testing/selftests/resctrl/mbm_test.c index b830fc84338b..1ae131a2e246 100644 --- a/tools/testing/selftests/resctrl/mbm_test.c +++ b/tools/testing/selftests/resctrl/mbm_test.c @@ -109,7 +109,7 @@ void mbm_test_cleanup(void) remove(RESULT_FILE_NAME); } -int mbm_bw_change(int cpu_no, char **benchmark_cmd) +int mbm_bw_change(int cpu_no, const char * const *benchmark_cmd) { struct resctrl_val_param param = { .resctrl_val = MBM_STR, diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h index bcd0d2060f81..32d23e665697 100644 --- a/tools/testing/selftests/resctrl/resctrl.h +++ b/tools/testing/selftests/resctrl/resctrl.h @@ -6,6 +6,7 @@ #include <math.h> #include <errno.h> #include <sched.h> +#include <stdint.h> #include <stdlib.h> #include <unistd.h> #include <string.h> @@ -38,6 +39,8 @@ #define END_OF_TESTS 1 +#define BENCHMARK_ARGS 64 + #define DEFAULT_SPAN (250 * MB) #define PARENT_EXIT(err_msg) \ @@ -97,11 +100,11 @@ int write_bm_pid_to_resctrl(pid_t bm_pid, char *ctrlgrp, char *mongrp, 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(int cpu_no, char **benchmark_cmd); +int resctrl_val(const char * const *benchmark_cmd, struct resctrl_val_param *param); +int mbm_bw_change(int cpu_no, const char * const *benchmark_cmd); void tests_cleanup(void); void mbm_test_cleanup(void); -int mba_schemata_change(int cpu_no, char **benchmark_cmd); +int mba_schemata_change(int cpu_no, const char *const *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); @@ -111,7 +114,7 @@ void signal_handler_unregister(void); int cat_val(struct resctrl_val_param *param, size_t span); void cat_test_cleanup(void); int cat_perf_miss_val(int cpu_no, int no_of_bits, char *cache_type); -int cmt_resctrl_val(int cpu_no, int n, char **benchmark_cmd); +int cmt_resctrl_val(int cpu_no, int n, const char * const *benchmark_cmd); unsigned int count_bits(unsigned long n); void cmt_test_cleanup(void); int get_core_sibling(int cpu_no); diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c index d4ce8592466c..84a37bf67306 100644 --- a/tools/testing/selftests/resctrl/resctrl_tests.c +++ b/tools/testing/selftests/resctrl/resctrl_tests.c @@ -10,9 +10,6 @@ */ #include "resctrl.h" -#define BENCHMARK_ARGS 64 -#define BENCHMARK_ARG_SIZE 64 - static int detect_vendor(void) { FILE *inf = fopen("/proc/cpuinfo", "r"); @@ -70,7 +67,7 @@ void tests_cleanup(void) cat_test_cleanup(); } -static void run_mbm_test(char **benchmark_cmd, int cpu_no) +static void run_mbm_test(const char **benchmark_cmd, int cpu_no) { int res; @@ -96,7 +93,7 @@ static void run_mbm_test(char **benchmark_cmd, int cpu_no) umount_resctrlfs(); } -static void run_mba_test(char **benchmark_cmd, int cpu_no) +static void run_mba_test(const char **benchmark_cmd, int cpu_no) { int res; @@ -120,7 +117,7 @@ static void run_mba_test(char **benchmark_cmd, int cpu_no) umount_resctrlfs(); } -static void run_cmt_test(char **benchmark_cmd, int cpu_no) +static void run_cmt_test(const char **benchmark_cmd, int cpu_no) { int res; @@ -173,11 +170,13 @@ static void run_cat_test(int cpu_no, int no_of_bits) int main(int argc, char **argv) { bool has_ben = false, mbm_test = true, mba_test = true, cmt_test = true; - 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]; + const char *benchmark_cmd[BENCHMARK_ARGS]; int ben_ind, ben_count, tests = 0; + char *span_str = NULL; bool cat_test = true; + char *skip_reason; + int ret; for (i = 0; i < argc; i++) { if (strcmp(argv[i], "-b") == 0) { @@ -257,31 +256,31 @@ int main(int argc, char **argv) ksft_exit_fail_msg("Too long benchmark command.\n"); /* Extract benchmark command from command line. */ - for (i = ben_ind; i < argc; i++) { - benchmark_cmd[i - ben_ind] = benchmark_cmd_area[i]; - if (strlen(argv[i]) >= BENCHMARK_ARG_SIZE - 1) - ksft_exit_fail_msg("Too long benchmark command argument.\n"); - sprintf(benchmark_cmd[i - ben_ind], "%s", argv[i]); - } + for (i = 0; i < argc - ben_ind; i++) + benchmark_cmd[i] = argv[i + ben_ind]; benchmark_cmd[ben_count] = NULL; } else { /* If no benchmark is given by "-b" argument, use fill_buf. */ - for (i = 0; i < 5; i++) - benchmark_cmd[i] = benchmark_cmd_area[i]; - - strcpy(benchmark_cmd[0], "fill_buf"); - sprintf(benchmark_cmd[1], "%u", DEFAULT_SPAN); - strcpy(benchmark_cmd[2], "1"); - strcpy(benchmark_cmd[3], "0"); - strcpy(benchmark_cmd[4], "false"); + benchmark_cmd[0] = "fill_buf"; + ret = asprintf(&span_str, "%u", DEFAULT_SPAN); + if (ret < 0) + ksft_exit_fail_msg("Out of memory!\n"); + benchmark_cmd[1] = span_str; + benchmark_cmd[2] = "1"; + benchmark_cmd[3] = "0"; + benchmark_cmd[4] = "false"; benchmark_cmd[5] = NULL; } - if (!check_resctrlfs_support()) - return ksft_exit_skip("resctrl FS does not exist. Enable X86_CPU_RESCTRL config option.\n"); + if (!check_resctrlfs_support()) { + skip_reason = "resctrl FS does not exist. Enable X86_CPU_RESCTRL config option.\n"; + goto free_span; + } - if (umount_resctrlfs()) - return ksft_exit_skip("resctrl FS unmount failed.\n"); + if (umount_resctrlfs()) { + skip_reason = "resctrl FS unmount failed.\n"; + goto free_span; + } filter_dmesg(); @@ -299,5 +298,10 @@ int main(int argc, char **argv) if (cat_test) run_cat_test(cpu_no, no_of_bits); + free(span_str); ksft_finished(); + +free_span: + free(span_str); + return ksft_exit_skip(skip_reason); } diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/selftests/resctrl/resctrl_val.c index f0f6c5f6e98b..51963a6f2186 100644 --- a/tools/testing/selftests/resctrl/resctrl_val.c +++ b/tools/testing/selftests/resctrl/resctrl_val.c @@ -629,7 +629,7 @@ measure_vals(struct resctrl_val_param *param, unsigned long *bw_resc_start) * * Return: 0 on success. non-zero on failure. */ -int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param) +int resctrl_val(const char * const *benchmark_cmd, struct resctrl_val_param *param) { char *resctrl_val = param->resctrl_val; unsigned long bw_resc_start = 0; @@ -710,7 +710,13 @@ int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param) if (ret) goto out; - value.sival_ptr = benchmark_cmd; + /* + * The cast removes constness but nothing mutates benchmark_cmd within + * the context of this process. At the receiving process, it becomes + * argv, which is mutable, on exec() but that's after fork() so it + * doesn't matter for the process running the tests. + */ + value.sival_ptr = (void *)benchmark_cmd; /* Taskset benchmark to specified cpu */ ret = taskset_benchmark(bm_pid, param->cpu_no);
Benchmark command is used in multiple tests so it should not be mutated by the tests but CMT test alters span argument. Due to the order of tests (CMT test runs last), mutating the span argument in CMT test does not trigger any real problems currently. Mark benchmark_cmd strings as const and setup the benchmark command using pointers. Because the benchmark command becomes const, the input arguments can be used directly. Besides being simpler, using the input arguments directly also removes the internal size restriction. CMT test has to create a copy of the benchmark command before altering the benchmark command. Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> --- tools/testing/selftests/resctrl/cmt_test.c | 25 +++++++-- tools/testing/selftests/resctrl/mba_test.c | 2 +- tools/testing/selftests/resctrl/mbm_test.c | 2 +- tools/testing/selftests/resctrl/resctrl.h | 11 ++-- .../testing/selftests/resctrl/resctrl_tests.c | 56 ++++++++++--------- tools/testing/selftests/resctrl/resctrl_val.c | 10 +++- 6 files changed, 67 insertions(+), 39 deletions(-)