x86/resctrl: Clean up domain_remove_cpu_ctrl()

For symmetry with domain_remove_cpu_mon() refactor domain_remove_cpu_ctrl()
to take an early return when removing a CPU does not empty the domain.

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/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
index 49b133e847d4cc416cf576283bbb5e6cba790a92..64ed81cbf8bffe91a5efa22cc2927f410a74ef9e 100644 (file)
--- a/arch/x86/kernel/cpu/resctrl/core.c
+++ b/arch/x86/kernel/cpu/resctrl/core.c
@@ -604,28 +604,27 @@ static void domain_remove_cpu_ctrl(int cpu, struct rdt_resource *r)
                return;
        }
 
+       cpumask_clear_cpu(cpu, &hdr->cpu_mask);
+       if (!cpumask_empty(&hdr->cpu_mask))
+               return;
+
        if (!domain_header_is_valid(hdr, RESCTRL_CTRL_DOMAIN, r->rid))
                return;
 
        d = container_of(hdr, struct rdt_ctrl_domain, hdr);
        hw_dom = resctrl_to_arch_ctrl_dom(d);
 
-       cpumask_clear_cpu(cpu, &d->hdr.cpu_mask);
-       if (cpumask_empty(&d->hdr.cpu_mask)) {
-               resctrl_offline_ctrl_domain(r, d);
-               list_del_rcu(&d->hdr.list);
-               synchronize_rcu();
-
-               /*
-                * rdt_ctrl_domain "d" is going to be freed below, so clear
-                * its pointer from pseudo_lock_region struct.
-                */
-               if (d->plr)
-                       d->plr->d = NULL;
-               ctrl_domain_free(hw_dom);
+       resctrl_offline_ctrl_domain(r, d);
+       list_del_rcu(&hdr->list);
+       synchronize_rcu();
 
-               return;
-       }
+       /*
+        * rdt_ctrl_domain "d" is going to be freed below, so clear
+        * its pointer from pseudo_lock_region struct.
+        */
+       if (d->plr)
+               d->plr->d = NULL;
+       ctrl_domain_free(hw_dom);
 }
 
 static void domain_remove_cpu_mon(int cpu, struct rdt_resource *r)