selftests: mptcp: add evts_get_info helper

commit 06848c0f341ee3f9226ed01e519c72e4d2b6f001 upstream.

This patch adds a new helper get_info_value(), using 'sed' command to
parse the value of the given item name in the line with the given keyword,
to make chk_mptcp_info() and pedit_action_pkts() more readable.

Also add another helper evts_get_info() to use get_info_value() to parse
the output of 'pm_nl_ctl events' command, to make all the userspace pm
selftests more readable, both in mptcp_join.sh and userspace_pm.sh.

Reviewed-by: Matthieu Baerts <matttbe@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231128-send-net-next-2023107-v4-2-8d6b94150f6b@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh
index 478878f613a8443f8cc99f25b607289a130395b4..10299f056261ca948c7034bfdcad441121924e86 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
@@ -1842,10 +1842,8 @@ chk_mptcp_info()
 
        print_check "mptcp_info ${info1:0:8}=$exp1:$exp2"
 
-       cnt1=$(ss -N $ns1 -inmHM | grep "$info1:" |
-              sed -n 's/.*\('"$info1"':\)\([[:digit:]]*\).*$/\2/p;q')
-       cnt2=$(ss -N $ns2 -inmHM | grep "$info2:" |
-              sed -n 's/.*\('"$info2"':\)\([[:digit:]]*\).*$/\2/p;q')
+       cnt1=$(ss -N $ns1 -inmHM | mptcp_lib_get_info_value "$info1" "$info1")
+       cnt2=$(ss -N $ns2 -inmHM | mptcp_lib_get_info_value "$info2" "$info2")
        # 'ss' only display active connections and counters that are not 0.
        [ -z "$cnt1" ] && cnt1=0
        [ -z "$cnt2" ] && cnt2=0
@@ -2821,13 +2819,13 @@ verify_listener_events()
                return
        fi
 
-       type=$(grep "type:$e_type," $evt | sed -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q')
-       family=$(grep "type:$e_type," $evt | sed -n 's/.*\(family:\)\([[:digit:]]*\).*$/\2/p;q')
-       sport=$(grep "type:$e_type," $evt | sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q')
+       type=$(mptcp_lib_evts_get_info type "$evt" "$e_type")
+       family=$(mptcp_lib_evts_get_info family "$evt" "$e_type")
+       sport=$(mptcp_lib_evts_get_info sport "$evt" "$e_type")
        if [ $family ] && [ $family = $AF_INET6 ]; then
-               saddr=$(grep "type:$e_type," $evt | sed -n 's/.*\(saddr6:\)\([0-9a-f:.]*\).*$/\2/p;q')
+               saddr=$(mptcp_lib_evts_get_info saddr6 "$evt" "$e_type")
        else
-               saddr=$(grep "type:$e_type," $evt | sed -n 's/.*\(saddr4:\)\([0-9.]*\).*$/\2/p;q')
+               saddr=$(mptcp_lib_evts_get_info saddr4 "$evt" "$e_type")
        fi
 
        if [ $type ] && [ $type = $e_type ] &&
@@ -3222,8 +3220,7 @@ fastclose_tests()
 pedit_action_pkts()
 {
        tc -n $ns2 -j -s action show action pedit index 100 | \
-               grep "packets" | \
-               sed 's/.*"packets":\([0-9]\+\),.*/\1/'
+               mptcp_lib_get_info_value \"packets\" packets
 }
 
 fail_tests()

diff --git a/tools/testing/selftests/net/mptcp/mptcp_lib.sh b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
index 2b10f200de4020f2bb4d1a7a1155d0c7f0e88590..3cf31be5f65584b21ed83456ff7cf1fe1499050c 100644 (file)
--- a/tools/testing/selftests/net/mptcp/mptcp_lib.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_lib.sh
@@ -208,6 +208,16 @@ mptcp_lib_result_print_all_tap() {
        done
 }
 
+# get the value of keyword $1 in the line marked by keyword $2
+mptcp_lib_get_info_value() {
+       grep "${2}" | sed -n 's/.*\('"${1}"':\)\([0-9a-f:.]*\).*$/\2/p;q'
+}
+
+# $1: info name ; $2: evts_ns ; $3: event type
+mptcp_lib_evts_get_info() {
+       mptcp_lib_get_info_value "${1}" "^type:${3:-1}," < "${2}"
+}
+
 # $1: PID
 mptcp_lib_kill_wait() {
        [ "${1}" -eq 0 ] && return 0

diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh
index 0e748068ee95e7737891b1df592d60d7c2006e84..4c62114de0637bb85022cd0460464a76f8bf5122 100755 (executable)
--- a/tools/testing/selftests/net/mptcp/userspace_pm.sh
+++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh
@@ -238,14 +238,11 @@ make_connection()
        local server_token
        local server_serverside
 
-       client_token=$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$client_evts")
-       client_port=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$client_evts")
-       client_serverside=$(sed --unbuffered -n 's/.*\(server_side:\)\([[:digit:]]*\).*$/\2/p;q'\
-                                     "$client_evts")
-       server_token=$(grep "type:1," "$server_evts" |
-                      sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q')
-       server_serverside=$(grep "type:1," "$server_evts" |
-                           sed --unbuffered -n 's/.*\(server_side:\)\([[:digit:]]*\).*$/\2/p;q')
+       client_token=$(mptcp_lib_evts_get_info token "$client_evts")
+       client_port=$(mptcp_lib_evts_get_info sport "$client_evts")
+       client_serverside=$(mptcp_lib_evts_get_info server_side "$client_evts")
+       server_token=$(mptcp_lib_evts_get_info token "$server_evts")
+       server_serverside=$(mptcp_lib_evts_get_info server_side "$server_evts")
 
        print_test "Established IP${is_v6} MPTCP Connection ns2 => ns1"
        if [ "$client_token" != "" ] && [ "$server_token" != "" ] && [ "$client_serverside" = 0 ] &&
@@ -331,16 +328,16 @@ verify_announce_event()
        local dport
        local id
 
-       type=$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$evt")
-       token=$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evt")
+       type=$(mptcp_lib_evts_get_info type "$evt" $e_type)
+       token=$(mptcp_lib_evts_get_info token "$evt" $e_type)
        if [ "$e_af" = "v6" ]
        then
-               addr=$(sed --unbuffered -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q' "$evt")
+               addr=$(mptcp_lib_evts_get_info daddr6 "$evt" $e_type)
        else
-               addr=$(sed --unbuffered -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evt")
+               addr=$(mptcp_lib_evts_get_info daddr4 "$evt" $e_type)
        fi
-       dport=$(sed --unbuffered -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evt")
-       id=$(sed --unbuffered -n 's/.*\(rem_id:\)\([[:digit:]]*\).*$/\2/p;q' "$evt")
+       dport=$(mptcp_lib_evts_get_info dport "$evt" $e_type)
+       id=$(mptcp_lib_evts_get_info rem_id "$evt" $e_type)
 
        check_expected "type" "token" "addr" "dport" "id"
 }
@@ -358,7 +355,7 @@ test_announce()
           $client_addr_id dev ns2eth1 > /dev/null 2>&1
 
        local type
-       type=$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$server_evts")
+       type=$(mptcp_lib_evts_get_info type "$server_evts")
        print_test "ADD_ADDR 10.0.2.2 (ns2) => ns1, invalid token"
        if [ "$type" = "" ]
        then
@@ -437,9 +434,9 @@ verify_remove_event()
        local token
        local id
 
-       type=$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$evt")
-       token=$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evt")
-       id=$(sed --unbuffered -n 's/.*\(rem_id:\)\([[:digit:]]*\).*$/\2/p;q' "$evt")
+       type=$(mptcp_lib_evts_get_info type "$evt" $e_type)
+       token=$(mptcp_lib_evts_get_info token "$evt" $e_type)
+       id=$(mptcp_lib_evts_get_info rem_id "$evt" $e_type)
 
        check_expected "type" "token" "id"
 }
@@ -457,7 +454,7 @@ test_remove()
           $client_addr_id > /dev/null 2>&1
        print_test "RM_ADDR id:${client_addr_id} ns2 => ns1, invalid token"
        local type
-       type=$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$server_evts")
+       type=$(mptcp_lib_evts_get_info type "$server_evts")
        if [ "$type" = "" ]
        then
                test_pass
@@ -470,7 +467,7 @@ test_remove()
        ip netns exec "$ns2" ./pm_nl_ctl rem token "$client4_token" id\
           $invalid_id > /dev/null 2>&1
        print_test "RM_ADDR id:${invalid_id} ns2 => ns1, invalid id"
-       type=$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$server_evts")
+       type=$(mptcp_lib_evts_get_info type "$server_evts")
        if [ "$type" = "" ]
        then
                test_pass
@@ -574,19 +571,19 @@ verify_subflow_events()
                fi
        fi
 
-       type=$(sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q' "$evt")
-       token=$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evt")
-       family=$(sed --unbuffered -n 's/.*\(family:\)\([[:digit:]]*\).*$/\2/p;q' "$evt")
-       dport=$(sed --unbuffered -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evt")
-       locid=$(sed --unbuffered -n 's/.*\(loc_id:\)\([[:digit:]]*\).*$/\2/p;q' "$evt")
-       remid=$(sed --unbuffered -n 's/.*\(rem_id:\)\([[:digit:]]*\).*$/\2/p;q' "$evt")
+       type=$(mptcp_lib_evts_get_info type "$evt" $e_type)
+       token=$(mptcp_lib_evts_get_info token "$evt" $e_type)
+       family=$(mptcp_lib_evts_get_info family "$evt" $e_type)
+       dport=$(mptcp_lib_evts_get_info dport "$evt" $e_type)
+       locid=$(mptcp_lib_evts_get_info loc_id "$evt" $e_type)
+       remid=$(mptcp_lib_evts_get_info rem_id "$evt" $e_type)
        if [ "$family" = "$AF_INET6" ]
        then
-               saddr=$(sed --unbuffered -n 's/.*\(saddr6:\)\([0-9a-f:.]*\).*$/\2/p;q' "$evt")
-               daddr=$(sed --unbuffered -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q' "$evt")
+               saddr=$(mptcp_lib_evts_get_info saddr6 "$evt" $e_type)
+               daddr=$(mptcp_lib_evts_get_info daddr6 "$evt" $e_type)
        else
-               saddr=$(sed --unbuffered -n 's/.*\(saddr4:\)\([0-9.]*\).*$/\2/p;q' "$evt")
-               daddr=$(sed --unbuffered -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evt")
+               saddr=$(mptcp_lib_evts_get_info saddr4 "$evt" $e_type)
+               daddr=$(mptcp_lib_evts_get_info daddr4 "$evt" $e_type)
        fi
 
        check_expected "type" "token" "daddr" "dport" "family" "saddr" "locid" "remid"
@@ -621,7 +618,7 @@ test_subflows()
        mptcp_lib_kill_wait $listener_pid
 
        local sport
-       sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$server_evts")
+       sport=$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED)
 
        # DESTROY_SUBFLOW from server to client machine
        :>"$server_evts"
@@ -659,7 +656,7 @@ test_subflows()
        # Delete the listener from the client ns, if one was created
        mptcp_lib_kill_wait $listener_pid
 
-       sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$server_evts")
+       sport=$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED)
 
        # DESTROY_SUBFLOW6 from server to client machine
        :>"$server_evts"
@@ -698,7 +695,7 @@ test_subflows()
        # Delete the listener from the client ns, if one was created
        mptcp_lib_kill_wait $listener_pid
 
-       sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$server_evts")
+       sport=$(mptcp_lib_evts_get_info sport "$server_evts" $SUB_ESTABLISHED)
 
        # DESTROY_SUBFLOW from server to client machine
        :>"$server_evts"
@@ -736,7 +733,7 @@ test_subflows()
        # Delete the listener from the server ns, if one was created
        mptcp_lib_kill_wait $listener_pid
 
-       sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$client_evts")
+       sport=$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED)
 
        # DESTROY_SUBFLOW from client to server machine
        :>"$client_evts"
@@ -775,7 +772,7 @@ test_subflows()
        # Delete the listener from the server ns, if one was created
        mptcp_lib_kill_wait $listener_pid
 
-       sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$client_evts")
+       sport=$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED)
 
        # DESTROY_SUBFLOW6 from client to server machine
        :>"$client_evts"
@@ -812,7 +809,7 @@ test_subflows()
        # Delete the listener from the server ns, if one was created
        mptcp_lib_kill_wait $listener_pid
 
-       sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$client_evts")
+       sport=$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED)
 
        # DESTROY_SUBFLOW from client to server machine
        :>"$client_evts"
@@ -858,7 +855,7 @@ test_subflows_v4_v6_mix()
        # Delete the listener from the server ns, if one was created
        mptcp_lib_kill_wait $listener_pid
 
-       sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$client_evts")
+       sport=$(mptcp_lib_evts_get_info sport "$client_evts" $SUB_ESTABLISHED)
 
        # DESTROY_SUBFLOW from client to server machine
        :>"$client_evts"
@@ -926,18 +923,13 @@ verify_listener_events()
                print_test "CLOSE_LISTENER $e_saddr:$e_sport"
        fi
 
-       type=$(grep "type:$e_type," $evt |
-              sed --unbuffered -n 's/.*\(type:\)\([[:digit:]]*\).*$/\2/p;q')
-       family=$(grep "type:$e_type," $evt |
-                sed --unbuffered -n 's/.*\(family:\)\([[:digit:]]*\).*$/\2/p;q')
-       sport=$(grep "type:$e_type," $evt |
-               sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q')
+       type=$(mptcp_lib_evts_get_info type $evt $e_type)
+       family=$(mptcp_lib_evts_get_info family $evt $e_type)
+       sport=$(mptcp_lib_evts_get_info sport $evt $e_type)
        if [ $family ] && [ $family = $AF_INET6 ]; then
-               saddr=$(grep "type:$e_type," $evt |
-                       sed --unbuffered -n 's/.*\(saddr6:\)\([0-9a-f:.]*\).*$/\2/p;q')
+               saddr=$(mptcp_lib_evts_get_info saddr6 $evt $e_type)
        else
-               saddr=$(grep "type:$e_type," $evt |
-                       sed --unbuffered -n 's/.*\(saddr4:\)\([0-9.]*\).*$/\2/p;q')
+               saddr=$(mptcp_lib_evts_get_info saddr4 $evt $e_type)
        fi
 
        check_expected "type" "family" "saddr" "sport"