arm_mpam: Add basic mpam driver
Subsystems (8)
James Morse
maintainerRFC PATCH 27/36 arm_mpam: Allow configuration to be applied and restored during cpu online
In reply to James MorseWhen CPUs come online the original configuration should be restored. Once the maximum partid is known, allocate an configuration array for each component, and reprogram each RIS configuration from this.
The MPAM spec describes how multiple controls can interact. To prevent this happening by accident, always reset controls that don't have a valid configuration. This allows the same helper to be used for configuration and reset.
--- drivers/platform/arm64/mpam/mpam_devices.c | 236 ++++++++++++++++++-- drivers/platform/arm64/mpam/mpam_internal.h | 26 ++- 2 files changed, 234 insertions(+), 28 deletions(-)
drivers/platform/arm64/mpam/mpam_devices.c +213 -23
@@ -374,12 +374,16 @@ static void mpam_class_destroy(struct mpam_class *class)add_to_garbage (class); } +static void __destroy_component_cfg (struct mpam_component *comp); +static void mpam_comp_destroy (struct mpam_component *comp) {struct mpam_class *class = comp->class;lockdep_assert_held (&mpam_list_lock); +__destroy_component_cfg (comp); +list_del_rcu (&comp->class_list);add_to_garbage (comp);
@@ -909,51 +913,90 @@ static void mpam_reset_msc_bitmap(struct mpam_msc *msc, u16 reg, u16 wd)__mpam_write_reg (msc, reg, bm); } -static void mpam_reset_ris_partid (struct mpam_msc_ris *ris,u16 partid) +/* Called via IPI. Call while holding an SRCU reference */ +static void mpam_reprogram_ris_partid (struct mpam_msc_ris *ris,u16 partid, +struct mpam_config *cfg) {u16 bwa_fract =MPAMCFG_MBW_MAX_MAX ;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_cpor_part, rprops)) { +if (mpam_has_feature (mpam_feat_cpor_part, cfg)) +mpam_write_partsel_reg (msc,CPBM , cfg->cpbm); +else +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_part, rprops)) { +if (mpam_has_feature (mpam_feat_mbw_part, cfg)) +mpam_write_partsel_reg (msc,MBW_PBM , cfg->mbw_pbm); +else +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 , bwa_fract); +if (mpam_has_feature (mpam_feat_mbw_max, rprops)) { +if (mpam_has_feature (mpam_feat_mbw_max, cfg)) +mpam_write_partsel_reg (msc,MBW_MAX , cfg->mbw_max); +else +mpam_write_partsel_reg (msc,MBW_MAX , bwa_fract); + }if (mpam_has_feature (mpam_feat_mbw_prop, rprops))mpam_write_partsel_reg (msc,MBW_PROP , bwa_fract);mutex_unlock (&msc->part_sel_lock); } +struct reprogram_ris { +struct mpam_msc_ris *ris; +struct mpam_config *cfg; +}; + +/* Call with MSC lock held */ +static int mpam_reprogram_ris (void *_arg) +{ +u16 partid, partid_max; +struct reprogram_ris *arg = _arg; +struct mpam_msc_ris *ris = arg->ris; +struct mpam_config *cfg = arg->cfg; + +if (ris->in_reset_state) +return 0 ; + +spin_lock (&partid_max_lock); + partid_max = mpam_partid_max; +spin_unlock (&partid_max_lock); +for (partid =0 ; partid <= partid_max; partid++) +mpam_reprogram_ris_partid (ris, partid, cfg); + +return 0 ; +} +/* * Called via smp_call_on_cpu() to prevent migration, while still being * pre-emptible. */ static int mpam_reset_ris (void *arg) { -u16 partid, partid_max;struct mpam_msc_ris *ris = arg; +struct reprogram_ris reprogram_arg; +struct mpam_config empty_cfg = {0 };if (ris->in_reset_state)return 0 ; -spin_lock (&partid_max_lock); - partid_max = mpam_partid_max; -spin_unlock (&partid_max_lock); -for (partid =0 ; partid < partid_max; partid++) -mpam_reset_ris_partid (ris, partid); + reprogram_arg.ris = ris; + reprogram_arg.cfg = &empty_cfg; + +mpam_reprogram_ris (&reprogram_arg);return 0 ; }
@@ -984,13 +1027,11 @@ static int mpam_touch_msc(struct mpam_msc *msc, int (*fn)(void *a), void *arg)static void mpam_reset_msc (struct mpam_msc *msc,bool online) { -int idx;struct mpam_msc_ris *ris;mpam_assert_srcu_read_lock_held ();mpam_mon_sel_outer_lock (msc); - idx =srcu_read_lock (&mpam_srcu);list_for_each_entry_srcu (ris, &msc->ris, msc_list,srcu_read_lock_held (&mpam_srcu)) {mpam_touch_msc (msc, &mpam_reset_ris, ris);
@@ -1000,10 +1041,38 @@ static void mpam_reset_msc(struct mpam_msc *msc, bool online)*/ ris->in_reset_state = online; } -srcu_read_unlock (&mpam_srcu, idx);mpam_mon_sel_outer_unlock (msc); } +static void mpam_reprogram_msc (struct mpam_msc *msc) +{ +int idx; +u16 partid; +bool reset; +struct mpam_config *cfg; +struct mpam_msc_ris *ris; + + idx =srcu_read_lock (&mpam_srcu); +list_for_each_entry_rcu (ris, &msc->ris, msc_list) { +if (!mpam_is_enabled () && !ris->in_reset_state) { +mpam_touch_msc (msc, &mpam_reset_ris, ris); + ris->in_reset_state = true; +continue ; + } + + reset = true; +for (partid =0 ; partid <= mpam_partid_max; partid++) { + cfg = &ris->vmsc->comp->cfg[partid]; +if (cfg->features) + reset = false; + +mpam_reprogram_ris_partid (ris, partid, cfg); + } + ris->in_reset_state = reset; + } +srcu_read_unlock (&mpam_srcu, idx); +} +static void _enable_percpu_irq (void *_irq) {int *irq = _irq;
@@ -1025,7 +1094,7 @@ static int mpam_cpu_online(unsigned int cpu)_enable_percpu_irq (&msc->reenable_error_ppi);if (atomic_fetch_inc (&msc->online_refs) ==0 ) -mpam_reset_msc (msc, true); +mpam_reprogram_msc (msc); }srcu_read_unlock (&mpam_srcu, idx);
@@ -1806,6 +1875,43 @@ static void mpam_unregister_irqs(void)cpus_read_unlock (); } +static void __destroy_component_cfg (struct mpam_component *comp) +{ +add_to_garbage (comp->cfg); +} + +static int __allocate_component_cfg (struct mpam_component *comp) +{ +if (comp->cfg) +return 0 ; + + comp->cfg =kcalloc (mpam_partid_max +1 ,sizeof (*comp->cfg),GFP_KERNEL ); +if (!comp->cfg) +return -ENOMEM ; +init_garbage (comp->cfg); + +return 0 ; +} + +static int mpam_allocate_config (void ) +{ +int err =0 ; +struct mpam_class *class; +struct mpam_component *comp; + +lockdep_assert_held (&mpam_list_lock); + +list_for_each_entry (class, &mpam_classes, classes_list) { +list_for_each_entry (comp, &class->components, class_list) { + err =__allocate_component_cfg (comp); +if (err) +return err; + } + } + +return 0 ; +} +static void mpam_enable_once (void ) {int err;
@@ -1817,12 +1923,21 @@ static void mpam_enable_once(void)*/ cpus_read_lock ();mutex_lock (&mpam_list_lock); -mpam_enable_merge_features (&mpam_classes); +do { +mpam_enable_merge_features (&mpam_classes); - err =mpam_register_irqs (); -if (err) -pr_warn ("Failed to register irqs: %d\n" , err); + err =mpam_allocate_config (); +if (err) { +pr_err ("Failed to allocate configuration arrays.\n" ); +break ; + } + err =mpam_register_irqs (); +if (err) { +pr_warn ("Failed to register irqs: %d\n" , err); +break ; + } + }while (0 );mutex_unlock (&mpam_list_lock);cpus_read_unlock ();
@@ -1861,6 +1976,8 @@ static void mpam_reset_component_locked(struct mpam_component *comp)might_sleep ();lockdep_assert_cpus_held (); +memset (comp->cfg,0 , (mpam_partid_max *sizeof (*comp->cfg))); + idx =srcu_read_lock (&mpam_srcu);list_for_each_entry_rcu (vmsc, &comp->vmsc, comp_list) { msc = vmsc->msc;
@@ -1963,6 +2080,79 @@ void mpam_enable(struct work_struct *work)mpam_enable_once (); } +struct mpam_write_config_arg { +struct mpam_msc_ris *ris; +struct mpam_component *comp; +u16 partid; +}; + +static int __write_config (void *arg) +{ +struct mpam_write_config_arg *c = arg; + +mpam_reprogram_ris_partid (c->ris, c->partid, &c->comp->cfg[c->partid]); + +return 0 ; +} + +#define maybe_update_config (cfg, feature, newcfg, member, changes) do { \ + if (mpam_has_feature(feature, newcfg) && \ + (newcfg)->member != (cfg)->member) { \ + (cfg)->member = (newcfg)->member; \ + cfg->features |= (1 << feature); \ + \ + (changes) |= (1 << feature); \ + } \ +} while (0) + +static mpam_features_t mpam_update_config (struct mpam_config *cfg, +const struct mpam_config *newcfg) +{ +mpam_features_t changes =0 ; + +maybe_update_config (cfg, mpam_feat_cpor_part, newcfg, cpbm, changes); +maybe_update_config (cfg, mpam_feat_mbw_part, newcfg, mbw_pbm, changes); +maybe_update_config (cfg, mpam_feat_mbw_max, newcfg, mbw_max, changes); + +return changes; +} + +/* TODO: split into write_config/sync_config */ +/* TODO: add config_dirty bitmap to drive sync_config */ +int mpam_apply_config (struct mpam_component *comp,u16 partid, +struct mpam_config *cfg) +{ +struct mpam_write_config_arg arg; +struct mpam_msc_ris *ris; +struct mpam_vmsc *vmsc; +struct mpam_msc *msc; +int idx; + +lockdep_assert_cpus_held (); + +/* Don't pass in the current config! */ +WARN_ON_ONCE (&comp->cfg[partid] == cfg); + +if (!mpam_update_config (&comp->cfg[partid], cfg)) +return 0 ; + + arg.comp = comp; + arg.partid = partid; + + idx =srcu_read_lock (&mpam_srcu); +list_for_each_entry_rcu (vmsc, &comp->vmsc, comp_list) { + msc = vmsc->msc; + +list_for_each_entry_rcu (ris, &vmsc->ris, vmsc_list) { + arg.ris = ris; +mpam_touch_msc (msc, __write_config, &arg); + } + } +srcu_read_unlock (&mpam_srcu, idx); + +return 0 ; +} +/* * MSC that are hidden under caches are not created as platform devices * as there is no cache driver. Caches are also special-cased in
drivers/platform/arm64/mpam/mpam_internal.h +21 -5
@@ -190,11 +190,7 @@ struct mpam_props {u16 num_mbwu_mon; }; -static inline bool mpam_has_feature (enum mpam_device_features feat, -struct mpam_props *props) -{ -return (1 << feat) & props->features; -} +#define mpam_has_feature (_feat, x) ((1 << (_feat)) & (x)->features)static inline void mpam_set_feature (enum mpam_device_features feat,struct mpam_props *props)
@@ -225,6 +221,17 @@ struct mpam_class {struct mpam_garbage garbage; }; +struct mpam_config { +/* Which configuration values are valid. 0 is used for reset */ +mpam_features_t features; + +u32 cpbm; +u32 mbw_pbm; +u16 mbw_max; + +struct mpam_garbage garbage; +}; +struct mpam_component {u32 comp_id;
@@ -233,6 +240,12 @@ struct mpam_component {cpumask_t affinity; +/* +* Array of configuration values, indexed by partid. +* Read from cpuhp callbacks, hold the cpuhp lock when writing. +*/ +struct mpam_config *cfg; +/* member of mpam_class:components */ struct list_head class_list;
@@ -297,6 +310,9 @@ extern u8 mpam_pmg_max;void mpam_enable (struct work_struct *work);void mpam_disable (struct work_struct *work); +int mpam_apply_config (struct mpam_component *comp,u16 partid, +struct mpam_config *cfg); +int mpam_get_cpumask_from_cache_id (unsigned long cache_id,u32 cache_level,cpumask_t *affinity);
Signature · 1 line
2.39.5
RE: [RFC PATCH 27/36] arm_mpam: Allow configuration to be applied and restored during cpu online
Hello James,
Quoted 85 lines
When CPUs come online the original configuration should be restored. Once the maximum partid is known, allocate an configuration array for each component, and reprogram each RIS configuration from this.
The MPAM spec describes how multiple controls can interact. To prevent this happening by accident, always reset controls that don't have a valid configuration. This allows the same helper to be used for configuration and reset.
CC Dave Martin <[email protected]>Signed-off-by James Morse <[email protected]>--- drivers/platform/arm64/mpam/mpam_devices.c | 236 ++++++++++++++++++-- drivers/platform/arm64/mpam/mpam_internal.h | 26 ++- 2 files changed, 234 insertions(+), 28 deletions(-)drivers/platform/arm64/mpam/mpam_devices.c +21
-7@@ -374,12 +374,16 @@ static void mpam_class_destroy(struct mpam_class *class)add_to_garbage (class); } +static void __destroy_component_cfg (struct mpam_component *comp); +static void mpam_comp_destroy (struct mpam_component *comp) {struct mpam_class *class = comp->class;lockdep_assert_held (&mpam_list_lock); +__destroy_component_cfg (comp); +list_del_rcu (&comp->class_list);add_to_garbage (comp);@@ -909,51 +913,90 @@ static void mpam_reset_msc_bitmap(struct mpam_msc *msc, u16 reg, u16 wd)__mpam_write_reg (msc ,reg ,bm ); } -static void mpam_reset_ris_partid (struct mpam_msc_ris *ris,u16 partid) +/* Called via IPI. Call while holding an SRCU reference */ static void +mpam_reprogram_ris_partid (struct mpam_msc_ris *ris,u16 partid, +struct mpam_config *cfg) {u16 bwa_fract =MPAMCFG_MBW_MAX_MAX ;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_cpor_part, rprops)) { +if (mpam_has_feature (mpam_feat_cpor_part, cfg)) +mpam_write_partsel_reg (msc,CPBM , cfg->cpbm); +else +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_part, rprops)) { +if (mpam_has_feature (mpam_feat_mbw_part, cfg)) +mpam_write_partsel_reg (msc,MBW_PBM , cfg->mbw_pbm); +else +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 );
drivers/platform/arm64/mpam/mpam_devices.c static void mpam_reset_msc_bitmap(struct · line 958
Quoted 10 lines
drivers/platform/arm64/mpam/mpam_devices.c +6
-2-if (mpam_has_feature (mpam_feat_mbw_max, rprops)) -mpam_write_partsel_reg (msc,MBW_MAX , bwa_fract); +if (mpam_has_feature (mpam_feat_mbw_max, rprops)) { +if (mpam_has_feature (mpam_feat_mbw_max, cfg)) +mpam_write_partsel_reg (msc,MBW_MAX , cfg->mbw_max); +else +mpam_write_partsel_reg (msc,MBW_MAX , bwa_fract); + }
0 was written to MPAMCFG_MBW_MAX. [HARDLIM].
Depending on the chip, if [HARDLIM] is set to 1 by default, it will be overwritten.
Best regards,
Shaopeng TAN
Quoted 342 lines
drivers/platform/arm64/mpam/mpam_devices.c +109
-14if (mpam_has_feature (mpam_feat_mbw_prop, rprops))mpam_write_partsel_reg (msc,MBW_PROP , bwa_fract);mutex_unlock (&msc->part_sel_lock); } +struct reprogram_ris { +struct mpam_msc_ris *ris; +struct mpam_config *cfg; +}; + +/* Call with MSC lock held */ +static int mpam_reprogram_ris (void *_arg) { +u16 partid, partid_max; +struct reprogram_ris *arg = _arg; +struct mpam_msc_ris *ris = arg->ris; +struct mpam_config *cfg = arg->cfg; + +if (ris->in_reset_state) +return 0 ; + +spin_lock (&partid_max_lock); + partid_max = mpam_partid_max; +spin_unlock (&partid_max_lock); +for (partid =0 ; partid <= partid_max; partid++) +mpam_reprogram_ris_partid (ris, partid, cfg); + +return 0 ; +} +/* * Called via smp_call_on_cpu() to prevent migration, while still being * pre-emptible. */ static int mpam_reset_ris (void *arg) { -u16 partid, partid_max;struct mpam_msc_ris *ris = arg; +struct reprogram_ris reprogram_arg; +struct mpam_config empty_cfg = {0 };if (ris->in_reset_state)return 0 ; -spin_lock (&partid_max_lock); - partid_max = mpam_partid_max; -spin_unlock (&partid_max_lock); -for (partid =0 ; partid < partid_max; partid++) -mpam_reset_ris_partid (ris, partid); + reprogram_arg.ris = ris; + reprogram_arg.cfg = &empty_cfg; + +mpam_reprogram_ris (&reprogram_arg);return 0 ; }@@ -984,13 +1027,11 @@ static int mpam_touch_msc(struct mpam_msc *msc, int (*fn)(void *a), void *arg)static void mpam_reset_msc (struct mpam_msc *msc,bool online) { -int idx;struct mpam_msc_ris *ris;mpam_assert_srcu_read_lock_held ();mpam_mon_sel_outer_lock (msc); - idx =srcu_read_lock (&mpam_srcu);list_for_each_entry_srcu (ris, &msc->ris, msc_list,srcu_read_lock_held (&mpam_srcu)) {mpam_touch_msc (msc, &mpam_reset_ris, ris);@@ -1000,10 +1041,38 @@ static void mpam_reset_msc(struct mpam_msc*msc, bool online) */ ris->in_reset_state = online; } -srcu_read_unlock (&mpam_srcu, idx);mpam_mon_sel_outer_unlock (msc); } +static void mpam_reprogram_msc (struct mpam_msc *msc) { +int idx; +u16 partid; +bool reset; +struct mpam_config *cfg; +struct mpam_msc_ris *ris; + + idx =srcu_read_lock (&mpam_srcu); +list_for_each_entry_rcu (ris, &msc->ris, msc_list) { +if (!mpam_is_enabled () && !ris->in_reset_state) { +mpam_touch_msc (msc, &mpam_reset_ris, ris); + ris->in_reset_state = true; +continue ; + } + + reset = true; +for (partid =0 ; partid <= mpam_partid_max; partid++) { + cfg = &ris->vmsc->comp->cfg[partid]; +if (cfg->features) + reset = false; + +mpam_reprogram_ris_partid (ris, partid, cfg); + } + ris->in_reset_state = reset; + } +srcu_read_unlock (&mpam_srcu, idx); +} +static void _enable_percpu_irq (void *_irq) {int *irq = _irq;@@ -1025,7 +1094,7 @@ static int mpam_cpu_online(unsigned int cpu)_enable_percpu_irq (&msc->reenable_error_ppi);if (atomic_fetch_inc (&msc->online_refs) ==0 ) -mpam_reset_msc (msc, true); +mpam_reprogram_msc (msc); }srcu_read_unlock (&mpam_srcu, idx);@@ -1806,6 +1875,43 @@ static void mpam_unregister_irqs(void)cpus_read_unlock (); } +static void __destroy_component_cfg (struct mpam_component *comp) { +add_to_garbage (comp->cfg); +} + +static int __allocate_component_cfg (struct mpam_component *comp) { +if (comp->cfg) +return 0 ; + + comp->cfg =kcalloc (mpam_partid_max +1 ,sizeof (*comp->cfg),GFP_KERNEL ); +if (!comp->cfg) +return -ENOMEM ; +init_garbage (comp->cfg); + +return 0 ; +} + +static int mpam_allocate_config (void ) +{ +int err =0 ; +struct mpam_class *class; +struct mpam_component *comp; + +lockdep_assert_held (&mpam_list_lock); + +list_for_each_entry (class, &mpam_classes, classes_list) { +list_for_each_entry (comp, &class->components, class_list) { + err =__allocate_component_cfg (comp); +if (err) +return err; + } + } + +return 0 ; +} +static void mpam_enable_once (void ) {int err;@@ -1817,12 +1923,21 @@ static void mpam_enable_once(void)*/ cpus_read_lock ();mutex_lock (&mpam_list_lock); -mpam_enable_merge_features (&mpam_classes); +do { +mpam_enable_merge_features (&mpam_classes); - err =mpam_register_irqs (); -if (err) -pr_warn ("Failed to register irqs: %d\n" , err); + err =mpam_allocate_config (); +if (err) { +pr_err ("Failed to allocate configuration arrays.\n" ); +break ; + } + err =mpam_register_irqs (); +if (err) { +pr_warn ("Failed to register irqs: %d\n" , err); +break ; + } + }while (0 );mutex_unlock (&mpam_list_lock);cpus_read_unlock ();@@ -1861,6 +1976,8 @@ static void mpam_reset_component_locked(struct mpam_component *comp)might_sleep ();lockdep_assert_cpus_held (); +memset (comp->cfg,0 , (mpam_partid_max *sizeof (*comp->cfg))); + idx =srcu_read_lock (&mpam_srcu);list_for_each_entry_rcu (vmsc, &comp->vmsc, comp_list) {drivers/platform/arm64/mpam/mpam_devices.c +33
-0msc = vmsc->msc;@@ -1963,6 +2080,79 @@ void mpam_enable(struct work_struct *work)mpam_enable_once (); } +struct mpam_write_config_arg { +struct mpam_msc_ris *ris; +struct mpam_component *comp; +u16 partid; +}; + +static int __write_config (void *arg) +{ +struct mpam_write_config_arg *c = arg; + +mpam_reprogram_ris_partid (c->ris, c->partid, +&c->comp->cfg[c->partid]); + +return 0 ; +} + +#define maybe_update_config (cfg, feature, newcfg, member, changes) do { \ + if (mpam_has_feature(feature, newcfg) && \ + (newcfg)->member != (cfg)->member) { \ + (cfg)->member = (newcfg)->member; \ + cfg->features |= (1 << feature); \ + \ + (changes) |= (1 << feature); \ + } \ +} while (0) + +static mpam_features_t mpam_update_config (struct mpam_config *cfg, +const struct mpam_config *newcfg) { +mpam_features_t changes =0 ; + +maybe_update_config (cfg, mpam_feat_cpor_part, newcfg, cpbm, changes); +maybe_update_config (cfg, mpam_feat_mbw_part, newcfg, mbw_pbm, changes); + maybe_update_config(cfg, mpam_feat_mbw_max, newcfg, mbw_max,changes);
drivers/platform/arm64/mpam/mpam_devices.c +40
-0+ +return changes; +} + +/* TODO: split into write_config/sync_config */ +/* TODO: add config_dirty bitmap to drive sync_config */ int +mpam_apply_config (struct mpam_component *comp,u16 partid, +struct mpam_config *cfg) +{ +struct mpam_write_config_arg arg; +struct mpam_msc_ris *ris; +struct mpam_vmsc *vmsc; +struct mpam_msc *msc; +int idx; + +lockdep_assert_cpus_held (); + +/* Don't pass in the current config! */ +WARN_ON_ONCE (&comp->cfg[partid] == cfg); + +if (!mpam_update_config (&comp->cfg[partid], cfg)) +return 0 ; + + arg.comp = comp; + arg.partid = partid; + + idx =srcu_read_lock (&mpam_srcu); +list_for_each_entry_rcu (vmsc, &comp->vmsc, comp_list) { + msc = vmsc->msc; + +list_for_each_entry_rcu (ris, &vmsc->ris, vmsc_list) { + arg.ris = ris; +mpam_touch_msc (msc, __write_config, &arg); + } + } +srcu_read_unlock (&mpam_srcu, idx); + +return 0 ; +} +/* * MSC that are hidden under caches are not created as platform devices * as there is no cache driver. Caches are also special-cased in diff --git
a/drivers/platform/arm64/mpam/mpam_internal.hb/drivers/platform/arm64/mpam/mpam_internal.h
index1a24424b48df..029ec89f56f2100644drivers/platform/arm64/mpam/mpam_internal.h +21
-6@@ -190,11 +190,7 @@ struct mpam_props {u16 num_mbwu_mon; }; -static inline bool mpam_has_feature (enum mpam_device_features feat, -struct mpam_props *props) -{ -return (1 << feat) & props->features; -} +#define mpam_has_feature (_feat, x) ((1 << (_feat)) & (x)->features)static inline void mpam_set_feature (enum mpam_device_features feat,struct mpam_props *props)@@ -225,6 +221,17 @@ struct mpam_class {struct mpam_garbage garbage; }; +struct mpam_config { +/* Which configuration values are valid. 0 is used for reset */ +mpam_features_t features; + +u32 cpbm; +u32 mbw_pbm; +u16 mbw_max; + +struct mpam_garbage garbage; +}; +struct mpam_component {u32 comp_id;@@ -233,6 +240,12 @@ struct mpam_component {cpumask_t affinity; +/* +* Array of configuration values, indexed by partid. +* Read from cpuhp callbacks, hold the cpuhp lock when writing. +*/ +struct mpam_config *cfg; +/* member of mpam_class:components */ struct list_head class_list;@@ -297,6 +310,9 @@ extern u8 mpam_pmg_max; void mpam_enable(struct work_struct *work); void mpam_disable(struct work_struct *work); +int mpam_apply_config (struct mpam_component *comp,u16 partid, +struct mpam_config *cfg); +int mpam_get_cpumask_from_cache_id (unsigned long cache_id,u32 cache_level,cpumask_t *affinity); --2.39.5
James Morse
maintainerRe: [RFC PATCH 27/36] arm_mpam: Allow configuration to be applied and restored during cpu online
Hi Shaopeng,
Quoted 60 lines · Shaopeng Tan (Fujitsu)
Quoted 60 lines
When CPUs come online the original configuration should be restored. Once the maximum partid is known, allocate an configuration array for each component, and reprogram each RIS configuration from this.
The MPAM spec describes how multiple controls can interact. To prevent this happening by accident, always reset controls that don't have a valid configuration. This allows the same helper to be used for configuration and reset.
drivers/platform/arm64/mpam/mpam_devices.c +17
-7@@ -909,51 +913,90 @@ static void mpam_reset_msc_bitmap(struct mpam_msc *msc, u16 reg, u16 wd)__mpam_write_reg (msc ,reg ,bm ); } -static void mpam_reset_ris_partid (struct mpam_msc_ris *ris,u16 partid) +/* Called via IPI. Call while holding an SRCU reference */ static void +mpam_reprogram_ris_partid (struct mpam_msc_ris *ris,u16 partid, +struct mpam_config *cfg) {u16 bwa_fract =MPAMCFG_MBW_MAX_MAX ;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_cpor_part, rprops)) { +if (mpam_has_feature (mpam_feat_cpor_part, cfg)) +mpam_write_partsel_reg (msc,CPBM , cfg->cpbm); +else +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_part, rprops)) { +if (mpam_has_feature (mpam_feat_mbw_part, cfg)) +mpam_write_partsel_reg (msc,MBW_PBM , cfg->mbw_pbm); +else +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 );
Quoted 13 lines
drivers/platform/arm64/mpam/mpam_devices.c static void mpam_reset_msc_bitmap(struct mpam_msc *msc, u16 reg, u16 wd) · line 951
Quoted 10 lines
drivers/platform/arm64/mpam/mpam_devices.c +6
-2-if (mpam_has_feature (mpam_feat_mbw_max, rprops)) -mpam_write_partsel_reg (msc,MBW_MAX , bwa_fract); +if (mpam_has_feature (mpam_feat_mbw_max, rprops)) { +if (mpam_has_feature (mpam_feat_mbw_max, cfg)) +mpam_write_partsel_reg (msc,MBW_MAX , cfg->mbw_max); +else +mpam_write_partsel_reg (msc,MBW_MAX , bwa_fract); + }0 was written to
MPAMCFG_MBW_MAX. [HARDLIM].
Depending on the chip, if [HARDLIM] is set to 1 by default, it will be overwritten.
Hardlimit was shoe-horned into the architecture as a backward-compatible thing. It's not too surprising it gets stamped on here - it was previously RES0. Again, the architecture doesn't say what the reset value of the register is - generally you can't rely on bits being preserved if the OS doesn't know what they are.
For the full picture - we don't have a way of getting a hard-limit hint from resctrl. Currently its just ignored as the behaviour will then be 'the same' on platforms that do or don't have hardlimit. If we add something like that to the user-space interface - then we can plumb it in. Enabling it on platforms that have it now will make that a murky picture as the 'old' behaviour would need to be preserved.
Yes, mpam_devices.c should give its callers a way of setting hardlim - but today resctrl can't.
Thanks,
James
Ben Horgan
maintainerRe: [RFC PATCH 27/36] arm_mpam: Allow configuration to be applied and restored during cpu online
In reply to James MorseHi James,
Quoted 173 lines · James Morse
When CPUs come online the original configuration should be restored. Once the maximum partid is known, allocate an configuration array for each component, and reprogram each RIS configuration from this.
The MPAM spec describes how multiple controls can interact. To prevent this happening by accident, always reset controls that don't have a valid configuration. This allows the same helper to be used for configuration and reset.
CC Dave Martin <[email protected]>Signed-off-by James Morse <[email protected]>--- drivers/platform/arm64/mpam/mpam_devices.c | 236 ++++++++++++++++++-- drivers/platform/arm64/mpam/mpam_internal.h | 26 ++- 2 files changed, 234 insertions(+), 28 deletions(-)drivers/platform/arm64/mpam/mpam_devices.c +66
-18@@ -374,12 +374,16 @@ static void mpam_class_destroy(struct mpam_class *class)add_to_garbage (class); } +static void __destroy_component_cfg (struct mpam_component *comp); +static void mpam_comp_destroy (struct mpam_component *comp) {struct mpam_class *class = comp->class;lockdep_assert_held (&mpam_list_lock); +__destroy_component_cfg (comp); +list_del_rcu (&comp->class_list);add_to_garbage (comp);@@ -909,51 +913,90 @@ static void mpam_reset_msc_bitmap(struct mpam_msc *msc, u16 reg, u16 wd)__mpam_write_reg (msc, reg, bm); } -static void mpam_reset_ris_partid (struct mpam_msc_ris *ris,u16 partid) +/* Called via IPI. Call while holding an SRCU reference */ +static void mpam_reprogram_ris_partid (struct mpam_msc_ris *ris,u16 partid, +struct mpam_config *cfg) {u16 bwa_fract =MPAMCFG_MBW_MAX_MAX ;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_cpor_part, rprops)) { +if (mpam_has_feature (mpam_feat_cpor_part, cfg)) +mpam_write_partsel_reg (msc,CPBM , cfg->cpbm); +else +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_part, rprops)) { +if (mpam_has_feature (mpam_feat_mbw_part, cfg)) +mpam_write_partsel_reg (msc,MBW_PBM , cfg->mbw_pbm); +else +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 , bwa_fract); +if (mpam_has_feature (mpam_feat_mbw_max, rprops)) { +if (mpam_has_feature (mpam_feat_mbw_max, cfg)) +mpam_write_partsel_reg (msc,MBW_MAX , cfg->mbw_max); +else +mpam_write_partsel_reg (msc,MBW_MAX , bwa_fract); + }if (mpam_has_feature (mpam_feat_mbw_prop, rprops))mpam_write_partsel_reg (msc,MBW_PROP , bwa_fract);mutex_unlock (&msc->part_sel_lock); } +struct reprogram_ris { +struct mpam_msc_ris *ris; +struct mpam_config *cfg; +}; + +/* Call with MSC lock held */ +static int mpam_reprogram_ris (void *_arg) +{ +u16 partid, partid_max; +struct reprogram_ris *arg = _arg; +struct mpam_msc_ris *ris = arg->ris; +struct mpam_config *cfg = arg->cfg; + +if (ris->in_reset_state) +return 0 ; + +spin_lock (&partid_max_lock); + partid_max = mpam_partid_max; +spin_unlock (&partid_max_lock); +for (partid =0 ; partid <= partid_max; partid++) +mpam_reprogram_ris_partid (ris, partid, cfg); + +return 0 ; +} +/* * Called via smp_call_on_cpu() to prevent migration, while still being * pre-emptible. */ static int mpam_reset_ris (void *arg) { -u16 partid, partid_max;struct mpam_msc_ris *ris = arg; +struct reprogram_ris reprogram_arg; +struct mpam_config empty_cfg = {0 };if (ris->in_reset_state)return 0 ; -spin_lock (&partid_max_lock); - partid_max = mpam_partid_max; -spin_unlock (&partid_max_lock); -for (partid =0 ; partid < partid_max; partid++) -mpam_reset_ris_partid (ris, partid); + reprogram_arg.ris = ris; + reprogram_arg.cfg = &empty_cfg; + +mpam_reprogram_ris (&reprogram_arg);return 0 ; }@@ -984,13 +1027,11 @@ static int mpam_touch_msc(struct mpam_msc *msc, int (*fn)(void *a), void *arg)static void mpam_reset_msc (struct mpam_msc *msc,bool online) { -int idx;struct mpam_msc_ris *ris;mpam_assert_srcu_read_lock_held ();mpam_mon_sel_outer_lock (msc); - idx =srcu_read_lock (&mpam_srcu);list_for_each_entry_srcu (ris, &msc->ris, msc_list,srcu_read_lock_held (&mpam_srcu)) {mpam_touch_msc (msc, &mpam_reset_ris, ris);@@ -1000,10 +1041,38 @@ static void mpam_reset_msc(struct mpam_msc *msc, bool online)*/ ris->in_reset_state = online; } -srcu_read_unlock (&mpam_srcu, idx);mpam_mon_sel_outer_unlock (msc); } +static void mpam_reprogram_msc (struct mpam_msc *msc) +{ +int idx; +u16 partid; +bool reset; +struct mpam_config *cfg; +struct mpam_msc_ris *ris; +
drivers/platform/arm64/mpam/mpam_devices.c static void mpam_reset_msc(struct mpam_msc *msc, bool online) · line 1064
Quoted 10 lines
drivers/platform/arm64/mpam/mpam_devices.c +10
-0+ idx =srcu_read_lock (&mpam_srcu); +list_for_each_entry_rcu (ris, &msc->ris, msc_list) { +if (!mpam_is_enabled () && !ris->in_reset_state) { +mpam_touch_msc (msc, &mpam_reset_ris, ris); + ris->in_reset_state = true; +continue ; + } + + reset = true; +for (partid =0 ; partid <= mpam_partid_max; partid++) {
Do we need to consider 'partid_max_lock' here?
Quoted 28 lines
drivers/platform/arm64/mpam/mpam_devices.c +13
-1+ cfg = &ris->vmsc->comp->cfg[partid]; +if (cfg->features) + reset = false; + +mpam_reprogram_ris_partid (ris, partid, cfg); + } + ris->in_reset_state = reset; + } +srcu_read_unlock (&mpam_srcu, idx); +} +static void _enable_percpu_irq (void *_irq) {int *irq = _irq;@@ -1025,7 +1094,7 @@ static int mpam_cpu_online(unsigned int cpu)_enable_percpu_irq (&msc->reenable_error_ppi);if (atomic_fetch_inc (&msc->online_refs) ==0 ) -mpam_reset_msc (msc, true); +mpam_reprogram_msc (msc); }srcu_read_unlock (&mpam_srcu, idx);@@ -1806,6 +1875,43 @@ static void mpam_unregister_irqs(void)cpus_read_unlock (); } +static void __destroy_component_cfg (struct mpam_component *comp)
drivers/platform/arm64/mpam/mpam_devices.c static void mpam_unregister_irqs(void) · line 1888
Quoted 10 lines
drivers/platform/arm64/mpam/mpam_devices.c +10
-0+{ +add_to_garbage (comp->cfg); +} + +static int __allocate_component_cfg (struct mpam_component *comp) +{ +if (comp->cfg) +return 0 ; + + comp->cfg =kcalloc (mpam_partid_max +1 ,sizeof (*comp->cfg),GFP_KERNEL );
And here?
Quoted 56 lines
drivers/platform/arm64/mpam/mpam_devices.c +39
-4+if (!comp->cfg) +return -ENOMEM ; +init_garbage (comp->cfg); + +return 0 ; +} + +static int mpam_allocate_config (void ) +{ +int err =0 ; +struct mpam_class *class; +struct mpam_component *comp; + +lockdep_assert_held (&mpam_list_lock); + +list_for_each_entry (class, &mpam_classes, classes_list) { +list_for_each_entry (comp, &class->components, class_list) { + err =__allocate_component_cfg (comp); +if (err) +return err; + } + } + +return 0 ; +} +static void mpam_enable_once (void ) {int err;@@ -1817,12 +1923,21 @@ static void mpam_enable_once(void)*/ cpus_read_lock ();mutex_lock (&mpam_list_lock); -mpam_enable_merge_features (&mpam_classes); +do { +mpam_enable_merge_features (&mpam_classes); - err =mpam_register_irqs (); -if (err) -pr_warn ("Failed to register irqs: %d\n" , err); + err =mpam_allocate_config (); +if (err) { +pr_err ("Failed to allocate configuration arrays.\n" ); +break ; + } + err =mpam_register_irqs (); +if (err) { +pr_warn ("Failed to register irqs: %d\n" , err); +break ; + } + }while (0 );mutex_unlock (&mpam_list_lock);cpus_read_unlock ();
drivers/platform/arm64/mpam/mpam_devices.c static void mpam_reset_component_locked(struct mpam_component *comp) · line 1979
Quoted 4 lines
drivers/platform/arm64/mpam/mpam_devices.c +1
-0@@ -1861,6 +1976,8 @@ static void mpam_reset_component_locked(struct mpam_component *comp)might_sleep ();lockdep_assert_cpus_held (); +memset (comp->cfg,0 , (mpam_partid_max *sizeof (*comp->cfg)));
And here?
Quoted 142 lines
drivers/platform/arm64/mpam/mpam_devices.c +74
-0+ idx =srcu_read_lock (&mpam_srcu);list_for_each_entry_rcu (vmsc, &comp->vmsc, comp_list) { msc = vmsc->msc;@@ -1963,6 +2080,79 @@ void mpam_enable(struct work_struct *work)mpam_enable_once (); } +struct mpam_write_config_arg { +struct mpam_msc_ris *ris; +struct mpam_component *comp; +u16 partid; +}; + +static int __write_config (void *arg) +{ +struct mpam_write_config_arg *c = arg; + +mpam_reprogram_ris_partid (c->ris, c->partid, &c->comp->cfg[c->partid]); + +return 0 ; +} + +#define maybe_update_config (cfg, feature, newcfg, member, changes) do { \ + if (mpam_has_feature(feature, newcfg) && \ + (newcfg)->member != (cfg)->member) { \ + (cfg)->member = (newcfg)->member; \ + cfg->features |= (1 << feature); \ + \ + (changes) |= (1 << feature); \ + } \ +} while (0) + +static mpam_features_t mpam_update_config (struct mpam_config *cfg, +const struct mpam_config *newcfg) +{ +mpam_features_t changes =0 ; + +maybe_update_config (cfg, mpam_feat_cpor_part, newcfg, cpbm, changes); +maybe_update_config (cfg, mpam_feat_mbw_part, newcfg, mbw_pbm, changes); +maybe_update_config (cfg, mpam_feat_mbw_max, newcfg, mbw_max, changes); + +return changes; +} + +/* TODO: split into write_config/sync_config */ +/* TODO: add config_dirty bitmap to drive sync_config */ +int mpam_apply_config (struct mpam_component *comp,u16 partid, +struct mpam_config *cfg) +{ +struct mpam_write_config_arg arg; +struct mpam_msc_ris *ris; +struct mpam_vmsc *vmsc; +struct mpam_msc *msc; +int idx; + +lockdep_assert_cpus_held (); + +/* Don't pass in the current config! */ +WARN_ON_ONCE (&comp->cfg[partid] == cfg); + +if (!mpam_update_config (&comp->cfg[partid], cfg)) +return 0 ; + + arg.comp = comp; + arg.partid = partid; + + idx =srcu_read_lock (&mpam_srcu); +list_for_each_entry_rcu (vmsc, &comp->vmsc, comp_list) { + msc = vmsc->msc; + +list_for_each_entry_rcu (ris, &vmsc->ris, vmsc_list) { + arg.ris = ris; +mpam_touch_msc (msc, __write_config, &arg); + } + } +srcu_read_unlock (&mpam_srcu, idx); + +return 0 ; +} +/* * MSC that are hidden under caches are not created as platform devices * as there is no cache driver. Caches are also special-cased in drivers/platform/arm64/mpam/mpam_internal.h +21
-5@@ -190,11 +190,7 @@ struct mpam_props {u16 num_mbwu_mon; }; -static inline bool mpam_has_feature (enum mpam_device_features feat, -struct mpam_props *props) -{ -return (1 << feat) & props->features; -} +#define mpam_has_feature (_feat, x) ((1 << (_feat)) & (x)->features)static inline void mpam_set_feature (enum mpam_device_features feat,struct mpam_props *props)@@ -225,6 +221,17 @@ struct mpam_class {struct mpam_garbage garbage; }; +struct mpam_config { +/* Which configuration values are valid. 0 is used for reset */ +mpam_features_t features; + +u32 cpbm; +u32 mbw_pbm; +u16 mbw_max; + +struct mpam_garbage garbage; +}; +struct mpam_component {u32 comp_id;@@ -233,6 +240,12 @@ struct mpam_component {cpumask_t affinity; +/* +* Array of configuration values, indexed by partid. +* Read from cpuhp callbacks, hold the cpuhp lock when writing. +*/ +struct mpam_config *cfg; +/* member of mpam_class:components */ struct list_head class_list;@@ -297,6 +310,9 @@ extern u8 mpam_pmg_max;void mpam_enable (struct work_struct *work);void mpam_disable (struct work_struct *work); +int mpam_apply_config (struct mpam_component *comp,u16 partid, +struct mpam_config *cfg); +int mpam_get_cpumask_from_cache_id (unsigned long cache_id,u32 cache_level,cpumask_t *affinity);
Signature · 3 lines
Thanks, Ben
Re: [RFC PATCH 27/36] arm_mpam: Allow configuration to be applied and restored during cpu online
Hi,
Quoted 23 lines · Ben Horgan
Hi James,
Quoted 20 lines · James Morse
When CPUs come online the original configuration should be restored. Once the maximum partid is known, allocate an configuration array for each component, and reprogram each RIS configuration from this.
The MPAM spec describes how multiple controls can interact. To prevent this happening by accident, always reset controls that don't have a valid configuration. This allows the same helper to be used for configuration and reset.
CC Dave Martin <[email protected]>Signed-off-by James Morse <[email protected]>--- drivers/platform/arm64/mpam/mpam_devices.c | 236 ++++++++++++++++++-- drivers/platform/arm64/mpam/mpam_internal.h | 26 ++- 2 files changed, 234 insertions(+), 28 deletions(-)drivers/platform/arm64/mpam/mpam_devices.c +0
-0
[...]
Quoted 1 line
Quoted 1 line
drivers/platform/arm64/mpam/mpam_devices.c +0
-0@@ -1000,10 +1041,38 @@ static void mpam_reset_msc(struct mpam_msc *msc, bool online)
[...]
Quoted 12 lines
Quoted 12 lines
drivers/platform/arm64/mpam/mpam_devices.c +12
-0+static void mpam_reprogram_msc (struct mpam_msc *msc) +{ +int idx; +u16 partid; +bool reset; +struct mpam_config *cfg; +struct mpam_msc_ris *ris; + + idx =srcu_read_lock (&mpam_srcu); +list_for_each_entry_rcu (ris, &msc->ris, msc_list) { +if (!mpam_is_enabled () && !ris->in_reset_state) { +mpam_touch_msc (msc, &mpam_reset_ris, ris);
Quoted 8 lines
drivers/platform/arm64/mpam/mpam_devices.c static void mpam_reset_msc(struct mpam_msc *msc, bool online) · line 1064
Quoted 6 lines
drivers/platform/arm64/mpam/mpam_devices.c +6
-0+ ris->in_reset_state = true; +continue ; + } + + reset = true; +for (partid =0 ; partid <= mpam_partid_max; partid++) {Do we need to consider '
partid_max_lock' here?
Just throwing in my 2¢, since I'd dug into this a bit previously:
Here, we are resetting an MSC or re-onlining a CPU. Either way, I think that this only happens after the initial probing phase is complete.
mpam_enable_once() is ordered with respect to the task that did the final unlock of partid_max_lock during probing, by means of the schedule_work() call. (See <linux/workqueue.h>.)
Taking the hotplug lock and installing mpam_cpu_online() for CPU hotplug probably brings a sufficient guarantee also (though I've not dug into it).
This function doesn't seem to be called during the probing phase (via mpam_discovery_cpu_online()), so there shouldn't be any racing updates to the global variables here.
Quoted 10 lines
Quoted 10 lines
drivers/platform/arm64/mpam/mpam_devices.c +10
-0+ cfg = &ris->vmsc->comp->cfg[partid]; +if (cfg->features) + reset = false; + +mpam_reprogram_ris_partid (ris, partid, cfg); + } + ris->in_reset_state = reset; + } +srcu_read_unlock (&mpam_srcu, idx); +}
[...]
Quoted 1 line
Quoted 1 line
drivers/platform/arm64/mpam/mpam_devices.c +0
-0@@ -1806,6 +1875,43 @@ static void mpam_unregister_irqs(void)
[...]
Quoted 8 lines
drivers/platform/arm64/mpam/mpam_devices.c static void mpam_unregister_irqs(void) · line 1888
Quoted 6 lines
drivers/platform/arm64/mpam/mpam_devices.c +6
-0+static int __allocate_component_cfg (struct mpam_component *comp) +{ +if (comp->cfg) +return 0 ; + + comp->cfg =kcalloc (mpam_partid_max +1 ,sizeof (*comp->cfg),GFP_KERNEL );And here?
Similarly, this runs only in the mpam_enable_once() call.
[...]
Quoted 6 lines
drivers/platform/arm64/mpam/mpam_devices.c static void mpam_reset_component_locked(struct mpam_component *comp) · line 1978
Quoted 4 lines
drivers/platform/arm64/mpam/mpam_devices.c +1
-0@@ -1861,6 +1976,8 @@ static void mpam_reset_component_locked(struct mpam_component *comp)might_sleep ();lockdep_assert_cpus_held (); +memset (comp->cfg,0 , (mpam_partid_max *sizeof (*comp->cfg)));And here?
Similarly to mpam_reset_msc(), I think this probably only runs from mpam_enable_once() or mpam_cpu_online().
I think most or all of the existing reads of the affected globals from within mpam_resctrl.c are also callbacks from resctrl_init(), which again exceutes during mpam_enable_once() (though I won't promise I haven't missed one or two).
Once resctrl has fired up, I believe that the MPAM driver basically trusts the IDs coming in from resctrl, and doesn't need to range-check them against the global parameters again.
[...]
Quoted 3 lines
Thanks,
Ben
I consciously haven't done all the homework on this.
Although it may look like the globals are read all over the place after probing, I think this actually only happens during resctrl initialision (which is basically single-threaded).
The only place where they are read after probing and without mediation via resctrl is on the CPU hotplug path.
Adding locking would ensure that an unstable value is never read, but this is not sufficient by itself to sure that the _final_ value of a variable is read (for some definition of "final"). And, if there is a well-defined notion of final value and there is sufficient synchronisation to ensure that this is the value read by a particular read, then by construction an unstable value cannot be read.
I think that this kind of pattern is not that uncommon in the kernel, though it is a bit painful to reason about.
Cheers
---Dave
James Morse
maintainerRe: [RFC PATCH 27/36] arm_mpam: Allow configuration to be applied and restored during cpu online
Hi Dave, Ben,
Quoted 6 lines · Dave Martin
Although it may look like the globals are read all over the place after probing, I think this actually only happens during resctrl initialision (which is basically single-threaded).
The only place where they are read after probing and without mediation via resctrl is on the CPU hotplug path.
(and the mpam driver gets the first go a cpuhp, then it calls into resctrl).
Quoted 10 lines
Adding locking would ensure that an unstable value is never read, but this is not sufficient by itself to sure that the _final_ value of a variable is read (for some definition of "final"). And, if there is a well-defined notion of final value and there is sufficient synchronisation to ensure that this is the value read by a particular read, then by construction an unstable value cannot be read.
I think that this kind of pattern is not that uncommon in the kernel, though it is a bit painful to reason about.
As it's sparked some discussion, I've added a mpam_assert_partid_sizes_fixed() that documents this, and will trigger a WARN_ON_ONCE() if these things are observed as happening in the wrong order.
Thanks,
James
James Morse
maintainerRe: [RFC PATCH 27/36] arm_mpam: Allow configuration to be applied and restored during cpu online
In reply to Ben HorganHi Ben,
Quoted 32 lines · Ben Horgan
Quoted 31 lines · James Morse
When CPUs come online the original configuration should be restored. Once the maximum partid is known, allocate an configuration array for each component, and reprogram each RIS configuration from this.
The MPAM spec describes how multiple controls can interact. To prevent this happening by accident, always reset controls that don't have a valid configuration. This allows the same helper to be used for configuration and reset.
drivers/platform/arm64/mpam/ renamed from drivers/platform/arm64/mpam/mpam_devices.c +0
-0
mpam_devices.c
indexbb3695eb84e9..f3ecfda265d2100644drivers/platform/arm64/mpam/mpam_devices.c +10
-1@@ -1000,10 +1041,38 @@ static void mpam_reset_msc(struct mpam_msc *msc, bool online) */ ris->in_reset_state = online; } -srcu_read_unlock (&mpam_srcu, idx);mpam_mon_sel_outer_unlock (msc); } +static void mpam_reprogram_msc(struct mpam_msc *msc) +{ +int idx; +u16 partid; +bool reset; +struct mpam_config *cfg; +struct mpam_msc_ris *ris; + + idx =srcu_read_lock (&mpam_srcu); +list_for_each_entry_rcu (ris, &msc->ris, msc_list) { +if (!mpam_is_enabled () && !ris->in_reset_state) {
Quoted 8 lines
drivers/platform/arm64/mpam/mpam_devices.c static void mpam_reset_msc(struct mpam_msc *msc, bool online) · line 1064
Quoted 7 lines
drivers/platform/arm64/mpam/mpam_devices.c +7
-0+mpam_touch_msc (msc, &mpam_reset_ris, ris); + ris->in_reset_state = true; +continue ; + } + + reset = true; +for (partid =0 ; partid <= mpam_partid_max; partid++) {Do we need to consider '
partid_max_lock' here?
The lock is only needed while those parameters can change, due to a race with mpam_register_requestor(). Once mpam_enabled() has been called, the values can't change, so the lock is redundant.
In this case, its relying on mpam_cpu_online() only ever being the cpuhp callback once partid_max_published has been set.
I'll add a comment.
Quoted 15 lines
Quoted 4 lines
drivers/platform/arm64/mpam/mpam_devices.c +4
-0+ cfg = &ris->vmsc->comp->cfg[partid]; +if (cfg->features) + reset = false; +drivers/platform/arm64/mpam/mpam_devices.c static void mpam_reset_msc(struct mpam_msc *msc, bool online) · line 1078
Quoted 10 lines
drivers/platform/arm64/mpam/mpam_devices.c +7
-0+mpam_reprogram_ris_partid (ris, partid, cfg); + } + ris->in_reset_state = reset; + } +srcu_read_unlock (&mpam_srcu, idx); +} +static void _enable_percpu_irq (void *_irq) {int *irq = _irq;@@ -1806,6 +1875,43 @@ static void
mpam_unregister_irqs(void)
Quoted 14 lines
drivers/platform/arm64/mpam/mpam_devices.c static void mpam_unregister_irqs(void) · line 1888
Quoted 13 lines
cpus_read_unlock();}
+static void__destroy_component_cfg(struct mpam_component *comp)drivers/platform/arm64/mpam/mpam_devices.c +10
-0+{ +add_to_garbage (comp->cfg); +} + +static int __allocate_component_cfg (struct mpam_component *comp) +{ +if (comp->cfg) +return 0 ; + + comp->cfg =kcalloc (mpam_partid_max +1 ,sizeof (*comp->cfg),GFP_KERNEL );And here?
Aha, that is a good one - the configuration should be allocated after the partid values are fixed. Currently its done by the same function, but not in the right order.
Quoted 50 lines
Quoted 50 lines
drivers/platform/arm64/mpam/mpam_devices.c +38
-3+if (!comp->cfg) +return -ENOMEM ; +init_garbage (comp->cfg); + +return 0 ; +} + +static int mpam_allocate_config (void ) +{ +int err =0 ; +struct mpam_class *class; +struct mpam_component *comp; + +lockdep_assert_held (&mpam_list_lock); + +list_for_each_entry (class, &mpam_classes, classes_list) { +list_for_each_entry (comp, &class->components, class_list) { + err =__allocate_component_cfg (comp); +if (err) +return err; + } + } + +return 0 ; +} +static void mpam_enable_once (void ) {int err;@@ -1817,12 +1923,21 @@ static void mpam_enable_once(void)*/ cpus_read_lock ();mutex_lock (&mpam_list_lock); -mpam_enable_merge_features (&mpam_classes); +do { +mpam_enable_merge_features (&mpam_classes); - err =mpam_register_irqs (); -if (err) -pr_warn ("Failed to register irqs: %d\n" , err); + err =mpam_allocate_config (); +if (err) { +pr_err ("Failed to allocate configuration arrays.\n" ); +break ; + } + err =mpam_register_irqs (); +if (err) { +pr_warn ("Failed to register irqs: %d\n" , err); +break ; + } + }while (0 );
Quoted 8 lines
Quoted 7 lines
drivers/platform/arm64/mpam/mpam_devices.c +0
-0mutex_unlock (&mpam_list_lock);cpus_read_unlock (); @@ -1861,6 +1976,8 @@ static void mpam_reset_component_locked(struct mpam_component *comp)might_sleep(); lockdep_assert_cpus_held();+
memset(comp->cfg, 0, (mpam_partid_max * sizeof(*comp->cfg)));And here?
Same story, and the same bug - the disable path can be called and reach this before the partid size has been fixed. The code that enables interrupts should pull that earlier in mpam_enable_once, which would simplify all of these.
Thanks,
James
Fenghua Yu
reviewerRe: [RFC PATCH 27/36] arm_mpam: Allow configuration to be applied and restored during cpu online
In reply to James MorseHi, James,
Quoted 100 lines · James Morse
When CPUs come online the original configuration should be restored. Once the maximum partid is known, allocate an configuration array for each component, and reprogram each RIS configuration from this.
The MPAM spec describes how multiple controls can interact. To prevent this happening by accident, always reset controls that don't have a valid configuration. This allows the same helper to be used for configuration and reset.
CC Dave Martin <[email protected]>Signed-off-by James Morse <[email protected]>--- drivers/platform/arm64/mpam/mpam_devices.c | 236 ++++++++++++++++++-- drivers/platform/arm64/mpam/mpam_internal.h | 26 ++- 2 files changed, 234 insertions(+), 28 deletions(-)drivers/platform/arm64/mpam/mpam_devices.c +35
-9@@ -374,12 +374,16 @@ static void mpam_class_destroy(struct mpam_class *class)add_to_garbage (class); } +static void __destroy_component_cfg (struct mpam_component *comp); +static void mpam_comp_destroy (struct mpam_component *comp) {struct mpam_class *class = comp->class;lockdep_assert_held (&mpam_list_lock); +__destroy_component_cfg (comp); +list_del_rcu (&comp->class_list);add_to_garbage (comp);@@ -909,51 +913,90 @@ static void mpam_reset_msc_bitmap(struct mpam_msc *msc, u16 reg, u16 wd)__mpam_write_reg (msc, reg, bm); } -static void mpam_reset_ris_partid (struct mpam_msc_ris *ris,u16 partid) +/* Called via IPI. Call while holding an SRCU reference */ +static void mpam_reprogram_ris_partid (struct mpam_msc_ris *ris,u16 partid, +struct mpam_config *cfg) {u16 bwa_fract =MPAMCFG_MBW_MAX_MAX ;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_cpor_part, rprops)) { +if (mpam_has_feature (mpam_feat_cpor_part, cfg)) +mpam_write_partsel_reg (msc,CPBM , cfg->cpbm); +else +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_part, rprops)) { +if (mpam_has_feature (mpam_feat_mbw_part, cfg)) +mpam_write_partsel_reg (msc,MBW_PBM , cfg->mbw_pbm); +else +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 , bwa_fract); +if (mpam_has_feature (mpam_feat_mbw_max, rprops)) { +if (mpam_has_feature (mpam_feat_mbw_max, cfg)) +mpam_write_partsel_reg (msc,MBW_MAX , cfg->mbw_max); +else +mpam_write_partsel_reg (msc,MBW_MAX , bwa_fract); + }if (mpam_has_feature (mpam_feat_mbw_prop, rprops))mpam_write_partsel_reg (msc,MBW_PROP , bwa_fract);mutex_unlock (&msc->part_sel_lock); } +struct reprogram_ris { +struct mpam_msc_ris *ris; +struct mpam_config *cfg; +}; + +/* Call with MSC lock held */ +static int mpam_reprogram_ris (void *_arg) +{
drivers/platform/arm64/mpam/mpam_devices.c static void mpam_reset_msc_bitmap(struct mpam_msc *msc, u16 reg, u16 wd) · line 975
Quoted 10 lines
drivers/platform/arm64/mpam/mpam_devices.c +10
-0+u16 partid, partid_max; +struct reprogram_ris *arg = _arg; +struct mpam_msc_ris *ris = arg->ris; +struct mpam_config *cfg = arg->cfg; + +if (ris->in_reset_state) +return 0 ; + +spin_lock (&partid_max_lock); + partid_max = mpam_partid_max;
partid_max is not used after the assignment.
drivers/platform/arm64/mpam/mpam_devices.c static void mpam_reset_msc_bitmap(struct mpam_msc *msc, u16 reg, u16 wd) · line 976
Quoted 1 line
drivers/platform/arm64/mpam/mpam_devices.c +1
-0+spin_unlock (&partid_max_lock);
Doesn't make sense to lock protect a local variable partid_max which is not used any way.
[SNIP]
Thanks.
-Fenghua
James Morse
maintainerRe: [RFC PATCH 27/36] arm_mpam: Allow configuration to be applied and restored during cpu online
Hi Fenghua,
Quoted 29 lines · Fenghua Yu
Quoted 17 lines · James Morse
When CPUs come online the original configuration should be restored. Once the maximum partid is known, allocate an configuration array for each component, and reprogram each RIS configuration from this.
The MPAM spec describes how multiple controls can interact. To prevent this happening by accident, always reset controls that don't have a valid configuration. This allows the same helper to be used for configuration and reset.
drivers/platform/arm64/mpam/ renamed from drivers/platform/arm64/mpam/mpam_devices.c +0
-0
mpam_devices.c
indexbb3695eb84e9..f3ecfda265d2100644drivers/platform/arm64/mpam/mpam_devices.c>> @@ -909,51 +913,90 @@ static void mpam_reset_msc_bitmap(struct mpam_msc *msc, u16 reg, renamed from drivers/platform/arm64/mpam/mpam_devices.c +3
-0+/* Call with MSC lock held */ +static int mpam_reprogram_ris(void *_arg) +{drivers/platform/arm64/mpam/mpam_devices.c>> @@ -909,51 +913,90 @@ static void mpam_reset_msc_bitmap(struct mpam_msc *msc, u16 reg,
Quoted 10 lines
drivers/platform/arm64/mpam/mpam_devices.c>> @@ -909,51 +913,90 @@ static void mpam_reset_msc_bitmap(struct mpam_msc *msc, u16 reg, renamed from drivers/platform/arm64/mpam/mpam_devices.c +10
-0+ u16 partid, partid_max; + struct reprogram_ris *arg = _arg; + struct mpam_msc_ris *ris = arg->ris; + struct mpam_config *cfg = arg->cfg; + + if (ris->in_reset_state) + return 0; + + spin_lock(&partid_max_lock); + partid_max = mpam_partid_max;
partid_maxis not used after the assignment.
Quoted 5 lines
Quoted 1 line
+
spin_unlock(&partid_max_lock);Doesn't make sense to lock protect a local variable
partid_maxwhich is not used any way.[SNIP]
Because you cut the user out:
| for (partid = 0; partid <= partid_max; partid++) | mpam_reprogram_ris_partid(ris, partid, cfg); | | return 0; | }
mpam_reprogram_ris() needs to snapshot the value because it can be called via mpam_reset_msc() - which does run before mpam_enable_once(). This can race with mpam_register_requestor(), but the race can only reduce partid_max, all the MSC are guaranteed to support at least the original value.
Taking the lock is so you don't get a torn value which is larger than the original value.
Thanks,
James
James Morse
maintainerRFC PATCH 28/36 arm_mpam: Probe and reset the rest of the features
In reply to James MorseMPAM supports more features than are going to be exposed to resctrl. For partid other than 0, the reset values of these controls isn't known.
Discover the rest of the features so they can be reset to avoid any side effects when resctrl is in use.
PARTID narrowing allows MSC/RIS to support less configuration space than is usable. If this feature is found on a class of device we are likely to use, then reduce the partid_max to make it usable. This allows us to map a PARTID to itself.
--- drivers/platform/arm64/mpam/mpam_devices.c | 175 ++++++++++++++++++++ drivers/platform/arm64/mpam/mpam_internal.h | 16 +- 2 files changed, 189 insertions(+), 2 deletions(-)
drivers/platform/arm64/mpam/mpam_devices.c +175 -0
@@ -203,6 +203,15 @@ static void __mpam_part_sel(u8 ris_idx, u16 partid, struct mpam_msc *msc)__mpam_part_sel_raw (partsel, msc); } +static void __mpam_intpart_sel (u8 ris_idx,u16 intpartid,struct mpam_msc *msc) +{ +u32 partsel =FIELD_PREP (MPAMCFG_PART_SEL_RIS , ris_idx) | +FIELD_PREP (MPAMCFG_PART_SEL_PARTID_SEL , intpartid) | +MPAMCFG_PART_SEL_INTERNAL ; + +__mpam_part_sel_raw (partsel, msc); +} +int mpam_register_requestor (u16 partid_max,u8 pmg_max) {int err =0 ;
@@ -733,10 +742,35 @@ static void mpam_ris_hw_probe(struct mpam_msc_ris *ris)int err;struct mpam_msc *msc = ris->vmsc->msc;struct mpam_props *props = &ris->props; +struct mpam_class *class = ris->vmsc->comp->class;lockdep_assert_held (&msc->probe_lock);lockdep_assert_held (&msc->part_sel_lock); +/* Cache Capacity Partitioning */ +if (FIELD_GET (MPAMF_IDR_HAS_CCAP_PART , ris->idr)) { +u32 ccap_features =mpam_read_partsel_reg (msc,CCAP_IDR ); + + props->cmax_wd =FIELD_GET (MPAMF_CCAP_IDR_CMAX_WD , ccap_features); +if (props->cmax_wd && +FIELD_GET (MPAMF_CCAP_IDR_HAS_CMAX_SOFTLIM , ccap_features)) +mpam_set_feature (mpam_feat_cmax_softlim, props); + +if (props->cmax_wd && + !FIELD_GET (MPAMF_CCAP_IDR_NO_CMAX , ccap_features)) +mpam_set_feature (mpam_feat_cmax_cmax, props); + +if (props->cmax_wd && +FIELD_GET (MPAMF_CCAP_IDR_HAS_CMIN , ccap_features)) +mpam_set_feature (mpam_feat_cmax_cmin, props); + + props->cassoc_wd =FIELD_GET (MPAMF_CCAP_IDR_CASSOC_WD , ccap_features); + +if (props->cassoc_wd && +FIELD_GET (MPAMF_CCAP_IDR_HAS_CASSOC , ccap_features)) +mpam_set_feature (mpam_feat_cmax_cassoc, props); + } +/* Cache Portion partitioning */ if (FIELD_GET (MPAMF_IDR_HAS_CPOR_PART , ris->idr)) {u32 cpor_features =mpam_read_partsel_reg (msc,CPOR_IDR );
@@ -759,6 +793,31 @@ static void mpam_ris_hw_probe(struct mpam_msc_ris *ris) props->bwa_wd =FIELD_GET (MPAMF_MBW_IDR_BWA_WD , mbw_features);if (props->bwa_wd &&FIELD_GET (MPAMF_MBW_IDR_HAS_MAX , mbw_features))mpam_set_feature (mpam_feat_mbw_max, props); + +if (props->bwa_wd &&FIELD_GET (MPAMF_MBW_IDR_HAS_MIN , mbw_features)) +mpam_set_feature (mpam_feat_mbw_min, props); + +if (props->bwa_wd &&FIELD_GET (MPAMF_MBW_IDR_HAS_PROP , mbw_features)) +mpam_set_feature (mpam_feat_mbw_prop, props); + } + +/* Priority partitioning */ +if (FIELD_GET (MPAMF_IDR_HAS_PRI_PART , ris->idr)) { +u32 pri_features =mpam_read_partsel_reg (msc,PRI_IDR ); + + props->intpri_wd =FIELD_GET (MPAMF_PRI_IDR_INTPRI_WD , pri_features); +if (props->intpri_wd &&FIELD_GET (MPAMF_PRI_IDR_HAS_INTPRI , pri_features)) { +mpam_set_feature (mpam_feat_intpri_part, props); +if (FIELD_GET (MPAMF_PRI_IDR_INTPRI_0_IS_LOW , pri_features)) +mpam_set_feature (mpam_feat_intpri_part_0_low, props); + } + + props->dspri_wd =FIELD_GET (MPAMF_PRI_IDR_DSPRI_WD , pri_features); +if (props->dspri_wd &&FIELD_GET (MPAMF_PRI_IDR_HAS_DSPRI , pri_features)) { +mpam_set_feature (mpam_feat_dspri_part, props); +if (FIELD_GET (MPAMF_PRI_IDR_DSPRI_0_IS_LOW , pri_features)) +mpam_set_feature (mpam_feat_dspri_part_0_low, props); + } }/* Performance Monitoring */
@@ -822,6 +881,21 @@ static void mpam_ris_hw_probe(struct mpam_msc_ris *ris)*/ } } + +/* +* RIS with PARTID narrowing don't have enough storage for one +* configuration per PARTID. If these are in a class we could use, +* reduce the supported partid_max to match the number of intpartid. +* If the class is unknown, just ignore it. +*/ +if (FIELD_GET (MPAMF_IDR_HAS_PARTID_NRW , ris->idr) && + class->type !=MPAM_CLASS_UNKNOWN ) { +u32 nrwidr =mpam_read_partsel_reg (msc,PARTID_NRW_IDR ); +u16 partid_max =FIELD_GET (MPAMF_PARTID_NRW_IDR_INTPARTID_MAX , nrwidr); + +mpam_set_feature (mpam_feat_partid_nrw, props); + msc->partid_max =min (msc->partid_max, partid_max); + } }static int mpam_msc_hw_probe (struct mpam_msc *msc)
@@ -917,13 +991,29 @@ static void mpam_reset_msc_bitmap(struct mpam_msc *msc, u16 reg, u16 wd)static void mpam_reprogram_ris_partid (struct mpam_msc_ris *ris,u16 partid,struct mpam_config *cfg) { +u32 pri_val =0 ; +u16 cmax =MPAMCFG_CMAX_CMAX ;u16 bwa_fract =MPAMCFG_MBW_MAX_MAX ;struct mpam_msc *msc = ris->vmsc->msc;struct mpam_props *rprops = &ris->props; +u16 dspri =GENMASK (rprops->dspri_wd,0 ); +u16 intpri =GENMASK (rprops->intpri_wd,0 );mutex_lock (&msc->part_sel_lock);__mpam_part_sel (ris->ris_idx, partid, msc); +if (mpam_has_feature (mpam_feat_partid_nrw, rprops)) { +/* Update the intpartid mapping */ +mpam_write_partsel_reg (msc,INTPARTID , +MPAMCFG_INTPARTID_INTERNAL | partid); + +/* +* Then switch to the 'internal' partid to update the +* configuration. +*/ +__mpam_intpart_sel (ris->ris_idx, partid, msc); + } +if (mpam_has_feature (mpam_feat_cpor_part, rprops)) {if (mpam_has_feature (mpam_feat_cpor_part, cfg))mpam_write_partsel_reg (msc,CPBM , cfg->cpbm);
@@ -952,6 +1042,29 @@ static void mpam_reprogram_ris_partid(struct mpam_msc_ris *ris, u16 partid,if (mpam_has_feature (mpam_feat_mbw_prop, rprops))mpam_write_partsel_reg (msc,MBW_PROP , bwa_fract); + +if (mpam_has_feature (mpam_feat_cmax_cmax, rprops)) +mpam_write_partsel_reg (msc,CMAX , cmax); + +if (mpam_has_feature (mpam_feat_cmax_cmin, rprops)) +mpam_write_partsel_reg (msc,CMIN ,0 ); + +if (mpam_has_feature (mpam_feat_intpri_part, rprops) || +mpam_has_feature (mpam_feat_dspri_part, rprops)) { +/* aces high? */ +if (!mpam_has_feature (mpam_feat_intpri_part_0_low, rprops)) + intpri =0 ; +if (!mpam_has_feature (mpam_feat_dspri_part_0_low, rprops)) + dspri =0 ; + +if (mpam_has_feature (mpam_feat_intpri_part, rprops)) + pri_val |=FIELD_PREP (MPAMCFG_PRI_INTPRI , intpri); +if (mpam_has_feature (mpam_feat_dspri_part, rprops)) + pri_val |=FIELD_PREP (MPAMCFG_PRI_DSPRI , dspri); + +mpam_write_partsel_reg (msc,PRI , pri_val); + } +mutex_unlock (&msc->part_sel_lock); }
@@ -1513,6 +1626,16 @@ static bool mpam_has_bwa_wd_feature(struct mpam_props *props)return false; } +/* Any of these features mean the CMAX_WD field is valid. */ +static bool mpam_has_cmax_wd_feature (struct mpam_props *props) +{ +if (mpam_has_feature (mpam_feat_cmax_cmax, props)) +return true; +if (mpam_has_feature (mpam_feat_cmax_cmin, props)) +return true; +return false; +} +#define MISMATCHED_HELPER (parent, child, helper, field, alias) \ helper(parent) && \ ((helper(child) && (parent)->field != (child)->field) || \
@@ -1567,6 +1690,23 @@ static void __props_mismatch(struct mpam_props *parent, parent->bwa_wd =min (parent->bwa_wd, child->bwa_wd); } +if (alias && !mpam_has_cmax_wd_feature (parent) &&mpam_has_cmax_wd_feature (child)) { + parent->cmax_wd = child->cmax_wd; + }else if (MISMATCHED_HELPER (parent, child, mpam_has_cmax_wd_feature, + cmax_wd, alias)) { +pr_debug ("%s took the min cmax_wd\n" , __func__); + parent->cmax_wd =min (parent->cmax_wd, child->cmax_wd); + } + +if (CAN_MERGE_FEAT (parent, child, mpam_feat_cmax_cassoc, alias)) { + parent->cassoc_wd = child->cassoc_wd; + }else if (MISMATCHED_FEAT (parent, child, mpam_feat_cmax_cassoc, + cassoc_wd, alias)) { +pr_debug ("%s cleared cassoc_wd\n" , __func__); +mpam_clear_feature (mpam_feat_cmax_cassoc, &parent->features); + parent->cassoc_wd =0 ; + } +/* 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;
@@ -1584,6 +1724,41 @@ static void __props_mismatch(struct mpam_props *parent, parent->num_mbwu_mon =min (parent->num_mbwu_mon, child->num_mbwu_mon); } +if (CAN_MERGE_FEAT (parent, child, mpam_feat_intpri_part, alias)) { + parent->intpri_wd = child->intpri_wd; + }else if (MISMATCHED_FEAT (parent, child, mpam_feat_intpri_part, + intpri_wd, alias)) { +pr_debug ("%s took the min intpri_wd\n" , __func__); + parent->intpri_wd =min (parent->intpri_wd, child->intpri_wd); + } + +if (CAN_MERGE_FEAT (parent, child, mpam_feat_dspri_part, alias)) { + parent->dspri_wd = child->dspri_wd; + }else if (MISMATCHED_FEAT (parent, child, mpam_feat_dspri_part, + dspri_wd, alias)) { +pr_debug ("%s took the min dspri_wd\n" , __func__); + parent->dspri_wd =min (parent->dspri_wd, child->dspri_wd); + } + +/* TODO: alias support for these two */ +/* {int,ds}pri may not have differing 0-low behaviour */ +if (mpam_has_feature (mpam_feat_intpri_part, parent) && + (!mpam_has_feature (mpam_feat_intpri_part, child) || +mpam_has_feature (mpam_feat_intpri_part_0_low, parent) != +mpam_has_feature (mpam_feat_intpri_part_0_low, child))) { +pr_debug ("%s cleared intpri_part\n" , __func__); +mpam_clear_feature (mpam_feat_intpri_part, &parent->features); +mpam_clear_feature (mpam_feat_intpri_part_0_low, &parent->features); + } +if (mpam_has_feature (mpam_feat_dspri_part, parent) && + (!mpam_has_feature (mpam_feat_dspri_part, child) || +mpam_has_feature (mpam_feat_dspri_part_0_low, parent) != +mpam_has_feature (mpam_feat_dspri_part_0_low, child))) { +pr_debug ("%s cleared dspri_part\n" , __func__); +mpam_clear_feature (mpam_feat_dspri_part, &parent->features); +mpam_clear_feature (mpam_feat_dspri_part_0_low, &parent->features); + } +if (alias) {/* Merge features for aliased resources */ parent->features |= child->features;
drivers/platform/arm64/mpam/mpam_internal.h +14 -2
@@ -157,16 +157,23 @@ static inline void mpam_mon_sel_lock_held(struct mpam_msc *msc)* When we compact the supported features, we don't care what they are. * Storing them as a bitmap makes life easy. */ -typedef u16 mpam_features_t ; +typedef u32 mpam_features_t ;/* Bits for mpam_features_t */ enum mpam_device_features { - mpam_feat_ccap_part =0 , + mpam_feat_cmax_softlim, + mpam_feat_cmax_cmax, + mpam_feat_cmax_cmin, + mpam_feat_cmax_cassoc, mpam_feat_cpor_part, mpam_feat_mbw_part, mpam_feat_mbw_min, mpam_feat_mbw_max, mpam_feat_mbw_prop, + mpam_feat_intpri_part, + mpam_feat_intpri_part_0_low, + mpam_feat_dspri_part, + mpam_feat_dspri_part_0_low, mpam_feat_msmon, mpam_feat_msmon_csu, mpam_feat_msmon_csu_capture,
@@ -176,6 +183,7 @@ enum mpam_device_features { mpam_feat_msmon_mbwu_rwbw, mpam_feat_msmon_mbwu_hw_nrdy, mpam_feat_msmon_capt, + mpam_feat_partid_nrw, MPAM_FEATURE_LAST, };#define MPAM_ALL_FEATURES ((1 << MPAM_FEATURE_LAST) - 1)
@@ -186,6 +194,10 @@ struct mpam_props {u16 cpbm_wd;u16 mbw_pbm_bits;u16 bwa_wd; +u16 cmax_wd; +u16 cassoc_wd; +u16 intpri_wd; +u16 dspri_wd;u16 num_csu_mon;u16 num_mbwu_mon; };
Signature · 1 line
2.39.5
James Morse
maintainerRFC PATCH 29/36 arm_mpam: Add helpers to allocate monitors
In reply to James MorseMPAM's MSC support a number of monitors, each of which supports bandwidth counters, or cache-storage-utilisation counters. To use a counter, a monitor needs to be configured. Add helpers to allocate and free CSU or MBWU monitors.
--- drivers/platform/arm64/mpam/mpam_devices.c | 2 ++ drivers/platform/arm64/mpam/mpam_internal.h | 35 +++++++++++++++++++++ 2 files changed, 37 insertions(+)
drivers/platform/arm64/mpam/mpam_devices.c +2 -0
@@ -338,6 +338,8 @@ mpam_class_alloc(u8 level_idx, enum mpam_class_types type, gfp_t gfp) class->level = level_idx; class->type = type;INIT_LIST_HEAD_RCU (&class->classes_list); +ida_init (&class->ida_csu_mon); +ida_init (&class->ida_mbwu_mon);list_add_rcu (&class->classes_list, &mpam_classes);
drivers/platform/arm64/mpam/mpam_internal.h +35 -0
@@ -230,6 +230,9 @@ struct mpam_class {/* member of mpam_classes */ struct list_head classes_list; +struct ida ida_csu_mon; +struct ida ida_mbwu_mon; +struct mpam_garbage garbage; };
@@ -305,6 +308,38 @@ struct mpam_msc_ris {struct mpam_garbage garbage; }; +static inline int mpam_alloc_csu_mon (struct mpam_class *class) +{ +struct mpam_props *cprops = &class->props; + +if (!mpam_has_feature (mpam_feat_msmon_csu, cprops)) +return -EOPNOTSUPP ; + +return ida_alloc_range (&class->ida_csu_mon,0 , cprops->num_csu_mon -1 , +GFP_KERNEL ); +} + +static inline void mpam_free_csu_mon (struct mpam_class *class,int csu_mon) +{ +ida_free (&class->ida_csu_mon, csu_mon); +} + +static inline int mpam_alloc_mbwu_mon (struct mpam_class *class) +{ +struct mpam_props *cprops = &class->props; + +if (!mpam_has_feature (mpam_feat_msmon_mbwu, cprops)) +return -EOPNOTSUPP ; + +return ida_alloc_range (&class->ida_mbwu_mon,0 , + cprops->num_mbwu_mon -1 ,GFP_KERNEL ); +} + +static inline void mpam_free_mbwu_mon (struct mpam_class *class,int mbwu_mon) +{ +ida_free (&class->ida_mbwu_mon, mbwu_mon); +} +/* List of all classes - protected by srcu*/ extern struct srcu_struct mpam_srcu;extern struct list_head mpam_classes;
Signature · 1 line
2.39.5
James Morse
maintainerRFC PATCH 30/36 arm_mpam: Add mpam_msmon_read() to read monitor value
In reply to James MorseReaing a monitor involves configuring what you want to monitor, and reading the value. Components made up of multiple MSC may need values from each MSC. MSCs may take time to configure, returning 'not ready'. The maximum 'not ready' time should have been provided by firmware.
Add mpam_msmon_read() to hide all this. If (one of) the MSC returns not ready, then wait the full timeout value before trying again.
--- drivers/platform/arm64/mpam/mpam_devices.c | 222 ++++++++++++++++++++ drivers/platform/arm64/mpam/mpam_internal.h | 18 ++ 2 files changed, 240 insertions(+)
drivers/platform/arm64/mpam/mpam_devices.c +222 -0
@@ -960,6 +960,228 @@ static int mpam_msc_hw_probe(struct mpam_msc *msc)return 0 ; } +struct mon_read { +struct mpam_msc_ris *ris; +struct mon_cfg *ctx; +enum mpam_device_features type; +u64 *val; +int err; +}; + +static void gen_msmon_ctl_flt_vals (struct mon_read *m,u32 *ctl_val, +u32 *flt_val) +{ +struct mon_cfg *ctx = m->ctx; + +switch (m->type) { +case mpam_feat_msmon_csu: + *ctl_val =MSMON_CFG_MBWU_CTL_TYPE_CSU ; +break ; +case mpam_feat_msmon_mbwu: + *ctl_val =MSMON_CFG_MBWU_CTL_TYPE_MBWU ; +break ; +default : +return ; + } + +/* +* For CSU counters its implementation-defined what happens when not +* filtering by partid. +*/ + *ctl_val |= MSMON_CFG_x_CTL_MATCH_PARTID; + + *flt_val =FIELD_PREP (MSMON_CFG_MBWU_FLT_PARTID , ctx->partid); +if (m->ctx->match_pmg) { + *ctl_val |= MSMON_CFG_x_CTL_MATCH_PMG; + *flt_val |=FIELD_PREP (MSMON_CFG_MBWU_FLT_PMG , ctx->pmg); + } + +if (mpam_has_feature (mpam_feat_msmon_mbwu_rwbw, &m->ris->props)) + *flt_val |=FIELD_PREP (MSMON_CFG_MBWU_FLT_RWBW , ctx->opts); +} + +static void read_msmon_ctl_flt_vals (struct mon_read *m,u32 *ctl_val, +u32 *flt_val) +{ +struct mpam_msc *msc = m->ris->vmsc->msc; + +switch (m->type) { +case mpam_feat_msmon_csu: + *ctl_val =mpam_read_monsel_reg (msc,CFG_CSU_CTL ); + *flt_val =mpam_read_monsel_reg (msc,CFG_CSU_FLT ); +break ; +case mpam_feat_msmon_mbwu: + *ctl_val =mpam_read_monsel_reg (msc,CFG_MBWU_CTL ); + *flt_val =mpam_read_monsel_reg (msc,CFG_MBWU_FLT ); +break ; +default : +return ; + } +} + +/* Remove values set by the hardware to prevent aparant mismatches. */ +static void clean_msmon_ctl_val (u32 *cur_ctl) +{ + *cur_ctl &= ~MSMON_CFG_x_CTL_OFLOW_STATUS; +} + +static void write_msmon_ctl_flt_vals (struct mon_read *m,u32 ctl_val, +u32 flt_val) +{ +struct mpam_msc *msc = m->ris->vmsc->msc; + +/* +* Write the ctl_val with the enable bit cleared, reset the counter, +* then enable counter. +*/ +switch (m->type) { +case mpam_feat_msmon_csu: +mpam_write_monsel_reg (msc,CFG_CSU_FLT , flt_val); +mpam_write_monsel_reg (msc,CFG_CSU_CTL , ctl_val); +mpam_write_monsel_reg (msc,CSU ,0 ); +mpam_write_monsel_reg (msc,CFG_CSU_CTL , ctl_val | MSMON_CFG_x_CTL_EN); +break ; +case mpam_feat_msmon_mbwu: +mpam_write_monsel_reg (msc,CFG_MBWU_FLT , flt_val); +mpam_write_monsel_reg (msc,CFG_MBWU_CTL , ctl_val); +mpam_write_monsel_reg (msc,MBWU ,0 ); +mpam_write_monsel_reg (msc,CFG_MBWU_CTL , ctl_val | MSMON_CFG_x_CTL_EN); +break ; +default : +return ; + } +} + +/* Call with MSC lock held */ +static void __ris_msmon_read (void *arg) +{ +u64 now; +bool nrdy = false; +struct mon_read *m = arg; +struct mon_cfg *ctx = m->ctx; +struct mpam_msc_ris *ris = m->ris; +struct mpam_props *rprops = &ris->props; +struct mpam_msc *msc = m->ris->vmsc->msc; +u32 mon_sel, ctl_val, flt_val, cur_ctl, cur_flt; + +if (!mpam_mon_sel_inner_lock (msc)) { + m->err = -EIO ; +return ; + } + mon_sel =FIELD_PREP (MSMON_CFG_MON_SEL_MON_SEL , ctx->mon) | +FIELD_PREP (MSMON_CFG_MON_SEL_RIS , ris->ris_idx); +mpam_write_monsel_reg (msc,CFG_MON_SEL , mon_sel); + +/* +* Read the existing configuration to avoid re-writing the same values. +* This saves waiting for 'nrdy' on subsequent reads. +*/ +read_msmon_ctl_flt_vals (m, &cur_ctl, &cur_flt); +clean_msmon_ctl_val (&cur_ctl); +gen_msmon_ctl_flt_vals (m, &ctl_val, &flt_val); +if (cur_flt != flt_val || cur_ctl != (ctl_val | MSMON_CFG_x_CTL_EN)) +write_msmon_ctl_flt_vals (m, ctl_val, flt_val); + +switch (m->type) { +case mpam_feat_msmon_csu: + now =mpam_read_monsel_reg (msc,CSU ); +if (mpam_has_feature (mpam_feat_msmon_csu_hw_nrdy, rprops)) + nrdy = now &MSMON___NRDY ; +break ; +case mpam_feat_msmon_mbwu: + now =mpam_read_monsel_reg (msc,MBWU ); +if (mpam_has_feature (mpam_feat_msmon_mbwu_hw_nrdy, rprops)) + nrdy = now &MSMON___NRDY ; +break ; +default : + m->err = -EINVAL ; +break ; + } +mpam_mon_sel_inner_unlock (msc); + +if (nrdy) { + m->err = -EBUSY ; +return ; + } + + now =FIELD_GET (MSMON___VALUE , now); + *m->val += now; +} + +static int _msmon_read (struct mpam_component *comp,struct mon_read *arg) +{ +int err, idx; +struct mpam_msc *msc; +struct mpam_vmsc *vmsc; +struct mpam_msc_ris *ris; + + idx =srcu_read_lock (&mpam_srcu); +list_for_each_entry_rcu (vmsc, &comp->vmsc, comp_list) { + msc = vmsc->msc; + +mpam_mon_sel_outer_lock (msc); +list_for_each_entry_rcu (ris, &vmsc->ris, vmsc_list) { + arg->ris = ris; + + err =smp_call_function_any (&msc->accessibility, + __ris_msmon_read, arg, + true); +if (!err && arg->err) + err = arg->err; +if (err) +break ; + } +mpam_mon_sel_outer_unlock (msc); +if (err) +break ; + } +srcu_read_unlock (&mpam_srcu, idx); + +return err; +} + +int mpam_msmon_read (struct mpam_component *comp,struct mon_cfg *ctx, +enum mpam_device_features type,u64 *val) +{ +int err; +struct mon_read arg; +u64 wait_jiffies =0 ; +struct mpam_props *cprops = &comp->class->props; + +might_sleep (); + +if (!mpam_is_enabled ()) +return -EIO ; + +if (!mpam_has_feature (type, cprops)) +return -EOPNOTSUPP ; + +memset (&arg,0 ,sizeof (arg)); + arg.ctx = ctx; + arg.type = type; + arg.val = val; + *val =0 ; + + err =_msmon_read (comp, &arg); +if (err == -EBUSY && comp->class->nrdy_usec) + wait_jiffies =usecs_to_jiffies (comp->class->nrdy_usec); + +while (wait_jiffies) + wait_jiffies =schedule_timeout_uninterruptible (wait_jiffies); + +if (err == -EBUSY ) { +memset (&arg,0 ,sizeof (arg)); + arg.ctx = ctx; + arg.type = type; + arg.val = val; + *val =0 ; + + err =_msmon_read (comp, &arg); + } + +return err; +} +static void mpam_reset_msc_bitmap (struct mpam_msc *msc,u16 reg,u16 wd) {u32 num_words, msb;
drivers/platform/arm64/mpam/mpam_internal.h +18 -0
@@ -308,6 +308,21 @@ struct mpam_msc_ris {struct mpam_garbage garbage; }; +/* The values for MSMON_CFG_MBWU_FLT.RWBW */ +enum mon_filter_options { +COUNT_BOTH =0 , +COUNT_WRITE =1 , +COUNT_READ =2 , +}; + +struct mon_cfg { +u16 mon; +u8 pmg; +bool match_pmg; +u32 partid; +enum mon_filter_options opts; +}; +static inline int mpam_alloc_csu_mon (struct mpam_class *class) {struct mpam_props *cprops = &class->props;
@@ -360,6 +375,9 @@ void mpam_disable(struct work_struct *work);int mpam_apply_config (struct mpam_component *comp,u16 partid,struct mpam_config *cfg); +int mpam_msmon_read (struct mpam_component *comp,struct mon_cfg *ctx, +enum mpam_device_features ,u64 *val); +int mpam_get_cpumask_from_cache_id (unsigned long cache_id,u32 cache_level,cpumask_t *affinity);
Signature · 1 line
2.39.5
Ben Horgan
maintainerRe: [RFC PATCH 30/36] arm_mpam: Add mpam_msmon_read() to read monitor value
Hi James,
Quoted 1 line · James Morse
Reaing a monitor involves configuring what you want to monitor, and
nit: s/Reaing/Reading/
Quoted 283 lines
reading the value. Components made up of multiple MSC may need values from each MSC. MSCs may take time to configure, returning 'not ready'. The maximum 'not ready' time should have been provided by firmware.
Add
mpam_msmon_read()to hide all this. If (one of) the MSC returns not ready, then wait the full timeout value before trying again.CC Shanker Donthineni <[email protected]>Signed-off-by James Morse <[email protected]>--- drivers/platform/arm64/mpam/mpam_devices.c | 222 ++++++++++++++++++++ drivers/platform/arm64/mpam/mpam_internal.h | 18 ++ 2 files changed, 240 insertions(+)drivers/platform/arm64/mpam/mpam_devices.c +222
-0@@ -960,6 +960,228 @@ static int mpam_msc_hw_probe(struct mpam_msc *msc)return 0 ; } +struct mon_read { +struct mpam_msc_ris *ris; +struct mon_cfg *ctx; +enum mpam_device_features type; +u64 *val; +int err; +}; + +static void gen_msmon_ctl_flt_vals (struct mon_read *m,u32 *ctl_val, +u32 *flt_val) +{ +struct mon_cfg *ctx = m->ctx; + +switch (m->type) { +case mpam_feat_msmon_csu: + *ctl_val =MSMON_CFG_MBWU_CTL_TYPE_CSU ; +break ; +case mpam_feat_msmon_mbwu: + *ctl_val =MSMON_CFG_MBWU_CTL_TYPE_MBWU ; +break ; +default : +return ; + } + +/* +* For CSU counters its implementation-defined what happens when not +* filtering by partid. +*/ + *ctl_val |= MSMON_CFG_x_CTL_MATCH_PARTID; + + *flt_val =FIELD_PREP (MSMON_CFG_MBWU_FLT_PARTID , ctx->partid); +if (m->ctx->match_pmg) { + *ctl_val |= MSMON_CFG_x_CTL_MATCH_PMG; + *flt_val |=FIELD_PREP (MSMON_CFG_MBWU_FLT_PMG , ctx->pmg); + } + +if (mpam_has_feature (mpam_feat_msmon_mbwu_rwbw, &m->ris->props)) + *flt_val |=FIELD_PREP (MSMON_CFG_MBWU_FLT_RWBW , ctx->opts); +} + +static void read_msmon_ctl_flt_vals (struct mon_read *m,u32 *ctl_val, +u32 *flt_val) +{ +struct mpam_msc *msc = m->ris->vmsc->msc; + +switch (m->type) { +case mpam_feat_msmon_csu: + *ctl_val =mpam_read_monsel_reg (msc,CFG_CSU_CTL ); + *flt_val =mpam_read_monsel_reg (msc,CFG_CSU_FLT ); +break ; +case mpam_feat_msmon_mbwu: + *ctl_val =mpam_read_monsel_reg (msc,CFG_MBWU_CTL ); + *flt_val =mpam_read_monsel_reg (msc,CFG_MBWU_FLT ); +break ; +default : +return ; + } +} + +/* Remove values set by the hardware to prevent aparant mismatches. */ +static void clean_msmon_ctl_val (u32 *cur_ctl) +{ + *cur_ctl &= ~MSMON_CFG_x_CTL_OFLOW_STATUS; +} + +static void write_msmon_ctl_flt_vals (struct mon_read *m,u32 ctl_val, +u32 flt_val) +{ +struct mpam_msc *msc = m->ris->vmsc->msc; + +/* +* Write the ctl_val with the enable bit cleared, reset the counter, +* then enable counter. +*/ +switch (m->type) { +case mpam_feat_msmon_csu: +mpam_write_monsel_reg (msc,CFG_CSU_FLT , flt_val); +mpam_write_monsel_reg (msc,CFG_CSU_CTL , ctl_val); +mpam_write_monsel_reg (msc,CSU ,0 ); +mpam_write_monsel_reg (msc,CFG_CSU_CTL , ctl_val | MSMON_CFG_x_CTL_EN); +break ; +case mpam_feat_msmon_mbwu: +mpam_write_monsel_reg (msc,CFG_MBWU_FLT , flt_val); +mpam_write_monsel_reg (msc,CFG_MBWU_CTL , ctl_val); +mpam_write_monsel_reg (msc,MBWU ,0 ); +mpam_write_monsel_reg (msc,CFG_MBWU_CTL , ctl_val | MSMON_CFG_x_CTL_EN); +break ; +default : +return ; + } +} + +/* Call with MSC lock held */ +static void __ris_msmon_read (void *arg) +{ +u64 now; +bool nrdy = false; +struct mon_read *m = arg; +struct mon_cfg *ctx = m->ctx; +struct mpam_msc_ris *ris = m->ris; +struct mpam_props *rprops = &ris->props; +struct mpam_msc *msc = m->ris->vmsc->msc; +u32 mon_sel, ctl_val, flt_val, cur_ctl, cur_flt; + +if (!mpam_mon_sel_inner_lock (msc)) { + m->err = -EIO ; +return ; + } + mon_sel =FIELD_PREP (MSMON_CFG_MON_SEL_MON_SEL , ctx->mon) | +FIELD_PREP (MSMON_CFG_MON_SEL_RIS , ris->ris_idx); +mpam_write_monsel_reg (msc,CFG_MON_SEL , mon_sel); + +/* +* Read the existing configuration to avoid re-writing the same values. +* This saves waiting for 'nrdy' on subsequent reads. +*/ +read_msmon_ctl_flt_vals (m, &cur_ctl, &cur_flt); +clean_msmon_ctl_val (&cur_ctl); +gen_msmon_ctl_flt_vals (m, &ctl_val, &flt_val); +if (cur_flt != flt_val || cur_ctl != (ctl_val | MSMON_CFG_x_CTL_EN)) +write_msmon_ctl_flt_vals (m, ctl_val, flt_val); + +switch (m->type) { +case mpam_feat_msmon_csu: + now =mpam_read_monsel_reg (msc,CSU ); +if (mpam_has_feature (mpam_feat_msmon_csu_hw_nrdy, rprops)) + nrdy = now &MSMON___NRDY ; +break ; +case mpam_feat_msmon_mbwu: + now =mpam_read_monsel_reg (msc,MBWU ); +if (mpam_has_feature (mpam_feat_msmon_mbwu_hw_nrdy, rprops)) + nrdy = now &MSMON___NRDY ; +break ; +default : + m->err = -EINVAL ; +break ; + } +mpam_mon_sel_inner_unlock (msc); + +if (nrdy) { + m->err = -EBUSY ; +return ; + } + + now =FIELD_GET (MSMON___VALUE , now); + *m->val += now; +} + +static int _msmon_read (struct mpam_component *comp,struct mon_read *arg) +{ +int err, idx; +struct mpam_msc *msc; +struct mpam_vmsc *vmsc; +struct mpam_msc_ris *ris; + + idx =srcu_read_lock (&mpam_srcu); +list_for_each_entry_rcu (vmsc, &comp->vmsc, comp_list) { + msc = vmsc->msc; + +mpam_mon_sel_outer_lock (msc); +list_for_each_entry_rcu (ris, &vmsc->ris, vmsc_list) { + arg->ris = ris; + + err =smp_call_function_any (&msc->accessibility, + __ris_msmon_read, arg, + true); +if (!err && arg->err) + err = arg->err; +if (err) +break ; + } +mpam_mon_sel_outer_unlock (msc); +if (err) +break ; + } +srcu_read_unlock (&mpam_srcu, idx); + +return err; +} + +int mpam_msmon_read (struct mpam_component *comp,struct mon_cfg *ctx, +enum mpam_device_features type,u64 *val) +{ +int err; +struct mon_read arg; +u64 wait_jiffies =0 ; +struct mpam_props *cprops = &comp->class->props; + +might_sleep (); + +if (!mpam_is_enabled ()) +return -EIO ; + +if (!mpam_has_feature (type, cprops)) +return -EOPNOTSUPP ; + +memset (&arg,0 ,sizeof (arg)); + arg.ctx = ctx; + arg.type = type; + arg.val = val; + *val =0 ; + + err =_msmon_read (comp, &arg); +if (err == -EBUSY && comp->class->nrdy_usec) + wait_jiffies =usecs_to_jiffies (comp->class->nrdy_usec); + +while (wait_jiffies) + wait_jiffies =schedule_timeout_uninterruptible (wait_jiffies); + +if (err == -EBUSY ) { +memset (&arg,0 ,sizeof (arg)); + arg.ctx = ctx; + arg.type = type; + arg.val = val; + *val =0 ; + + err =_msmon_read (comp, &arg); + } + +return err; +} +static void mpam_reset_msc_bitmap (struct mpam_msc *msc,u16 reg,u16 wd) {u32 num_words, msb;drivers/platform/arm64/mpam/mpam_internal.h +18
-0@@ -308,6 +308,21 @@ struct mpam_msc_ris {struct mpam_garbage garbage; }; +/* The values for MSMON_CFG_MBWU_FLT.RWBW */ +enum mon_filter_options { +COUNT_BOTH =0 , +COUNT_WRITE =1 , +COUNT_READ =2 , +}; + +struct mon_cfg { +u16 mon; +u8 pmg; +bool match_pmg; +u32 partid; +enum mon_filter_options opts; +}; +static inline int mpam_alloc_csu_mon (struct mpam_class *class) {struct mpam_props *cprops = &class->props;@@ -360,6 +375,9 @@ void mpam_disable(struct work_struct *work);int mpam_apply_config (struct mpam_component *comp,u16 partid,struct mpam_config *cfg); +int mpam_msmon_read (struct mpam_component *comp,struct mon_cfg *ctx, +enum mpam_device_features ,u64 *val); +int mpam_get_cpumask_from_cache_id (unsigned long cache_id,u32 cache_level,cpumask_t *affinity);
Signature · 3 lines
Thanks, Ben
James Morse
maintainerRFC PATCH 31/36 arm_mpam: Track bandwidth counter state for overflow and power management
In reply to James MorseBandwidth counters need to run continuously to correctly reflect the bandwidth.
The value read may be lower than the previous value read in the case of overflow and when the hardware is reset due to CPU hotplug.
Add struct mbwu_state to track the bandwidth counter to allow overflow and power management to be handled.
--- drivers/platform/arm64/mpam/mpam_devices.c | 164 +++++++++++++++++++- drivers/platform/arm64/mpam/mpam_internal.h | 54 +++++-- 2 files changed, 201 insertions(+), 17 deletions(-)
drivers/platform/arm64/mpam/mpam_devices.c +162 -2
@@ -991,6 +991,7 @@ static void gen_msmon_ctl_flt_vals(struct mon_read *m, u32 *ctl_val, *ctl_val |= MSMON_CFG_x_CTL_MATCH_PARTID; *flt_val =FIELD_PREP (MSMON_CFG_MBWU_FLT_PARTID , ctx->partid); + *flt_val |=FIELD_PREP (MSMON_CFG_MBWU_FLT_RWBW , ctx->opts);if (m->ctx->match_pmg) { *ctl_val |= MSMON_CFG_x_CTL_MATCH_PMG; *flt_val |=FIELD_PREP (MSMON_CFG_MBWU_FLT_PMG , ctx->pmg);
@@ -1028,6 +1029,7 @@ static void clean_msmon_ctl_val(u32 *cur_ctl)static void write_msmon_ctl_flt_vals (struct mon_read *m,u32 ctl_val,u32 flt_val) { +struct msmon_mbwu_state *mbwu_state;struct mpam_msc *msc = m->ris->vmsc->msc;/*
@@ -1046,20 +1048,32 @@ static void write_msmon_ctl_flt_vals(struct mon_read *m, u32 ctl_val,mpam_write_monsel_reg (msc,CFG_MBWU_CTL , ctl_val);mpam_write_monsel_reg (msc,MBWU ,0 );mpam_write_monsel_reg (msc,CFG_MBWU_CTL , ctl_val | MSMON_CFG_x_CTL_EN); + + mbwu_state = &m->ris->mbwu_state[m->ctx->mon]; +if (mbwu_state) + mbwu_state->prev_val =0 ; +break ;default :return ; } } +static u64 mpam_msmon_overflow_val (struct mpam_msc_ris *ris) +{ +/* TODO: scaling, and long counters */ +return GENMASK_ULL (30 ,0 ); +} +/* Call with MSC lock held */ static void __ris_msmon_read (void *arg) { -u64 now;bool nrdy = false;struct mon_read *m = arg; +u64 now, overflow_val =0 ;struct mon_cfg *ctx = m->ctx;struct mpam_msc_ris *ris = m->ris; +struct msmon_mbwu_state *mbwu_state;struct mpam_props *rprops = &ris->props;struct mpam_msc *msc = m->ris->vmsc->msc;u32 mon_sel, ctl_val, flt_val, cur_ctl, cur_flt;
@@ -1087,11 +1101,30 @@ static void __ris_msmon_read(void *arg) now =mpam_read_monsel_reg (msc,CSU );if (mpam_has_feature (mpam_feat_msmon_csu_hw_nrdy, rprops)) nrdy = now &MSMON___NRDY ; + now =FIELD_GET (MSMON___VALUE , now);break ;case mpam_feat_msmon_mbwu: now =mpam_read_monsel_reg (msc,MBWU );if (mpam_has_feature (mpam_feat_msmon_mbwu_hw_nrdy, rprops)) nrdy = now &MSMON___NRDY ; + now =FIELD_GET (MSMON___VALUE , now); + +if (nrdy) +break ; + + mbwu_state = &ris->mbwu_state[ctx->mon]; +if (!mbwu_state) +break ; + +/* Add any pre-overflow value to the mbwu_state->val */ +if (mbwu_state->prev_val > now) + overflow_val =mpam_msmon_overflow_val (ris) - mbwu_state->prev_val; + + mbwu_state->prev_val = now; + mbwu_state->correction += overflow_val; + +/* Include bandwidth consumed before the last hardware reset */ + now += mbwu_state->correction;break ;default : m->err = -EINVAL ;
@@ -1104,7 +1137,6 @@ static void __ris_msmon_read(void *arg)return ; } - now =FIELD_GET (MSMON___VALUE , now); *m->val += now; }
@@ -1317,6 +1349,72 @@ static int mpam_reprogram_ris(void *_arg)return 0 ; } +/* Call with MSC lock and outer mon_sel lock held */ +static int mpam_restore_mbwu_state (void *_ris) +{ +int i; +struct mon_read mwbu_arg; +struct mpam_msc_ris *ris = _ris; +struct mpam_msc *msc = ris->vmsc->msc; + +mpam_mon_sel_outer_lock (msc); + +for (i =0 ; i < ris->props.num_mbwu_mon; i++) { +if (ris->mbwu_state[i].enabled) { + mwbu_arg.ris = ris; + mwbu_arg.ctx = &ris->mbwu_state[i].cfg; + mwbu_arg.type = mpam_feat_msmon_mbwu; + +__ris_msmon_read (&mwbu_arg); + } + } + +mpam_mon_sel_outer_unlock (msc); + +return 0 ; +} + +/* Call with MSC lock and outer mon_sel lock held */ +static int mpam_save_mbwu_state (void *arg) +{ +int i; +u64 val; +struct mon_cfg *cfg; +u32 cur_flt, cur_ctl, mon_sel; +struct mpam_msc_ris *ris = arg; +struct msmon_mbwu_state *mbwu_state; +struct mpam_msc *msc = ris->vmsc->msc; + +for (i =0 ; i < ris->props.num_mbwu_mon; i++) { + mbwu_state = &ris->mbwu_state[i]; + cfg = &mbwu_state->cfg; + +if (WARN_ON_ONCE (!mpam_mon_sel_inner_lock (msc))) +return -EIO ; + + mon_sel =FIELD_PREP (MSMON_CFG_MON_SEL_MON_SEL , i) | +FIELD_PREP (MSMON_CFG_MON_SEL_RIS , ris->ris_idx); +mpam_write_monsel_reg (msc,CFG_MON_SEL , mon_sel); + + cur_flt =mpam_read_monsel_reg (msc,CFG_MBWU_FLT ); + cur_ctl =mpam_read_monsel_reg (msc,CFG_MBWU_CTL ); +mpam_write_monsel_reg (msc,CFG_MBWU_CTL ,0 ); + + val =mpam_read_monsel_reg (msc,MBWU ); +mpam_write_monsel_reg (msc,MBWU ,0 ); + + cfg->mon = i; + cfg->pmg =FIELD_GET (MSMON_CFG_MBWU_FLT_PMG , cur_flt); + cfg->match_pmg =FIELD_GET (MSMON_CFG_x_CTL_MATCH_PMG, cur_ctl); + cfg->partid =FIELD_GET (MSMON_CFG_MBWU_FLT_PARTID , cur_flt); + mbwu_state->correction += val; + mbwu_state->enabled =FIELD_GET (MSMON_CFG_x_CTL_EN, cur_ctl); +mpam_mon_sel_inner_unlock (msc); + } + +return 0 ; +} +/* * Called via smp_call_on_cpu() to prevent migration, while still being * pre-emptible.
@@ -1377,6 +1475,9 @@ static void mpam_reset_msc(struct mpam_msc *msc, bool online)* for non-zero partid may be lost while the CPUs are offline. */ ris->in_reset_state = online; + +if (mpam_is_enabled () && !online) +mpam_touch_msc (msc, &mpam_save_mbwu_state, ris); }mpam_mon_sel_outer_unlock (msc); }
@@ -1406,6 +1507,9 @@ static void mpam_reprogram_msc(struct mpam_msc *msc)mpam_reprogram_ris_partid (ris, partid, cfg); } ris->in_reset_state = reset; + +if (mpam_has_feature (mpam_feat_msmon_mbwu, &ris->props)) +mpam_touch_msc (msc, &mpam_restore_mbwu_state, ris); }srcu_read_unlock (&mpam_srcu, idx); }
@@ -2276,11 +2380,36 @@ static void mpam_unregister_irqs(void)static void __destroy_component_cfg (struct mpam_component *comp) { +struct mpam_msc *msc; +struct mpam_vmsc *vmsc; +struct mpam_msc_ris *ris; + +lockdep_assert_held (&mpam_list_lock); +add_to_garbage (comp->cfg); +list_for_each_entry (vmsc, &comp->vmsc, comp_list) { + msc = vmsc->msc; + +mpam_mon_sel_outer_lock (msc); +if (mpam_mon_sel_inner_lock (msc)) { +list_for_each_entry (ris, &vmsc->ris, vmsc_list) +add_to_garbage (ris->mbwu_state); +mpam_mon_sel_inner_unlock (msc); + } +mpam_mon_sel_outer_lock (msc); + } }static int __allocate_component_cfg (struct mpam_component *comp) { +int err =0 ; +struct mpam_msc *msc; +struct mpam_vmsc *vmsc; +struct mpam_msc_ris *ris; +struct msmon_mbwu_state *mbwu_state; + +lockdep_assert_held (&mpam_list_lock); +if (comp->cfg)return 0 ;
@@ -2289,6 +2418,37 @@ static int __allocate_component_cfg(struct mpam_component *comp)return -ENOMEM ;init_garbage (comp->cfg); +list_for_each_entry (vmsc, &comp->vmsc, comp_list) { +if (!vmsc->props.num_mbwu_mon) +continue ; + + msc = vmsc->msc; +mpam_mon_sel_outer_lock (msc); +list_for_each_entry (ris, &vmsc->ris, vmsc_list) { +if (!ris->props.num_mbwu_mon) +continue ; + + mbwu_state =kcalloc (ris->props.num_mbwu_mon, +sizeof (*ris->mbwu_state), +GFP_KERNEL ); +if (!mbwu_state) { +__destroy_component_cfg (comp); + err = -ENOMEM ; +break ; + } + +if (mpam_mon_sel_inner_lock (msc)) { +init_garbage (mbwu_state); + ris->mbwu_state = mbwu_state; +mpam_mon_sel_inner_unlock (msc); + } + } +mpam_mon_sel_outer_unlock (msc); + +if (err) +break ; + } +return 0 ; }
drivers/platform/arm64/mpam/mpam_internal.h +39 -15
69 lines not on this page · raw message
Signature · 1 line
2.39.5
James Morse
maintainerRFC PATCH 32/36 arm_mpam: Probe for long/lwd mbwu counters
In reply to James MorseFrom: Rohit Mathew <[email protected]>
mpam v0.1 and versions above v1.0 support optional long counter for memory bandwidth monitoring. The MPAMF_MBWUMON_IDR register have fields indicating support for long counters. As of now, a 44 bit counter represented by HAS_LONG field (bit 30) and a 63 bit counter represented by LWD (bit 29) can be optionally integrated. Probe for these counters and set corresponding feature bits if any of these counters are present.
--- drivers/platform/arm64/mpam/mpam_devices.c | 23 ++++++++++++++++++++- drivers/platform/arm64/mpam/mpam_internal.h | 8 +++++++ 2 files changed, 30 insertions(+), 1 deletion(-)
drivers/platform/arm64/mpam/mpam_devices.c +22 -1
@@ -860,7 +860,7 @@ static void mpam_ris_hw_probe(struct mpam_msc_ris *ris)pr_err_once ("Counters are not usable because not-ready timeout was not provided by firmware." ); }if (FIELD_GET (MPAMF_MSMON_IDR_MSMON_MBWU , msmon_features)) { -bool hw_managed; +bool has_long, hw_managed;u32 mbwumonidr =mpam_read_partsel_reg (msc,MBWUMON_IDR ); props->num_mbwu_mon =FIELD_GET (MPAMF_MBWUMON_IDR_NUM_MON , mbwumonidr);
@@ -870,6 +870,27 @@ static void mpam_ris_hw_probe(struct mpam_msc_ris *ris)if (FIELD_GET (MPAMF_MBWUMON_IDR_HAS_RWBW , mbwumonidr))mpam_set_feature (mpam_feat_msmon_mbwu_rwbw, props); +/* +* Treat long counter and its extension, lwd as mutually +* exclusive feature bits. Though these are dependent +* fields at the implementation level, there would never +* be a need for mpam_feat_msmon_mbwu_44counter (long +* counter) and mpam_feat_msmon_mbwu_63counter (lwd) +* bits to be set together. +* +* mpam_feat_msmon_mbwu isn't treated as an exclusive +* bit as this feature bit would be used as the "front +* facing feature bit" for any checks related to mbwu +* monitors. +*/ + has_long =FIELD_GET (MPAMF_MBWUMON_IDR_HAS_LONG , mbwumonidr); +if (props->num_mbwu_mon && has_long) { +if (FIELD_GET (MPAMF_MBWUMON_IDR_LWD , mbwumonidr)) +mpam_set_feature (mpam_feat_msmon_mbwu_63counter, props); +else +mpam_set_feature (mpam_feat_msmon_mbwu_44counter, props); + } +/* Is NRDY hardware managed? */ mpam_mon_sel_outer_lock (msc);mpam_ris_hw_probe_hw_nrdy (ris,MBWU , hw_managed);
drivers/platform/arm64/mpam/mpam_internal.h +8 -0
@@ -178,7 +178,15 @@ enum mpam_device_features { mpam_feat_msmon_csu, mpam_feat_msmon_csu_capture, mpam_feat_msmon_csu_hw_nrdy, + +/* +* Having mpam_feat_msmon_mbwu set doesn't mean the regular 31 bit MBWU +* counter would be used. The exact counter used is decided based on the +* status of mpam_feat_msmon_mbwu_l/mpam_feat_msmon_mbwu_lwd as well. +*/ mpam_feat_msmon_mbwu, + mpam_feat_msmon_mbwu_44counter, + mpam_feat_msmon_mbwu_63counter, mpam_feat_msmon_mbwu_capture, mpam_feat_msmon_mbwu_rwbw, mpam_feat_msmon_mbwu_hw_nrdy,
Signature · 1 line
2.39.5
James Morse
maintainerRFC PATCH 33/36 arm_mpam: Use long MBWU counters if supported
In reply to James MorseFrom: Rohit Mathew <[email protected]>
If the 44 bit (long) or 63 bit (LWD) counters are detected on probing the RIS, use long/LWD counter instead of the regular 31 bit mbwu counter.
Only 32bit accesses to the MSC are required to be supported by the spec, but these registers are 64bits. The lower half may overflow into the higher half between two 32bit reads. To avoid this, use a helper that reads the top half twice to check for overflow.
--- drivers/platform/arm64/mpam/mpam_devices.c | 89 ++++++++++++++++++--- drivers/platform/arm64/mpam/mpam_internal.h | 8 +- 2 files changed, 86 insertions(+), 11 deletions(-)
drivers/platform/arm64/mpam/mpam_devices.c +80 -9
@@ -989,6 +989,48 @@ struct mon_read {int err; }; +static bool mpam_ris_has_mbwu_long_counter (struct mpam_msc_ris *ris) +{ +return (mpam_has_feature (mpam_feat_msmon_mbwu_63counter, &ris->props) || +mpam_has_feature (mpam_feat_msmon_mbwu_44counter, &ris->props)); +} + +static u64 mpam_msc_read_mbwu_l (struct mpam_msc *msc) +{ +int retry =3 ; +u32 mbwu_l_low; +u64 mbwu_l_high1, mbwu_l_high2; + +mpam_mon_sel_lock_held (msc); + +WARN_ON_ONCE ((MSMON_MBWU_L +sizeof (u64)) > msc->mapped_hwpage_sz); +WARN_ON_ONCE (!cpumask_test_cpu (smp_processor_id (), &msc->accessibility)); + + mbwu_l_high2 =__mpam_read_reg (msc,MSMON_MBWU_L +4 ); +do { + mbwu_l_high1 = mbwu_l_high2; + mbwu_l_low =__mpam_read_reg (msc,MSMON_MBWU_L ); + mbwu_l_high2 =__mpam_read_reg (msc,MSMON_MBWU_L +4 ); + + retry--; + }while (mbwu_l_high1 != mbwu_l_high2 && retry >0 ); + +if (mbwu_l_high1 == mbwu_l_high2) +return (mbwu_l_high1 <<32 ) | mbwu_l_low; +return MSMON___NRDY_L ; +} + +static void mpam_msc_zero_mbwu_l (struct mpam_msc *msc) +{ +mpam_mon_sel_lock_held (msc); + +WARN_ON_ONCE ((MSMON_MBWU_L +sizeof (u64)) > msc->mapped_hwpage_sz); +WARN_ON_ONCE (!cpumask_test_cpu (smp_processor_id (), &msc->accessibility)); + +__mpam_write_reg (msc,MSMON_MBWU_L ,0 ); +__mpam_write_reg (msc,MSMON_MBWU_L +4 ,0 ); +} +static void gen_msmon_ctl_flt_vals (struct mon_read *m,u32 *ctl_val,u32 *flt_val) {
@@ -1045,6 +1087,7 @@ static void read_msmon_ctl_flt_vals(struct mon_read *m, u32 *ctl_val,static void clean_msmon_ctl_val (u32 *cur_ctl) { *cur_ctl &= ~MSMON_CFG_x_CTL_OFLOW_STATUS; + *cur_ctl &= ~MSMON_CFG_x_CTL_OFLOW_STATUS_L; } static void write_msmon_ctl_flt_vals(struct mon_read *m, u32 ctl_val,
@@ -1067,7 +1110,11 @@ static void write_msmon_ctl_flt_vals(struct mon_read *m, u32 ctl_val,case mpam_feat_msmon_mbwu:mpam_write_monsel_reg (msc,CFG_MBWU_FLT , flt_val);mpam_write_monsel_reg (msc,CFG_MBWU_CTL , ctl_val); -mpam_write_monsel_reg (msc,MBWU ,0 ); +if (mpam_ris_has_mbwu_long_counter (m->ris)) +mpam_msc_zero_mbwu_l (m->ris->vmsc->msc); +else +mpam_write_monsel_reg (msc,MBWU ,0 ); +mpam_write_monsel_reg (msc,CFG_MBWU_CTL , ctl_val | MSMON_CFG_x_CTL_EN); mbwu_state = &m->ris->mbwu_state[m->ctx->mon];
@@ -1082,8 +1129,13 @@ static void write_msmon_ctl_flt_vals(struct mon_read *m, u32 ctl_val,static u64 mpam_msmon_overflow_val (struct mpam_msc_ris *ris) { -/* TODO: scaling, and long counters */ -return GENMASK_ULL (30 ,0 ); +/* TODO: implement scaling counters */ +if (mpam_has_feature (mpam_feat_msmon_mbwu_63counter, &ris->props)) +return GENMASK_ULL (62 ,0 ); +else if (mpam_has_feature (mpam_feat_msmon_mbwu_44counter, &ris->props)) +return GENMASK_ULL (43 ,0 ); +else +return GENMASK_ULL (30 ,0 ); }/* Call with MSC lock held */
@@ -1125,10 +1177,24 @@ static void __ris_msmon_read(void *arg) now =FIELD_GET (MSMON___VALUE , now);break ;case mpam_feat_msmon_mbwu: - now =mpam_read_monsel_reg (msc,MBWU ); -if (mpam_has_feature (mpam_feat_msmon_mbwu_hw_nrdy, rprops)) - nrdy = now &MSMON___NRDY ; - now =FIELD_GET (MSMON___VALUE , now); +/* +* If long or lwd counters are supported, use them, else revert +* to the 32 bit counter. +*/ +if (mpam_ris_has_mbwu_long_counter (ris)) { + now =mpam_msc_read_mbwu_l (msc); +if (mpam_has_feature (mpam_feat_msmon_mbwu_hw_nrdy, rprops)) + nrdy = now &MSMON___NRDY_L ; +if (mpam_has_feature (mpam_feat_msmon_mbwu_63counter, rprops)) + now =FIELD_GET (MSMON___LWD_VALUE , now); +else + now =FIELD_GET (MSMON___L_VALUE , now); + }else { + now =mpam_read_monsel_reg (msc,MBWU ); +if (mpam_has_feature (mpam_feat_msmon_mbwu_hw_nrdy, rprops)) + nrdy = now &MSMON___NRDY ; + now =FIELD_GET (MSMON___VALUE , now); + }if (nrdy)break ;
@@ -1421,8 +1487,13 @@ static int mpam_save_mbwu_state(void *arg) cur_ctl =mpam_read_monsel_reg (msc,CFG_MBWU_CTL );mpam_write_monsel_reg (msc,CFG_MBWU_CTL ,0 ); - val =mpam_read_monsel_reg (msc,MBWU ); -mpam_write_monsel_reg (msc,MBWU ,0 ); +if (mpam_ris_has_mbwu_long_counter (ris)) { + val =mpam_msc_read_mbwu_l (msc); +mpam_msc_zero_mbwu_l (msc); + }else { + val =mpam_read_monsel_reg (msc,MBWU ); +mpam_write_monsel_reg (msc,MBWU ,0 ); + } cfg->mon = i; cfg->pmg =FIELD_GET (MSMON_CFG_MBWU_FLT_PMG , cur_flt);
drivers/platform/arm64/mpam/mpam_internal.h +6 -2
@@ -178,7 +178,6 @@ enum mpam_device_features { mpam_feat_msmon_csu, mpam_feat_msmon_csu_capture, mpam_feat_msmon_csu_hw_nrdy, -/* * Having mpam_feat_msmon_mbwu set doesn't mean the regular 31 bit MBWU * counter would be used. The exact counter used is decided based on the
@@ -457,6 +456,8 @@ int mpam_get_cpumask_from_cache_id(unsigned long cache_id, u32 cache_level,#define MSMON_CSU_CAPTURE 0x0848/* last cache-usage value captured */ #define MSMON_MBWU 0x0860/* current mem-bw usage value */ #define MSMON_MBWU_CAPTURE 0x0868/* last mem-bw value captured */ +#define MSMON_MBWU_L 0x0880/* current long mem-bw usage value */ +#define MSMON_MBWU_CAPTURE_L 0x0890/* last long mem-bw value captured */ #define MSMON_CAPT_EVNT 0x0808/* signal a capture event */ #define MPAMF_ESR 0x00F8/* error status register */ #define MPAMF_ECR 0x00F0/* error control register */
@@ -674,7 +675,10 @@ int mpam_get_cpumask_from_cache_id(unsigned long cache_id, u32 cache_level,*/ #define MSMON___VALUE GENMASK(30, 0)#define MSMON___NRDY BIT(31) -#define MSMON_MBWU_L_VALUE GENMASK(62, 0) +#define MSMON___NRDY_L BIT(63) +#define MSMON___L_VALUE GENMASK(43, 0) +#define MSMON___LWD_VALUE GENMASK(62, 0) +/* * MSMON_CAPT_EVNT - Memory system performance monitoring capture event * generation register
Signature · 1 line
2.39.5
Ben Horgan
maintainerRe: [RFC PATCH 33/36] arm_mpam: Use long MBWU counters if supported
Hi James,
Quoted 10 lines · James Morse
From: Rohit Mathew <[email protected]>
If the 44 bit (long) or 63 bit (LWD) counters are detected on probing the RIS, use long/LWD counter instead of the regular 31 bit mbwu counter.
Only 32bit accesses to the MSC are required to be supported by the spec, but these registers are 64bits. The lower half may overflow into the higher half between two 32bit reads. To avoid this, use a helper that reads the top half twice to check for overflow.
Slightly misleading as it may be read up to 4 times.
Quoted 101 lines
Signed-off-by Rohit Mathew <[email protected]>[morse: merged multiple patches from Rohit]Signed-off-by James Morse <[email protected]>--- drivers/platform/arm64/mpam/mpam_devices.c | 89 ++++++++++++++++++--- drivers/platform/arm64/mpam/mpam_internal.h | 8 +- 2 files changed, 86 insertions(+), 11 deletions(-)drivers/platform/arm64/mpam/mpam_devices.c +55
-3@@ -989,6 +989,48 @@ struct mon_read {int err; }; +static bool mpam_ris_has_mbwu_long_counter (struct mpam_msc_ris *ris) +{ +return (mpam_has_feature (mpam_feat_msmon_mbwu_63counter, &ris->props) || +mpam_has_feature (mpam_feat_msmon_mbwu_44counter, &ris->props)); +} + +static u64 mpam_msc_read_mbwu_l (struct mpam_msc *msc) +{ +int retry =3 ; +u32 mbwu_l_low; +u64 mbwu_l_high1, mbwu_l_high2; + +mpam_mon_sel_lock_held (msc); + +WARN_ON_ONCE ((MSMON_MBWU_L +sizeof (u64)) > msc->mapped_hwpage_sz); +WARN_ON_ONCE (!cpumask_test_cpu (smp_processor_id (), &msc->accessibility)); + + mbwu_l_high2 =__mpam_read_reg (msc,MSMON_MBWU_L +4 ); +do { + mbwu_l_high1 = mbwu_l_high2; + mbwu_l_low =__mpam_read_reg (msc,MSMON_MBWU_L ); + mbwu_l_high2 =__mpam_read_reg (msc,MSMON_MBWU_L +4 ); + + retry--; + }while (mbwu_l_high1 != mbwu_l_high2 && retry >0 ); + +if (mbwu_l_high1 == mbwu_l_high2) +return (mbwu_l_high1 <<32 ) | mbwu_l_low; +return MSMON___NRDY_L ; +} + +static void mpam_msc_zero_mbwu_l (struct mpam_msc *msc) +{ +mpam_mon_sel_lock_held (msc); + +WARN_ON_ONCE ((MSMON_MBWU_L +sizeof (u64)) > msc->mapped_hwpage_sz); +WARN_ON_ONCE (!cpumask_test_cpu (smp_processor_id (), &msc->accessibility)); + +__mpam_write_reg (msc,MSMON_MBWU_L ,0 ); +__mpam_write_reg (msc,MSMON_MBWU_L +4 ,0 ); +} +static void gen_msmon_ctl_flt_vals (struct mon_read *m,u32 *ctl_val,u32 *flt_val) {@@ -1045,6 +1087,7 @@ static void read_msmon_ctl_flt_vals(struct mon_read *m, u32 *ctl_val,static void clean_msmon_ctl_val (u32 *cur_ctl) { *cur_ctl &= ~MSMON_CFG_x_CTL_OFLOW_STATUS; + *cur_ctl &= ~MSMON_CFG_x_CTL_OFLOW_STATUS_L; } static void write_msmon_ctl_flt_vals(struct mon_read *m, u32 ctl_val,@@ -1067,7 +1110,11 @@ static void write_msmon_ctl_flt_vals(struct mon_read *m, u32 ctl_val,case mpam_feat_msmon_mbwu:mpam_write_monsel_reg (msc,CFG_MBWU_FLT , flt_val);mpam_write_monsel_reg (msc,CFG_MBWU_CTL , ctl_val); -mpam_write_monsel_reg (msc,MBWU ,0 ); +if (mpam_ris_has_mbwu_long_counter (m->ris)) +mpam_msc_zero_mbwu_l (m->ris->vmsc->msc); +else +mpam_write_monsel_reg (msc,MBWU ,0 ); +mpam_write_monsel_reg (msc,CFG_MBWU_CTL , ctl_val | MSMON_CFG_x_CTL_EN); mbwu_state = &m->ris->mbwu_state[m->ctx->mon];@@ -1082,8 +1129,13 @@ static void write_msmon_ctl_flt_vals(struct mon_read *m, u32 ctl_val,static u64 mpam_msmon_overflow_val (struct mpam_msc_ris *ris) { -/* TODO: scaling, and long counters */ -return GENMASK_ULL (30 ,0 ); +/* TODO: implement scaling counters */ +if (mpam_has_feature (mpam_feat_msmon_mbwu_63counter, &ris->props)) +return GENMASK_ULL (62 ,0 ); +else if (mpam_has_feature (mpam_feat_msmon_mbwu_44counter, &ris->props)) +return GENMASK_ULL (43 ,0 ); +else +return GENMASK_ULL (30 ,0 ); }/* Call with MSC lock held */ @@ -1125,10 +1177,24 @@ static void __ris_msmon_read(void *arg) now =FIELD_GET (MSMON___VALUE , now);
drivers/platform/arm64/mpam/mpam_devices.c static void __ris_msmon_read(void *arg) · line 1183
Quoted 10 lines
drivers/platform/arm64/mpam/mpam_devices.c +4
-4break ;case mpam_feat_msmon_mbwu: - now =mpam_read_monsel_reg (msc,MBWU ); -if (mpam_has_feature (mpam_feat_msmon_mbwu_hw_nrdy, rprops)) - nrdy = now &MSMON___NRDY ; - now =FIELD_GET (MSMON___VALUE , now); +/* +* If long or lwd counters are supported, use them, else revert +* to the 32 bit counter. +*/
32 bit counter -> 31 bit counter
Quoted 55 lines
drivers/platform/arm64/mpam/mpam_devices.c +21
-2+if (mpam_ris_has_mbwu_long_counter (ris)) { + now =mpam_msc_read_mbwu_l (msc); +if (mpam_has_feature (mpam_feat_msmon_mbwu_hw_nrdy, rprops)) + nrdy = now &MSMON___NRDY_L ; +if (mpam_has_feature (mpam_feat_msmon_mbwu_63counter, rprops)) + now =FIELD_GET (MSMON___LWD_VALUE , now); +else + now =FIELD_GET (MSMON___L_VALUE , now); + }else { + now =mpam_read_monsel_reg (msc,MBWU ); +if (mpam_has_feature (mpam_feat_msmon_mbwu_hw_nrdy, rprops)) + nrdy = now &MSMON___NRDY ; + now =FIELD_GET (MSMON___VALUE , now); + }if (nrdy)break ;@@ -1421,8 +1487,13 @@ static int mpam_save_mbwu_state(void *arg) cur_ctl =mpam_read_monsel_reg (msc,CFG_MBWU_CTL );mpam_write_monsel_reg (msc,CFG_MBWU_CTL ,0 ); - val =mpam_read_monsel_reg (msc,MBWU ); -mpam_write_monsel_reg (msc,MBWU ,0 ); +if (mpam_ris_has_mbwu_long_counter (ris)) { + val =mpam_msc_read_mbwu_l (msc); +mpam_msc_zero_mbwu_l (msc); + }else { + val =mpam_read_monsel_reg (msc,MBWU ); +mpam_write_monsel_reg (msc,MBWU ,0 ); + } cfg->mon = i; cfg->pmg =FIELD_GET (MSMON_CFG_MBWU_FLT_PMG , cur_flt);drivers/platform/arm64/mpam/mpam_internal.h +2
-1@@ -178,7 +178,6 @@ enum mpam_device_features { mpam_feat_msmon_csu, mpam_feat_msmon_csu_capture, mpam_feat_msmon_csu_hw_nrdy, -/* * Having mpam_feat_msmon_mbwu set doesn't mean the regular 31 bit MBWU * counter would be used. The exact counter used is decided based on the @@ -457,6 +456,8 @@ int mpam_get_cpumask_from_cache_id(unsigned long cache_id, u32 cache_level,#define MSMON_CSU_CAPTURE 0x0848/* last cache-usage value captured */ #define MSMON_MBWU 0x0860/* current mem-bw usage value */ #define MSMON_MBWU_CAPTURE 0x0868/* last mem-bw value captured */ +#define MSMON_MBWU_L 0x0880/* current long mem-bw usage value */ +#define MSMON_MBWU_CAPTURE_L 0x0890/* last long mem-bw value captured */ #define MSMON_CAPT_EVNT 0x0808/* signal a capture event */ #define MPAMF_ESR 0x00F8/* error status register */ #define MPAMF_ECR 0x00F0/* error control register */
drivers/platform/arm64/mpam/mpam_internal.h int mpam_get_cpumask_from_cache_id(unsigned long cache_id, u32 cache_level, · line 681
Quoted 8 lines
drivers/platform/arm64/mpam/mpam_internal.h +4
-1@@ -674,7 +675,10 @@ int mpam_get_cpumask_from_cache_id(unsigned long cache_id, u32 cache_level,*/ #define MSMON___VALUE GENMASK(30, 0)#define MSMON___NRDY BIT(31) -#define MSMON_MBWU_L_VALUE GENMASK(62, 0) +#define MSMON___NRDY_L BIT(63) +#define MSMON___L_VALUE GENMASK(43, 0) +#define MSMON___LWD_VALUE GENMASK(62, 0) +
As mentioned on an earlier patch. These could be added with all the other register definition.
Quoted 3 lines
drivers/platform/arm64/mpam/mpam_internal.h +0
-0/* * MSMON_CAPT_EVNT - Memory system performance monitoring capture event * generation register
Signature · 3 lines
Thanks, Ben
James Morse
maintainerRe: [RFC PATCH 33/36] arm_mpam: Use long MBWU counters if supported
Hi Ben,
Quoted 7 lines · Ben Horgan
Quoted 6 lines · James Morse
From: Rohit Mathew <[email protected]>
If the 44 bit (long) or 63 bit (LWD) counters are detected on probing the RIS, use long/LWD counter instead of the regular 31 bit mbwu counter.
Quoted 6 lines
Quoted 4 lines
Only 32bit accesses to the MSC are required to be supported by the spec, but these registers are 64bits. The lower half may overflow into the higher half between two 32bit reads. To avoid this, use a helper that reads the top half twice to check for overflow.
Slightly misleading as it may be read up to 4 times.
Meh - its referring to the high/low/high pattern. Sure if it fails you go round the whole thing again. I'll change it 'read multiple times to check for overflow'.
Quoted 10 lines
Quoted 10 lines
drivers/platform/arm64/mpam/ renamed from drivers/platform/arm64/mpam/mpam_devices.c +0
-0
mpam_devices.c
index774137a124f8..ace69ac2d0ee100644drivers/platform/arm64/mpam/mpam_devices.c +0
-1@@ -1125,10 +1177,24 @@ static void __ris_msmon_read(void *arg) now =FIELD_GET (MSMON___VALUE , now);break ;case mpam_feat_msmon_mbwu: - now =mpam_read_monsel_reg (msc,MBWU );
Quoted 8 lines
drivers/platform/arm64/mpam/mpam_devices.c static void __ris_msmon_read(void *arg) · line 1183
Quoted 7 lines
drivers/platform/arm64/mpam/mpam_devices.c +4
-3-if (mpam_has_feature (mpam_feat_msmon_mbwu_hw_nrdy, rprops)) - nrdy = now &MSMON___NRDY ; - now =FIELD_GET (MSMON___VALUE , now); +/* +* If long or lwd counters are supported, use them, else revert +* to the 32 bit counter. +*/ 32 bit counter -> 31 bit counter
Sure,
Quoted 26 lines
Quoted 26 lines
drivers/platform/arm64/mpam/mpam_devices.c +14
-0+if (mpam_ris_has_mbwu_long_counter (ris)) { + now =mpam_msc_read_mbwu_l (msc); +if (mpam_has_feature (mpam_feat_msmon_mbwu_hw_nrdy, rprops)) + nrdy = now &MSMON___NRDY_L ; +if (mpam_has_feature (mpam_feat_msmon_mbwu_63counter, rprops)) + now =FIELD_GET (MSMON___LWD_VALUE , now); +else + now =FIELD_GET (MSMON___L_VALUE , now); + }else { + now =mpam_read_monsel_reg (msc,MBWU ); +if (mpam_has_feature (mpam_feat_msmon_mbwu_hw_nrdy, rprops)) + nrdy = now &MSMON___NRDY ; + now =FIELD_GET (MSMON___VALUE , now); + }if (nrdy)break ;drivers/platform/arm64/mpam/ renamed from drivers/platform/arm64/mpam/mpam_internal.h +0
-0
mpam_internal.h
indexfc705801c1b6..4553616f2f67100644drivers/platform/arm64/mpam/mpam_internal.h +0
-0@@ -674,7 +675,10 @@ int mpam_get_cpumask_from_cache_id(unsigned long cache_id, u32cache_level, */ #define MSMON___VALUE GENMASK(30, 0)
Quoted 8 lines
drivers/platform/arm64/mpam/mpam_internal.h int mpam_get_cpumask_from_cache_id(unsigned long cache_id, u32 cache_level, · line 681
Quoted 6 lines
drivers/platform/arm64/mpam/mpam_internal.h +4
-1#define MSMON___NRDY BIT(31) -#define MSMON_MBWU_L_VALUE GENMASK(62, 0) +#define MSMON___NRDY_L BIT(63) +#define MSMON___L_VALUE GENMASK(43, 0) +#define MSMON___LWD_VALUE GENMASK(62, 0) +As mentioned on an earlier patch. These could be added with all the other register definition.
Yup,
Thanks,
James
James Morse
maintainerRFC PATCH 34/36 arm_mpam: Add helper to reset saved mbwu state
In reply to James Morseresctrl expects to reset the bandwidth counters when the filesystem is mounted.
To allow this, add a helper that clears the saved mbwu state. Instead of cross calling to each CPU that can access the component MSC to write to the counter, set a flag that causes it to be zero'd on the the next read. This is easily done by forcing a configuration update.
--- drivers/platform/arm64/mpam/mpam_devices.c | 49 ++++++++++++++++++++- drivers/platform/arm64/mpam/mpam_internal.h | 5 ++- 2 files changed, 51 insertions(+), 3 deletions(-)
drivers/platform/arm64/mpam/mpam_devices.c +47 -2
@@ -1142,9 +1142,11 @@ static u64 mpam_msmon_overflow_val(struct mpam_msc_ris *ris)static void __ris_msmon_read (void *arg) {bool nrdy = false; +bool config_mismatch;struct mon_read *m = arg;u64 now, overflow_val =0 ;struct mon_cfg *ctx = m->ctx; +bool reset_on_next_read = false;struct mpam_msc_ris *ris = m->ris;struct msmon_mbwu_state *mbwu_state;struct mpam_props *rprops = &ris->props;
@@ -1159,6 +1161,14 @@ static void __ris_msmon_read(void *arg)FIELD_PREP (MSMON_CFG_MON_SEL_RIS , ris->ris_idx);mpam_write_monsel_reg (msc,CFG_MON_SEL , mon_sel); +if (m->type == mpam_feat_msmon_mbwu) { + mbwu_state = &ris->mbwu_state[ctx->mon]; +if (mbwu_state) { + reset_on_next_read = mbwu_state->reset_on_next_read; + mbwu_state->reset_on_next_read = false; + } + } +/* * Read the existing configuration to avoid re-writing the same values. * This saves waiting for 'nrdy' on subsequent reads.
@@ -1166,7 +1176,10 @@ static void __ris_msmon_read(void *arg)read_msmon_ctl_flt_vals (m, &cur_ctl, &cur_flt);clean_msmon_ctl_val (&cur_ctl);gen_msmon_ctl_flt_vals (m, &ctl_val, &flt_val); -if (cur_flt != flt_val || cur_ctl != (ctl_val | MSMON_CFG_x_CTL_EN)) + config_mismatch = cur_flt != flt_val || + cur_ctl != (ctl_val | MSMON_CFG_x_CTL_EN); + +if (config_mismatch || reset_on_next_read)write_msmon_ctl_flt_vals (m, ctl_val, flt_val);switch (m->type) {
@@ -1199,7 +1212,6 @@ static void __ris_msmon_read(void *arg)if (nrdy)break ; - mbwu_state = &ris->mbwu_state[ctx->mon];if (!mbwu_state)break ;
@@ -1301,6 +1313,39 @@ int mpam_msmon_read(struct mpam_component *comp, struct mon_cfg *ctx,return err; } +void mpam_msmon_reset_mbwu (struct mpam_component *comp,struct mon_cfg *ctx) +{ +int idx; +struct mpam_msc *msc; +struct mpam_vmsc *vmsc; +struct mpam_msc_ris *ris; + +if (!mpam_is_enabled ()) +return ; + + idx =srcu_read_lock (&mpam_srcu); +list_for_each_entry_rcu (vmsc, &comp->vmsc, comp_list) { +if (!mpam_has_feature (mpam_feat_msmon_mbwu, &vmsc->props)) +continue ; + + msc = vmsc->msc; +mpam_mon_sel_outer_lock (msc); +list_for_each_entry_rcu (ris, &vmsc->ris, vmsc_list) { +if (!mpam_has_feature (mpam_feat_msmon_mbwu, &ris->props)) +continue ; + +if (WARN_ON_ONCE (!mpam_mon_sel_inner_lock (msc))) +continue ; + + ris->mbwu_state[ctx->mon].correction =0 ; + ris->mbwu_state[ctx->mon].reset_on_next_read = true; +mpam_mon_sel_inner_unlock (msc); + } +mpam_mon_sel_outer_unlock (msc); + } +srcu_read_unlock (&mpam_srcu, idx); +} +static void mpam_reset_msc_bitmap (struct mpam_msc *msc,u16 reg,u16 wd) {u32 num_words, msb;
drivers/platform/arm64/mpam/mpam_internal.h +4 -1
@@ -295,10 +295,12 @@ struct mon_cfg {/* * Changes to enabled and cfg are protected by the msc->lock. -* Changes to prev_val and correction are protected by the msc's mon_sel_lock. +* Changes to reset_on_next_read, prev_val and correction are protected by the +* msc's mon_sel_lock. */ struct msmon_mbwu_state {bool enabled; +bool reset_on_next_read;struct mon_cfg cfg;/* The value last read from the hardware. Used to detect overflow. */
@@ -408,6 +410,7 @@ int mpam_apply_config(struct mpam_component *comp, u16 partid,int mpam_msmon_read (struct mpam_component *comp,struct mon_cfg *ctx,enum mpam_device_features ,u64 *val); +void mpam_msmon_reset_mbwu (struct mpam_component *comp,struct mon_cfg *ctx);int mpam_get_cpumask_from_cache_id (unsigned long cache_id,u32 cache_level,cpumask_t *affinity);
Signature · 1 line
2.39.5
James Morse
maintainerRFC PATCH 35/36 arm_mpam: Add kunit test for bitmap reset
In reply to James MorseThe bitmap reset code has been a source of bugs. Add a unit test.
This currently has to be built in, as the rest of the driver is builtin.
--- drivers/platform/arm64/mpam/Kconfig | 13 ++++ drivers/platform/arm64/mpam/mpam_devices.c | 4 ++ .../platform/arm64/mpam/test_mpam_devices.c | 68 +++++++++++++++++++ 3 files changed, 85 insertions(+) create mode 100644 drivers/platform/arm64/mpam/test_mpam_devices.c
drivers/platform/arm64/mpam/Kconfig +13 -0
@@ -4,7 +4,20 @@ config ARM_CPU_RESCTRL bool depends on ARM64 +menu "ARM64 MPAM driver options" + config ARM64_MPAM_DRIVER_DEBUG bool "Enable debug messages from the MPAM driver." help Say yes here to enable debug messages from the MPAM driver. + +config MPAM_KUNIT_TEST + bool "KUnit tests for MPAM driver " if !KUNIT_ALL_TESTS + depends on KUNIT=y + default KUNIT_ALL_TESTS + help + Enable this option to run tests in the MPAM driver. + + If unsure, say N. + +endmenu
drivers/platform/arm64/mpam/mpam_devices.c +4 -0
@@ -2904,3 +2904,7 @@ static int __init mpam_msc_driver_init(void) }/* Must occur after arm64_mpam_register_cpus() from arch_initcall() */ subsys_initcall (mpam_msc_driver_init); + +#ifdef CONFIG_MPAM_KUNIT_TEST +#include "test_mpam_devices.c" +#endif
drivers/platform/arm64/mpam/test_mpam_devices.c new file +68 -0
68 lines not on this page · raw message
Signature · 1 line
2.39.5
James Morse
maintainerRFC PATCH 36/36 arm_mpam: Add kunit tests for props_mismatch()
In reply to James MorseWhen features are mismatched between MSC the way features are combined to the class determines whether resctrl can support this SoC.
Add some tests to illustrate the sort of thing that is expected to work, and those that must be removed.
--- drivers/platform/arm64/mpam/mpam_internal.h | 8 +- .../platform/arm64/mpam/test_mpam_devices.c | 322 ++++++++++++++++++ 2 files changed, 329 insertions(+), 1 deletion(-)
drivers/platform/arm64/mpam/mpam_internal.h +7 -1
@@ -18,6 +18,12 @@DECLARE_STATIC_KEY_FALSE (mpam_enabled); +#ifdef CONFIG_MPAM_KUNIT_TEST +#define PACKED_FOR_KUNIT __packed +#else +#define PACKED_FOR_KUNIT +#endif +static inline bool mpam_is_enabled (void ) {return static_branch_likely (&mpam_enabled);
@@ -207,7 +213,7 @@ struct mpam_props {u16 dspri_wd;u16 num_csu_mon;u16 num_mbwu_mon; -}; +}PACKED_FOR_KUNIT ;#define mpam_has_feature (_feat, x) ((1 << (_feat)) & (x)->features)
drivers/platform/arm64/mpam/test_mpam_devices.c +322 -0
334 lines not on this page · raw message
Signature · 1 line
2.39.5
Quoted 29 lines · On Fri, 11 Jul 2025 18:36:12 +0000 James Morse <[email protected]> wrote:
Hello,
This is just enough MPAM driver for the ACPI and DT pre-requisites. It doesn't contain any of the resctrl code, meaning you can't actually drive it from user-space yet.
This is the initial group of patches that allows the resctrl code to be built on top. Including that will increase the number of trees that may need to coordinate, so breaking it up make sense.
The locking looks very strange - but is influenced by the 'mpam-fb' firmware interface specification that is still alpha. That thing needs to wait for an interrupt after every system register write, which significantly impacts the driver. Some features just won't work, e.g. reading the monitor registers via perf.
The aim is to not have to make invasive changes to the locking to support the firmware interface, hence it looks strange from day-1.I've not found a platform that can test all the behaviours around the monitors, so this is where I'd expect the most bugs.
It's unclear where in the tree this should be put. It affects memory bandwidth and cache allocation, but doesn't (yet) interact with perf. The main interaction is with resctrl in fs/resctrl - but there will be no filesystem code in here. Its also likely there will be other in-kernel users. (in-kernel MSC emulation by KVM being an obvious example).
(I'm not a fan ofdrivers/resctrlordrivers/mpam- its not the sort of thing
that justifies being a 'subsystem'.)
Quoted 5 lines
For now, I've put this under
drivers/platform/arm64. Other ideas welcome.The first three patches are currently a series on the list, the PPTT stuff has previously been posted - this is where the users of those helpers appear.
Hi James,
Whilst I get that this is minimal, I was a bit surprised that it doesn't contain enough to have the driver actually bind to the platform devices I think that needs the CPU hotplug handler to register a requester. So about another 4 arch patches from your tree. Maybe you can shuffle things around to help with that.
That makes this a pain to test in isolation.
Given desire to poke the corners, I'm rebasing the old QEMU emulation and will poke it some more. Now we are getting close to upstream kernel support maybe I'll even clean that up for potential upstream QEMU.
For bonus points I 'could' hook it up to the cache simulator and actually generate real 'counts' but that's probably more for fun than because it's useful. Fake numbers are a lot cheaper to get.
Jonathan
Quoted 111 lines
The MPAM spec that describes all the system and MMIO registers can be found here:
https://developer.arm.com/documentation/ddi0598/db/?lang=en
(Ignored the 'RETIRED' warning - that is just arm moving the documentation
around. This document has the best overview)This series is based on v6.16-rc4, and can be retrieved from:
https://git.kernel.org/pub/scm/linux/kernel/git/morse/linux.git mpam/driver/rfcThe rest of the driver can be found here:
https://git.kernel.org/pub/scm/linux/kernel/git/morse/linux.git mpam/snapshot/v6.16-rc4What is MPAM? Set your time-machine to 2020:
https://lore.kernel.org/lkml/[email protected]/Bugs welcome,
Thanks,James Morse (31):
cacheinfo: Add arch hook to compress CPU h/w id into 32 bits for
cache-id
arm64: cacheinfo: Provide helper to compress MPIDR value into u32
cacheinfo: Expose the code to generate a cache-id from adevice_nodeACPI / PPTT: Add a helper to fill a cpumask from a processor container ACPI / PPTT: Stopacpi_count_levels()expecting callers to clear
levels
ACPI / PPTT: Find cache level by cache-id
ACPI / PPTT: Add a helper to fill a cpumask from acache_id
arm64: kconfig: AddKconfigentry for MPAM
ACPI / MPAM: Parse the MPAM table
platform: arm64: Move ec devices to an ec subdirectory
arm_mpam: Add probe/remove for mpam msc driver and kbuild boiler plate
arm_mpam: Add the class and component structures for ris firmware
described
arm_mpam: Add MPAM MSC register layout definitions
arm_mpam: Add cpuhp callbacks to probe MSC hardware
arm_mpam: Probe MSCs to find the supported partid/pmg values
arm_mpam: Add helpers for managing the locking around themon_sel
registers
arm_mpam: Probe the hardware features resctrl supports
arm_mpam: Merge supported features duringmpam_enable()into
mpam_class
arm_mpam: Reset MSC controls from cpu hp callbacks
arm_mpam: Add a helper to touch an MSC from any CPU
arm_mpam: Extend reset logic to allow devices to be reset any time
arm_mpam: Register and enable IRQs
arm_mpam: Use a static key to indicate when mpam is enabled
arm_mpam: Allow configuration to be applied and restored during cpu
online
arm_mpam: Probe and reset the rest of the features
arm_mpam: Add helpers to allocate monitors
arm_mpam: Addmpam_msmon_read()to read monitor value
arm_mpam: Track bandwidth counter state for overflow and power
management
arm_mpam: Add helper to reset saved mbwu state
arm_mpam: Add kunit test for bitmap reset
arm_mpam: Add kunit tests forprops_mismatch()Rob Herring (2):
cacheinfo: Set cache 'id' based on DT data
dt-bindings: arm: Add MPAM MSC bindingRohit Mathew (2):
arm_mpam: Probe for long/lwd mbwu counters
arm_mpam: Use long MBWU counters if supportedShanker Donthineni (1):
arm_mpam: Add support for memory controller MSC on DT platforms.../devicetree/bindings/arm/arm,mpam-msc.yaml | 227 ++ MAINTAINERS | 6 +- arch/arm64/Kconfig | 19 + arch/arm64/include/asm/cache.h | 17 + drivers/acpi/arm64/Kconfig | 3 + drivers/acpi/arm64/Makefile | 1 + drivers/acpi/arm64/mpam.c | 365 +++ drivers/acpi/pptt.c | 240 +- drivers/acpi/tables.c | 2 +- drivers/base/cacheinfo.c | 57 + drivers/platform/arm64/Kconfig | 73 +- drivers/platform/arm64/Makefile | 10 +- drivers/platform/arm64/ec/Kconfig | 73 + drivers/platform/arm64/ec/Makefile | 10 + .../platform/arm64/{ => ec}/acer-aspire1-ec.c | 0 .../arm64/{ => ec}/huawei-gaokun-ec.c | 0 .../arm64/{ => ec}/lenovo-yoga-c630.c | 0 drivers/platform/arm64/mpam/Kconfig | 23 + drivers/platform/arm64/mpam/Makefile | 4 + drivers/platform/arm64/mpam/mpam_devices.c | 2910 +++++++++++++++++ drivers/platform/arm64/mpam/mpam_internal.h | 697 ++++ .../platform/arm64/mpam/test_mpam_devices.c | 390 +++ include/linux/acpi.h | 17 + include/linux/arm_mpam.h | 56 + include/linux/cacheinfo.h | 1 + 25 files changed, 5117 insertions(+), 84 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/arm,mpam-msc.yaml create mode 100644 drivers/acpi/arm64/mpam.c create mode 100644 drivers/platform/arm64/ec/Kconfig create mode 100644 drivers/platform/arm64/ec/Makefile rename drivers/platform/arm64/{ => ec}/acer-aspire1-ec.c (100%) rename drivers/platform/arm64/{ => ec}/huawei-gaokun-ec.c (100%) rename drivers/platform/arm64/{ => ec}/lenovo-yoga-c630.c (100%) create mode 100644 drivers/platform/arm64/mpam/Kconfig create mode 100644 drivers/platform/arm64/mpam/Makefile create mode 100644 drivers/platform/arm64/mpam/mpam_devices.c create mode 100644 drivers/platform/arm64/mpam/mpam_internal.h create mode 100644 drivers/platform/arm64/mpam/test_mpam_devices.c create mode 100644 include/linux/arm_mpam.h
James Morse
maintainerHi Jonathan,
Quoted 5 lines · Jonathan Cameron
Quoted 3 lines · On Fri, 11 Jul 2025 18:36:12 +0000 James Morse <[email protected]> wrote:
This is just enough MPAM driver for the ACPI and DT pre-requisites. It doesn't contain any of the resctrl code, meaning you can't actually drive it from user-space yet.
[..]
Quoted 5 lines
Whilst I get that this is minimal, I was a bit surprised that it doesn't contain enough to have the driver actually bind to the platform devices I think that needs the CPU hotplug handler to register a requester. So about another 4 arch patches from your tree. Maybe you can shuffle things around to help with that.
Ah, I hadn't spotted that. The register-requestor code should only serve to reduce the available PARTID - just in case the CPUs support less than the cache hierarchy.
It's likely its the 'system_supports_mpam()' that prevents the driver being registered. I'll move that into the arm64 patches - its needed so any id register overrides in the CPU knock out the driver too.
Quoted 9 lines
That makes this a pain to test in isolation.
Given desire to poke the corners, I'm rebasing the old QEMU emulation and will poke it some more. Now we are getting close to upstream kernel support maybe I'll even clean that up for potential upstream QEMU.
For bonus points I 'could' hook it up to the cache simulator and actually generate real 'counts' but that's probably more for fun than because it's useful. Fake numbers are a lot cheaper to get.
I've not found a good source of fake numbers to use. Ideally it would just increment whenever the task was scheduled - but I've found that hard to hack that up in linux.
I fall back to reading the counters instead of the MPAM registers ... but its hard to test for overflow or double counting with that.
Thanks,
James