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

x86/resctrl: Remove the rdt_mon_features global variable 



rdt_mon_features is used as a bitmask of enabled monitor events. A monitor
event's status is now maintained in mon_evt::enabled with all monitor events'
mon_evt structures found in the filesystem's mon_event_all[] array.

Remove the remaining uses of rdt_mon_features.

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 d257cc2e

arch/x86/include/asm/resctrl.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ DECLARE_PER_CPU(struct resctrl_pqr_state, pqr_state); 


extern bool rdt_alloc_capable;

extern bool rdt_mon_capable;

extern unsigned int rdt_mon_features;



DECLARE_STATIC_KEY_FALSE(rdt_enable_key);

DECLARE_STATIC_KEY_FALSE(rdt_alloc_enable_key);

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

+5 −4
Original line number Diff line number Diff line
@@ -863,21 +863,22 @@ static __init bool get_rdt_alloc_resources(void) 
static __init bool get_rdt_mon_resources(void)

{

	struct rdt_resource *r = &rdt_resources_all[RDT_RESOURCE_L3].r_resctrl;

	bool ret = false;



	if (rdt_cpu_has(X86_FEATURE_CQM_OCCUP_LLC)) {

		resctrl_enable_mon_event(QOS_L3_OCCUP_EVENT_ID);

		rdt_mon_features |= (1 << QOS_L3_OCCUP_EVENT_ID);

		ret = true;

	}

	if (rdt_cpu_has(X86_FEATURE_CQM_MBM_TOTAL)) {

		resctrl_enable_mon_event(QOS_L3_MBM_TOTAL_EVENT_ID);

		rdt_mon_features |= (1 << QOS_L3_MBM_TOTAL_EVENT_ID);

		ret = true;

	}

	if (rdt_cpu_has(X86_FEATURE_CQM_MBM_LOCAL)) {

		resctrl_enable_mon_event(QOS_L3_MBM_LOCAL_EVENT_ID);

		rdt_mon_features |= (1 << QOS_L3_MBM_LOCAL_EVENT_ID);

		ret = true;

	}



	if (!rdt_mon_features)

	if (!ret)

		return false;



	return !rdt_get_mon_l3_config(r);

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

+0 −5
Original line number Diff line number Diff line
@@ -31,11 +31,6 @@ 
 */

bool rdt_mon_capable;



/*

 * Global to indicate which monitoring events are enabled.

 */

unsigned int rdt_mon_features;



#define CF(cf)	((unsigned long)(1048576 * (cf) + 0.5))



static int snc_nodes_per_l3_cache = 1;