Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ad4fa41 authored by Babu Moger's avatar Babu Moger Committed by Borislav Petkov
Browse files

x86/resctrl: Initialize the vendor-specific resource functions 



Initialize the resource functions that are different between the
vendors. Some features are initialized differently between the vendors.
Add _intel suffix to Intel-specific functions.

For example, the MBA feature varies significantly between Intel and AMD.
Separate the initialization of these resource functions. That way we can
easily add AMD's functions later.

Signed-off-by: default avatarBabu Moger <babu.moger@amd.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Brijesh Singh <brijesh.singh@amd.com>
Cc: "Chang S. Bae" <chang.seok.bae@intel.com>
Cc: David Miller <davem@davemloft.net>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Dmitry Safonov <dima@arista.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jann Horn <jannh@google.com>
Cc: Joerg Roedel <jroedel@suse.de>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Kate Stewart <kstewart@linuxfoundation.org>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: <linux-doc@vger.kernel.org>
Cc: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Philippe Ombredanne <pombredanne@nexb.com>
Cc: Pu Wen <puwen@hygon.cn>
Cc: <qianyue.zj@alibaba-inc.com>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Reinette Chatre <reinette.chatre@intel.com>
Cc: Rian Hunter <rian@alum.mit.edu>
Cc: Sherry Hurwitz <sherry.hurwitz@amd.com>
Cc: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Thomas Lendacky <Thomas.Lendacky@amd.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: <xiaochen.shen@intel.com>
Link: https://lkml.kernel.org/r/20181121202811.4492-6-babu.moger@amd.com
parent aa50453a

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

+29 −5
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ int max_name_width, max_data_width; 
bool rdt_alloc_capable;



static void

mba_wrmsr(struct rdt_domain *d, struct msr_param *m, struct rdt_resource *r);

mba_wrmsr_intel(struct rdt_domain *d, struct msr_param *m,

		struct rdt_resource *r);

static void

cat_wrmsr(struct rdt_domain *d, struct msr_param *m, struct rdt_resource *r);
@@ -171,10 +172,7 @@ struct rdt_resource rdt_resources_all[] = { 
		.rid			= RDT_RESOURCE_MBA,

		.name			= "MB",

		.domains		= domain_init(RDT_RESOURCE_MBA),

		.msr_base		= MSR_IA32_MBA_THRTL_BASE,

		.msr_update		= mba_wrmsr,

		.cache_level		= 3,

		.parse_ctrlval		= parse_bw,

		.format_str		= "%d=%*u",

		.fflags			= RFTYPE_RES_MB,

	},
@@ -357,7 +355,8 @@ u32 delay_bw_map(unsigned long bw, struct rdt_resource *r) 
}



static void

mba_wrmsr(struct rdt_domain *d, struct msr_param *m, struct rdt_resource *r)

mba_wrmsr_intel(struct rdt_domain *d, struct msr_param *m,

		struct rdt_resource *r)

{

	unsigned int i;
@@ -874,6 +873,25 @@ static __init bool get_rdt_resources(void) 
	return (rdt_mon_capable || rdt_alloc_capable);

}



static __init void rdt_init_res_defs_intel(void)

{

	struct rdt_resource *r;



	for_each_rdt_resource(r) {

		if (r->rid == RDT_RESOURCE_MBA) {

			r->msr_base = MSR_IA32_MBA_THRTL_BASE;

			r->msr_update = mba_wrmsr_intel;

			r->parse_ctrlval = parse_bw_intel;

		}

	}

}



static __init void rdt_init_res_defs(void)

{

	if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)

		rdt_init_res_defs_intel();

}



static enum cpuhp_state rdt_online;



static int __init resctrl_late_init(void)
@@ -881,6 +899,12 @@ static int __init resctrl_late_init(void) 
	struct rdt_resource *r;

	int state, ret;



	/*

	 * Initialize functions(or definitions) that are different

	 * between vendors here.

	 */

	rdt_init_res_defs();



	check_quirks();



	if (!get_rdt_resources())

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

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ static bool bw_validate(char *buf, unsigned long *data, struct rdt_resource *r) 
	return true;

}



int parse_bw(struct rdt_parse_data *data, struct rdt_resource *r,

int parse_bw_intel(struct rdt_parse_data *data, struct rdt_resource *r,

		   struct rdt_domain *d)

{

	unsigned long bw_val;

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

+6 −2
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ struct rdt_resource { 


int parse_cbm(struct rdt_parse_data *data, struct rdt_resource *r,

	      struct rdt_domain *d);

int parse_bw(struct rdt_parse_data *data, struct rdt_resource *r,

int parse_bw_intel(struct rdt_parse_data *data, struct rdt_resource *r,

		   struct rdt_domain *d);



extern struct mutex rdtgroup_mutex;
@@ -468,6 +468,10 @@ enum { 
	RDT_NUM_RESOURCES,

};



#define for_each_rdt_resource(r)					      \

	for (r = rdt_resources_all; r < rdt_resources_all + RDT_NUM_RESOURCES;\

	     r++)



#define for_each_capable_rdt_resource(r)				      \

	for (r = rdt_resources_all; r < rdt_resources_all + RDT_NUM_RESOURCES;\

	     r++)							      \