iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

selftests/resctrl: Remove unnecessary __u64 -> unsigned long conversion

Browse Source 
Perf counters are __u64 but the code converts them to unsigned long
before printing them out.

Remove unnecessary type conversion and retain the perf originating
value as __u64.

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>
This commit is contained in:
Ilpo Järvinen 2023-12-15 17:04:59 +02:00 committed by Shuah Khan
parent 5caf1b6400
commit 33403bc7fe
3 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tools/testing/selftests/resctrl/cache.c
View File

@ -83,9 +83,8 @@ static int reset_enable_llc_perf(pid_t pid, int cpu_no)
*
* Return: =0 on success. <0 on failure.
*/
static int get_llc_perf(unsigned long *llc_perf_miss)
static int get_llc_perf(__u64 *llc_perf_miss)
{
__u64 total_misses;
int ret;
/* Stop counters after one span to get miss rate */
@ -98,8 +97,7 @@ static int get_llc_perf(unsigned long *llc_perf_miss)
return -1;
}
total_misses = rf_cqm.values[0].value;
*llc_perf_miss = total_misses;
*llc_perf_miss = rf_cqm.values[0].value;
return 0;
}
@ -147,14 +145,12 @@ static int get_llc_occu_resctrl(unsigned long *llc_occupancy)
*
* Return: 0 on success, < 0 on error.
*/
static int print_results_cache(const char *filename, int bm_pid,
unsigned long llc_value)
static int print_results_cache(const char *filename, int bm_pid, __u64 llc_value)
{
FILE *fp;
if (strcmp(filename, "stdio") == 0 || strcmp(filename, "stderr") == 0) {
printf("Pid: %d \t LLC_value: %lu\n", bm_pid,
llc_value);
printf("Pid: %d \t LLC_value: %llu\n", bm_pid, llc_value);
} else {
fp = fopen(filename, "a");
if (!fp) {
@ -162,7 +158,7 @@ static int print_results_cache(const char *filename, int bm_pid,
return -1;
}
fprintf(fp, "Pid: %d \t llc_value: %lu\n", bm_pid, llc_value);
fprintf(fp, "Pid: %d \t llc_value: %llu\n", bm_pid, llc_value);
fclose(fp);
}
@ -182,7 +178,7 @@ static int print_results_cache(const char *filename, int bm_pid,
*/
static int perf_event_measure(const char *filename, int bm_pid)
{
unsigned long llc_perf_miss = 0;
__u64 llc_perf_miss = 0;
int ret;
ret = get_llc_perf(&llc_perf_miss);
@ -285,11 +281,10 @@ pe_close:
* @cache_span: Cache span
* @lines: @cache_span in lines or bytes
*/
void show_cache_info(int no_of_bits, unsigned long avg_llc_val,
size_t cache_span, bool lines)
void show_cache_info(int no_of_bits, __u64 avg_llc_val, size_t cache_span, bool lines)
{
ksft_print_msg("Number of bits: %d\n", no_of_bits);
ksft_print_msg("Average LLC val: %lu\n", avg_llc_val);
ksft_print_msg("Average LLC val: %llu\n", avg_llc_val);
ksft_print_msg("Cache span (%s): %zu\n", lines ? "lines" : "bytes",
cache_span);
}

8
tools/testing/selftests/resctrl/cat_test.c
View File

@ -41,12 +41,12 @@ static int cat_setup(struct resctrl_val_param *p)
return ret;
}
static int show_results_info(unsigned long sum_llc_val, int no_of_bits,
static int show_results_info(__u64 sum_llc_val, int no_of_bits,
unsigned long cache_span, unsigned long max_diff,
unsigned long max_diff_percent, unsigned long num_of_runs,
bool platform)
{
unsigned long avg_llc_val = 0;
__u64 avg_llc_val = 0;
float diff_percent;
int ret;
@ -68,8 +68,8 @@ static int show_results_info(unsigned long sum_llc_val, int no_of_bits,
static int check_results(struct resctrl_val_param *param, size_t span)
{
char *token_array[8], temp[512];
unsigned long sum_llc_perf_miss = 0;
int runs = 0, no_of_bits = 0;
__u64 sum_llc_perf_miss = 0;
FILE *fp;
ksft_print_msg("Checking for pass/fail\n");
@ -93,7 +93,7 @@ static int check_results(struct resctrl_val_param *param, size_t span)
* setup transition phase.
*/
if (runs > 0)
sum_llc_perf_miss += strtoul(token_array[3], NULL, 0);
sum_llc_perf_miss += strtoull(token_array[3], NULL, 0);
runs++;
}

3
tools/testing/selftests/resctrl/resctrl.h
View File

@ -113,8 +113,7 @@ unsigned int count_bits(unsigned long n);
void cmt_test_cleanup(void);
int get_core_sibling(int cpu_no);
int measure_llc_resctrl(const char *filename, int bm_pid);
void show_cache_info(int no_of_bits, unsigned long avg_llc_val,
size_t cache_span, bool lines);
void show_cache_info(int no_of_bits, __u64 avg_llc_val, size_t cache_span, bool lines);
/*
* cache_portion_size - Calculate the size of a cache portion