| Message ID | 20231120111340.7805-25-ilpo.jarvinen@linux.intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,01/26] selftests/resctrl: Don't use ctrlc_handler() outside signal handling | expand |
Hi Ilpo, On 11/20/2023 3:13 AM, Ilpo Järvinen wrote: > Kernel-side calls the instances of a resource domains. > > Change the resource_id naming in the selftest code to domain_id to > match the kernel side better. > > Suggested-by: Maciej Wieczór-Retman <maciej.wieczor-retman@intel.com> > Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> > --- > tools/testing/selftests/resctrl/resctrl.h | 2 +- > tools/testing/selftests/resctrl/resctrl_val.c | 30 +++++++++---------- > tools/testing/selftests/resctrl/resctrlfs.c | 18 +++++------ > 3 files changed, 25 insertions(+), 25 deletions(-) > > diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h > index ed7a69578daf..280ab6b6bd07 100644 > --- a/tools/testing/selftests/resctrl/resctrl.h > +++ b/tools/testing/selftests/resctrl/resctrl.h > @@ -124,7 +124,7 @@ extern char llc_occup_path[1024]; > int get_vendor(void); > bool check_resctrlfs_support(void); > int filter_dmesg(void); > -int get_resource_id(int cpu_no, int *resource_id); > +int get_domain_id(int cpu_no, int *domain_id); > int mount_resctrlfs(void); > int umount_resctrlfs(void); > int validate_bw_report_request(char *bw_report); > diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/selftests/resctrl/resctrl_val.c > index 4e0c356b7f18..f278f5c9195c 100644 > --- a/tools/testing/selftests/resctrl/resctrl_val.c > +++ b/tools/testing/selftests/resctrl/resctrl_val.c > @@ -387,20 +387,20 @@ static int get_mem_bw_imc(int cpu_no, char *bw_report, float *bw_imc) > return 0; > } > > -void set_mbm_path(const char *ctrlgrp, const char *mongrp, int resource_id) > +void set_mbm_path(const char *ctrlgrp, const char *mongrp, int domain_id) > { > if (ctrlgrp && mongrp) > sprintf(mbm_total_path, CON_MON_MBM_LOCAL_BYTES_PATH, > - RESCTRL_PATH, ctrlgrp, mongrp, resource_id); > + RESCTRL_PATH, ctrlgrp, mongrp, domain_id); > else if (!ctrlgrp && mongrp) > sprintf(mbm_total_path, MON_MBM_LOCAL_BYTES_PATH, RESCTRL_PATH, > - mongrp, resource_id); > + mongrp, domain_id); > else if (ctrlgrp && !mongrp) > sprintf(mbm_total_path, CON_MBM_LOCAL_BYTES_PATH, RESCTRL_PATH, > - ctrlgrp, resource_id); > + ctrlgrp, domain_id); > else if (!ctrlgrp && !mongrp) > sprintf(mbm_total_path, MBM_LOCAL_BYTES_PATH, RESCTRL_PATH, > - resource_id); > + domain_id); > } > > /* > @@ -413,23 +413,23 @@ void set_mbm_path(const char *ctrlgrp, const char *mongrp, int resource_id) > static void initialize_mem_bw_resctrl(const char *ctrlgrp, const char *mongrp, > int cpu_no, char *resctrl_val) > { > - int resource_id; > + int domain_id; > > - if (get_resource_id(cpu_no, &resource_id) < 0) { > - perror("Could not get resource_id"); > + if (get_domain_id(cpu_no, &domain_id) < 0) { > + perror("Could not get domain ID"); I do not think perror() is appropriate here. It is too far away from failing system call (for which perror() was already called anyway). > return; > } > > if (!strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR))) > - set_mbm_path(ctrlgrp, mongrp, resource_id); > + set_mbm_path(ctrlgrp, mongrp, domain_id); > > if (!strncmp(resctrl_val, MBA_STR, sizeof(MBA_STR))) { > if (ctrlgrp) > sprintf(mbm_total_path, CON_MBM_LOCAL_BYTES_PATH, > - RESCTRL_PATH, ctrlgrp, resource_id); > + RESCTRL_PATH, ctrlgrp, domain_id); > else > sprintf(mbm_total_path, MBM_LOCAL_BYTES_PATH, > - RESCTRL_PATH, resource_id); > + RESCTRL_PATH, domain_id); > } > } > > @@ -582,15 +582,15 @@ static void set_cmt_path(const char *ctrlgrp, const char *mongrp, char sock_num) > static void initialize_llc_occu_resctrl(const char *ctrlgrp, const char *mongrp, > int cpu_no, char *resctrl_val) > { > - int resource_id; > + int domain_id; > > - if (get_resource_id(cpu_no, &resource_id) < 0) { > - perror("# Unable to resource_id"); > + if (get_domain_id(cpu_no, &domain_id) < 0) { > + perror("# Could not get domain ID"); here also > return; > } > > if (!strncmp(resctrl_val, CMT_STR, sizeof(CMT_STR))) > - set_cmt_path(ctrlgrp, mongrp, resource_id); > + set_cmt_path(ctrlgrp, mongrp, domain_id); > } > > static int measure_vals(const struct user_params *uparams, Reinette
diff --git a/tools/testing/selftests/resctrl/resctrl.h b/tools/testing/selftests/resctrl/resctrl.h index ed7a69578daf..280ab6b6bd07 100644 --- a/tools/testing/selftests/resctrl/resctrl.h +++ b/tools/testing/selftests/resctrl/resctrl.h @@ -124,7 +124,7 @@ extern char llc_occup_path[1024]; int get_vendor(void); bool check_resctrlfs_support(void); int filter_dmesg(void); -int get_resource_id(int cpu_no, int *resource_id); +int get_domain_id(int cpu_no, int *domain_id); int mount_resctrlfs(void); int umount_resctrlfs(void); int validate_bw_report_request(char *bw_report); diff --git a/tools/testing/selftests/resctrl/resctrl_val.c b/tools/testing/selftests/resctrl/resctrl_val.c index 4e0c356b7f18..f278f5c9195c 100644 --- a/tools/testing/selftests/resctrl/resctrl_val.c +++ b/tools/testing/selftests/resctrl/resctrl_val.c @@ -387,20 +387,20 @@ static int get_mem_bw_imc(int cpu_no, char *bw_report, float *bw_imc) return 0; } -void set_mbm_path(const char *ctrlgrp, const char *mongrp, int resource_id) +void set_mbm_path(const char *ctrlgrp, const char *mongrp, int domain_id) { if (ctrlgrp && mongrp) sprintf(mbm_total_path, CON_MON_MBM_LOCAL_BYTES_PATH, - RESCTRL_PATH, ctrlgrp, mongrp, resource_id); + RESCTRL_PATH, ctrlgrp, mongrp, domain_id); else if (!ctrlgrp && mongrp) sprintf(mbm_total_path, MON_MBM_LOCAL_BYTES_PATH, RESCTRL_PATH, - mongrp, resource_id); + mongrp, domain_id); else if (ctrlgrp && !mongrp) sprintf(mbm_total_path, CON_MBM_LOCAL_BYTES_PATH, RESCTRL_PATH, - ctrlgrp, resource_id); + ctrlgrp, domain_id); else if (!ctrlgrp && !mongrp) sprintf(mbm_total_path, MBM_LOCAL_BYTES_PATH, RESCTRL_PATH, - resource_id); + domain_id); } /* @@ -413,23 +413,23 @@ void set_mbm_path(const char *ctrlgrp, const char *mongrp, int resource_id) static void initialize_mem_bw_resctrl(const char *ctrlgrp, const char *mongrp, int cpu_no, char *resctrl_val) { - int resource_id; + int domain_id; - if (get_resource_id(cpu_no, &resource_id) < 0) { - perror("Could not get resource_id"); + if (get_domain_id(cpu_no, &domain_id) < 0) { + perror("Could not get domain ID"); return; } if (!strncmp(resctrl_val, MBM_STR, sizeof(MBM_STR))) - set_mbm_path(ctrlgrp, mongrp, resource_id); + set_mbm_path(ctrlgrp, mongrp, domain_id); if (!strncmp(resctrl_val, MBA_STR, sizeof(MBA_STR))) { if (ctrlgrp) sprintf(mbm_total_path, CON_MBM_LOCAL_BYTES_PATH, - RESCTRL_PATH, ctrlgrp, resource_id); + RESCTRL_PATH, ctrlgrp, domain_id); else sprintf(mbm_total_path, MBM_LOCAL_BYTES_PATH, - RESCTRL_PATH, resource_id); + RESCTRL_PATH, domain_id); } } @@ -582,15 +582,15 @@ static void set_cmt_path(const char *ctrlgrp, const char *mongrp, char sock_num) static void initialize_llc_occu_resctrl(const char *ctrlgrp, const char *mongrp, int cpu_no, char *resctrl_val) { - int resource_id; + int domain_id; - if (get_resource_id(cpu_no, &resource_id) < 0) { - perror("# Unable to resource_id"); + if (get_domain_id(cpu_no, &domain_id) < 0) { + perror("# Could not get domain ID"); return; } if (!strncmp(resctrl_val, CMT_STR, sizeof(CMT_STR))) - set_cmt_path(ctrlgrp, mongrp, resource_id); + set_cmt_path(ctrlgrp, mongrp, domain_id); } static int measure_vals(const struct user_params *uparams, diff --git a/tools/testing/selftests/resctrl/resctrlfs.c b/tools/testing/selftests/resctrl/resctrlfs.c index 38ca3ae562e9..c173e0fa5c94 100644 --- a/tools/testing/selftests/resctrl/resctrlfs.c +++ b/tools/testing/selftests/resctrl/resctrlfs.c @@ -112,13 +112,13 @@ static int get_cache_level(const char *cache_type) } /* - * get_resource_id - Get socket number/l3 id for a specified CPU + * get_domain_id - Get resctrl domain ID for a specified CPU * @cpu_no: CPU number - * @resource_id: Socket number or l3_id + * @domain_id: domain ID (cache ID; for MB, L3 cache ID) * * Return: >= 0 on success, < 0 on failure. */ -int get_resource_id(int cpu_no, int *resource_id) +int get_domain_id(int cpu_no, int *domain_id) { char phys_pkg_path[1024]; FILE *fp; @@ -136,8 +136,8 @@ int get_resource_id(int cpu_no, int *resource_id) return -1; } - if (fscanf(fp, "%d", resource_id) <= 0) { - perror("Could not get socket number or l3 id"); + if (fscanf(fp, "%d", domain_id) <= 0) { + perror("Could not get domain ID"); fclose(fp); return -1; @@ -524,7 +524,7 @@ int write_bm_pid_to_resctrl(pid_t bm_pid, char *ctrlgrp, char *mongrp, int write_schemata(char *ctrlgrp, char *schemata, int cpu_no, const char *resource) { char controlgroup[1024], reason[128], schema[1024] = {}; - int resource_id, fd, schema_len, ret = 0; + int domain_id, fd, schema_len, ret = 0; if (!schemata) { ksft_print_msg("Skipping empty schemata update\n"); @@ -532,8 +532,8 @@ int write_schemata(char *ctrlgrp, char *schemata, int cpu_no, const char *resour return -1; } - if (get_resource_id(cpu_no, &resource_id) < 0) { - sprintf(reason, "Failed to get resource id"); + if (get_domain_id(cpu_no, &domain_id) < 0) { + sprintf(reason, "Failed to get domain ID"); ret = -1; goto out; @@ -545,7 +545,7 @@ int write_schemata(char *ctrlgrp, char *schemata, int cpu_no, const char *resour sprintf(controlgroup, "%s/schemata", RESCTRL_PATH); schema_len = snprintf(schema, sizeof(schema), "%s:%d=%s\n", - resource, resource_id, schemata); + resource, domain_id, schemata); if (schema_len < 0 || schema_len >= sizeof(schema)) { snprintf(reason, sizeof(reason), "snprintf() failed with return value : %d", schema_len);
Kernel-side calls the instances of a resource domains. Change the resource_id naming in the selftest code to domain_id to match the kernel side better. Suggested-by: Maciej Wieczór-Retman <maciej.wieczor-retman@intel.com> Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com> --- tools/testing/selftests/resctrl/resctrl.h | 2 +- tools/testing/selftests/resctrl/resctrl_val.c | 30 +++++++++---------- tools/testing/selftests/resctrl/resctrlfs.c | 18 +++++------ 3 files changed, 25 insertions(+), 25 deletions(-)