cf99daf7c3
[ Upstream commit 8236c51d85a64643588505a6791e022cc8d84864 ] Reinette reported following compilation issue on Fedora 32, gcc version 10.1.1 /usr/bin/ld: cqm_test.o:<src_dir>/cqm_test.c:22: multiple definition of `cache_size'; cat_test.o:<src_dir>/cat_test.c:23: first defined here The same issue is reported for long_mask, cbm_mask, count_of_bits etc variables as well. Compiler isn't happy because these variables are defined globally in two .c files namely cqm_test.c and cat_test.c and the compiler during compilation finds that the variable is already defined (multiple definition error). Taking a closer look at the usage of these variables reveals that these variables are used only locally in functions such as cqm_resctrl_val() (defined in cqm_test.c) and cat_perf_miss_val() (defined in cat_test.c). These variables are not shared between those functions. So, there is no need for these variables to be global. Hence, fix this issue by making them static variables. Reported-by: Reinette Chatre <reinette.chatre@intel.com> Tested-by: Babu Moger <babu.moger@amd.com> Signed-off-by: Fenghua Yu <fenghua.yu@intel.com> Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
108 lines
3.4 KiB
C
108 lines
3.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#define _GNU_SOURCE
|
|
#ifndef RESCTRL_H
|
|
#define RESCTRL_H
|
|
#include <stdio.h>
|
|
#include <stdarg.h>
|
|
#include <math.h>
|
|
#include <errno.h>
|
|
#include <sched.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
#include <signal.h>
|
|
#include <dirent.h>
|
|
#include <stdbool.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/ioctl.h>
|
|
#include <sys/mount.h>
|
|
#include <sys/types.h>
|
|
#include <sys/wait.h>
|
|
#include <sys/select.h>
|
|
#include <sys/time.h>
|
|
#include <sys/eventfd.h>
|
|
#include <asm/unistd.h>
|
|
#include <linux/perf_event.h>
|
|
|
|
#define MB (1024 * 1024)
|
|
#define RESCTRL_PATH "/sys/fs/resctrl"
|
|
#define PHYS_ID_PATH "/sys/devices/system/cpu/cpu"
|
|
#define CBM_MASK_PATH "/sys/fs/resctrl/info"
|
|
|
|
#define PARENT_EXIT(err_msg) \
|
|
do { \
|
|
perror(err_msg); \
|
|
kill(ppid, SIGKILL); \
|
|
exit(EXIT_FAILURE); \
|
|
} while (0)
|
|
|
|
/*
|
|
* resctrl_val_param: resctrl test parameters
|
|
* @resctrl_val: Resctrl feature (Eg: mbm, mba.. etc)
|
|
* @ctrlgrp: Name of the control monitor group (con_mon grp)
|
|
* @mongrp: Name of the monitor group (mon grp)
|
|
* @cpu_no: CPU number to which the benchmark would be binded
|
|
* @span: Memory bytes accessed in each benchmark iteration
|
|
* @mum_resctrlfs: Should the resctrl FS be remounted?
|
|
* @filename: Name of file to which the o/p should be written
|
|
* @bw_report: Bandwidth report type (reads vs writes)
|
|
* @setup: Call back function to setup test environment
|
|
*/
|
|
struct resctrl_val_param {
|
|
char *resctrl_val;
|
|
char ctrlgrp[64];
|
|
char mongrp[64];
|
|
int cpu_no;
|
|
unsigned long span;
|
|
int mum_resctrlfs;
|
|
char filename[64];
|
|
char *bw_report;
|
|
unsigned long mask;
|
|
int num_of_runs;
|
|
int (*setup)(int num, ...);
|
|
};
|
|
|
|
pid_t bm_pid, ppid;
|
|
int tests_run;
|
|
|
|
char llc_occup_path[1024];
|
|
bool is_amd;
|
|
|
|
bool check_resctrlfs_support(void);
|
|
int filter_dmesg(void);
|
|
int remount_resctrlfs(bool mum_resctrlfs);
|
|
int get_resource_id(int cpu_no, int *resource_id);
|
|
int umount_resctrlfs(void);
|
|
int validate_bw_report_request(char *bw_report);
|
|
bool validate_resctrl_feature_request(char *resctrl_val);
|
|
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);
|
|
int write_schemata(char *ctrlgrp, char *schemata, int cpu_no,
|
|
char *resctrl_val);
|
|
int write_bm_pid_to_resctrl(pid_t bm_pid, char *ctrlgrp, char *mongrp,
|
|
char *resctrl_val);
|
|
int perf_event_open(struct perf_event_attr *hw_event, pid_t pid, int cpu,
|
|
int group_fd, unsigned long flags);
|
|
int run_fill_buf(unsigned long span, int malloc_and_init_memory, int memflush,
|
|
int op, char *resctrl_va);
|
|
int resctrl_val(char **benchmark_cmd, struct resctrl_val_param *param);
|
|
int mbm_bw_change(int span, int cpu_no, char *bw_report, char **benchmark_cmd);
|
|
void tests_cleanup(void);
|
|
void mbm_test_cleanup(void);
|
|
int mba_schemata_change(int cpu_no, char *bw_report, char **benchmark_cmd);
|
|
void mba_test_cleanup(void);
|
|
int get_cbm_mask(char *cache_type, char *cbm_mask);
|
|
int get_cache_size(int cpu_no, char *cache_type, unsigned long *cache_size);
|
|
void ctrlc_handler(int signum, siginfo_t *info, void *ptr);
|
|
int cat_val(struct resctrl_val_param *param);
|
|
void cat_test_cleanup(void);
|
|
int cat_perf_miss_val(int cpu_no, int no_of_bits, char *cache_type);
|
|
int cqm_resctrl_val(int cpu_no, int n, char **benchmark_cmd);
|
|
unsigned int count_bits(unsigned long n);
|
|
void cqm_test_cleanup(void);
|
|
int get_core_sibling(int cpu_no);
|
|
int measure_cache_vals(struct resctrl_val_param *param, int bm_pid);
|
|
|
|
#endif /* RESCTRL_H */
|