The main CAT test function is called cat_val() and resides in cache.c
which is illogical.
Rename the function to cat_test() and move it into cat_test.c.
Signed-off-by: Ilpo Järvinen <ilpo.jarvi...@linux.intel.com>
---
tools/testing/selftests/resctrl/cache.c | 90 ++--------------------
tools/testing/selftests/resctrl/cat_test.c | 73 +++++++++++++++++-
tools/testing/selftests/resctrl/resctrl.h | 14 +++-
3 files changed, 90 insertions(+), 87 deletions(-)
diff --git a/tools/testing/selftests/resctrl/cache.c
b/tools/testing/selftests/resctrl/cache.c
index a65e2e35c33c..c4cb3cb8c2c9 100644
--- a/tools/testing/selftests/resctrl/cache.c
+++ b/tools/testing/selftests/resctrl/cache.c
@@ -3,16 +3,9 @@
#include <stdint.h>
#include "resctrl.h"
-struct perf_event_read {
- __u64 nr; /* The number of events */
- struct {
- __u64 value; /* The value of the event */
- } values[2];
-};
-
char llc_occup_path[1024];
-static void perf_event_attr_initialize(struct perf_event_attr *pea, __u64
config)
+void perf_event_attr_initialize(struct perf_event_attr *pea, __u64 config)
{
memset(pea, 0, sizeof(*pea));
pea->type = PERF_TYPE_HARDWARE;
@@ -28,13 +21,13 @@ static void perf_event_attr_initialize(struct
perf_event_attr *pea, __u64 config
pea->config = config;
}
-static void perf_event_initialize_read_format(struct perf_event_read *pe_read)
+void perf_event_initialize_read_format(struct perf_event_read *pe_read)
{
memset(pe_read, 0, sizeof(*pe_read));
pe_read->nr = 1;
}
-static int perf_event_reset_enable(struct perf_event_attr *pea, pid_t pid, int
cpu_no)
+int perf_event_reset_enable(struct perf_event_attr *pea, pid_t pid, int cpu_no)
{
int pe_fd;
@@ -123,8 +116,8 @@ static int print_results_cache(char *filename, int bm_pid,
__u64 llc_value)
*
* Return: =0 on success. <0 on failure.
*/
-static int perf_event_measure(int pe_fd, struct perf_event_read *pe_read,
- struct resctrl_val_param *param, int bm_pid)
+int perf_event_measure(int pe_fd, struct perf_event_read *pe_read,
+ struct resctrl_val_param *param, int bm_pid)
{
int ret;
@@ -156,79 +149,6 @@ int measure_llc_resctrl(struct resctrl_val_param *param,
int bm_pid)
return ret;
}
-/*
- * cache_val: execute benchmark and measure LLC occupancy resctrl
- * and perf cache miss for the benchmark
- * @param: parameters passed to cache_val()
- * @span: buffer size for the benchmark
- *
- * Return: 0 on success. non-zero on failure.
- */
-int cat_val(struct resctrl_val_param *param, size_t span)
-{
- int memflush = 1, operation = 0, ret = 0;
- char *resctrl_val = param->resctrl_val;
- static struct perf_event_read pe_read;
- struct perf_event_attr pea;
- pid_t bm_pid;
- int pe_fd;
-
- if (strcmp(param->filename, "") == 0)
- sprintf(param->filename, "stdio");
-
- bm_pid = getpid();
-
- /* Taskset benchmark to specified cpu */
- ret = taskset_benchmark(bm_pid, param->cpu_no);
- if (ret)
- return ret;
-
- /* Write benchmark to specified con_mon grp, mon_grp in resctrl FS*/
- ret = write_bm_pid_to_resctrl(bm_pid, param->ctrlgrp, param->mongrp,
- resctrl_val);
- if (ret)
- return ret;
-
- perf_event_attr_initialize(&pea, PERF_COUNT_HW_CACHE_MISSES);
- perf_event_initialize_read_format(&pe_read);
-
- /* Test runs until the callback setup() tells the test to stop. */
- while (1) {
- ret = param->setup(param);
- if (ret == END_OF_TESTS) {
- ret = 0;
- break;
- }
- if (ret < 0)
- break;
-
- pe_fd = perf_event_reset_enable(&pea, bm_pid, param->cpu_no);
- if (pe_fd < 0) {
- ret = -1;
- break;
- }
-
- if (run_fill_buf(span, memflush, operation, true)) {
- fprintf(stderr, "Error-running fill buffer\n");
- ret = -1;
- goto pe_close;
- }
-
- sleep(1);
- ret = perf_event_measure(pe_fd, &pe_read, param, bm_pid);
- if (ret)
- goto pe_close;
-
- close(pe_fd);
- }
-
- return ret;
-
-pe_close:
- close(pe_fd);
- return ret;
-}
-
/*
* show_cache_info: show generic cache test information
* @no_of_bits: number of bits
diff --git a/tools/testing/selftests/resctrl/cat_test.c
b/tools/testing/selftests/resctrl/cat_test.c
index 2106cc3601d9..e71690a9bbb3 100644
--- a/tools/testing/selftests/resctrl/cat_test.c
+++ b/tools/testing/selftests/resctrl/cat_test.c
@@ -111,6 +111,77 @@ void cat_test_cleanup(void)
remove(RESULT_FILE_NAME2);
}
+/*
+ * cat_test: execute CAT benchmark and measure LLC cache misses
+ * @param: parameters passed to cat_test()
+ * @span: buffer size for the benchmark
+ *
+ * Return: 0 on success. non-zero on failure.
+ */
+static int cat_test(struct resctrl_val_param *param, size_t span)
+{
+ int memflush = 1, operation = 0, ret = 0;
+ char *resctrl_val = param->resctrl_val;
+ static struct perf_event_read pe_read;
+ struct perf_event_attr pea;
+ pid_t bm_pid;
+ int pe_fd;
+
+ if (strcmp(param->filename, "") == 0)
+ sprintf(param->filename, "stdio");
+
+ bm_pid = getpid();
+
+ /* Taskset benchmark to specified cpu */
+ ret = taskset_benchmark(bm_pid, param->cpu_no);
+ if (ret)
+ return ret;
+
+ /* Write benchmark to specified con_mon grp, mon_grp in resctrl FS*/
+ ret = write_bm_pid_to_resctrl(bm_pid, param->ctrlgrp, param->mongrp,
+ resctrl_val);
+ if (ret)
+ return ret;
+
+ perf_event_attr_initialize(&pea, PERF_COUNT_HW_CACHE_MISSES);
+ perf_event_initialize_read_format(&pe_read);
+
+ /* Test runs until the callback setup() tells the test to stop. */
+ while (1) {
+ ret = param->setup(param);
+ if (ret == END_OF_TESTS) {
+ ret = 0;
+ break;
+ }
+ if (ret < 0)
+ break;
+ pe_fd = perf_event_reset_enable(&pea, bm_pid, param->cpu_no);
+ if (pe_fd < 0) {
+ ret = -1;
+ break;
+ }
+
+ if (run_fill_buf(span, memflush, operation, true)) {
+ fprintf(stderr, "Error-running fill buffer\n");
+ ret = -1;
+ goto pe_close;
+ }
+
+ sleep(1);
+ ret = perf_event_measure(pe_fd, &pe_read, param, bm_pid);
+ if (ret)
+ goto pe_close;
+
+ close(pe_fd);
+ }
+
+ return ret;
+
+pe_close:
+ close(pe_fd);
+ return ret;
+}
+
int cat_perf_miss_val(int cpu_no, int n, char *cache_type)
{
unsigned long l_mask, l_mask_1;
@@ -196,7 +267,7 @@ int cat_perf_miss_val(int cpu_no, int n, char *cache_type)
remove(param.filename);
- ret = cat_val(¶m, span);
+ ret = cat_test(¶m, span);
if (ret == 0)
ret = check_results(¶m, span);
diff --git a/tools/testing/selftests/resctrl/resctrl.h
b/tools/testing/selftests/resctrl/resctrl.h
index 033c49784581..ee3cee74a69c 100644
--- a/tools/testing/selftests/resctrl/resctrl.h
+++ b/tools/testing/selftests/resctrl/resctrl.h
@@ -67,6 +67,13 @@ struct resctrl_val_param {
int (*setup)(struct resctrl_val_param *param);
};
+struct perf_event_read {
+ __u64 nr; /* The number of events */
+ struct {
+ __u64 value; /* The value of the event */
+ } values[2];
+};
+
#define MBM_STR "mbm"
#define MBA_STR "mba"
#define CMT_STR "cmt"
@@ -107,13 +114,18 @@ int get_cache_size(int cpu_no, const char *cache_type,
unsigned long *cache_size
void ctrlc_handler(int signum, siginfo_t *info, void *ptr);
int signal_handler_register(void);
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, const char * const *benchmark_cmd);
unsigned int count_bits(unsigned long n);
void cmt_test_cleanup(void);
int get_core_sibling(int cpu_no);
+
+void perf_event_attr_initialize(struct perf_event_attr *pea, __u64 config);
+void perf_event_initialize_read_format(struct perf_event_read *pe_read);
+int perf_event_reset_enable(struct perf_event_attr *pea, pid_t pid, int
cpu_no);
+int perf_event_measure(int pe_fd, struct perf_event_read *pe_read,
+ struct resctrl_val_param *param, int bm_pid);
int measure_llc_resctrl(struct resctrl_val_param *param, int bm_pid);
void show_cache_info(int no_of_bits, __u64 avg_llc_val, size_t cache_span,
bool lines);
--
2.30.2
