Commit dbe6d75e authored by Babu Moger's avatar Babu Moger Committed by Wenkuan Wang
Browse files

x86/resctrl: Add __init attribute to rdt_get_mon_l3_config() 

mainline inclusion
from mainline-v6.3-rc1
commit bd334c86
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9U2JC


CVE: NA

--------------------------------

In an upcoming change, rdt_get_mon_l3_config() needs to call rdt_cpu_has() to
query the monitor related features. It cannot be called right now because
rdt_cpu_has() has the __init attribute but rdt_get_mon_l3_config() doesn't.

Add the __init attribute to rdt_get_mon_l3_config() that is only called by
get_rdt_mon_resources() that already has the __init attribute. Also make
rdt_cpu_has() available to by rdt_get_mon_l3_config() via the internal header
file.

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/r/20230113152039.770054-8-babu.moger@amd.com


Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Signed-off-by: default avatarWenkuan Wang <Wenkuan.Wang@amd.com>
parent f4f3deb3

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

+1 −1
Original line number Diff line number Diff line
@@ -862,7 +862,7 @@ static int __init set_rdt_options(char *str) 
}

__setup("rdt", set_rdt_options);



static bool __init rdt_cpu_has(int flag)

bool __init rdt_cpu_has(int flag)

{

	bool ret = boot_cpu_has(flag);

	struct rdt_options *o;

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

+1 −0
Original line number Diff line number Diff line
@@ -528,6 +528,7 @@ void closid_free(int closid); 
int alloc_rmid(void);

void free_rmid(u32 rmid);

int rdt_get_mon_l3_config(struct rdt_resource *r);

bool __init rdt_cpu_has(int flag);

void mon_event_count(void *info);

int rdtgroup_mondata_show(struct seq_file *m, void *arg);

void rmdir_mondata_subdir_allrdtgrp(struct rdt_resource *r,

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

+1 −1
Original line number Diff line number Diff line
@@ -676,7 +676,7 @@ static void l3_mon_evt_init(struct rdt_resource *r) 
		list_add_tail(&mbm_local_event.list, &r->evt_list);

}



int rdt_get_mon_l3_config(struct rdt_resource *r)

int __init rdt_get_mon_l3_config(struct rdt_resource *r)

{

	unsigned int mbm_offset = boot_cpu_data.x86_cache_mbm_width_offset;

	struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r);