Re: [PATCH v4 11/31] x86,fs/resctrl: Rename struct rdt_mon_domain and rdt_hw_mon_domain

[Reinette Chatre <reinette.chatre@intel.com>]

Hi Tony,

On 4/28/25 5:33 PM, Tony Luck wrote:
> These structures have generic names, but are only used for L3 monitor
> events.
> 
> Rename:

Please add information about why the rename is needed.

> rdt_mon_domain		-> rdt_l3_mon_domain
> rdt_hw_mon_domain	-> rdt_hw_l3_mon_domain
> 
> Signed-off-by: Tony Luck <tony.luck@intel.com>
> ---
>  include/linux/resctrl.h                | 12 ++++----
>  arch/x86/kernel/cpu/resctrl/internal.h | 12 ++++----
>  fs/resctrl/internal.h                  | 12 ++++----
>  arch/x86/kernel/cpu/resctrl/core.c     | 14 ++++-----
>  arch/x86/kernel/cpu/resctrl/monitor.c  | 18 ++++++------
>  fs/resctrl/ctrlmondata.c               |  6 ++--
>  fs/resctrl/monitor.c                   | 28 +++++++++---------
>  fs/resctrl/rdtgroup.c                  | 40 +++++++++++++-------------
>  8 files changed, 71 insertions(+), 71 deletions(-)
> 
> diff --git a/include/linux/resctrl.h b/include/linux/resctrl.h
> index bb55c449adc4..cd7881313d4e 100644
> --- a/include/linux/resctrl.h
> +++ b/include/linux/resctrl.h
> @@ -166,7 +166,7 @@ struct rdt_ctrl_domain {
>  };
>  
>  /**
> - * struct rdt_mon_domain - group of CPUs sharing a resctrl monitor resource
> + * struct rdt_l3_mon_domain - group of CPUs sharing a resctrl monitor resource
>   * @hdr:		common header for different domain types
>   * @ci:			cache info for this domain
>   * @rmid_busy_llc:	bitmap of which limbo RMIDs are above threshold
> @@ -176,7 +176,7 @@ struct rdt_ctrl_domain {
>   * @mbm_work_cpu:	worker CPU for MBM h/w counters
>   * @cqm_work_cpu:	worker CPU for CQM h/w counters
>   */
> -struct rdt_mon_domain {
> +struct rdt_l3_mon_domain {
>  	struct rdt_domain_hdr		hdr;
>  	struct cacheinfo		*ci;
>  	unsigned long			*rmid_busy_llc;
> @@ -335,7 +335,7 @@ struct resctrl_cpu_defaults {
>  
>  struct resctrl_mon_config_info {
>  	struct rdt_resource	*r;
> -	struct rdt_mon_domain	*d;
> +	struct rdt_l3_mon_domain	*d;
>  	u32			evtid;
>  	u32			mon_config;

Please adjust alignment of the other members to match.

>  };
> @@ -475,7 +475,7 @@ void resctrl_offline_cpu(unsigned int cpu);
>   * Return:
>   * 0 on success, or -EIO, -EINVAL etc on error.
>   */
> -int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_mon_domain *d,
> +int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_l3_mon_domain *d,
>  			   u32 closid, u32 rmid, enum resctrl_event_id eventid,
>  			   u64 *val, void *arch_mon_ctx);
>  
> @@ -522,7 +522,7 @@ struct rdt_domain_hdr *resctrl_find_domain(struct list_head *h, int id,
>   *
>   * This can be called from any CPU.
>   */
> -void resctrl_arch_reset_rmid(struct rdt_resource *r, struct rdt_mon_domain *d,
> +void resctrl_arch_reset_rmid(struct rdt_resource *r, struct rdt_l3_mon_domain *d,
>  			     u32 closid, u32 rmid,
>  			     enum resctrl_event_id eventid);
>  
> @@ -535,7 +535,7 @@ void resctrl_arch_reset_rmid(struct rdt_resource *r, struct rdt_mon_domain *d,
>   *
>   * This can be called from any CPU.
>   */
> -void resctrl_arch_reset_rmid_all(struct rdt_resource *r, struct rdt_mon_domain *d);
> +void resctrl_arch_reset_rmid_all(struct rdt_resource *r, struct rdt_l3_mon_domain *d);
>  
>  /**
>   * resctrl_arch_reset_all_ctrls() - Reset the control for each CLOSID to its
> diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h
> index b563406b4996..83b20e6b25d7 100644
> --- a/arch/x86/kernel/cpu/resctrl/internal.h
> +++ b/arch/x86/kernel/cpu/resctrl/internal.h
> @@ -51,15 +51,15 @@ struct rdt_hw_ctrl_domain {
>  };
>  
>  /**
> - * struct rdt_hw_mon_domain - Arch private attributes of a set of CPUs that share
> + * struct rdt_hw_l3_mon_domain - Arch private attributes of a set of CPUs that share
>   *			      a resource for a monitor function
>   * @d_resctrl:	Properties exposed to the resctrl file system
>   * @arch_mbm_states:	arch private state for each MBM event
>   *
>   * Members of this structure are accessed via helpers that provide abstraction.
>   */
> -struct rdt_hw_mon_domain {
> -	struct rdt_mon_domain		d_resctrl;
> +struct rdt_hw_l3_mon_domain {
> +	struct rdt_l3_mon_domain		d_resctrl;
>  	struct arch_mbm_state		*arch_mbm_states[QOS_NUM_MBM_EVENTS];

Please adjust alignment.

>  };
>  
> @@ -68,9 +68,9 @@ static inline struct rdt_hw_ctrl_domain *resctrl_to_arch_ctrl_dom(struct rdt_ctr
>  	return container_of(r, struct rdt_hw_ctrl_domain, d_resctrl);
>  }
>  
> -static inline struct rdt_hw_mon_domain *resctrl_to_arch_mon_dom(struct rdt_mon_domain *r)
> +static inline struct rdt_hw_l3_mon_domain *resctrl_to_arch_mon_dom(struct rdt_l3_mon_domain *r)
>  {
> -	return container_of(r, struct rdt_hw_mon_domain, d_resctrl);
> +	return container_of(r, struct rdt_hw_l3_mon_domain, d_resctrl);
>  }
>  
>  /**
> @@ -122,7 +122,7 @@ static inline struct rdt_hw_resource *resctrl_to_arch_res(struct rdt_resource *r
>  
>  extern struct rdt_hw_resource rdt_resources_all[];
>  
> -void arch_l3_mon_domain_online(struct rdt_resource *r, struct rdt_mon_domain *d);
> +void arch_l3_mon_domain_online(struct rdt_resource *r, struct rdt_l3_mon_domain *d);
>  
>  /* CPUID.(EAX=10H, ECX=ResID=1).EAX */
>  union cpuid_0x10_1_eax {
> diff --git a/fs/resctrl/internal.h b/fs/resctrl/internal.h
> index b69170760316..759768e2a2a8 100644
> --- a/fs/resctrl/internal.h
> +++ b/fs/resctrl/internal.h
> @@ -129,7 +129,7 @@ struct mon_data {
>  struct rmid_read {
>  	struct rdtgroup		*rgrp;
>  	struct rdt_resource	*r;
> -	struct rdt_mon_domain	*d;
> +	struct rdt_l3_mon_domain	*d;
>  	enum resctrl_event_id	evtid;
>  	bool			first;
>  	struct cacheinfo	*ci;

Alignment. Please check all changed structures.

...

> @@ -618,9 +618,9 @@ static void domain_remove_cpu_ctrl(int cpu, struct rdt_resource *r)
>  static void domain_remove_cpu_mon(int cpu, struct rdt_resource *r)
>  {
>  	int id = get_domain_id_from_scope(cpu, r->mon_scope);
> -	struct rdt_hw_mon_domain *hw_dom;
> +	struct rdt_hw_l3_mon_domain *hw_dom;
>  	struct rdt_domain_hdr *hdr;
> -	struct rdt_mon_domain *d;
> +	struct rdt_l3_mon_domain *d;
>  

Please fix reverse fir ordering. Looking further there are multiple instances, please check
entire patch.

Reinette