Skip to contentSkip to conversation

xen: remove on-stack cpumask from stop_machine_run()

PATCH In review Juergen Gross 3 participants 3 messages May 31, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 xen: remove on-stack cpumask from stop_machine_run()

The "allbutself" cpumask in stop_machine_run() is not needed. Instead of allocating it on the stack it can easily be avoided.

---
 xen/common/stop_machine.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
xen/common/stop_machine.c +7 -6
index ce6f5624c4..74d04427bd 100644
@@ -69,8 +69,8 @@ static void stopmachine_wait_state(void)
 
 int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu)
 {
-    cpumask_t allbutself;
     unsigned int i, nr_cpus;
+    unsigned int this = smp_processor_id();
     int ret;
 
     BUG_ON(!local_irq_is_enabled());
@@ -79,9 +79,9 @@ int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu)
     if ( !get_cpu_maps() )
         return -EBUSY;
 
-    cpumask_andnot(&allbutself, &cpu_online_map,
-                   cpumask_of(smp_processor_id()));
-    nr_cpus = cpumask_weight(&allbutself);
+    nr_cpus = num_online_cpus();
+    if ( cpu_online(this) )
+        nr_cpus--;
 
     /* Must not spin here as the holder will expect us to be descheduled. */
     if ( !spin_trylock(&stopmachine_lock) )
@@ -100,8 +100,9 @@ int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu)
 
     smp_wmb();
 
-    for_each_cpu ( i, &allbutself )
-        tasklet_schedule_on_cpu(&per_cpu(stopmachine_tasklet, i), i);
+    for_each_online_cpu ( i )
+        if ( i != this )
+            tasklet_schedule_on_cpu(&per_cpu(stopmachine_tasklet, i), i);
 
     stopmachine_set_state(STOPMACHINE_PREPARE);
     stopmachine_wait_state();
Signature · 7 lines
2.16.4


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Reviewed-by on v2 1/1
#1 lore raw
Quoted 5 lines
Quoted 1 line
Quoted 1 line · On 31.05.19 at 13:53, <[email protected]> wrote:

The "allbutself" cpumask in stop_machine_run() is not needed. Instead of allocating it on the stack it can easily be avoided.

with one further remark:

Quoted 27 lines
xen/common/stop_machine.c +4 -4
@@ -69,8 +69,8 @@ static void stopmachine_wait_state(void)
 
 int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu)
 {
-    cpumask_t allbutself;
     unsigned int i, nr_cpus;
+    unsigned int this = smp_processor_id();
     int ret;
 
     BUG_ON(!local_irq_is_enabled());
@@ -79,9 +79,9 @@ int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu)
     if ( !get_cpu_maps() )
         return -EBUSY;
 
-    cpumask_andnot(&allbutself, &cpu_online_map,
-                   cpumask_of(smp_processor_id()));
-    nr_cpus = cpumask_weight(&allbutself);
+    nr_cpus = num_online_cpus();
+    if ( cpu_online(this) )
+        nr_cpus--;
 
     /* Must not spin here as the holder will expect us to be descheduled. */
     if ( !spin_trylock(&stopmachine_lock) )
@@ -100,8 +100,9 @@ int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu)
 

xen/common/stop_machine.c int stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu) · line 108

Quoted 10 lines
xen/common/stop_machine.c +3 -2
     smp_wmb();
 
-    for_each_cpu ( i, &allbutself )
-        tasklet_schedule_on_cpu(&per_cpu(stopmachine_tasklet, i), i);
+    for_each_online_cpu ( i )
+        if ( i != this )
+            tasklet_schedule_on_cpu(&per_cpu(stopmachine_tasklet, i), i);
 
     stopmachine_set_state(STOPMACHINE_PREPARE);
     stopmachine_wait_state();

A few lines down from here there's another use of smp_processor_id(). If I end up committing this I may take the liberty and also change that to "this", unless you object.

Jan

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel

#2 lore raw
Quoted 6 lines · Jan Beulich
Quoted 5 lines
Quoted 1 line
Quoted 1 line · On 31.05.19 at 13:53, <[email protected]> wrote:

The "allbutself" cpumask in stop_machine_run() is not needed. Instead of allocating it on the stack it can easily be avoided.

LGTM.  Acked-by: Andrew Cooper <[email protected]>

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel