selftests/resctrl: Skip the test if requested resctrl feature is not supported

[linux-2.6-microblaze.git] / tools / testing / selftests / resctrl / resctrl_tests.c

diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c
index ccc1d69..fb246bc 100644 (file)
--- a/tools/testing/selftests/resctrl/resctrl_tests.c
+++ b/tools/testing/selftests/resctrl/resctrl_tests.c
@@ -37,8 +37,8 @@ void detect_amd(void)
 static void cmd_help(void)
 {
        printf("usage: resctrl_tests [-h] [-b \"benchmark_cmd [options]\"] [-t test list] [-n no_of_bits]\n");
-       printf("\t-b benchmark_cmd [options]: run specified benchmark for MBM, MBA and CMT");
-       printf("\t default benchmark is builtin fill_buf\n");
+       printf("\t-b benchmark_cmd [options]: run specified benchmark for MBM, MBA and CMT\n");
+       printf("\t   default benchmark is builtin fill_buf\n");
        printf("\t-t test list: run tests specified in the test list, ");
        printf("e.g. -t mbm, mba, cmt, cat\n");
        printf("\t-n no_of_bits: run cache tests using specified no of bits in cache bit mask\n");
@@ -54,10 +54,81 @@ void tests_cleanup(void)
        cat_test_cleanup();
 }
 
+static void run_mbm_test(bool has_ben, char **benchmark_cmd, int span,
+                        int cpu_no, char *bw_report)
+{
+       int res;
+
+       ksft_print_msg("Starting MBM BW change ...\n");
+
+       if (!validate_resctrl_feature_request(MBM_STR)) {
+               ksft_test_result_skip("Hardware does not support MBM or MBM is disabled\n");
+               return;
+       }
+
+       if (!has_ben)
+               sprintf(benchmark_cmd[5], "%s", MBA_STR);
+       res = mbm_bw_change(span, cpu_no, bw_report, benchmark_cmd);
+       ksft_test_result(!res, "MBM: bw change\n");
+       mbm_test_cleanup();
+}
+
+static void run_mba_test(bool has_ben, char **benchmark_cmd, int span,
+                        int cpu_no, char *bw_report)
+{
+       int res;
+
+       ksft_print_msg("Starting MBA Schemata change ...\n");
+
+       if (!validate_resctrl_feature_request(MBA_STR)) {
+               ksft_test_result_skip("Hardware does not support MBA or MBA is disabled\n");
+               return;
+       }
+
+       if (!has_ben)
+               sprintf(benchmark_cmd[1], "%d", span);
+       res = mba_schemata_change(cpu_no, bw_report, benchmark_cmd);
+       ksft_test_result(!res, "MBA: schemata change\n");
+       mba_test_cleanup();
+}
+
+static void run_cmt_test(bool has_ben, char **benchmark_cmd, int cpu_no)
+{
+       int res;
+
+       ksft_print_msg("Starting CMT test ...\n");
+       if (!validate_resctrl_feature_request(CMT_STR)) {
+               ksft_test_result_skip("Hardware does not support CMT or CMT is disabled\n");
+               return;
+       }
+
+       if (!has_ben)
+               sprintf(benchmark_cmd[5], "%s", CMT_STR);
+       res = cmt_resctrl_val(cpu_no, 5, benchmark_cmd);
+       ksft_test_result(!res, "CMT: test\n");
+       cmt_test_cleanup();
+}
+
+static void run_cat_test(int cpu_no, int no_of_bits)
+{
+       int res;
+
+       ksft_print_msg("Starting CAT test ...\n");
+
+       if (!validate_resctrl_feature_request(CAT_STR)) {
+               ksft_test_result_skip("Hardware does not support CAT or CAT is disabled\n");
+               return;
+       }
+
+       res = cat_perf_miss_val(cpu_no, no_of_bits, "L3");
+       ksft_test_result(!res, "CAT: test\n");
+       cat_test_cleanup();
+}
+
 int main(int argc, char **argv)
 {
        bool has_ben = false, mbm_test = true, mba_test = true, cmt_test = true;
-       int res, c, cpu_no = 1, span = 250, argc_new = argc, i, no_of_bits = 5;
+       int c, cpu_no = 1, span = 250, argc_new = argc, i, no_of_bits = 0;
        char *benchmark_cmd[BENCHMARK_ARGS], bw_report[64], bm_type[64];
        char benchmark_cmd_area[BENCHMARK_ARGS][BENCHMARK_ARG_SIZE];
        int ben_ind, ben_count, tests = 0;
@@ -110,6 +181,10 @@ int main(int argc, char **argv)
                        break;
                case 'n':
                        no_of_bits = atoi(optarg);
+                       if (no_of_bits <= 0) {
+                               printf("Bail out! invalid argument for no_of_bits\n");
+                               return -1;
+                       }
                        break;
                case 'h':
                        cmd_help();
@@ -166,39 +241,17 @@ int main(int argc, char **argv)
 
        ksft_set_plan(tests ? : 4);
 
-       if (!is_amd && mbm_test) {
-               ksft_print_msg("Starting MBM BW change ...\n");
-               if (!has_ben)
-                       sprintf(benchmark_cmd[5], "%s", MBA_STR);
-               res = mbm_bw_change(span, cpu_no, bw_report, benchmark_cmd);
-               ksft_test_result(!res, "MBM: bw change\n");
-               mbm_test_cleanup();
-       }
+       if (!is_amd && mbm_test)
+               run_mbm_test(has_ben, benchmark_cmd, span, cpu_no, bw_report);
 
-       if (!is_amd && mba_test) {
-               ksft_print_msg("Starting MBA Schemata change ...\n");
-               if (!has_ben)
-                       sprintf(benchmark_cmd[1], "%d", span);
-               res = mba_schemata_change(cpu_no, bw_report, benchmark_cmd);
-               ksft_test_result(!res, "MBA: schemata change\n");
-               mba_test_cleanup();
-       }
+       if (!is_amd && mba_test)
+               run_mba_test(has_ben, benchmark_cmd, span, cpu_no, bw_report);
 
-       if (cmt_test) {
-               ksft_print_msg("Starting CMT test ...\n");
-               if (!has_ben)
-                       sprintf(benchmark_cmd[5], "%s", CMT_STR);
-               res = cmt_resctrl_val(cpu_no, no_of_bits, benchmark_cmd);
-               ksft_test_result(!res, "CMT: test\n");
-               cmt_test_cleanup();
-       }
+       if (cmt_test)
+               run_cmt_test(has_ben, benchmark_cmd, cpu_no);
 
-       if (cat_test) {
-               ksft_print_msg("Starting CAT test ...\n");
-               res = cat_perf_miss_val(cpu_no, no_of_bits, "L3");
-               ksft_test_result(!res, "CAT: test\n");
-               cat_test_cleanup();
-       }
+       if (cat_test)
+               run_cat_test(cpu_no, no_of_bits);
 
        return ksft_exit_pass();
 }