Commit 0d66ddb2 authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by Shuah Khan
Browse files

selftests/resctrl: Remove test name comparing from write_bm_pid_to_resctrl() 



write_bm_pid_to_resctrl() uses resctrl_val to check test name which is
not a good interface generic resctrl FS functions should provide.

Tests define mongrp when needed. Remove the test name check in
write_bm_pid_to_resctrl() to only rely on the mongrp parameter being
non-NULL.

Remove write_bm_pid_to_resctrl() resctrl_val parameter and resctrl_val
member from the struct resctrl_val_param that are not used anymore.
Similarly, remove the test name constants that are no longer used.

Signed-off-by: default avatarIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Tested-by: default avatarBabu Moger <babu.moger@amd.com>
Reviewed-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent f58e66be

tools/testing/selftests/resctrl/cat_test.c

+1 −4
Original line number Diff line number Diff line
@@ -158,7 +158,6 @@ static int cat_test(const struct resctrl_test *test, 
		    struct resctrl_val_param *param,

		    size_t span, unsigned long current_mask)

{

	char *resctrl_val = param->resctrl_val;

	struct perf_event_read pe_read;

	struct perf_event_attr pea;

	cpu_set_t old_affinity;
@@ -178,8 +177,7 @@ static int cat_test(const struct resctrl_test *test, 
		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);

	ret = write_bm_pid_to_resctrl(bm_pid, param->ctrlgrp, param->mongrp);

	if (ret)

		goto reset_affinity;
@@ -272,7 +270,6 @@ static int cat_run_test(const struct resctrl_test *test, const struct user_param 
	start_mask = create_bit_mask(start, n);



	struct resctrl_val_param param = {

		.resctrl_val	= CAT_STR,

		.ctrlgrp	= "c1",

		.filename	= RESULT_FILE_NAME,

		.num_of_runs	= 0,

tools/testing/selftests/resctrl/cmt_test.c

+0 −1
Original line number Diff line number Diff line
@@ -144,7 +144,6 @@ static int cmt_run_test(const struct resctrl_test *test, const struct user_param 
	}



	struct resctrl_val_param param = {

		.resctrl_val	= CMT_STR,

		.ctrlgrp	= "c1",

		.filename	= RESULT_FILE_NAME,

		.mask		= ~(long_mask << n) & long_mask,

tools/testing/selftests/resctrl/mba_test.c

+0 −1
Original line number Diff line number Diff line
@@ -164,7 +164,6 @@ static void mba_test_cleanup(void) 
static int mba_run_test(const struct resctrl_test *test, const struct user_params *uparams)

{

	struct resctrl_val_param param = {

		.resctrl_val	= MBA_STR,

		.ctrlgrp	= "c1",

		.filename	= RESULT_FILE_NAME,

		.init		= mba_init,

tools/testing/selftests/resctrl/mbm_test.c

+0 −1
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ static void mbm_test_cleanup(void) 
static int mbm_run_test(const struct resctrl_test *test, const struct user_params *uparams)

{

	struct resctrl_val_param param = {

		.resctrl_val	= MBM_STR,

		.ctrlgrp	= "c1",

		.filename	= RESULT_FILE_NAME,

		.init		= mbm_init,

tools/testing/selftests/resctrl/resctrl.h

+1 −9
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ struct resctrl_test { 


/*

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

 * @filename:		Name of file to which the o/p should be written
@@ -90,7 +89,6 @@ struct resctrl_test { 
 * @measure:		Callback that performs the measurement (a single test)

 */

struct resctrl_val_param {

	char		*resctrl_val;

	const char	*ctrlgrp;

	const char	*mongrp;

	char		filename[64];
@@ -113,11 +111,6 @@ struct perf_event_read { 
	} values[2];

};



#define MBM_STR			"mbm"

#define MBA_STR			"mba"

#define CMT_STR			"cmt"

#define CAT_STR			"cat"



/*

 * Memory location that consumes values compiler must not optimize away.

 * Volatile ensures writes to this location cannot be optimized away by
@@ -143,8 +136,7 @@ int taskset_benchmark(pid_t bm_pid, int cpu_no, cpu_set_t *old_affinity); 
int taskset_restore(pid_t bm_pid, cpu_set_t *old_affinity);

int write_schemata(const char *ctrlgrp, char *schemata, int cpu_no,

		   const char *resource);

int write_bm_pid_to_resctrl(pid_t bm_pid, const char *ctrlgrp,

			    const char *mongrp, const char *resctrl_val);

int write_bm_pid_to_resctrl(pid_t bm_pid, const char *ctrlgrp, const char *mongrp);

int perf_event_open(struct perf_event_attr *hw_event, pid_t pid, int cpu,

		    int group_fd, unsigned long flags);

unsigned char *alloc_buffer(size_t buf_size, int memflush);