x86/resctrl: Replace smp_call_function_many() with on_each_cpu_mask()

on_each_cpu_mask() runs the function on each CPU specified by cpumask,
which may include the local processor.

Replace smp_call_function_many() with on_each_cpu_mask() to simplify
the code.

Signed-off-by: Babu Moger <babu.moger@amd.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
Link: https://lore.kernel.org/r/20230113152039.770054-2-babu.moger@amd.com

diff --git a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
index 1df0e32..7eece3d 100644 (file)
--- a/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
+++ b/arch/x86/kernel/cpu/resctrl/ctrlmondata.c
@@ -310,7 +310,6 @@ int resctrl_arch_update_domains(struct rdt_resource *r, u32 closid)
        enum resctrl_conf_type t;
        cpumask_var_t cpu_mask;
        struct rdt_domain *d;
-       int cpu;
        u32 idx;
 
        if (!zalloc_cpumask_var(&cpu_mask, GFP_KERNEL))
@@ -341,13 +340,9 @@ int resctrl_arch_update_domains(struct rdt_resource *r, u32 closid)
 
        if (cpumask_empty(cpu_mask))
                goto done;
-       cpu = get_cpu();
-       /* Update resource control msr on this CPU if it's in cpu_mask. */
-       if (cpumask_test_cpu(cpu, cpu_mask))
-               rdt_ctrl_update(&msr_param);
-       /* Update resource control msr on other CPUs. */
-       smp_call_function_many(cpu_mask, rdt_ctrl_update, &msr_param, 1);
-       put_cpu();
+
+       /* Update resource control msr on all the CPUs. */
+       on_each_cpu_mask(cpu_mask, rdt_ctrl_update, &msr_param, 1);
 
 done:
        free_cpumask_var(cpu_mask);

diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
index 5993da2..d23fbc4 100644 (file)
--- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c
+++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -325,12 +325,7 @@ static void update_cpu_closid_rmid(void *info)
 static void
 update_closid_rmid(const struct cpumask *cpu_mask, struct rdtgroup *r)
 {
-       int cpu = get_cpu();
-
-       if (cpumask_test_cpu(cpu, cpu_mask))
-               update_cpu_closid_rmid(r);
-       smp_call_function_many(cpu_mask, update_cpu_closid_rmid, r, 1);
-       put_cpu();
+       on_each_cpu_mask(cpu_mask, update_cpu_closid_rmid, r, 1);
 }
 
 static int cpus_mon_write(struct rdtgroup *rdtgrp, cpumask_var_t newmask,
@@ -1866,13 +1861,9 @@ static int set_cache_qos_cfg(int level, bool enable)
                        /* Pick one CPU from each domain instance to update MSR */
                        cpumask_set_cpu(cpumask_any(&d->cpu_mask), cpu_mask);
        }
-       cpu = get_cpu();
-       /* Update QOS_CFG MSR on this cpu if it's in cpu_mask. */
-       if (cpumask_test_cpu(cpu, cpu_mask))
-               update(&enable);
-       /* Update QOS_CFG MSR on all other cpus in cpu_mask. */
-       smp_call_function_many(cpu_mask, update, &enable, 1);
-       put_cpu();
+
+       /* Update QOS_CFG MSR on all the CPUs in cpu_mask */
+       on_each_cpu_mask(cpu_mask, update, &enable, 1);
 
        free_cpumask_var(cpu_mask);
 
@@ -2349,7 +2340,7 @@ static int reset_all_ctrls(struct rdt_resource *r)
        struct msr_param msr_param;
        cpumask_var_t cpu_mask;
        struct rdt_domain *d;
-       int i, cpu;
+       int i;
 
        if (!zalloc_cpumask_var(&cpu_mask, GFP_KERNEL))
                return -ENOMEM;
@@ -2370,13 +2361,9 @@ static int reset_all_ctrls(struct rdt_resource *r)
                for (i = 0; i < hw_res->num_closid; i++)
                        hw_dom->ctrl_val[i] = r->default_ctrl;
        }
-       cpu = get_cpu();
-       /* Update CBM on this cpu if it's in cpu_mask. */
-       if (cpumask_test_cpu(cpu, cpu_mask))
-               rdt_ctrl_update(&msr_param);
-       /* Update CBM on all other cpus in cpu_mask. */
-       smp_call_function_many(cpu_mask, rdt_ctrl_update, &msr_param, 1);
-       put_cpu();
+
+       /* Update CBM on all the CPUs in cpu_mask */
+       on_each_cpu_mask(cpu_mask, rdt_ctrl_update, &msr_param, 1);
 
        free_cpumask_var(cpu_mask);