Commit 6874f6ed authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Shuah Khan
Browse files

selftests/resctrl: Rename resource ID to domain ID 



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: default avatarMaciej Wieczór-Retman <maciej.wieczor-retman@intel.com>
Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Reviewed-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent e73dda7f

tools/testing/selftests/resctrl/resctrl.h

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,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);

tools/testing/selftests/resctrl/resctrl_val.c

+15 −15
Original line number Diff line number Diff line
@@ -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) {

		ksft_print_msg("Could not get resource_id\n");

	if (get_domain_id(cpu_no, &domain_id) < 0) {

		ksft_print_msg("Could not get domain ID\n");

		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) {

		ksft_print_msg("Could not get resource_id\n");

	if (get_domain_id(cpu_no, &domain_id) < 0) {

		ksft_print_msg("Could not get domain ID\n");

		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,

tools/testing/selftests/resctrl/resctrlfs.c

+9 −9
Original line number Diff line number Diff line
@@ -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) {

		ksft_perror("Could not get socket number or l3 id");

	if (fscanf(fp, "%d", domain_id) <= 0) {

		ksft_perror("Could not get domain ID");

		fclose(fp);



		return -1;
@@ -551,7 +551,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");
@@ -559,8 +559,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;
@@ -572,7 +572,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);