Commit 83b03987 authored by Tony Luck's avatar Tony Luck Committed by Borislav Petkov (AMD)
Browse files

x86,fs/resctrl: Prepare for more monitor events 



There's a rule in computer programming that objects appear zero, once, or many
times. So code accordingly.

There are two MBM events and resctrl is coded with a lot of

  if (local)
          do one thing
  if (total)
          do a different thing

Change the rdt_mon_domain and rdt_hw_mon_domain structures to hold arrays of
pointers to per event data instead of explicit fields for total and local
bandwidth.

Simplify by coding for many events using loops on which are enabled.

Move resctrl_is_mbm_event() to <linux/resctrl.h> so it can be used more
widely. Also provide a for_each_mbm_event_id() helper macro.

Cleanup variable names in functions touched to consistently use "eventid" for
those with type enum resctrl_event_id.

Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
Signed-off-by: default avatarBabu Moger <babu.moger@amd.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Link: https://lore.kernel.org/cover.1757108044.git.babu.moger@amd.com
parent 63cc9811

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

+22 −18
Original line number Diff line number Diff line
@@ -365,8 +365,10 @@ static void ctrl_domain_free(struct rdt_hw_ctrl_domain *hw_dom) 


static void mon_domain_free(struct rdt_hw_mon_domain *hw_dom)

{

	kfree(hw_dom->arch_mbm_total);

	kfree(hw_dom->arch_mbm_local);

	int idx;



	for_each_mbm_idx(idx)

		kfree(hw_dom->arch_mbm_states[idx]);

	kfree(hw_dom);

}
@@ -400,25 +402,27 @@ static int domain_setup_ctrlval(struct rdt_resource *r, struct rdt_ctrl_domain * 
 */

static int arch_domain_mbm_alloc(u32 num_rmid, struct rdt_hw_mon_domain *hw_dom)

{

	size_t tsize;

	size_t tsize = sizeof(*hw_dom->arch_mbm_states[0]);

	enum resctrl_event_id eventid;

	int idx;



	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID)) {

		tsize = sizeof(*hw_dom->arch_mbm_total);

		hw_dom->arch_mbm_total = kcalloc(num_rmid, tsize, GFP_KERNEL);

		if (!hw_dom->arch_mbm_total)

			return -ENOMEM;

	}

	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID)) {

		tsize = sizeof(*hw_dom->arch_mbm_local);

		hw_dom->arch_mbm_local = kcalloc(num_rmid, tsize, GFP_KERNEL);

		if (!hw_dom->arch_mbm_local) {

			kfree(hw_dom->arch_mbm_total);

			hw_dom->arch_mbm_total = NULL;

			return -ENOMEM;

		}

	for_each_mbm_event_id(eventid) {

		if (!resctrl_is_mon_event_enabled(eventid))

			continue;

		idx = MBM_STATE_IDX(eventid);

		hw_dom->arch_mbm_states[idx] = kcalloc(num_rmid, tsize, GFP_KERNEL);

		if (!hw_dom->arch_mbm_states[idx])

			goto cleanup;

	}



	return 0;

cleanup:

	for_each_mbm_idx(idx) {

		kfree(hw_dom->arch_mbm_states[idx]);

		hw_dom->arch_mbm_states[idx] = NULL;

	}



	return -ENOMEM;

}



static int get_domain_id_from_scope(int cpu, enum resctrl_scope scope)

arch/x86/kernel/cpu/resctrl/internal.h

+4 −4
Original line number Diff line number Diff line
@@ -54,15 +54,15 @@ struct rdt_hw_ctrl_domain { 
 * struct rdt_hw_mon_domain - Arch private attributes of a set of CPUs that share

 *			      a resource for a monitor function

 * @d_resctrl:	Properties exposed to the resctrl file system

 * @arch_mbm_total:	arch private state for MBM total bandwidth

 * @arch_mbm_local:	arch private state for MBM local bandwidth

 * @arch_mbm_states:	Per-event pointer to the MBM event's saved state.

 *			An MBM event's state is an array of struct arch_mbm_state

 *			indexed by RMID on x86.

 *

 * Members of this structure are accessed via helpers that provide abstraction.

 */

struct rdt_hw_mon_domain {

	struct rdt_mon_domain		d_resctrl;

	struct arch_mbm_state		*arch_mbm_total;

	struct arch_mbm_state		*arch_mbm_local;

	struct arch_mbm_state		*arch_mbm_states[QOS_NUM_L3_MBM_EVENTS];

};



static inline struct rdt_hw_ctrl_domain *resctrl_to_arch_ctrl_dom(struct rdt_ctrl_domain *r)

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

+17 −19
Original line number Diff line number Diff line
@@ -161,18 +161,14 @@ static struct arch_mbm_state *get_arch_mbm_state(struct rdt_hw_mon_domain *hw_do 
						 u32 rmid,

						 enum resctrl_event_id eventid)

{

	switch (eventid) {

	case QOS_L3_OCCUP_EVENT_ID:

		return NULL;

	case QOS_L3_MBM_TOTAL_EVENT_ID:

		return &hw_dom->arch_mbm_total[rmid];

	case QOS_L3_MBM_LOCAL_EVENT_ID:

		return &hw_dom->arch_mbm_local[rmid];

	default:

		/* Never expect to get here */

		WARN_ON_ONCE(1);

	struct arch_mbm_state *state;



	if (!resctrl_is_mbm_event(eventid))

		return NULL;

	}



	state = hw_dom->arch_mbm_states[MBM_STATE_IDX(eventid)];



	return state ? &state[rmid] : NULL;

}



void resctrl_arch_reset_rmid(struct rdt_resource *r, struct rdt_mon_domain *d,
@@ -201,14 +197,16 @@ void resctrl_arch_reset_rmid(struct rdt_resource *r, struct rdt_mon_domain *d, 
void resctrl_arch_reset_rmid_all(struct rdt_resource *r, struct rdt_mon_domain *d)

{

	struct rdt_hw_mon_domain *hw_dom = resctrl_to_arch_mon_dom(d);



	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID))

		memset(hw_dom->arch_mbm_total, 0,

		       sizeof(*hw_dom->arch_mbm_total) * r->num_rmid);



	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID))

		memset(hw_dom->arch_mbm_local, 0,

		       sizeof(*hw_dom->arch_mbm_local) * r->num_rmid);

	enum resctrl_event_id eventid;

	int idx;



	for_each_mbm_event_id(eventid) {

		if (!resctrl_is_mon_event_enabled(eventid))

			continue;

		idx = MBM_STATE_IDX(eventid);

		memset(hw_dom->arch_mbm_states[idx], 0,

		       sizeof(*hw_dom->arch_mbm_states[0]) * r->num_rmid);

	}

}



static u64 mbm_overflow_count(u64 prev_msr, u64 cur_msr, unsigned int width)

fs/resctrl/monitor.c

+6 −7
Original line number Diff line number Diff line
@@ -346,15 +346,14 @@ static struct mbm_state *get_mbm_state(struct rdt_mon_domain *d, u32 closid, 
				       u32 rmid, enum resctrl_event_id evtid)

{

	u32 idx = resctrl_arch_rmid_idx_encode(closid, rmid);

	struct mbm_state *state;



	switch (evtid) {

	case QOS_L3_MBM_TOTAL_EVENT_ID:

		return &d->mbm_total[idx];

	case QOS_L3_MBM_LOCAL_EVENT_ID:

		return &d->mbm_local[idx];

	default:

	if (!resctrl_is_mbm_event(evtid))

		return NULL;

	}



	state = d->mbm_states[MBM_STATE_IDX(evtid)];



	return state ? &state[idx] : NULL;

}



static int __mon_event_count(u32 closid, u32 rmid, struct rmid_read *rr)

fs/resctrl/rdtgroup.c

+25 −25
Original line number Diff line number Diff line
@@ -127,12 +127,6 @@ static bool resctrl_is_mbm_enabled(void) 
		resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID));

}



static bool resctrl_is_mbm_event(int e)

{

	return (e >= QOS_L3_MBM_TOTAL_EVENT_ID &&

		e <= QOS_L3_MBM_LOCAL_EVENT_ID);

}



/*

 * Trivial allocator for CLOSIDs. Use BITMAP APIs to manipulate a bitmap

 * of free CLOSIDs.
@@ -4020,9 +4014,13 @@ static void rdtgroup_setup_default(void) 


static void domain_destroy_mon_state(struct rdt_mon_domain *d)

{

	int idx;



	bitmap_free(d->rmid_busy_llc);

	kfree(d->mbm_total);

	kfree(d->mbm_local);

	for_each_mbm_idx(idx) {

		kfree(d->mbm_states[idx]);

		d->mbm_states[idx] = NULL;

	}

}



void resctrl_offline_ctrl_domain(struct rdt_resource *r, struct rdt_ctrl_domain *d)
@@ -4082,32 +4080,34 @@ void resctrl_offline_mon_domain(struct rdt_resource *r, struct rdt_mon_domain *d 
static int domain_setup_mon_state(struct rdt_resource *r, struct rdt_mon_domain *d)

{

	u32 idx_limit = resctrl_arch_system_num_rmid_idx();

	size_t tsize;

	size_t tsize = sizeof(*d->mbm_states[0]);

	enum resctrl_event_id eventid;

	int idx;



	if (resctrl_is_mon_event_enabled(QOS_L3_OCCUP_EVENT_ID)) {

		d->rmid_busy_llc = bitmap_zalloc(idx_limit, GFP_KERNEL);

		if (!d->rmid_busy_llc)

			return -ENOMEM;

	}

	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID)) {

		tsize = sizeof(*d->mbm_total);

		d->mbm_total = kcalloc(idx_limit, tsize, GFP_KERNEL);

		if (!d->mbm_total) {

			bitmap_free(d->rmid_busy_llc);

			return -ENOMEM;

		}



	for_each_mbm_event_id(eventid) {

		if (!resctrl_is_mon_event_enabled(eventid))

			continue;

		idx = MBM_STATE_IDX(eventid);

		d->mbm_states[idx] = kcalloc(idx_limit, tsize, GFP_KERNEL);

		if (!d->mbm_states[idx])

			goto cleanup;

	}

	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID)) {

		tsize = sizeof(*d->mbm_local);

		d->mbm_local = kcalloc(idx_limit, tsize, GFP_KERNEL);

		if (!d->mbm_local) {



	return 0;

cleanup:

	bitmap_free(d->rmid_busy_llc);

			kfree(d->mbm_total);

			return -ENOMEM;

		}

	for_each_mbm_idx(idx) {

		kfree(d->mbm_states[idx]);

		d->mbm_states[idx] = NULL;

	}



	return 0;

	return -ENOMEM;

}



int resctrl_online_ctrl_domain(struct rdt_resource *r, struct rdt_ctrl_domain *d)