lkml.org 
[lkml]   [2022]   [Oct]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 6.0 454/862] selftests/cpu-hotplug: Use return instead of exit
    Date
    From: Zhao Gongyi <zhaogongyi@huawei.com>

    [ Upstream commit 972cf4ce51ef5532d56822af17defb148aac0ccb ]

    Some cpus will be left in offline state when online
    function exits in some error conditions. Use return
    instead of exit to fix it.

    Signed-off-by: Zhao Gongyi <zhaogongyi@huawei.com>
    Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
    Stable-dep-of: 51d4c851465c ("selftests/cpu-hotplug: Reserve one cpu online at least")
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../selftests/cpu-hotplug/cpu-on-off-test.sh | 13 ++++++++-----
    1 file changed, 8 insertions(+), 5 deletions(-)

    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 0d26b5e3f966..940b68c940bb 100755
    --- a/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh
    +++ b/tools/testing/selftests/cpu-hotplug/cpu-on-off-test.sh
    @@ -4,6 +4,7 @@
    SYSFS=
    # Kselftest framework requirement - SKIP code is 4.
    ksft_skip=4
    +retval=0

    prerequisite()
    {
    @@ -102,10 +103,10 @@ online_cpu_expect_success()

    if ! online_cpu $cpu; then
    echo $FUNCNAME $cpu: unexpected fail >&2
    - exit 1
    + retval=1
    elif ! cpu_is_online $cpu; then
    echo $FUNCNAME $cpu: unexpected offline >&2
    - exit 1
    + retval=1
    fi
    }

    @@ -128,10 +129,10 @@ offline_cpu_expect_success()

    if ! offline_cpu $cpu; then
    echo $FUNCNAME $cpu: unexpected fail >&2
    - exit 1
    + retval=1
    elif ! cpu_is_offline $cpu; then
    echo $FUNCNAME $cpu: unexpected offline >&2
    - exit 1
    + retval=1
    fi
    }

    @@ -201,7 +202,7 @@ if [ $allcpus -eq 0 ]; then
    offline_cpu_expect_success $present_max
    online_cpu $present_max
    fi
    - exit 0
    + exit $retval
    else
    echo "Full scope test: all hotplug cpus"
    echo -e "\t online all offline cpus"
    @@ -291,3 +292,5 @@ done

    echo 0 > $NOTIFIER_ERR_INJECT_DIR/actions/CPU_DOWN_PREPARE/error
    /sbin/modprobe -q -r cpu-notifier-error-inject
    +
    +exit $retval
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-10-19 13:58    [W:2.313 / U:0.420 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site