selftests/resctrl: Split measure_cache_vals()

measure_cache_vals() does a different thing depending on the test case
that called it:
  - For CAT, it measures LLC misses through perf.
  - For CMT, it measures LLC occupancy through resctrl.

Split these two functionalities into own functions the CAT and CMT
tests can call directly. Replace passing the struct resctrl_val_param
parameter with the filename because it's more generic and all those
functions need out of resctrl_val.

Co-developed-by: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>

diff --git a/tools/testing/selftests/resctrl/cache.c b/tools/testing/selftests/resctrl/cache.c
index a9a0394..0c18603 100644 (file)
--- a/tools/testing/selftests/resctrl/cache.c
+++ b/tools/testing/selftests/resctrl/cache.c
@@ -147,7 +147,7 @@ static int get_llc_occu_resctrl(unsigned long *llc_occupancy)
  *
  * Return:             0 on success, < 0 on error.
  */
-static int print_results_cache(char *filename, int bm_pid,
+static int print_results_cache(const char *filename, int bm_pid,
                               unsigned long llc_value)
 {
        FILE *fp;
@@ -169,35 +169,49 @@ static int print_results_cache(char *filename, int bm_pid,
        return 0;
 }
 
-int measure_cache_vals(struct resctrl_val_param *param, int bm_pid)
+/*
+ * perf_event_measure - Measure perf events
+ * @filename:  Filename for writing the results
+ * @bm_pid:    PID that runs the benchmark
+ *
+ * Measures perf events (e.g., cache misses) and writes the results into
+ * @filename. @bm_pid is written to the results file along with the measured
+ * value.
+ *
+ * Return: =0 on success. <0 on failure.
+ */
+static int perf_event_measure(const char *filename, int bm_pid)
 {
-       unsigned long llc_perf_miss = 0, llc_occu_resc = 0, llc_value = 0;
+       unsigned long llc_perf_miss = 0;
        int ret;
 
-       /*
-        * Measure cache miss from perf.
-        */
-       if (!strncmp(param->resctrl_val, CAT_STR, sizeof(CAT_STR))) {
-               ret = get_llc_perf(&llc_perf_miss);
-               if (ret < 0)
-                       return ret;
-               llc_value = llc_perf_miss;
-       }
+       ret = get_llc_perf(&llc_perf_miss);
+       if (ret < 0)
+               return ret;
 
-       /*
-        * Measure llc occupancy from resctrl.
-        */
-       if (!strncmp(param->resctrl_val, CMT_STR, sizeof(CMT_STR))) {
-               ret = get_llc_occu_resctrl(&llc_occu_resc);
-               if (ret < 0)
-                       return ret;
-               llc_value = llc_occu_resc;
-       }
-       ret = print_results_cache(param->filename, bm_pid, llc_value);
-       if (ret)
+       return print_results_cache(filename, bm_pid, llc_perf_miss);
+}
+
+/*
+ * measure_llc_resctrl - Measure resctrl LLC value from resctrl
+ * @filename:  Filename for writing the results
+ * @bm_pid:    PID that runs the benchmark
+ *
+ * Measures LLC occupancy from resctrl and writes the results into @filename.
+ * @bm_pid is written to the results file along with the measured value.
+ *
+ * Return: =0 on success. <0 on failure.
+ */
+int measure_llc_resctrl(const char *filename, int bm_pid)
+{
+       unsigned long llc_occu_resc = 0;
+       int ret;
+
+       ret = get_llc_occu_resctrl(&llc_occu_resc);
+       if (ret < 0)
                return ret;
 
-       return 0;
+       return print_results_cache(filename, bm_pid, llc_occu_resc);
 }
 
 /*
@@ -252,7 +266,7 @@ int cat_val(struct resctrl_val_param *param, size_t span)
                }
 
                sleep(1);
-               ret = measure_cache_vals(param, bm_pid);
+               ret = perf_event_measure(param->filename, bm_pid);
                if (ret)
                        goto pe_close;
        }

diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h
index 72381b5..3983226 100644 (file)
--- a/tools/testing/selftests/resctrl/resctrl.h
+++ b/tools/testing/selftests/resctrl/resctrl.h
@@ -112,7 +112,7 @@ 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);
-int measure_cache_vals(struct resctrl_val_param *param, int bm_pid);
+int measure_llc_resctrl(const char *filename, int bm_pid);
 int show_cache_info(unsigned long sum_llc_val, int no_of_bits,
                    size_t cache_span, unsigned long max_diff,
                    unsigned long max_diff_percent, unsigned long num_of_runs,

diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/selftests/resctrl/resctrl_val.c
index 7fd9f10..f6859fe 100644 (file)
--- a/tools/testing/selftests/resctrl/resctrl_val.c
+++ b/tools/testing/selftests/resctrl/resctrl_val.c
@@ -838,7 +838,7 @@ int resctrl_val(const char * const *benchmark_cmd, struct resctrl_val_param *par
                                break;
                } else if (!strncmp(resctrl_val, CMT_STR, sizeof(CMT_STR))) {
                        sleep(1);
-                       ret = measure_cache_vals(param, bm_pid);
+                       ret = measure_llc_resctrl(param->filename, bm_pid);
                        if (ret)
                                break;
                }