From: Ben Horgan <ben.horgan@arm.com>
To: James Morse <james.morse@arm.com>,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org
Cc: Rob Herring <robh@kernel.org>,
Rohit Mathew <rohit.mathew@arm.com>,
Shanker Donthineni <sdonthineni@nvidia.com>,
Zeng Heng <zengheng4@huawei.com>,
Lecopzer Chen <lecopzerc@nvidia.com>,
Carl Worth <carl@os.amperecomputing.com>,
shameerali.kolothum.thodi@huawei.com,
D Scott Phillips OS <scott@os.amperecomputing.com>,
lcherian@marvell.com, bobo.shaobowang@huawei.com,
tan.shaopeng@fujitsu.com, baolin.wang@linux.alibaba.com,
Jamie Iles <quic_jiles@quicinc.com>,
Xin Hao <xhao@linux.alibaba.com>,
peternewman@google.com, dfustini@baylibre.com,
amitsinght@marvell.com, David Hildenbrand <david@redhat.com>,
Rex Nie <rex.nie@jaguarmicro.com>,
Dave Martin <dave.martin@arm.com>, Koba Ko <kobak@nvidia.com>
Subject: Re: [RFC PATCH 21/36] arm_mpam: Merge supported features during mpam_enable() into mpam_class
Date: Mon, 28 Jul 2025 10:15:25 +0100 [thread overview]
Message-ID: <b7f48e6b-2b48-4946-8ab6-fae7a3fec061@arm.com> (raw)
In-Reply-To: <20250711183648.30766-22-james.morse@arm.com>
Hi James,
On 7/11/25 19:36, James Morse wrote:
> To make a decision about whether to expose an mpam class as
> a resctrl resource we need to know its overall supported
> features and properties.
>
> Once we've probed all the resources, we can walk the tree
> and produced overall values by merging the bitmaps. This
nit: s/produced/produce/
> eliminates features that are only supported by some MSC
> that make up a component or class.
>
> If bitmap properties are mismatched within a component we
> cannot support the mismatched feature.
>
> Care has to be taken as vMSC may hold mismatched RIS.
>
> Signed-off-by: James Morse <james.morse@arm.com>
> ---
> drivers/platform/arm64/mpam/mpam_devices.c | 215 ++++++++++++++++++++
> drivers/platform/arm64/mpam/mpam_internal.h | 8 +
> 2 files changed, 223 insertions(+)
>
> diff --git a/drivers/platform/arm64/mpam/mpam_devices.c b/drivers/platform/arm64/mpam/mpam_devices.c
> index 61911831ab39..7b042a35405a 100644
> --- a/drivers/platform/arm64/mpam/mpam_devices.c
> +++ b/drivers/platform/arm64/mpam/mpam_devices.c
> @@ -1186,8 +1186,223 @@ static struct platform_driver mpam_msc_driver = {
> .remove = mpam_msc_drv_remove,
> };
>
> +/* Any of these features mean the BWA_WD field is valid. */
> +static bool mpam_has_bwa_wd_feature(struct mpam_props *props)
> +{
> + if (mpam_has_feature(mpam_feat_mbw_min, props))
> + return true;
> + if (mpam_has_feature(mpam_feat_mbw_max, props))
> + return true;
> + if (mpam_has_feature(mpam_feat_mbw_prop, props))
> + return true;
> + return false;
> +}
> +
> +#define MISMATCHED_HELPER(parent, child, helper, field, alias) \
> + helper(parent) && \
> + ((helper(child) && (parent)->field != (child)->field) || \
> + (!helper(child) && !(alias)))
> +
> +#define MISMATCHED_FEAT(parent, child, feat, field, alias) \
> + mpam_has_feature((feat), (parent)) && \
> + ((mpam_has_feature((feat), (child)) && (parent)->field != (child)->field) || \
> + (!mpam_has_feature((feat), (child)) && !(alias)))
> +
> +#define CAN_MERGE_FEAT(parent, child, feat, alias) \
> + (alias) && !mpam_has_feature((feat), (parent)) && \
> + mpam_has_feature((feat), (child))
> +
> +/*
> + * Combime two props fields.
nit: s/combime/combine/
> + * If this is for controls that alias the same resource, it is safe to just
> + * copy the values over. If two aliasing controls implement the same scheme
> + * a safe value must be picked.
> + * For non-aliasing controls, these control different resources, and the
> + * resulting safe value must be compatible with both. When merging values in
> + * the tree, all the aliasing resources must be handled first.
> + * On mismatch, parent is modified.
> + */
> +static void __props_mismatch(struct mpam_props *parent,
> + struct mpam_props *child, bool alias)
> +{
> + if (CAN_MERGE_FEAT(parent, child, mpam_feat_cpor_part, alias)) {
> + parent->cpbm_wd = child->cpbm_wd;
> + } else if (MISMATCHED_FEAT(parent, child, mpam_feat_cpor_part,
> + cpbm_wd, alias)) {
> + pr_debug("%s cleared cpor_part\n", __func__);
> + mpam_clear_feature(mpam_feat_cpor_part, &parent->features);
> + parent->cpbm_wd = 0;
> + }
> +
> + if (CAN_MERGE_FEAT(parent, child, mpam_feat_mbw_part, alias)) {
> + parent->mbw_pbm_bits = child->mbw_pbm_bits;
> + } else if (MISMATCHED_FEAT(parent, child, mpam_feat_mbw_part,
> + mbw_pbm_bits, alias)) {
> + pr_debug("%s cleared mbw_part\n", __func__);
> + mpam_clear_feature(mpam_feat_mbw_part, &parent->features);
> + parent->mbw_pbm_bits = 0;
> + }
> +
> + /* bwa_wd is a count of bits, fewer bits means less precision */
> + if (alias && !mpam_has_bwa_wd_feature(parent) && mpam_has_bwa_wd_feature(child)) {
> + parent->bwa_wd = child->bwa_wd;
> + } else if (MISMATCHED_HELPER(parent, child, mpam_has_bwa_wd_feature,
> + bwa_wd, alias)) {
> + pr_debug("%s took the min bwa_wd\n", __func__);
> + parent->bwa_wd = min(parent->bwa_wd, child->bwa_wd);
> + }
> +
> + /* For num properties, take the minimum */
> + if (CAN_MERGE_FEAT(parent, child, mpam_feat_msmon_csu, alias)) {
> + parent->num_csu_mon = child->num_csu_mon;
> + } else if (MISMATCHED_FEAT(parent, child, mpam_feat_msmon_csu,
> + num_csu_mon, alias)) {
> + pr_debug("%s took the min num_csu_mon\n", __func__);
> + parent->num_csu_mon = min(parent->num_csu_mon, child->num_csu_mon);
> + }
> +
> + if (CAN_MERGE_FEAT(parent, child, mpam_feat_msmon_mbwu, alias)) {
> + parent->num_mbwu_mon = child->num_mbwu_mon;
> + } else if (MISMATCHED_FEAT(parent, child, mpam_feat_msmon_mbwu,
> + num_mbwu_mon, alias)) {
> + pr_debug("%s took the min num_mbwu_mon\n", __func__);
> + parent->num_mbwu_mon = min(parent->num_mbwu_mon, child->num_mbwu_mon);
> + }
> +
> + if (alias) {
> + /* Merge features for aliased resources */
> + parent->features |= child->features;
> + } else {
> + /* Clear missing features for non aliasing */
> + parent->features &= child->features;
> + }
> +}
> +
> +/*
> + * If a vmsc doesn't match class feature/configuration, do the right thing(tm).
> + * For 'num' properties we can just take the minimum.
> + * For properties where the mismatched unused bits would make a difference, we
> + * nobble the class feature, as we can't configure all the resources.
> + * e.g. The L3 cache is composed of two resources with 13 and 17 portion
> + * bitmaps respectively.
> + */
> +static void
> +__class_props_mismatch(struct mpam_class *class, struct mpam_vmsc *vmsc)
> +{
> + struct mpam_props *cprops = &class->props;
> + struct mpam_props *vprops = &vmsc->props;
> +
> + lockdep_assert_held(&mpam_list_lock); /* we modify class */
> +
> + pr_debug("%s: Merging features for class:0x%lx &= vmsc:0x%lx\n",
> + dev_name(&vmsc->msc->pdev->dev),
> + (long)cprops->features, (long)vprops->features);
> +
> + /* Take the safe value for any common features */
> + __props_mismatch(cprops, vprops, false);
> +}
> +
> +static void
> +__vmsc_props_mismatch(struct mpam_vmsc *vmsc, struct mpam_msc_ris *ris)
> +{
> + struct mpam_props *rprops = &ris->props;
> + struct mpam_props *vprops = &vmsc->props;
> +
> + lockdep_assert_held(&mpam_list_lock); /* we modify vmsc */
> +
> + pr_debug("%s: Merging features for vmsc:0x%lx |= ris:0x%lx\n",
> + dev_name(&vmsc->msc->pdev->dev),
> + (long)vprops->features, (long)rprops->features);
> +
> + /*
> + * Merge mismatched features - Copy any features that aren't common,
> + * but take the safe value for any common features.
> + */
> + __props_mismatch(vprops, rprops, true);
> +}
> +
> +/*
> + * Copy the first component's first vMSC's properties and features to the
> + * class. __class_props_mismatch() will remove conflicts.
> + * It is not possible to have a class with no components, or a component with
> + * no resources. The vMSC properties have already been built.
> + */
> +static void mpam_enable_init_class_features(struct mpam_class *class)
> +{
> + struct mpam_vmsc *vmsc;
> + struct mpam_component *comp;
> +
> + comp = list_first_entry_or_null(&class->components,
> + struct mpam_component, class_list);
> + if (WARN_ON(!comp))
> + return;
> +
> + vmsc = list_first_entry_or_null(&comp->vmsc,
> + struct mpam_vmsc, comp_list);
> + if (WARN_ON(!vmsc))
> + return;
> +
> + class->props = vmsc->props;
> +}
> +
> +static void mpam_enable_merge_vmsc_features(struct mpam_component *comp)
> +{
> + struct mpam_vmsc *vmsc;
> + struct mpam_msc_ris *ris;
> + struct mpam_class *class = comp->class;
> +
> + list_for_each_entry(vmsc, &comp->vmsc, comp_list) {
> + list_for_each_entry(ris, &vmsc->ris, vmsc_list) {
> + __vmsc_props_mismatch(vmsc, ris);
> + class->nrdy_usec = max(class->nrdy_usec,
> + vmsc->msc->nrdy_usec);
> + }
> + }
> +}
> +
> +static void mpam_enable_merge_class_features(struct mpam_component *comp)
> +{
> + struct mpam_vmsc *vmsc;
> + struct mpam_class *class = comp->class;
> +
> + list_for_each_entry(vmsc, &comp->vmsc, comp_list)
> + __class_props_mismatch(class, vmsc);
> +}
> +
> +/*
> + * Merge all the common resource features into class.
> + * vmsc features are bitwise-or'd together, this must be done first.
> + * Next the class features are the bitwise-and of all the vmsc features.
> + * Other features are the min/max as appropriate.
> + *
> + * To avoid walking the whole tree twice, the class->nrdy_usec property is
> + * updated when working with the vmsc as it is a max(), and doesn't need
> + * initialising first.
> + */
> +static void mpam_enable_merge_features(struct list_head *all_classes_list)
> +{
> + struct mpam_class *class;
> + struct mpam_component *comp;
> +
> + lockdep_assert_held(&mpam_list_lock);
> +
> + list_for_each_entry(class, all_classes_list, classes_list) {
> + list_for_each_entry(comp, &class->components, class_list)
> + mpam_enable_merge_vmsc_features(comp);
> +
> + mpam_enable_init_class_features(class);
> +
> + list_for_each_entry(comp, &class->components, class_list)
> + mpam_enable_merge_class_features(comp);
> + }
> +}
> +
> static void mpam_enable_once(void)
> {
> + mutex_lock(&mpam_list_lock);
> + mpam_enable_merge_features(&mpam_classes);
> + mutex_unlock(&mpam_list_lock);
> +
> mutex_lock(&mpam_cpuhp_state_lock);
> cpuhp_remove_state(mpam_cpuhp_state);
> mpam_cpuhp_state = 0;
> diff --git a/drivers/platform/arm64/mpam/mpam_internal.h b/drivers/platform/arm64/mpam/mpam_internal.h
> index ae6fd1f62cc4..be56234b84b4 100644
> --- a/drivers/platform/arm64/mpam/mpam_internal.h
> +++ b/drivers/platform/arm64/mpam/mpam_internal.h
> @@ -185,12 +185,20 @@ static inline void mpam_set_feature(enum mpam_device_features feat,
> props->features |= (1 << feat);
> }
>
> +static inline void mpam_clear_feature(enum mpam_device_features feat,
> + mpam_features_t *supported)
> +{
> + *supported &= ~(1 << feat);
> +}
> +
> struct mpam_class {
> /* mpam_components in this class */
> struct list_head components;
>
> cpumask_t affinity;
>
> + struct mpam_props props;
> + u32 nrdy_usec;
> u8 level;
> enum mpam_class_types type;
>
Thanks,
Ben
next prev parent reply other threads:[~2025-07-28 9:15 UTC|newest]
Thread overview: 117+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-11 18:36 [RFC PATCH 00/36] arm_mpam: Add basic mpam driver James Morse
2025-07-11 18:36 ` [RFC PATCH 01/36] cacheinfo: Set cache 'id' based on DT data James Morse
2025-07-11 18:36 ` [RFC PATCH 02/36] cacheinfo: Add arch hook to compress CPU h/w id into 32 bits for cache-id James Morse
2025-07-11 18:36 ` [RFC PATCH 03/36] arm64: cacheinfo: Provide helper to compress MPIDR value into u32 James Morse
2025-07-11 18:36 ` [RFC PATCH 04/36] cacheinfo: Expose the code to generate a cache-id from a device_node James Morse
2025-07-14 11:40 ` Ben Horgan
2025-07-25 17:08 ` James Morse
2025-07-28 8:37 ` Ben Horgan
2025-07-11 18:36 ` [RFC PATCH 05/36] ACPI / PPTT: Add a helper to fill a cpumask from a processor container James Morse
2025-07-17 7:58 ` Shaopeng Tan (Fujitsu)
2025-07-25 17:06 ` James Morse
2025-07-22 14:28 ` Jonathan Cameron
2025-07-25 17:05 ` James Morse
2025-07-23 14:42 ` Ben Horgan
2025-07-25 17:05 ` James Morse
2025-07-11 18:36 ` [RFC PATCH 06/36] ACPI / PPTT: Stop acpi_count_levels() expecting callers to clear levels James Morse
2025-07-16 15:51 ` Jonathan Cameron
2025-07-25 17:05 ` James Morse
2025-07-11 18:36 ` [RFC PATCH 07/36] ACPI / PPTT: Find cache level by cache-id James Morse
2025-07-14 11:42 ` Ben Horgan
2025-08-05 17:06 ` James Morse
2025-07-16 16:21 ` [RFC PATCH 07/36] ACPI / PPTT: Find cache level by cache-idUIRE Jonathan Cameron
2025-08-05 17:06 ` [RFC PATCH 07/36] ACPI / PPTT: Find cache level by cache-id James Morse
2025-07-11 18:36 ` [RFC PATCH 08/36] ACPI / PPTT: Add a helper to fill a cpumask from a cache_id James Morse
2025-07-16 16:24 ` Jonathan Cameron
2025-08-05 17:06 ` James Morse
2025-07-11 18:36 ` [RFC PATCH 09/36] arm64: kconfig: Add Kconfig entry for MPAM James Morse
2025-07-16 16:26 ` Jonathan Cameron
2025-07-11 18:36 ` [RFC PATCH 10/36] ACPI / MPAM: Parse the MPAM table James Morse
2025-07-16 17:07 ` Jonathan Cameron
2025-07-23 16:39 ` Ben Horgan
2025-08-05 17:07 ` James Morse
2025-08-15 9:33 ` Ben Horgan
2025-07-28 10:08 ` Jonathan Cameron
2025-08-05 17:08 ` James Morse
2025-08-05 17:07 ` James Morse
2025-07-24 10:50 ` Ben Horgan
2025-08-05 17:08 ` James Morse
2025-07-11 18:36 ` [RFC PATCH 11/36] dt-bindings: arm: Add MPAM MSC binding James Morse
2025-07-11 21:43 ` Rob Herring
2025-08-05 17:08 ` James Morse
2025-07-11 18:36 ` [RFC PATCH 12/36] platform: arm64: Move ec devices to an ec subdirectory James Morse
2025-07-21 16:32 ` Jonathan Cameron
2025-08-06 18:03 ` James Morse
2025-07-24 10:56 ` Ben Horgan
2025-08-06 18:03 ` James Morse
2025-07-11 18:36 ` [RFC PATCH 13/36] arm_mpam: Add probe/remove for mpam msc driver and kbuild boiler plate James Morse
2025-07-24 11:02 ` Ben Horgan
2025-08-06 18:03 ` James Morse
2025-07-24 12:09 ` Catalin Marinas
2025-08-06 18:04 ` James Morse
2025-08-07 17:50 ` Drew Fustini
2025-07-11 18:36 ` [RFC PATCH 14/36] arm_mpam: Add support for memory controller MSC on DT platforms James Morse
2025-07-11 18:36 ` [RFC PATCH 15/36] arm_mpam: Add the class and component structures for ris firmware described James Morse
2025-07-11 18:36 ` [RFC PATCH 16/36] arm_mpam: Add MPAM MSC register layout definitions James Morse
2025-07-17 1:04 ` Shaopeng Tan (Fujitsu)
2025-08-06 18:04 ` James Morse
2025-07-24 14:02 ` Ben Horgan
2025-08-06 18:05 ` James Morse
2025-07-11 18:36 ` [RFC PATCH 17/36] arm_mpam: Add cpuhp callbacks to probe MSC hardware James Morse
2025-07-24 14:13 ` Ben Horgan
2025-08-06 18:07 ` James Morse
2025-07-29 6:11 ` Baisheng Gao
2025-08-06 18:07 ` James Morse
2025-08-05 8:46 ` Jonathan Cameron
2025-07-11 18:36 ` [RFC PATCH 18/36] arm_mpam: Probe MSCs to find the supported partid/pmg values James Morse
2025-07-11 18:36 ` [RFC PATCH 19/36] arm_mpam: Add helpers for managing the locking around the mon_sel registers James Morse
2025-07-11 18:36 ` [RFC PATCH 20/36] arm_mpam: Probe the hardware features resctrl supports James Morse
2025-07-24 15:08 ` Ben Horgan
2025-07-28 16:16 ` Jonathan Cameron
2025-08-07 18:26 ` James Morse
2025-07-28 8:56 ` Ben Horgan
2025-08-08 7:20 ` James Morse
2025-07-11 18:36 ` [RFC PATCH 21/36] arm_mpam: Merge supported features during mpam_enable() into mpam_class James Morse
2025-07-28 9:15 ` Ben Horgan [this message]
2025-07-11 18:36 ` [RFC PATCH 22/36] arm_mpam: Reset MSC controls from cpu hp callbacks James Morse
2025-07-28 9:49 ` Ben Horgan
2025-08-08 7:05 ` James Morse
2025-07-11 18:36 ` [RFC PATCH 23/36] arm_mpam: Add a helper to touch an MSC from any CPU James Morse
2025-07-11 18:36 ` [RFC PATCH 24/36] arm_mpam: Extend reset logic to allow devices to be reset any time James Morse
2025-07-28 10:22 ` Ben Horgan
2025-08-08 7:07 ` James Morse
2025-07-11 18:36 ` [RFC PATCH 25/36] arm_mpam: Register and enable IRQs James Morse
2025-07-16 7:31 ` Shaopeng Tan (Fujitsu)
2025-08-08 7:08 ` James Morse
2025-07-17 1:08 ` Shaopeng Tan (Fujitsu)
2025-08-08 7:07 ` James Morse
2025-07-22 15:06 ` Jonathan Cameron
2025-08-08 7:11 ` James Morse
2025-07-28 10:49 ` Ben Horgan
2025-08-08 7:11 ` James Morse
2025-08-04 16:53 ` Fenghua Yu
2025-08-08 7:12 ` James Morse
2025-07-11 18:36 ` [RFC PATCH 26/36] arm_mpam: Use a static key to indicate when mpam is enabled James Morse
2025-07-11 18:36 ` [RFC PATCH 27/36] arm_mpam: Allow configuration to be applied and restored during cpu online James Morse
2025-07-16 6:49 ` Shaopeng Tan (Fujitsu)
2025-08-08 7:13 ` James Morse
2025-07-28 11:59 ` Ben Horgan
2025-07-28 15:34 ` Dave Martin
2025-08-08 7:16 ` James Morse
2025-08-08 7:14 ` James Morse
2025-08-04 16:39 ` Fenghua Yu
2025-08-08 7:17 ` James Morse
2025-07-11 18:36 ` [RFC PATCH 28/36] arm_mpam: Probe and reset the rest of the features James Morse
2025-07-11 18:36 ` [RFC PATCH 29/36] arm_mpam: Add helpers to allocate monitors James Morse
2025-07-11 18:36 ` [RFC PATCH 30/36] arm_mpam: Add mpam_msmon_read() to read monitor value James Morse
2025-07-28 13:02 ` Ben Horgan
2025-07-11 18:36 ` [RFC PATCH 31/36] arm_mpam: Track bandwidth counter state for overflow and power management James Morse
2025-07-11 18:36 ` [RFC PATCH 32/36] arm_mpam: Probe for long/lwd mbwu counters James Morse
2025-07-11 18:36 ` [RFC PATCH 33/36] arm_mpam: Use long MBWU counters if supported James Morse
2025-07-28 13:46 ` Ben Horgan
2025-08-08 7:19 ` James Morse
2025-07-11 18:36 ` [RFC PATCH 34/36] arm_mpam: Add helper to reset saved mbwu state James Morse
2025-07-11 18:36 ` [RFC PATCH 35/36] arm_mpam: Add kunit test for bitmap reset James Morse
2025-07-11 18:36 ` [RFC PATCH 36/36] arm_mpam: Add kunit tests for props_mismatch() James Morse
2025-08-01 16:09 ` [RFC PATCH 00/36] arm_mpam: Add basic mpam driver Jonathan Cameron
2025-08-08 7:23 ` James Morse
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=b7f48e6b-2b48-4946-8ab6-fae7a3fec061@arm.com \
--to=ben.horgan@arm.com \
--cc=amitsinght@marvell.com \
--cc=baolin.wang@linux.alibaba.com \
--cc=bobo.shaobowang@huawei.com \
--cc=carl@os.amperecomputing.com \
--cc=dave.martin@arm.com \
--cc=david@redhat.com \
--cc=dfustini@baylibre.com \
--cc=james.morse@arm.com \
--cc=kobak@nvidia.com \
--cc=lcherian@marvell.com \
--cc=lecopzerc@nvidia.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peternewman@google.com \
--cc=quic_jiles@quicinc.com \
--cc=rex.nie@jaguarmicro.com \
--cc=robh@kernel.org \
--cc=rohit.mathew@arm.com \
--cc=scott@os.amperecomputing.com \
--cc=sdonthineni@nvidia.com \
--cc=shameerali.kolothum.thodi@huawei.com \
--cc=tan.shaopeng@fujitsu.com \
--cc=xhao@linux.alibaba.com \
--cc=zengheng4@huawei.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®