Skip to content

Commit 201d96c

Browse files
James Morsectmarinas
authored andcommitted
arm_mpam: Add helper to reset saved mbwu state
resctrl 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. Signed-off-by: James Morse <james.morse@arm.com> Cc: Peter Newman <peternewman@google.com> Reviewed-by: Fenghua Yu <fenghuay@nvdia.com> Reviewed-by: Gavin Shan <gshan@redhat.com> Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com> Reviewed-by: Shaopeng Tan <tan.shaopeng@jp.fujitsu.com> Tested-by: Fenghua Yu <fenghuay@nvidia.com> Tested-by: Carl Worth <carl@os.amperecomputing.com> Tested-by: Gavin Shan <gshan@redhat.com> Tested-by: Zeng Heng <zengheng4@huawei.com> Tested-by: Shaopeng Tan <tan.shaopeng@jp.fujitsu.com> Tested-by: Hanjun Guo <guohanjun@huawei.com> Signed-off-by: Ben Horgan <ben.horgan@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent 9e5afb7 commit 201d96c

2 files changed

Lines changed: 49 additions & 1 deletion

File tree

drivers/resctrl/mpam_devices.c

Lines changed: 47 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1075,6 +1075,7 @@ static void __ris_msmon_read(void *arg)
10751075
bool overflow;
10761076
struct mon_read *m = arg;
10771077
struct mon_cfg *ctx = m->ctx;
1078+
bool reset_on_next_read = false;
10781079
struct mpam_msc_ris *ris = m->ris;
10791080
struct msmon_mbwu_state *mbwu_state;
10801081
struct mpam_props *rprops = &ris->props;
@@ -1089,6 +1090,20 @@ static void __ris_msmon_read(void *arg)
10891090
FIELD_PREP(MSMON_CFG_MON_SEL_RIS, ris->ris_idx);
10901091
mpam_write_monsel_reg(msc, CFG_MON_SEL, mon_sel);
10911092

1093+
switch (m->type) {
1094+
case mpam_feat_msmon_mbwu_31counter:
1095+
case mpam_feat_msmon_mbwu_44counter:
1096+
case mpam_feat_msmon_mbwu_63counter:
1097+
mbwu_state = &ris->mbwu_state[ctx->mon];
1098+
if (mbwu_state) {
1099+
reset_on_next_read = mbwu_state->reset_on_next_read;
1100+
mbwu_state->reset_on_next_read = false;
1101+
}
1102+
break;
1103+
default:
1104+
break;
1105+
}
1106+
10921107
/*
10931108
* Read the existing configuration to avoid re-writing the same values.
10941109
* This saves waiting for 'nrdy' on subsequent reads.
@@ -1106,7 +1121,7 @@ static void __ris_msmon_read(void *arg)
11061121
config_mismatch = cur_flt != flt_val ||
11071122
cur_ctl != (ctl_val | MSMON_CFG_x_CTL_EN);
11081123

1109-
if (config_mismatch) {
1124+
if (config_mismatch || reset_on_next_read) {
11101125
write_msmon_ctl_flt_vals(m, ctl_val, flt_val);
11111126
overflow = false;
11121127
} else if (overflow) {
@@ -1263,6 +1278,37 @@ int mpam_msmon_read(struct mpam_component *comp, struct mon_cfg *ctx,
12631278
return err;
12641279
}
12651280

1281+
void mpam_msmon_reset_mbwu(struct mpam_component *comp, struct mon_cfg *ctx)
1282+
{
1283+
struct mpam_msc *msc;
1284+
struct mpam_vmsc *vmsc;
1285+
struct mpam_msc_ris *ris;
1286+
1287+
if (!mpam_is_enabled())
1288+
return;
1289+
1290+
guard(srcu)(&mpam_srcu);
1291+
list_for_each_entry_srcu(vmsc, &comp->vmsc, comp_list,
1292+
srcu_read_lock_held(&mpam_srcu)) {
1293+
if (!mpam_has_feature(mpam_feat_msmon_mbwu, &vmsc->props))
1294+
continue;
1295+
1296+
msc = vmsc->msc;
1297+
list_for_each_entry_srcu(ris, &vmsc->ris, vmsc_list,
1298+
srcu_read_lock_held(&mpam_srcu)) {
1299+
if (!mpam_has_feature(mpam_feat_msmon_mbwu, &ris->props))
1300+
continue;
1301+
1302+
if (WARN_ON_ONCE(!mpam_mon_sel_lock(msc)))
1303+
continue;
1304+
1305+
ris->mbwu_state[ctx->mon].correction = 0;
1306+
ris->mbwu_state[ctx->mon].reset_on_next_read = true;
1307+
mpam_mon_sel_unlock(msc);
1308+
}
1309+
}
1310+
}
1311+
12661312
static void mpam_reset_msc_bitmap(struct mpam_msc *msc, u16 reg, u16 wd)
12671313
{
12681314
u32 num_words, msb;

drivers/resctrl/mpam_internal.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ struct mon_cfg {
211211
/* Changes to msmon_mbwu_state are protected by the msc's mon_sel_lock. */
212212
struct msmon_mbwu_state {
213213
bool enabled;
214+
bool reset_on_next_read;
214215
struct mon_cfg cfg;
215216

216217
/*
@@ -370,6 +371,7 @@ int mpam_apply_config(struct mpam_component *comp, u16 partid,
370371

371372
int mpam_msmon_read(struct mpam_component *comp, struct mon_cfg *ctx,
372373
enum mpam_device_features, u64 *val);
374+
void mpam_msmon_reset_mbwu(struct mpam_component *comp, struct mon_cfg *ctx);
373375

374376
int mpam_get_cpumask_from_cache_id(unsigned long cache_id, u32 cache_level,
375377
cpumask_t *affinity);

0 commit comments

Comments
 (0)