]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
torture: Bring any extra CPUs online during kernel startup
authorPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 21 Aug 2018 22:27:16 +0000 (15:27 -0700)
committerPaul E. McKenney <paulmck@linux.ibm.com>
Sat, 1 Dec 2018 20:45:32 +0000 (12:45 -0800)
Currently, the torture scripts rely on the initrd/init script to bring
any extra CPUs online, for example, in the case where the kernel and
qemu have different ideas about how many CPUs are present.  This works,
but is an unnecessary dependency on initrd, which needs to vary depending
on the distro.  This commit therefore causes torture_onoff() to check
for additional CPUs, attempting to bring any found online. Errors are
ignored, just as they are by the initrd/init script.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
kernel/torture.c

index 17d91f5fba2acb09da97fe4cacb6479d52cb0bdd..9410d1bf84d6693ebe0c6b25b260241b38475de4 100644 (file)
@@ -194,11 +194,23 @@ torture_onoff(void *arg)
        int cpu;
        int maxcpu = -1;
        DEFINE_TORTURE_RANDOM(rand);
+       int ret;
 
        VERBOSE_TOROUT_STRING("torture_onoff task started");
        for_each_online_cpu(cpu)
                maxcpu = cpu;
        WARN_ON(maxcpu < 0);
+       if (!IS_MODULE(CONFIG_TORTURE_TEST))
+               for_each_possible_cpu(cpu) {
+                       if (cpu_online(cpu))
+                               continue;
+                       ret = cpu_up(cpu);
+                       if (ret && verbose) {
+                               pr_alert("%s" TORTURE_FLAG
+                                        "%s: Initial online %d: errno %d\n",
+                                        __func__, torture_type, cpu, ret);
+                       }
+               }
 
        if (maxcpu == 0) {
                VERBOSE_TOROUT_STRING("Only one CPU, so CPU-hotplug testing is disabled");