selftests/resctrl: Call kselftest APIs to log test results

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

diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/selftests/resctrl/resctrl_val.c
index 520fea3..5dfae51 100644 (file)
--- a/tools/testing/selftests/resctrl/resctrl_val.c
+++ b/tools/testing/selftests/resctrl/resctrl_val.c
@@ -397,10 +397,10 @@ static void initialize_mem_bw_resctrl(const char *ctrlgrp, const char *mongrp,
                return;
        }
 
-       if (strcmp(resctrl_val, "mbm") == 0)
+       if (!strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR)))
                set_mbm_path(ctrlgrp, mongrp, resource_id);
 
-       if ((strcmp(resctrl_val, "mba") == 0)) {
+       if (!strncmp(resctrl_val, MBA_STR, sizeof(MBA_STR))) {
                if (ctrlgrp)
                        sprintf(mbm_total_path, CON_MBM_LOCAL_BYTES_PATH,
                                RESCTRL_PATH, ctrlgrp, resource_id);
@@ -449,7 +449,7 @@ void ctrlc_handler(int signum, siginfo_t *info, void *ptr)
        kill(bm_pid, SIGKILL);
        umount_resctrlfs();
        tests_cleanup();
-       printf("Ending\n\n");
+       ksft_print_msg("Ending\n\n");
 
        exit(EXIT_SUCCESS);
 }
@@ -492,7 +492,7 @@ static int print_results_bw(char *filename,  int bm_pid, float bw_imc,
        return 0;
 }
 
-static void set_cqm_path(const char *ctrlgrp, const char *mongrp, char sock_num)
+static void set_cmt_path(const char *ctrlgrp, const char *mongrp, char sock_num)
 {
        if (strlen(ctrlgrp) && strlen(mongrp))
                sprintf(llc_occup_path, CON_MON_LCC_OCCUP_PATH, RESCTRL_PATH,
@@ -512,7 +512,7 @@ static void set_cqm_path(const char *ctrlgrp, const char *mongrp, char sock_num)
  * @ctrlgrp:                   Name of the control monitor group (con_mon grp)
  * @mongrp:                    Name of the monitor group (mon grp)
  * @cpu_no:                    CPU number that the benchmark PID is binded to
- * @resctrl_val:               Resctrl feature (Eg: cat, cqm.. etc)
+ * @resctrl_val:               Resctrl feature (Eg: cat, cmt.. etc)
  */
 static void initialize_llc_occu_resctrl(const char *ctrlgrp, const char *mongrp,
                                        int cpu_no, char *resctrl_val)
@@ -524,8 +524,8 @@ static void initialize_llc_occu_resctrl(const char *ctrlgrp, const char *mongrp,
                return;
        }
 
-       if (strcmp(resctrl_val, "cqm") == 0)
-               set_cqm_path(ctrlgrp, mongrp, resource_id);
+       if (!strncmp(resctrl_val, CMT_STR, sizeof(CMT_STR)))
+               set_cmt_path(ctrlgrp, mongrp, resource_id);
 }
 
 static int
@@ -579,8 +579,8 @@ int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param)
        if (strcmp(param->filename, "") == 0)
                sprintf(param->filename, "stdio");
 
-       if ((strcmp(resctrl_val, "mba")) == 0 ||
-           (strcmp(resctrl_val, "mbm")) == 0) {
+       if (!strncmp(resctrl_val, MBA_STR, sizeof(MBA_STR)) ||
+           !strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR))) {
                ret = validate_bw_report_request(param->bw_report);
                if (ret)
                        return ret;
@@ -645,7 +645,7 @@ int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param)
                PARENT_EXIT("Child is done");
        }
 
-       printf("# benchmark PID: %d\n", bm_pid);
+       ksft_print_msg("Benchmark PID: %d\n", bm_pid);
 
        /*
         * Register CTRL-C handler for parent, as it has to kill benchmark
@@ -674,15 +674,15 @@ int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param)
        if (ret)
                goto out;
 
-       if ((strcmp(resctrl_val, "mbm") == 0) ||
-           (strcmp(resctrl_val, "mba") == 0)) {
+       if (!strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR)) ||
+           !strncmp(resctrl_val, MBA_STR, sizeof(MBA_STR))) {
                ret = initialize_mem_bw_imc();
                if (ret)
                        goto out;
 
                initialize_mem_bw_resctrl(param->ctrlgrp, param->mongrp,
                                          param->cpu_no, resctrl_val);
-       } else if (strcmp(resctrl_val, "cqm") == 0)
+       } else if (!strncmp(resctrl_val, CMT_STR, sizeof(CMT_STR)))
                initialize_llc_occu_resctrl(param->ctrlgrp, param->mongrp,
                                            param->cpu_no, resctrl_val);
 
@@ -710,8 +710,8 @@ int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param)
 
        /* Test runs until the callback setup() tells the test to stop. */
        while (1) {
-               if ((strcmp(resctrl_val, "mbm") == 0) ||
-                   (strcmp(resctrl_val, "mba") == 0)) {
+               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;
@@ -721,7 +721,7 @@ int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param)
                        ret = measure_vals(param, &bw_resc_start);
                        if (ret)
                                break;
-               } else if (strcmp(resctrl_val, "cqm") == 0) {
+               } else if (!strncmp(resctrl_val, CMT_STR, sizeof(CMT_STR))) {
                        ret = param->setup(1, param);
                        if (ret) {
                                ret = 0;