lkml.org 
[lkml]   [2019]   [Dec]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 324/434] selftests, bpf: Fix test_tc_tunnel hanging
    Date
    From: Jiri Benc <jbenc@redhat.com>

    [ Upstream commit 3b054b7133b4ad93671c82e8d6185258e3f1a7a5 ]

    When run_kselftests.sh is run, it hangs after test_tc_tunnel.sh. The reason
    is test_tc_tunnel.sh ensures the server ('nc -l') is run all the time,
    starting it again every time it is expected to terminate. The exception is
    the final client_connect: the server is not started anymore, which ensures
    no process is kept running after the test is finished.

    For a sit test, though, the script is terminated prematurely without the
    final client_connect and the 'nc' process keeps running. This in turn causes
    the run_one function in kselftest/runner.sh to hang forever, waiting for the
    runaway process to finish.

    Ensure a remaining server is terminated on cleanup.

    Fixes: f6ad6accaa99 ("selftests/bpf: expand test_tc_tunnel with SIT encap")
    Signed-off-by: Jiri Benc <jbenc@redhat.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Acked-by: Willem de Bruijn <willemb@google.com>
    Link: https://lore.kernel.org/bpf/60919291657a9ee89c708d8aababc28ebe1420be.1573821780.git.jbenc@redhat.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    tools/testing/selftests/bpf/test_tc_tunnel.sh | 5 +++++
    1 file changed, 5 insertions(+)

    diff --git a/tools/testing/selftests/bpf/test_tc_tunnel.sh b/tools/testing/selftests/bpf/test_tc_tunnel.sh
    index ff0d31d38061..7c76b841b17b 100755
    --- a/tools/testing/selftests/bpf/test_tc_tunnel.sh
    +++ b/tools/testing/selftests/bpf/test_tc_tunnel.sh
    @@ -62,6 +62,10 @@ cleanup() {
    if [[ -f "${infile}" ]]; then
    rm "${infile}"
    fi
    +
    + if [[ -n $server_pid ]]; then
    + kill $server_pid 2> /dev/null
    + fi
    }

    server_listen() {
    @@ -77,6 +81,7 @@ client_connect() {

    verify_data() {
    wait "${server_pid}"
    + server_pid=
    # sha1sum returns two fields [sha1] [filepath]
    # convert to bash array and access first elem
    insum=($(sha1sum ${infile}))
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-12-29 18:56    [W:2.097 / U:10.100 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site