Commit 75408e43 authored by James Morse's avatar James Morse Committed by Borislav Petkov
Browse files

x86/resctrl: Allow different CODE/DATA configurations to be staged 



Before the CDP resources can be merged, struct rdt_domain will need an
array of struct resctrl_staged_config, one per type of configuration.

Use the type as an index to the array to ensure that a schema
configuration string can't specify the same domain twice. This will
allow two schemata to apply configuration changes to one resource.

Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarJamie Iles <jamie@nuviainc.com>
Reviewed-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Tested-by: default avatarBabu Moger <babu.moger@amd.com>
Link: https://lkml.kernel.org/r/20210728170637.25610-15-james.morse@arm.com
parent e8f72825

arch/x86/kernel/cpu/resctrl/ctrlmondata.c

+14 −6
Original line number Diff line number Diff line
@@ -60,10 +60,11 @@ static bool bw_validate(char *buf, unsigned long *data, struct rdt_resource *r) 
int parse_bw(struct rdt_parse_data *data, struct resctrl_schema *s,

	     struct rdt_domain *d)

{

	struct resctrl_staged_config *cfg;

	struct rdt_resource *r = s->res;

	unsigned long bw_val;

	struct resctrl_staged_config *cfg = &d->staged_config;



	cfg = &d->staged_config[s->conf_type];

	if (cfg->have_new_ctrl) {

		rdt_last_cmd_printf("Duplicate domain %d\n", d->id);

		return -EINVAL;
@@ -130,11 +131,12 @@ static bool cbm_validate(char *buf, u32 *data, struct rdt_resource *r) 
int parse_cbm(struct rdt_parse_data *data, struct resctrl_schema *s,

	      struct rdt_domain *d)

{

	struct resctrl_staged_config *cfg = &d->staged_config;

	struct rdtgroup *rdtgrp = data->rdtgrp;

	struct resctrl_staged_config *cfg;

	struct rdt_resource *r = s->res;

	u32 cbm_val;



	cfg = &d->staged_config[s->conf_type];

	if (cfg->have_new_ctrl) {

		rdt_last_cmd_printf("Duplicate domain %d\n", d->id);

		return -EINVAL;
@@ -192,6 +194,7 @@ int parse_cbm(struct rdt_parse_data *data, struct resctrl_schema *s, 
static int parse_line(char *line, struct resctrl_schema *s,

		      struct rdtgroup *rdtgrp)

{

	enum resctrl_conf_type t = s->conf_type;

	struct resctrl_staged_config *cfg;

	struct rdt_resource *r = s->res;

	struct rdt_parse_data data;
@@ -222,7 +225,7 @@ static int parse_line(char *line, struct resctrl_schema *s, 
			if (r->parse_ctrlval(&data, s, d))

				return -EINVAL;

			if (rdtgrp->mode ==  RDT_MODE_PSEUDO_LOCKSETUP) {

				cfg = &d->staged_config;

				cfg = &d->staged_config[t];

				/*

				 * In pseudo-locking setup mode and just

				 * parsed a valid CBM that should be
@@ -261,6 +264,7 @@ int update_domains(struct rdt_resource *r, int closid) 
	struct resctrl_staged_config *cfg;

	struct rdt_hw_domain *hw_dom;

	struct msr_param msr_param;

	enum resctrl_conf_type t;

	cpumask_var_t cpu_mask;

	struct rdt_domain *d;

	bool mba_sc;
@@ -276,10 +280,14 @@ int update_domains(struct rdt_resource *r, int closid) 
	mba_sc = is_mba_sc(r);

	list_for_each_entry(d, &r->domains, list) {

		hw_dom = resctrl_to_arch_dom(d);

		cfg = &hw_dom->d_resctrl.staged_config;

		if (cfg->have_new_ctrl)

		for (t = 0; t < CDP_NUM_TYPES; t++) {

			cfg = &hw_dom->d_resctrl.staged_config[t];

			if (!cfg->have_new_ctrl)

				continue;



			apply_config(hw_dom, cfg, closid, cpu_mask, mba_sc);

		}

	}



	/*

	 * Avoid writing the control msr with control values when
@@ -350,7 +358,7 @@ ssize_t rdtgroup_schemata_write(struct kernfs_open_file *of, 


	list_for_each_entry(s, &resctrl_schema_all, list) {

		list_for_each_entry(dom, &s->res->domains, list)

			memset(&dom->staged_config, 0, sizeof(dom->staged_config));

			memset(dom->staged_config, 0, sizeof(dom->staged_config));

	}



	while ((tok = strsep(&buf, "\n")) != NULL) {

arch/x86/kernel/cpu/resctrl/rdtgroup.c

+3 −2
Original line number Diff line number Diff line
@@ -2751,6 +2751,7 @@ static u32 cbm_ensure_valid(u32 _val, struct rdt_resource *r) 
static int __init_one_rdt_domain(struct rdt_domain *d, struct resctrl_schema *s,

				 u32 closid)

{

	enum resctrl_conf_type t = s->conf_type;

	struct rdt_resource *r_cdp = NULL;

	struct resctrl_staged_config *cfg;

	struct rdt_domain *d_cdp = NULL;
@@ -2762,7 +2763,7 @@ static int __init_one_rdt_domain(struct rdt_domain *d, struct resctrl_schema *s, 
	int i;



	rdt_cdp_peer_get(r, d, &r_cdp, &d_cdp);

	cfg = &d->staged_config;

	cfg = &d->staged_config[t];

	cfg->have_new_ctrl = false;

	cfg->new_ctrl = r->cache.shareable_bits;

	used_b = r->cache.shareable_bits;
@@ -2846,7 +2847,7 @@ static void rdtgroup_init_mba(struct rdt_resource *r) 
	struct rdt_domain *d;



	list_for_each_entry(d, &r->domains, list) {

		cfg = &d->staged_config;

		cfg = &d->staged_config[CDP_NONE];

		cfg->new_ctrl = is_mba_sc(r) ? MBA_MAX_MBPS : r->default_ctrl;

		cfg->have_new_ctrl = true;

	}

include/linux/resctrl.h

+3 −1
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ enum resctrl_conf_type { 
	CDP_DATA,

};



#define CDP_NUM_TYPES	(CDP_DATA + 1)



/**

 * struct resctrl_staged_config - parsed configuration to be applied

 * @new_ctrl:		new ctrl value to be loaded
@@ -64,7 +66,7 @@ struct rdt_domain { 
	int				mbm_work_cpu;

	int				cqm_work_cpu;

	struct pseudo_lock_region	*plr;

	struct resctrl_staged_config	staged_config;

	struct resctrl_staged_config	staged_config[CDP_NUM_TYPES];

};



/**