fs/resctrl: Move allocation/free of closid_num_dirty_rmid[]

closid_num_dirty_rmid[] and rmid_ptrs[] are allocated together during resctrl
initialization and freed together during resctrl exit.

Telemetry events are enumerated on resctrl mount so only at resctrl mount will
the number of RMID supported by all monitoring resources and needed as size
for rmid_ptrs[] be known.

Separate closid_num_dirty_rmid[] and rmid_ptrs[] allocation and free in
preparation for rmid_ptrs[] to be allocated on resctrl mount.

Keep the rdtgroup_mutex protection around the allocation and free of
closid_num_dirty_rmid[] as ARM needs this to guarantee memory ordering.

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
Link: https://lore.kernel.org/20251217172121.12030-1-tony.luck@intel.com

diff --git a/fs/resctrl/monitor.c b/fs/resctrl/monitor.c
index 8a4c2ae72740cf801588f9fdf1a4883335363058..bbf8c9037887bc8160e60bced34bb28b14bcf33e 100644 (file)
--- a/fs/resctrl/monitor.c
+++ b/fs/resctrl/monitor.c
@@ -906,36 +906,14 @@ void mbm_setup_overflow_handler(struct rdt_l3_mon_domain *dom, unsigned long del
 static int dom_data_init(struct rdt_resource *r)
 {
        u32 idx_limit = resctrl_arch_system_num_rmid_idx();
-       u32 num_closid = resctrl_arch_get_num_closid(r);
        struct rmid_entry *entry = NULL;
        int err = 0, i;
        u32 idx;
 
        mutex_lock(&rdtgroup_mutex);
-       if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) {
-               u32 *tmp;
-
-               /*
-                * If the architecture hasn't provided a sanitised value here,
-                * this may result in larger arrays than necessary. Resctrl will
-                * use a smaller system wide value based on the resources in
-                * use.
-                */
-               tmp = kcalloc(num_closid, sizeof(*tmp), GFP_KERNEL);
-               if (!tmp) {
-                       err = -ENOMEM;
-                       goto out_unlock;
-               }
-
-               closid_num_dirty_rmid = tmp;
-       }
 
        rmid_ptrs = kcalloc(idx_limit, sizeof(struct rmid_entry), GFP_KERNEL);
        if (!rmid_ptrs) {
-               if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) {
-                       kfree(closid_num_dirty_rmid);
-                       closid_num_dirty_rmid = NULL;
-               }
                err = -ENOMEM;
                goto out_unlock;
        }
@@ -971,11 +949,6 @@ static void dom_data_exit(struct rdt_resource *r)
        if (!r->mon_capable)
                goto out_unlock;
 
-       if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) {
-               kfree(closid_num_dirty_rmid);
-               closid_num_dirty_rmid = NULL;
-       }
-
        kfree(rmid_ptrs);
        rmid_ptrs = NULL;
 
@@ -1814,6 +1787,45 @@ ssize_t mbm_L3_assignments_write(struct kernfs_open_file *of, char *buf,
        return ret ?: nbytes;
 }
 
+static int closid_num_dirty_rmid_alloc(struct rdt_resource *r)
+{
+       if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) {
+               u32 num_closid = resctrl_arch_get_num_closid(r);
+               u32 *tmp;
+
+               /* For ARM memory ordering access to closid_num_dirty_rmid */
+               mutex_lock(&rdtgroup_mutex);
+
+               /*
+                * If the architecture hasn't provided a sanitised value here,
+                * this may result in larger arrays than necessary. Resctrl will
+                * use a smaller system wide value based on the resources in
+                * use.
+                */
+               tmp = kcalloc(num_closid, sizeof(*tmp), GFP_KERNEL);
+               if (!tmp) {
+                       mutex_unlock(&rdtgroup_mutex);
+                       return -ENOMEM;
+               }
+
+               closid_num_dirty_rmid = tmp;
+
+               mutex_unlock(&rdtgroup_mutex);
+       }
+
+       return 0;
+}
+
+static void closid_num_dirty_rmid_free(void)
+{
+       if (IS_ENABLED(CONFIG_RESCTRL_RMID_DEPENDS_ON_CLOSID)) {
+               mutex_lock(&rdtgroup_mutex);
+               kfree(closid_num_dirty_rmid);
+               closid_num_dirty_rmid = NULL;
+               mutex_unlock(&rdtgroup_mutex);
+       }
+}
+
 /**
  * resctrl_l3_mon_resource_init() - Initialise global monitoring structures.
  *
@@ -1834,10 +1846,16 @@ int resctrl_l3_mon_resource_init(void)
        if (!r->mon_capable)
                return 0;
 
-       ret = dom_data_init(r);
+       ret = closid_num_dirty_rmid_alloc(r);
        if (ret)
                return ret;
 
+       ret = dom_data_init(r);
+       if (ret) {
+               closid_num_dirty_rmid_free();
+               return ret;
+       }
+
        if (resctrl_arch_is_evt_configurable(QOS_L3_MBM_TOTAL_EVENT_ID)) {
                mon_event_all[QOS_L3_MBM_TOTAL_EVENT_ID].configurable = true;
                resctrl_file_fflags_init("mbm_total_bytes_config",
@@ -1880,5 +1898,10 @@ void resctrl_l3_mon_resource_exit(void)
 {
        struct rdt_resource *r = resctrl_arch_get_resource(RDT_RESOURCE_L3);
 
+       if (!r->mon_capable)
+               return;
+
+       closid_num_dirty_rmid_free();
+
        dom_data_exit(r);
 }