Re: [PATCH v9 01/26] x86/resctrl: Add __init attribute for the functions called in resctrl_late_init

["Moger, Babu" <babu.moger@amd.com>]

Hi Reinette,

On 11/15/24 17:21, Reinette Chatre wrote:
> Hi Babu,
> 
> In subject please use () to indicate a function, writing resctrl_late_init()

Will change it to

x86/resctrl: Add __init attribute for all the call sequences in
resctrl_late_init()

> 
> On 10/29/24 4:21 PM, Babu Moger wrote:
>> The function resctrl_late_init() has the __init attribute, but some
> 
> No need to say "The function" when using ().
> 
>> functions it calls do not. Add the __init attribute to all the functions
> 
> None of the functions changed are actually called by resctrl_late_init(). If this
> is indeed the goal then I think cache_alloc_hsw_probe() was missed.

Will change the function to.

static inline __init void cache_alloc_hsw_probe(void)

How about this description?

"resctrl_late_init() has the __init attribute, but some of the call
sequences of it do not have the __init attribute.

Add the __init attribute to all the functions in the call sequences to
maintain consistency throughout."

> 
>> to maintain consistency throughout the call sequence.
>>
>> Fixes: 6a445edce657 ("x86/intel_rdt/cqm: Add RDT monitoring initialization")
>> Fixes: def10853930a ("x86/intel_rdt: Add two new resources for L2 Code and Data Prioritization (CDP)")
>> Fixes: bd334c86b5d7 ("x86/resctrl: Add __init attribute to rdt_get_mon_l3_config()")
>> Suggested-by: Reinette Chatre <reinette.chatre@intel.com>
>> Signed-off-by: Babu Moger <babu.moger@amd.com>
>> ---
>> v9: Moved the patch to the begining of the series.
>>     Fixed all the call sequences. Added additional Fixed tags.
>>
>> v8: New patch.
>> ---
>>  arch/x86/kernel/cpu/resctrl/core.c     | 8 ++++----
>>  arch/x86/kernel/cpu/resctrl/internal.h | 2 +-
>>  arch/x86/kernel/cpu/resctrl/monitor.c  | 4 ++--
>>  3 files changed, 7 insertions(+), 7 deletions(-)
>>
>> diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
>> index b681c2e07dbf..f845d0590429 100644
>> --- a/arch/x86/kernel/cpu/resctrl/core.c
>> +++ b/arch/x86/kernel/cpu/resctrl/core.c
>> @@ -275,7 +275,7 @@ static __init bool __rdt_get_mem_config_amd(struct rdt_resource *r)
>>  	return true;
>>  }
>>  
>> -static void rdt_get_cache_alloc_cfg(int idx, struct rdt_resource *r)
>> +static __init void rdt_get_cache_alloc_cfg(int idx, struct rdt_resource *r)
>>  {
>>  	struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r);
>>  	union cpuid_0x10_1_eax eax;
>> @@ -294,7 +294,7 @@ static void rdt_get_cache_alloc_cfg(int idx, struct rdt_resource *r)
>>  	r->alloc_capable = true;
>>  }
>>  
>> -static void rdt_get_cdp_config(int level)
>> +static __init void rdt_get_cdp_config(int level)
>>  {
>>  	/*
>>  	 * By default, CDP is disabled. CDP can be enabled by mount parameter
>> @@ -304,12 +304,12 @@ static void rdt_get_cdp_config(int level)
>>  	rdt_resources_all[level].r_resctrl.cdp_capable = true;
>>  }
>>  
>> -static void rdt_get_cdp_l3_config(void)
>> +static __init void rdt_get_cdp_l3_config(void)
>>  {
>>  	rdt_get_cdp_config(RDT_RESOURCE_L3);
>>  }
>>  
>> -static void rdt_get_cdp_l2_config(void)
>> +static __init void rdt_get_cdp_l2_config(void)
>>  {
>>  	rdt_get_cdp_config(RDT_RESOURCE_L2);
>>  }
>> diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
>> index 955999aecfca..16181b90159a 100644
>> --- a/arch/x86/kernel/cpu/resctrl/internal.h
>> +++ b/arch/x86/kernel/cpu/resctrl/internal.h
>> @@ -627,7 +627,7 @@ int closids_supported(void);
>>  void closid_free(int closid);
>>  int alloc_rmid(u32 closid);
>>  void free_rmid(u32 closid, u32 rmid);
>> -int rdt_get_mon_l3_config(struct rdt_resource *r);
>> +int __init rdt_get_mon_l3_config(struct rdt_resource *r);
>>  void __exit rdt_put_mon_l3_config(void);
>>  bool __init rdt_cpu_has(int flag);
>>  void mon_event_count(void *info);
>> diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c
>> index 851b561850e0..17790f92ef51 100644
>> --- a/arch/x86/kernel/cpu/resctrl/monitor.c
>> +++ b/arch/x86/kernel/cpu/resctrl/monitor.c
>> @@ -983,7 +983,7 @@ void mbm_setup_overflow_handler(struct rdt_mon_domain *dom, unsigned long delay_
>>  		schedule_delayed_work_on(cpu, &dom->mbm_over, delay);
>>  }
>>  
>> -static int dom_data_init(struct rdt_resource *r)
>> +static __init int dom_data_init(struct rdt_resource *r)
>>  {
>>  	u32 idx_limit = resctrl_arch_system_num_rmid_idx();
>>  	u32 num_closid = resctrl_arch_get_num_closid(r);
>> @@ -1081,7 +1081,7 @@ static struct mon_evt mbm_local_event = {
>>   * because as per the SDM the total and local memory bandwidth
>>   * are enumerated as part of L3 monitoring.
>>   */
>> -static void l3_mon_evt_init(struct rdt_resource *r)
>> +static void __init l3_mon_evt_init(struct rdt_resource *r)
> 
> This change follows a different order from the other changes in this patch. "Function prototypes"
> in Documentation/process/coding-style.rst indicates the preferred order is storage class
> before return type. I acknowledge that resctrl is not consistent in this regard but we can
> work towards the preferred order while keeping this patch consistent?

Sure. Will change it to.

static __init void l3_mon_evt_init(struct rdt_resource *r)


-- 
Thanks
Babu Moger