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

x86,fs/resctrl: Replace architecture event enabled checks 



The resctrl file system now has complete knowledge of the status of every
event. So there is no need for per-event function calls to check.

Replace each of the resctrl_arch_is_{event}enabled() calls with
resctrl_is_mon_event_enabled(QOS_{EVENT}).

No functional change.

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 avatarFenghua Yu <fenghuay@nvidia.com>
Reviewed-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Link: https://lore.kernel.org/cover.1757108044.git.babu.moger@amd.com
parent 09f37134

arch/x86/include/asm/resctrl.h

+0 −15
Original line number Diff line number Diff line
@@ -84,21 +84,6 @@ static inline void resctrl_arch_disable_mon(void) 
	static_branch_dec_cpuslocked(&rdt_enable_key);

}



static inline bool resctrl_arch_is_llc_occupancy_enabled(void)

{

	return (rdt_mon_features & (1 << QOS_L3_OCCUP_EVENT_ID));

}



static inline bool resctrl_arch_is_mbm_total_enabled(void)

{

	return (rdt_mon_features & (1 << QOS_L3_MBM_TOTAL_EVENT_ID));

}



static inline bool resctrl_arch_is_mbm_local_enabled(void)

{

	return (rdt_mon_features & (1 << QOS_L3_MBM_LOCAL_EVENT_ID));

}



/*

 * __resctrl_sched_in() - Writes the task's CLOSid/RMID to IA32_PQR_MSR

 *

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

+2 −2
Original line number Diff line number Diff line
@@ -402,13 +402,13 @@ static int arch_domain_mbm_alloc(u32 num_rmid, struct rdt_hw_mon_domain *hw_dom) 
{

	size_t tsize;



	if (resctrl_arch_is_mbm_total_enabled()) {

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

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

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

+2 −2
Original line number Diff line number Diff line
@@ -207,11 +207,11 @@ void resctrl_arch_reset_rmid_all(struct rdt_resource *r, struct rdt_mon_domain * 
{

	struct rdt_hw_mon_domain *hw_dom = resctrl_to_arch_mon_dom(d);



	if (resctrl_arch_is_mbm_total_enabled())

	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_arch_is_mbm_local_enabled())

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

}

fs/resctrl/ctrlmondata.c

+2 −2
Original line number Diff line number Diff line
@@ -473,12 +473,12 @@ ssize_t rdtgroup_mba_mbps_event_write(struct kernfs_open_file *of, 
	rdt_last_cmd_clear();



	if (!strcmp(buf, "mbm_local_bytes")) {

		if (resctrl_arch_is_mbm_local_enabled())

		if (resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID))

			rdtgrp->mba_mbps_event = QOS_L3_MBM_LOCAL_EVENT_ID;

		else

			ret = -EINVAL;

	} else if (!strcmp(buf, "mbm_total_bytes")) {

		if (resctrl_arch_is_mbm_total_enabled())

		if (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID))

			rdtgrp->mba_mbps_event = QOS_L3_MBM_TOTAL_EVENT_ID;

		else

			ret = -EINVAL;

fs/resctrl/monitor.c

+11 −5
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ void free_rmid(u32 closid, u32 rmid) 


	entry = __rmid_entry(idx);



	if (resctrl_arch_is_llc_occupancy_enabled())

	if (resctrl_is_mon_event_enabled(QOS_L3_OCCUP_EVENT_ID))

		add_rmid_to_limbo(entry);

	else

		list_add_tail(&entry->list, &rmid_free_lru);
@@ -635,10 +635,10 @@ static void mbm_update(struct rdt_resource *r, struct rdt_mon_domain *d, 
	 * This is protected from concurrent reads from user as both

	 * the user and overflow handler hold the global mutex.

	 */

	if (resctrl_arch_is_mbm_total_enabled())

	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID))

		mbm_update_one_event(r, d, closid, rmid, QOS_L3_MBM_TOTAL_EVENT_ID);



	if (resctrl_arch_is_mbm_local_enabled())

	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID))

		mbm_update_one_event(r, d, closid, rmid, QOS_L3_MBM_LOCAL_EVENT_ID);

}
@@ -877,6 +877,12 @@ void resctrl_enable_mon_event(enum resctrl_event_id eventid) 
	mon_event_all[eventid].enabled = true;

}



bool resctrl_is_mon_event_enabled(enum resctrl_event_id eventid)

{

	return eventid >= QOS_FIRST_EVENT && eventid < QOS_NUM_EVENTS &&

	       mon_event_all[eventid].enabled;

}



/**

 * resctrl_mon_resource_init() - Initialise global monitoring structures.

 *
@@ -912,9 +918,9 @@ int resctrl_mon_resource_init(void) 
					 RFTYPE_MON_INFO | RFTYPE_RES_CACHE);

	}



	if (resctrl_arch_is_mbm_local_enabled())

	if (resctrl_is_mon_event_enabled(QOS_L3_MBM_LOCAL_EVENT_ID))

		mba_mbps_default_event = QOS_L3_MBM_LOCAL_EVENT_ID;

	else if (resctrl_arch_is_mbm_total_enabled())

	else if (resctrl_is_mon_event_enabled(QOS_L3_MBM_TOTAL_EVENT_ID))

		mba_mbps_default_event = QOS_L3_MBM_TOTAL_EVENT_ID;



	return 0;