selftests/resctrl: Refactor feature check to use resource and feature name

commit d56e5da0e0f557a206bace16bbbdad00a5800e34 upstream.

Feature check in validate_resctrl_feature_request() takes in the test
name string and maps that to what to check per test.

Pass resource and feature names to validate_resctrl_feature_request()
directly rather than deriving them from the test name inside the
function which makes the feature check easier to extend for new test
cases.

Use !! in the return statement to make the boolean conversion more
obvious even if it is not strictly necessary from correctness point of
view (to avoid it looking like the function is returning a freed
pointer).

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>
Cc: <stable@vger.kernel.org> # selftests/resctrl: Remove duplicate feature check from CMT test
Cc: <stable@vger.kernel.org> # selftests/resctrl: Move _GNU_SOURCE define into Makefile
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h
index eff178b..9e46fa9 100644 (file)
--- a/tools/testing/selftests/resctrl/resctrl.h
+++ b/tools/testing/selftests/resctrl/resctrl.h
@@ -27,10 +27,6 @@
 #define RESCTRL_PATH           "/sys/fs/resctrl"
 #define PHYS_ID_PATH           "/sys/devices/system/cpu/cpu"
 #define INFO_PATH              "/sys/fs/resctrl/info"
-#define L3_PATH                        "/sys/fs/resctrl/info/L3"
-#define MB_PATH                        "/sys/fs/resctrl/info/MB"
-#define L3_MON_PATH            "/sys/fs/resctrl/info/L3_MON"
-#define L3_MON_FEATURES_PATH   "/sys/fs/resctrl/info/L3_MON/mon_features"
 
 #define ARCH_INTEL     1
 #define ARCH_AMD       2
@@ -85,7 +81,7 @@ int get_resource_id(int cpu_no, int *resource_id);
 int mount_resctrlfs(void);
 int umount_resctrlfs(void);
 int validate_bw_report_request(char *bw_report);
-bool validate_resctrl_feature_request(const char *resctrl_val);
+bool validate_resctrl_feature_request(const char *resource, const char *feature);
 char *fgrep(FILE *inf, const char *str);
 int taskset_benchmark(pid_t bm_pid, int cpu_no);
 void run_benchmark(int signum, siginfo_t *info, void *ucontext);

diff --git a/tools/testing/selftests/resctrl/resctrl_tests.c b/tools/testing/selftests/resctrl/resctrl_tests.c
index 9e2bc8b..65b27aa 100644 (file)
--- a/tools/testing/selftests/resctrl/resctrl_tests.c
+++ b/tools/testing/selftests/resctrl/resctrl_tests.c
@@ -83,7 +83,9 @@ static void run_mbm_test(char **benchmark_cmd, size_t span,
                return;
        }
 
-       if (!validate_resctrl_feature_request(MBM_STR) || (get_vendor() != ARCH_INTEL)) {
+       if (!validate_resctrl_feature_request("L3_MON", "mbm_total_bytes") ||
+           !validate_resctrl_feature_request("L3_MON", "mbm_local_bytes") ||
+           (get_vendor() != ARCH_INTEL)) {
                ksft_test_result_skip("Hardware does not support MBM or MBM is disabled\n");
                goto umount;
        }
@@ -109,7 +111,7 @@ static void run_mba_test(char **benchmark_cmd, int cpu_no, char *bw_report)
                return;
        }
 
-       if (!validate_resctrl_feature_request(MBA_STR) || (get_vendor() != ARCH_INTEL)) {
+       if (!validate_resctrl_feature_request("MB", NULL) || (get_vendor() != ARCH_INTEL)) {
                ksft_test_result_skip("Hardware does not support MBA or MBA is disabled\n");
                goto umount;
        }
@@ -133,7 +135,7 @@ static void run_cmt_test(char **benchmark_cmd, int cpu_no)
                return;
        }
 
-       if (!validate_resctrl_feature_request(CMT_STR)) {
+       if (!validate_resctrl_feature_request("L3_MON", "llc_occupancy")) {
                ksft_test_result_skip("Hardware does not support CMT or CMT is disabled\n");
                goto umount;
        }
@@ -159,7 +161,7 @@ static void run_cat_test(int cpu_no, int no_of_bits)
                return;
        }
 
-       if (!validate_resctrl_feature_request(CAT_STR)) {
+       if (!validate_resctrl_feature_request("L3", NULL)) {
                ksft_test_result_skip("Hardware does not support CAT or CAT is disabled\n");
                goto umount;
        }

diff --git a/tools/testing/selftests/resctrl/resctrlfs.c b/tools/testing/selftests/resctrl/resctrlfs.c
index bd36ee2..3a81113 100644 (file)
--- a/tools/testing/selftests/resctrl/resctrlfs.c
+++ b/tools/testing/selftests/resctrl/resctrlfs.c
@@ -8,6 +8,8 @@
  *    Sai Praneeth Prakhya <sai.praneeth.prakhya@intel.com>,
  *    Fenghua Yu <fenghua.yu@intel.com>
  */
+#include <limits.h>
+
 #include "resctrl.h"
 
 static int find_resctrl_mount(char *buffer)
@@ -604,63 +606,46 @@ char *fgrep(FILE *inf, const char *str)
 
 /*
  * validate_resctrl_feature_request - Check if requested feature is valid.
- * @resctrl_val:       Requested feature
+ * @resource:  Required resource (e.g., MB, L3, L2, L3_MON, etc.)
+ * @feature:   Required monitor feature (in mon_features file). Can only be
+ *             set for L3_MON. Must be NULL for all other resources.
  *
- * Return: True if the feature is supported, else false. False is also
- *         returned if resctrl FS is not mounted.
+ * Return: True if the resource/feature is supported, else false. False is
+ *         also returned if resctrl FS is not mounted.
  */
-bool validate_resctrl_feature_request(const char *resctrl_val)
+bool validate_resctrl_feature_request(const char *resource, const char *feature)
 {
+       char res_path[PATH_MAX];
        struct stat statbuf;
-       bool found = false;
        char *res;
        FILE *inf;
        int ret;
 
-       if (!resctrl_val)
+       if (!resource)
                return false;
 
        ret = find_resctrl_mount(NULL);
        if (ret)
                return false;
 
-       if (!strncmp(resctrl_val, CAT_STR, sizeof(CAT_STR))) {
-               if (!stat(L3_PATH, &statbuf))
-                       return true;
-       } else if (!strncmp(resctrl_val, MBA_STR, sizeof(MBA_STR))) {
-               if (!stat(MB_PATH, &statbuf))
-                       return true;
-       } else if (!strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR)) ||
-                  !strncmp(resctrl_val, CMT_STR, sizeof(CMT_STR))) {
-               if (!stat(L3_MON_PATH, &statbuf)) {
-                       inf = fopen(L3_MON_FEATURES_PATH, "r");
-                       if (!inf)
-                               return false;
-
-                       if (!strncmp(resctrl_val, CMT_STR, sizeof(CMT_STR))) {
-                               res = fgrep(inf, "llc_occupancy");
-                               if (res) {
-                                       found = true;
-                                       free(res);
-                               }
-                       }
-
-                       if (!strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR))) {
-                               res = fgrep(inf, "mbm_total_bytes");
-                               if (res) {
-                                       free(res);
-                                       res = fgrep(inf, "mbm_local_bytes");
-                                       if (res) {
-                                               found = true;
-                                               free(res);
-                                       }
-                               }
-                       }
-                       fclose(inf);
-               }
-       }
+       snprintf(res_path, sizeof(res_path), "%s/%s", INFO_PATH, resource);
+
+       if (stat(res_path, &statbuf))
+               return false;
+
+       if (!feature)
+               return true;
+
+       snprintf(res_path, sizeof(res_path), "%s/%s/mon_features", INFO_PATH, resource);
+       inf = fopen(res_path, "r");
+       if (!inf)
+               return false;
+
+       res = fgrep(inf, feature);
+       free(res);
+       fclose(inf);
 
-       return found;
+       return !!res;
 }
 
 int filter_dmesg(void)