selftests/cpu-hotplug: Delete fault injection related code

Delete fault injection related code since the module has been deleted.

Signed-off-by: Zhao Gongyi <[email protected]>
Signed-off-by: Shuah Khan <[email protected]>

diff --git a/tools/testing/selftests/cpu-hotplug/config b/tools/testing/selftests/cpu-hotplug/config
deleted file mode 100644 (file)
index d4aca2a..0000000
--- a/tools/testing/selftests/cpu-hotplug/config
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_NOTIFIER_ERROR_INJECTION=y

diff --git a/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh b/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh
index bd2e791fe8878c3c6fa08ebb1fb10091ece6f9ae..184156763ccb8fe2f5c6d6e42270b83d192b2700 100755 (executable)
--- a/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh
+++ b/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh
@@ -116,10 +116,10 @@ online_cpu_expect_fail()
 
        if online_cpu $cpu 2> /dev/null; then
                echo $FUNCNAME $cpu: unexpected success >&2
 
        if online_cpu $cpu 2> /dev/null; then
                echo $FUNCNAME $cpu: unexpected success >&2

-               exit 1
+               retval=1

        elif ! cpu_is_offline $cpu; then
                echo $FUNCNAME $cpu: unexpected online >&2
        elif ! cpu_is_offline $cpu; then
                echo $FUNCNAME $cpu: unexpected online >&2

-               exit 1
+               retval=1

        fi
 }
 
        fi
 }
 


@@ -142,16 +142,14 @@ offline_cpu_expect_fail()
 
        if offline_cpu $cpu 2> /dev/null; then
                echo $FUNCNAME $cpu: unexpected success >&2
 
        if offline_cpu $cpu 2> /dev/null; then
                echo $FUNCNAME $cpu: unexpected success >&2

-               exit 1
+               retval=1

        elif ! cpu_is_online $cpu; then
                echo $FUNCNAME $cpu: unexpected offline >&2
        elif ! cpu_is_online $cpu; then
                echo $FUNCNAME $cpu: unexpected offline >&2

-               exit 1
+               retval=1

        fi
 }
 
        fi
 }
 

-error=-12

 allcpus=0
 allcpus=0

-priority=0

 online_cpus=0
 online_max=0
 offline_cpus=0
 online_cpus=0
 online_max=0
 offline_cpus=0


@@ -159,31 +157,20 @@ offline_max=0
 present_cpus=0
 present_max=0
 
 present_cpus=0
 present_max=0
 

-while getopts e:ahp: opt; do
+while getopts ah opt; do

        case $opt in
        case $opt in

-       e)
-               error=$OPTARG
-               ;;

        a)
                allcpus=1
                ;;
        h)
        a)
                allcpus=1
                ;;
        h)

-               echo "Usage $0 [ -a ] [ -e errno ] [ -p notifier-priority ]"
+               echo "Usage $0 [ -a ]"

                echo -e "\t default offline one cpu"
                echo -e "\t run with -a option to offline all cpus"
                exit
                ;;
                echo -e "\t default offline one cpu"
                echo -e "\t run with -a option to offline all cpus"
                exit
                ;;

-       p)
-               priority=$OPTARG
-               ;;

        esac
 done
 
        esac
 done
 

-if ! [ "$error" -ge -4095 -a "$error" -lt 0 ]; then
-       echo "error code must be -4095 <= errno < 0" >&2
-       exit 1
-fi
-

 prerequisite
 
 #
 prerequisite
 
 #


@@ -231,66 +218,4 @@ for cpu in `hotplaggable_offline_cpus`; do
        online_cpu_expect_success $cpu
 done
 
        online_cpu_expect_success $cpu
 done
 

-#
-# Test with cpu notifier error injection
-#
-
-DEBUGFS=`mount -t debugfs | head -1 | awk '{ print $3 }'`
-NOTIFIER_ERR_INJECT_DIR=$DEBUGFS/notifier-error-inject/cpu
-
-prerequisite_extra()
-{
-       msg="skip extra tests:"
-
-       /sbin/modprobe -q -r cpu-notifier-error-inject
-       /sbin/modprobe -q cpu-notifier-error-inject priority=$priority
-
-       if [ ! -d "$DEBUGFS" ]; then
-               echo $msg debugfs is not mounted >&2
-               exit $ksft_skip
-       fi
-
-       if [ ! -d $NOTIFIER_ERR_INJECT_DIR ]; then
-               echo $msg cpu-notifier-error-inject module is not available >&2
-               exit $ksft_skip
-       fi
-}
-
-prerequisite_extra
-
-#
-# Offline all hot-pluggable CPUs
-#
-echo 0 > $NOTIFIER_ERR_INJECT_DIR/actions/CPU_DOWN_PREPARE/error
-for cpu in `hotpluggable_online_cpus`; do
-       offline_cpu_expect_success $cpu
-done
-
-#
-# Test CPU hot-add error handling (offline => online)
-#
-echo $error > $NOTIFIER_ERR_INJECT_DIR/actions/CPU_UP_PREPARE/error
-for cpu in `hotplaggable_offline_cpus`; do
-       online_cpu_expect_fail $cpu
-done
-
-#
-# Online all hot-pluggable CPUs
-#
-echo 0 > $NOTIFIER_ERR_INJECT_DIR/actions/CPU_UP_PREPARE/error
-for cpu in `hotplaggable_offline_cpus`; do
-       online_cpu_expect_success $cpu
-done
-
-#
-# Test CPU hot-remove error handling (online => offline)
-#
-echo $error > $NOTIFIER_ERR_INJECT_DIR/actions/CPU_DOWN_PREPARE/error
-for cpu in `hotpluggable_online_cpus`; do
-       offline_cpu_expect_fail $cpu
-done
-
-echo 0 > $NOTIFIER_ERR_INJECT_DIR/actions/CPU_DOWN_PREPARE/error
-/sbin/modprobe -q -r cpu-notifier-error-inject
-

 exit $retval
 exit $retval