mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ben Horgan <ben.horgan@arm.com>
To: Reinette Chatre <reinette.chatre@intel.com>,
	james.morse@arm.com, Dave.Martin@arm.com, fenghuay@nvidia.com,
	ruanjinjie@huawei.com
Cc: tony.luck@intel.com, yu.c.chen@intel.com, babu.moger@amd.com,
	fustini@kernel.org, tan.shaopeng@fujitsu.com,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, patches@lists.linux.dev
Subject: Re: [PATCH v3 1/8] arm_mpam: resctrl: Add a helper to find the component counting an event
Date: Wed, 18 Nov 2026 16:28:02 +0000	[thread overview]
Message-ID: <691a76a5-7b22-4c2a-8861-3581791a01c0@arm.com> (raw)
In-Reply-To: <8635f50f938afbe3f58dcd69966c2dd45e2394cd.1794283825.git.reinette.chatre@intel.com>

Hi Reinette,

On 10/11/2026 04:19, Reinette Chatre wrote:
> resctrl_arch_cntr_read() and resctrl_arch_reset_cntr() both drive the
> monitors MPAM pre-allocated for bandwidth counting. Each starts with the
> same sequence: check that MPAM is enabled, reject cache occupancy and
> events without a class, then take the component counting the event from
> the monitoring domain.
> 
> The duplicated sequence has to be kept in sync by hand. Only the failure
> handling differs: one reports the failure to its caller while the other
> has no way to do so.
> 
> Add find_mbwu_mon_comp() to locate the component, returning an error
> pointer on the failures both callers test for. Ignore that error in
> resctrl_arch_reset_cntr(), which cannot report it.
> 
> No functional change intended.
> 
> Suggested-by: Jinjie Ruan <ruanjinjie@huawei.com>
> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
> ---
> Changes since RFC v2:
> - New patch.
> ---
>  drivers/resctrl/mpam_resctrl.c | 62 ++++++++++++++++++++++------------
>  1 file changed, 41 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/resctrl/mpam_resctrl.c b/drivers/resctrl/mpam_resctrl.c
> index 5468367776e2..1b1e724ae040 100644
> --- a/drivers/resctrl/mpam_resctrl.c
> +++ b/drivers/resctrl/mpam_resctrl.c
> @@ -7,6 +7,7 @@
>  #include <linux/cacheinfo.h>
>  #include <linux/cpu.h>
>  #include <linux/cpumask.h>
> +#include <linux/err.h>
>  #include <linux/errno.h>
>  #include <linux/limits.h>
>  #include <linux/list.h>
> @@ -541,26 +542,51 @@ int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain_hdr *hdr,
>  				 closid, rmid, val);
>  }
>  
> -/* MBWU counters when in ABMC mode */
> -int resctrl_arch_cntr_read(struct rdt_resource *r, struct rdt_l3_mon_domain *d,
> -			   u32 closid, u32 rmid, int mon_idx,
> -			   enum resctrl_event_id eventid, u64 *val)
> +/*
> + * find_mbwu_mon_comp() - Find the component counting @eventid in a domain
> + * @d:		The monitoring domain to search.
> + * @eventid:	The event to find the counting component for.
> + *
> + * The counters reached through this component are the monitors MPAM
> + * pre-allocated for bandwidth counting. Cache occupancy is not counted by> + * those monitors, it is read on demand via resctrl_arch_rmid_read().
> + *
> + * Return: the component counting @eventid in @d, or an error pointer when
> + * MPAM is disabled, when @eventid is cache occupancy, or when no class was
> + * picked to count @eventid.
> + */
> +static struct mpam_component *find_mbwu_mon_comp(struct rdt_l3_mon_domain *d,
> +						 enum resctrl_event_id eventid)

I find this a somewhat strange helper. It's operation is not mbwu specific except for its rejection
of CSU events and it doesn't support the similar code in resctrl_arch_rmid_read(). Something a bit
more general that just finds the monitoring component is easier to understand for me.

What do you think of something like the change below? (The baseline is unhelpful, as it's your
series with the first patch removed and the build fixed but hopefully it illustrates the idea well
enough.)

$ git diff
diff --git a/drivers/resctrl/mpam_resctrl.c b/drivers/resctrl/mpam_resctrl.c
index c14343fb5a95..343b4fd351f6 100644
--- a/drivers/resctrl/mpam_resctrl.c
+++ b/drivers/resctrl/mpam_resctrl.c
@@ -510,12 +510,20 @@ static int read_mon_cdp_safe(struct mpam_resctrl_mon *mon, struct mpam_component
                          CDP_NONE, closid, rmid, val);
 }

+static struct mpam_component * find_mon_comp(struct rdt_domain_hdr *hdr,
+                                            enum resctrl_event_id eventid)
+{
+       struct mpam_resctrl_mon_dom *l3_dom;
+
+       l3_dom = container_of(hdr, struct mpam_resctrl_mon_dom, resctrl_mon_dom.hdr);
+       return l3_dom->mon_comp[eventid];
+}
+
 /* MBWU when not in ABMC mode (not supported), and CSU counters. */
 int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain_hdr *hdr,
                           u32 closid, u32 rmid, enum resctrl_event_id eventid,
                           void *arch_priv, u64 *val, void *arch_mon_ctx)
 {
-       struct mpam_resctrl_mon_dom *l3_dom;
        struct mpam_component *mon_comp;
        u32 mon_idx = *(u32 *)arch_mon_ctx;
        enum mpam_device_features mon_type;
@@ -529,8 +537,7 @@ int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain_hdr *hdr,
        if (eventid >= QOS_NUM_EVENTS || !mon->class)
                return -EINVAL;

-       l3_dom = container_of(hdr, struct mpam_resctrl_mon_dom, resctrl_mon_dom.hdr);
-       mon_comp = l3_dom->mon_comp[eventid];
+       mon_comp = find_mon_comp(hdr, eventid);

        if (eventid != QOS_L3_OCCUP_EVENT_ID)
                return -EINVAL;
@@ -547,7 +554,6 @@ int resctrl_arch_cntr_read(struct rdt_resource *r, struct rdt_l3_mon_domain *d,
                           enum resctrl_event_id eventid, u64 *val)
 {
        struct mpam_resctrl_mon *mon = &mpam_resctrl_counters[eventid];
-       struct mpam_resctrl_dom *l3_dom;
        struct mpam_component *mon_comp;

        if (!mpam_is_enabled())
@@ -556,8 +562,7 @@ int resctrl_arch_cntr_read(struct rdt_resource *r, struct rdt_l3_mon_domain *d,
        if (eventid == QOS_L3_OCCUP_EVENT_ID || !mon->class)
                return -EINVAL;

-       l3_dom = container_of(d, struct mpam_resctrl_dom, resctrl_mon_dom);
-       mon_comp = l3_dom->mon_comp[eventid];
+       mon_comp = find_mon_comp(&d->hdr, eventid);

        return read_mon_cdp_safe(mon, mon_comp, mpam_feat_msmon_mbwu,
                                 USE_PRE_ALLOCATED, closid, rmid, val);
@@ -604,7 +609,6 @@ void resctrl_arch_reset_cntr(struct rdt_resource *r, struct rdt_l3_mon_domain *d
                             enum resctrl_event_id eventid)
 {
        struct mpam_resctrl_mon *mon = &mpam_resctrl_counters[eventid];
-       struct mpam_resctrl_dom *l3_dom;
        struct mpam_component *mon_comp;

        if (!mpam_is_enabled())
@@ -613,8 +617,7 @@ void resctrl_arch_reset_cntr(struct rdt_resource *r, struct rdt_l3_mon_domain *d
        if (eventid == QOS_L3_OCCUP_EVENT_ID || !mon->class)
                return;

-       l3_dom = container_of(d, struct mpam_resctrl_dom, resctrl_mon_dom);
-       mon_comp = l3_dom->mon_comp[eventid];
+       mon_comp = find_mon_comp(&d->hdr, eventid);

        reset_mon_cdp_safe(mon, mon_comp, USE_PRE_ALLOCATED, closid, rmid);
 }


Thanks,

Ben

>  {
> -	struct mpam_resctrl_mon *mon = &mpam_resctrl_counters[eventid];
>  	struct mpam_resctrl_dom *l3_dom;
> -	struct mpam_component *mon_comp;
> +	struct mpam_resctrl_mon *mon;
>  
>  	if (!mpam_is_enabled())
> -		return -EINVAL;
> +		return ERR_PTR(-EINVAL);
>  
> +	mon = &mpam_resctrl_counters[eventid];
>  	if (eventid == QOS_L3_OCCUP_EVENT_ID || !mon->class)
> -		return -EINVAL;
> +		return ERR_PTR(-EINVAL);
>  
>  	l3_dom = container_of(d, struct mpam_resctrl_dom, resctrl_mon_dom);
> -	mon_comp = l3_dom->mon_comp[eventid];
>  
> -	return read_mon_cdp_safe(mon, mon_comp, mpam_feat_msmon_mbwu,
> -				 USE_PRE_ALLOCATED, closid, rmid, val);
> +	return l3_dom->mon_comp[eventid];
> +}
> +
> +/* MBWU counters when in ABMC mode */
> +int resctrl_arch_cntr_read(struct rdt_resource *r, struct rdt_l3_mon_domain *d,
> +			   u32 closid, u32 rmid, int mon_idx,
> +			   enum resctrl_event_id eventid, u64 *val)
> +{
> +	struct mpam_component *mon_comp;
> +
> +	mon_comp = find_mbwu_mon_comp(d, eventid);
> +	if (IS_ERR(mon_comp))
> +		return PTR_ERR(mon_comp);
> +
> +	return read_mon_cdp_safe(&mpam_resctrl_counters[eventid], mon_comp,
> +				 mpam_feat_msmon_mbwu, USE_PRE_ALLOCATED,
> +				 closid, rmid, val);
>  }
>  
>  static void __reset_mon(struct mpam_resctrl_mon *mon, struct mpam_component *mon_comp,
> @@ -603,20 +629,14 @@ void resctrl_arch_reset_cntr(struct rdt_resource *r, struct rdt_l3_mon_domain *d
>  			     u32 closid, u32 rmid, int cntr_id,
>  			     enum resctrl_event_id eventid)
>  {
> -	struct mpam_resctrl_mon *mon = &mpam_resctrl_counters[eventid];
> -	struct mpam_resctrl_dom *l3_dom;
>  	struct mpam_component *mon_comp;
>  
> -	if (!mpam_is_enabled())
> +	mon_comp = find_mbwu_mon_comp(d, eventid);
> +	if (IS_ERR(mon_comp))
>  		return;
>  
> -	if (eventid == QOS_L3_OCCUP_EVENT_ID || !mon->class)
> -		return;
> -
> -	l3_dom = container_of(d, struct mpam_resctrl_dom, resctrl_mon_dom);
> -	mon_comp = l3_dom->mon_comp[eventid];
> -
> -	reset_mon_cdp_safe(mon, mon_comp, USE_PRE_ALLOCATED, closid, rmid);
> +	reset_mon_cdp_safe(&mpam_resctrl_counters[eventid], mon_comp,
> +			   USE_PRE_ALLOCATED, closid, rmid);
>  }
>  
>  /*


  reply	other threads:[~2026-11-18 16:28 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-10  4:19 [PATCH v3 0/8] arm_mpam: resctrl: Separate MPAM domains Reinette Chatre
2026-11-10  4:19 ` [PATCH v3 1/8] arm_mpam: resctrl: Add a helper to find the component counting an event Reinette Chatre
2026-11-18 16:28   ` Ben Horgan [this message]
2026-11-10  4:19 ` [PATCH v3 2/8] arm_mpam: resctrl: Use find_component() when allocating a domain Reinette Chatre
2026-11-18 16:46   ` Ben Horgan
2026-11-10  4:19 ` [PATCH v3 3/8] arm_mpam: resctrl: Rename ctrl_comp in mpam_resctrl_alloc_domain() Reinette Chatre
2026-11-10  4:19 ` [PATCH v3 4/8] arm_mpam: resctrl: Do not fail CPU online when domain setup fails Reinette Chatre
2026-11-18 17:01   ` Ben Horgan
2026-11-10  4:19 ` [PATCH v3 5/8] arm_mpam: resctrl: Split control and monitoring domain setup into helpers Reinette Chatre
2026-11-18 17:08   ` Ben Horgan
2026-11-10  4:19 ` [PATCH v3 6/8] arm_mpam: resctrl: Require a component for each monitoring event Reinette Chatre
2026-11-10  4:19 ` [PATCH v3 7/8] arm_mpam: resctrl: Give the monitoring domain its own structure Reinette Chatre
2026-11-10  4:19 ` [PATCH v3 8/8] arm_mpam: resctrl: Rename struct mpam_resctrl_dom to mpam_resctrl_ctrl_dom Reinette Chatre
2026-11-10 11:00 ` [PATCH v3 0/8] arm_mpam: resctrl: Separate MPAM domains Ben Horgan
2026-11-11  6:10 ` Shaopeng Tan (Fujitsu)
2026-11-11 18:35   ` Reinette Chatre

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=691a76a5-7b22-4c2a-8861-3581791a01c0@arm.com \
    --to=ben.horgan@arm.com \
    --cc=Dave.Martin@arm.com \
    --cc=babu.moger@amd.com \
    --cc=fenghuay@nvidia.com \
    --cc=fustini@kernel.org \
    --cc=james.morse@arm.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=patches@lists.linux.dev \
    --cc=reinette.chatre@intel.com \
    --cc=ruanjinjie@huawei.com \
    --cc=tan.shaopeng@fujitsu.com \
    --cc=tony.luck@intel.com \
    --cc=yu.c.chen@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®