x86/resctrl: Handle removing directories in Sub-NUMA Cluster (SNC) mode

In SNC mode, there are multiple subdirectories in each L3 level monitor
directory (one for each SNC node). If all the CPUs in an SNC node are taken
offline, just remove the SNC directory for that node. In non-SNC mode, or when
the last SNC node directory is removed, remove the L3 monitor directory.

Add a helper function to avoid duplicated code.

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/r/20240702173820.90368-2-tony.luck@intel.com

diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index 8502385e389facead172208560622b65c4276745..58e53f1f52a05a149e2fd3e2ca6d63d9bef19334 100644 (file)
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -3006,22 +3006,45 @@ static int mon_addfile(struct kernfs_node *parent_kn, const char *name,
        return ret;
 }
 
+static void mon_rmdir_one_subdir(struct kernfs_node *pkn, char *name, char *subname)
+{
+       struct kernfs_node *kn;
+
+       kn = kernfs_find_and_get(pkn, name);
+       if (!kn)
+               return;
+       kernfs_put(kn);
+
+       if (kn->dir.subdirs <= 1)
+               kernfs_remove(kn);
+       else
+               kernfs_remove_by_name(kn, subname);
+}
+
 /*
  * Remove all subdirectories of mon_data of ctrl_mon groups
- * and monitor groups with given domain id.
+ * and monitor groups for the given domain.
+ * Remove files and directories containing "sum" of domain data
+ * when last domain being summed is removed.
  */
 static void rmdir_mondata_subdir_allrdtgrp(struct rdt_resource *r,
-                                          unsigned int dom_id)
+                                          struct rdt_mon_domain *d)
 {
        struct rdtgroup *prgrp, *crgrp;
+       char subname[32];
+       bool snc_mode;
        char name[32];
 
+       snc_mode = r->mon_scope == RESCTRL_L3_NODE;
+       sprintf(name, "mon_%s_%02d", r->name, snc_mode ? d->ci->id : d->hdr.id);
+       if (snc_mode)
+               sprintf(subname, "mon_sub_%s_%02d", r->name, d->hdr.id);
+
        list_for_each_entry(prgrp, &rdt_all_groups, rdtgroup_list) {
-               sprintf(name, "mon_%s_%02d", r->name, dom_id);
-               kernfs_remove_by_name(prgrp->mon.mon_data_kn, name);
+               mon_rmdir_one_subdir(prgrp->mon.mon_data_kn, name, subname);
 
                list_for_each_entry(crgrp, &prgrp->mon.crdtgrp_list, mon.crdtgrp_list)
-                       kernfs_remove_by_name(crgrp->mon.mon_data_kn, name);
+                       mon_rmdir_one_subdir(crgrp->mon.mon_data_kn, name, subname);
        }
 }
 
@@ -3991,7 +4014,7 @@ void resctrl_offline_mon_domain(struct rdt_resource *r, struct rdt_mon_domain *d
         * per domain monitor data directories.
         */
        if (resctrl_mounted && resctrl_arch_mon_capable())
-               rmdir_mondata_subdir_allrdtgrp(r, d->hdr.id);
+               rmdir_mondata_subdir_allrdtgrp(r, d);
 
        if (is_mbm_enabled())
                cancel_delayed_work(&d->mbm_over);