lkml.org 
[lkml]   [2020]   [Dec]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.10 045/217] locktorture: Prevent hangs for invalid arguments
    Date
    From: "Paul E. McKenney" <paulmck@kernel.org>

    [ Upstream commit 6b74fa0a776e3715d385b23d29db469179c825b0 ]

    If an locktorture torture-test run is given a bad kvm.sh argument, the
    test will complain to the console, which is good. What is bad is that
    from the user's perspective, it will just hang for the time specified
    by the --duration argument. This commit therefore forces an immediate
    kernel shutdown if a lock_torture_init()-time error occurs, thus avoiding
    the appearance of a hang. It also forces a console splat in this case
    to clearly indicate the presence of an error.

    Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/locking/locktorture.c | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
    index 62d215b2e39f6..8bcb6a75cb9c0 100644
    --- a/kernel/locking/locktorture.c
    +++ b/kernel/locking/locktorture.c
    @@ -29,6 +29,7 @@
    #include <linux/slab.h>
    #include <linux/percpu-rwsem.h>
    #include <linux/torture.h>
    +#include <linux/reboot.h>

    MODULE_LICENSE("GPL");
    MODULE_AUTHOR("Paul E. McKenney <paulmck@linux.ibm.com>");
    @@ -1038,6 +1039,10 @@ static int __init lock_torture_init(void)
    unwind:
    torture_init_end();
    lock_torture_cleanup();
    + if (shutdown_secs) {
    + WARN_ON(!IS_MODULE(CONFIG_LOCK_TORTURE_TEST));
    + kernel_power_off();
    + }
    return firsterr;
    }

    --
    2.27.0
    \
     
     \ /
      Last update: 2020-12-23 04:12    [W:3.776 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site