2 files changed, 53 insertions, 2 deletions

diff --git a/tools/testing/selftests/cpu-hotplug/Makefile b/tools/testing/selftests/cpu-hotplug/Makefile
index 790c23a9db44..e9c28d8dc84b 100644
--- a/tools/testing/selftests/cpu-hotplug/Makefile
+++ b/tools/testing/selftests/cpu-hotplug/Makefile
@@ -3,4 +3,7 @@ all:
 run_tests:
         @/bin/bash ./on-off-test.sh || echo "cpu-hotplug selftests: [FAIL]"
 
+run_full_test:
+        @/bin/bash ./on-off-test.sh -a || echo "cpu-hotplug selftests: [FAIL]"
+
 clean:
diff --git a/tools/testing/selftests/cpu-hotplug/on-off-test.sh b/tools/testing/selftests/cpu-hotplug/on-off-test.sh
index bdde7cf428bb..98b1d6565f2c 100644
--- a/tools/testing/selftests/cpu-hotplug/on-off-test.sh
+++ b/tools/testing/selftests/cpu-hotplug/on-off-test.sh
@@ -11,6 +11,8 @@ prerequisite()
                 exit 0
         fi
 
+        taskset -p 01 $$
+
         SYSFS=`mount -t sysfs | head -1 | awk '{ print $3 }'`
 
         if [ ! -d "$SYSFS" ]; then
@@ -22,6 +24,19 @@ prerequisite()
                 echo $msg cpu hotplug is not supported >&2
                 exit 0
         fi
+
+        echo "CPU online/offline summary:"
+        online_cpus=`cat $SYSFS/devices/system/cpu/online`
+        online_max=${online_cpus##*-}
+        echo -e "\t Cpus in online state: $online_cpus"
+
+        offline_cpus=`cat $SYSFS/devices/system/cpu/offline`
+        if [[ "a$offline_cpus" = "a" ]]; then
+                offline_cpus=0
+        else
+                offline_max=${offline_cpus##*-}
+        fi
+        echo -e "\t Cpus in offline state: $offline_cpus"
 }
 
 #
@@ -113,15 +128,25 @@ offline_cpu_expect_fail()
 }
 
 error=-12
+allcpus=0
 priority=0
+online_cpus=0
+online_max=0
+offline_cpus=0
+offline_max=0
 
-while getopts e:hp: opt; do
+while getopts e:ahp: opt; do
         case $opt in
         e)
                 error=$OPTARG
                 ;;
+        a)
+                allcpus=1
+                ;;
         h)
-                echo "Usage $0 [ -e errno ] [ -p notifier-priority ]"
+                echo "Usage $0 [ -a ] [ -e errno ] [ -p notifier-priority ]"
+                echo -e "\t default offline one cpu"
+                echo -e "\t run with -a option to offline all cpus"
                 exit
                 ;;
         p)
@@ -138,6 +163,29 @@ fi
 prerequisite
 
 #
+# Safe test (default) - offline and online one cpu
+#
+if [ $allcpus -eq 0 ]; then
+        echo "Limited scope test: one hotplug cpu"
+        echo -e "\t (leaves cpu in the original state):"
+        echo -e "\t online to offline to online: cpu $online_max"
+        offline_cpu_expect_success $online_max
+        online_cpu_expect_success $online_max
+
+        if [[ $offline_cpus -gt 0 ]]; then
+                echo -e "\t offline to online to offline: cpu $offline_max"
+                online_cpu_expect_success $offline_max
+                offline_cpu_expect_success $offline_max
+        fi
+        exit 0
+else
+        echo "Full scope test: all hotplug cpus"
+        echo -e "\t online all offline cpus"
+        echo -e "\t offline all online cpus"
+        echo -e "\t online all offline cpus"
+fi
+
+#
 # Online all hot-pluggable CPUs
 #
 for cpu in `hotplaggable_offline_cpus`; do