Re: [PATCH v2 15/29] arm_mpam: Reset MSC controls from cpu hp callbacks

James Morse
2025-09-30T17:06:37Z

Hi Ben,

On 12/09/2025 12:25, Ben Horgan wrote:
> On 9/10/25 21:42, James Morse wrote:
>> When a CPU comes online, it may bring a newly accessible MSC with
>> it. Only the default partid has its value reset by hardware, and
>> even then the MSC might not have been reset since its config was
>> previously dirtyied. e.g. Kexec.
>>
>> Any in-use partid must have its configuration restored, or reset.
>> In-use partids may be held in caches and evicted later.
>>
>> MSC are also reset when CPUs are taken offline to cover cases where
>> firmware doesn't reset the MSC over reboot using UEFI, or kexec
>> where there is no firmware involvement.
>>
>> If the configuration for a RIS has not been touched since it was
>> brought online, it does not need resetting again.
>>
>> To reset, write the maximum values for all discovered controls.

>> diff --git a/drivers/resctrl/mpam_devices.c b/drivers/resctrl/mpam_devices.c
>> index cd8e95fa5fd6..0353313cf284 100644
>> --- a/drivers/resctrl/mpam_devices.c
>> +++ b/drivers/resctrl/mpam_devices.c
>> @@ -777,8 +778,110 @@ static int mpam_msc_hw_probe(struct mpam_msc *msc)

>> +static void mpam_reset_ris_partid(struct mpam_msc_ris *ris, u16 partid)
>> +{
>> + struct mpam_msc *msc = ris->vmsc->msc;
>> + struct mpam_props *rprops = &ris->props;
>> +
>> + mpam_assert_srcu_read_lock_held();
>> +
>> + mutex_lock(&msc->part_sel_lock);
>> + __mpam_part_sel(ris->ris_idx, partid, msc);
>> +
>> + if (mpam_has_feature(mpam_feat_cpor_part, rprops))
>> + mpam_reset_msc_bitmap(msc, MPAMCFG_CPBM, rprops->cpbm_wd);
>> +
>> + if (mpam_has_feature(mpam_feat_mbw_part, rprops))
>> + mpam_reset_msc_bitmap(msc, MPAMCFG_MBW_PBM, rprops->mbw_pbm_bits);
>> +
>> + if (mpam_has_feature(mpam_feat_mbw_min, rprops))
>> + mpam_write_partsel_reg(msc, MBW_MIN, 0);
>> +
>> + if (mpam_has_feature(mpam_feat_mbw_max, rprops))
>> + mpam_write_partsel_reg(msc, MBW_MAX, MPAMCFG_MBW_MAX_MAX);
>> +
>> + if (mpam_has_feature(mpam_feat_mbw_prop, rprops))
>> + mpam_write_partsel_reg(msc, MBW_PROP, 0);

> If mpam_feat_ccap_part is already in enum mpam_device_features then the
> reset would belong here but I expect it is better just to introduce
> mpam_feat_ccap_part later (patch 21). I also commented on this feature
> introduction split on patch 13.

Yup, this is some knock on cleanup from that change.
(I didn't understand what you meant the first time round!)

>> + mutex_unlock(&msc->part_sel_lock);
>> +}

>> +static void mpam_reset_msc(struct mpam_msc *msc, bool online)
>> +{
>> + struct mpam_msc_ris *ris;
>> +
>> + mpam_assert_srcu_read_lock_held();

> Unneeded? Checked in list_for_each_entry_srcu().> +

So it is! I'll rip those out. They were mostly for documentation anyway.
There will likely be a few others of these in the series...

>> + list_for_each_entry_srcu(ris, &msc->ris, msc_list, srcu_read_lock_held(&mpam_srcu)) {
>> + mpam_reset_ris(ris);
>> +
>> + /*
>> + * Set in_reset_state when coming online. The reset state
>> + * for non-zero partid may be lost while the CPUs are offline.
>> + */
>> + ris->in_reset_state = online;
>> + }
>> +}
>> +

Thanks,

James