releases/6.6.28/selftests-mptcp-use-operator-to-append-strings.patch

   1 From e7c42bf4d320affe37337aa83ae0347832b3f568 Mon Sep 17 00:00:00 2001
   2 From: Geliang Tang <tanggeliang@kylinos.cn>
   3 Date: Fri, 8 Mar 2024 23:10:15 +0100
   4 Subject: selftests: mptcp: use += operator to append strings
   5
   6 From: Geliang Tang <tanggeliang@kylinos.cn>
   7
   8 commit e7c42bf4d320affe37337aa83ae0347832b3f568 upstream.
   9
  10 This patch uses addition assignment operator (+=) to append strings
  11 instead of duplicating the variable name in mptcp_connect.sh and
  12 mptcp_join.sh.
  13
  14 This can make the statements shorter.
  15
  16 Note: in mptcp_connect.sh, add a local variable extra in do_transfer to
  17 save the various extra warning logs, using += to append it. And add a
  18 new variable tc_info to save various tc info, also using += to append it.
  19 This can make the code more readable and prepare for the next commit.
  20
  21 Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
  22 Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
  23 Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
  24 Link: https://lore.kernel.org/r/20240308-upstream-net-next-20240308-selftests-mptcp-unification-v1-8-4f42c347b653@kernel.org
  25 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  26 [ Conflicts in mptcp_connect.sh: this commit was supposed to be
  27   backported before commit 7a1b3490f47e ("mptcp: don't account accept()
  28   of non-MPC client as fallback to TCP"). The new condition added by
  29   this commit was then not expected, and was in fact at the wrong place
  30   in v6.6: in case of issue, the problem would not have been reported
  31   correctly. ]
  32 Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
  33 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  34 ---
  35  tools/testing/selftests/net/mptcp/mptcp_connect.sh |   53 +++++++++++----------
  36  tools/testing/selftests/net/mptcp/mptcp_join.sh    |   30 +++++------
  37  2 files changed, 43 insertions(+), 40 deletions(-)
  38
  39 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.sh
  40 +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.sh
  41 @@ -374,15 +374,15 @@ do_transfer()
  42         TEST_COUNT=$((TEST_COUNT+1))
  43
  44         if [ "$rcvbuf" -gt 0 ]; then
  45 -               extra_args="$extra_args -R $rcvbuf"
  46 +               extra_args+=" -R $rcvbuf"
  47         fi
  48
  49         if [ "$sndbuf" -gt 0 ]; then
  50 -               extra_args="$extra_args -S $sndbuf"
  51 +               extra_args+=" -S $sndbuf"
  52         fi
  53
  54         if [ -n "$testmode" ]; then
  55 -               extra_args="$extra_args -m $testmode"
  56 +               extra_args+=" -m $testmode"
  57         fi
  58
  59         if [ -n "$extra_args" ] && $options_log; then
  60 @@ -503,6 +503,7 @@ do_transfer()
  61         check_transfer $cin $sout "file received by server"
  62         rets=$?
  63
  64 +       local extra=""
  65         local stat_synrx_now_l
  66         local stat_ackrx_now_l
  67         local stat_cookietx_now
  68 @@ -538,7 +539,7 @@ do_transfer()
  69                                 "${stat_ackrx_now_l}" "${expect_ackrx}" 1>&2
  70                         rets=1
  71                 else
  72 -                       printf "[ Note ] fallback due to TCP OoO"
  73 +                       extra+=" [ Note ] fallback due to TCP OoO"
  74                 fi
  75         fi
  76
  77 @@ -561,13 +562,6 @@ do_transfer()
  78                 fi
  79         fi
  80
  81 -       if [ $retc -eq 0 ] && [ $rets -eq 0 ]; then
  82 -               printf "[ OK ]"
  83 -               mptcp_lib_result_pass "${TEST_GROUP}: ${result_msg}"
  84 -       else
  85 -               mptcp_lib_result_fail "${TEST_GROUP}: ${result_msg}"
  86 -       fi
  87 -
  88         if [ ${stat_ooo_now} -eq 0 ] && [ ${stat_tcpfb_last_l} -ne ${stat_tcpfb_now_l} ]; then
  89                 mptcp_lib_pr_fail "unexpected fallback to TCP"
  90                 rets=1
  91 @@ -575,30 +569,39 @@ do_transfer()
  92
  93         if [ $cookies -eq 2 ];then
  94                 if [ $stat_cookietx_last -ge $stat_cookietx_now ] ;then
  95 -                       printf " WARN: CookieSent: did not advance"
  96 +                       extra+=" WARN: CookieSent: did not advance"
  97                 fi
  98                 if [ $stat_cookierx_last -ge $stat_cookierx_now ] ;then
  99 -                       printf " WARN: CookieRecv: did not advance"
 100 +                       extra+=" WARN: CookieRecv: did not advance"
 101                 fi
 102         else
 103                 if [ $stat_cookietx_last -ne $stat_cookietx_now ] ;then
 104 -                       printf " WARN: CookieSent: changed"
 105 +                       extra+=" WARN: CookieSent: changed"
 106                 fi
 107                 if [ $stat_cookierx_last -ne $stat_cookierx_now ] ;then
 108 -                       printf " WARN: CookieRecv: changed"
 109 +                       extra+=" WARN: CookieRecv: changed"
 110                 fi
 111         fi
 112
 113         if [ ${stat_synrx_now_l} -gt ${expect_synrx} ]; then
 114 -               printf " WARN: SYNRX: expect %d, got %d (probably retransmissions)" \
 115 -                       "${expect_synrx}" "${stat_synrx_now_l}"
 116 +               extra+=" WARN: SYNRX: expect ${expect_synrx},"
 117 +               extra+=" got ${stat_synrx_now_l} (probably retransmissions)"
 118         fi
 119         if [ ${stat_ackrx_now_l} -gt ${expect_ackrx} ]; then
 120 -               printf " WARN: ACKRX: expect %d, got %d (probably retransmissions)" \
 121 -                       "${expect_ackrx}" "${stat_ackrx_now_l}"
 122 +               extra+=" WARN: ACKRX: expect ${expect_ackrx},"
 123 +               extra+=" got ${stat_ackrx_now_l} (probably retransmissions)"
 124 +       fi
 125 +
 126 +       if [ $retc -eq 0 ] && [ $rets -eq 0 ]; then
 127 +               printf "[ OK ]%s\n" "${extra}"
 128 +               mptcp_lib_result_pass "${TEST_GROUP}: ${result_msg}"
 129 +       else
 130 +               if [ -n "${extra}" ]; then
 131 +                       printf "%s\n" "${extra:1}"
 132 +               fi
 133 +               mptcp_lib_result_fail "${TEST_GROUP}: ${result_msg}"
 134         fi
 135
 136 -       echo
 137         cat "$capout"
 138         [ $retc -eq 0 ] && [ $rets -eq 0 ]
 139  }
 140 @@ -924,8 +927,8 @@ mptcp_lib_result_code "${ret}" "ping tes
 141  stop_if_error "Could not even run ping tests"
 142
 143  [ -n "$tc_loss" ] && tc -net "$ns2" qdisc add dev ns2eth3 root netem loss random $tc_loss delay ${tc_delay}ms
 144 -echo -n "INFO: Using loss of $tc_loss "
 145 -test "$tc_delay" -gt 0 && echo -n "delay $tc_delay ms "
 146 +tc_info="loss of $tc_loss "
 147 +test "$tc_delay" -gt 0 && tc_info+="delay $tc_delay ms "
 148
 149  reorder_delay=$((tc_delay / 4))
 150
 151 @@ -936,17 +939,17 @@ if [ -z "${tc_reorder}" ]; then
 152
 153         if [ $reorder_delay -gt 0 ] && [ $reorder1 -lt 100 ] && [ $reorder2 -gt 0 ]; then
 154                 tc_reorder="reorder ${reorder1}% ${reorder2}%"
 155 -               echo -n "$tc_reorder with delay ${reorder_delay}ms "
 156 +               tc_info+="$tc_reorder with delay ${reorder_delay}ms "
 157         fi
 158  elif [ "$tc_reorder" = "0" ];then
 159         tc_reorder=""
 160  elif [ "$reorder_delay" -gt 0 ];then
 161         # reordering requires some delay
 162         tc_reorder="reorder $tc_reorder"
 163 -       echo -n "$tc_reorder with delay ${reorder_delay}ms "
 164 +       tc_info+="$tc_reorder with delay ${reorder_delay}ms "
 165  fi
 166
 167 -echo "on ns3eth4"
 168 +echo "INFO: Using ${tc_info}on ns3eth4"
 169
 170  tc -net "$ns3" qdisc add dev ns3eth4 root netem delay ${reorder_delay}ms $tc_reorder
 171
 172 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh
 173 +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh
 174 @@ -822,18 +822,18 @@ pm_nl_check_endpoint()
 175                 line="${line% }"
 176                 # the dump order is: address id flags port dev
 177                 [ -n "$addr" ] && expected_line="$addr"
 178 -               expected_line="$expected_line $id"
 179 -               [ -n "$_flags" ] && expected_line="$expected_line ${_flags//","/" "}"
 180 -               [ -n "$dev" ] && expected_line="$expected_line $dev"
 181 -               [ -n "$port" ] && expected_line="$expected_line $port"
 182 +               expected_line+=" $id"
 183 +               [ -n "$_flags" ] && expected_line+=" ${_flags//","/" "}"
 184 +               [ -n "$dev" ] && expected_line+=" $dev"
 185 +               [ -n "$port" ] && expected_line+=" $port"
 186         else
 187                 line=$(ip netns exec $ns ./pm_nl_ctl get $_id)
 188                 # the dump order is: id flags dev address port
 189                 expected_line="$id"
 190 -               [ -n "$flags" ] && expected_line="$expected_line $flags"
 191 -               [ -n "$dev" ] && expected_line="$expected_line $dev"
 192 -               [ -n "$addr" ] && expected_line="$expected_line $addr"
 193 -               [ -n "$_port" ] && expected_line="$expected_line $_port"
 194 +               [ -n "$flags" ] && expected_line+=" $flags"
 195 +               [ -n "$dev" ] && expected_line+=" $dev"
 196 +               [ -n "$addr" ] && expected_line+=" $addr"
 197 +               [ -n "$_port" ] && expected_line+=" $_port"
 198         fi
 199         if [ "$line" = "$expected_line" ]; then
 200                 print_ok
 201 @@ -1256,7 +1256,7 @@ chk_csum_nr()
 202         print_check "sum"
 203         count=$(mptcp_lib_get_counter ${ns1} "MPTcpExtDataCsumErr")
 204         if [ "$count" != "$csum_ns1" ]; then
 205 -               extra_msg="$extra_msg ns1=$count"
 206 +               extra_msg+=" ns1=$count"
 207         fi
 208         if [ -z "$count" ]; then
 209                 print_skip
 210 @@ -1269,7 +1269,7 @@ chk_csum_nr()
 211         print_check "csum"
 212         count=$(mptcp_lib_get_counter ${ns2} "MPTcpExtDataCsumErr")
 213         if [ "$count" != "$csum_ns2" ]; then
 214 -               extra_msg="$extra_msg ns2=$count"
 215 +               extra_msg+=" ns2=$count"
 216         fi
 217         if [ -z "$count" ]; then
 218                 print_skip
 219 @@ -1313,7 +1313,7 @@ chk_fail_nr()
 220         print_check "ftx"
 221         count=$(mptcp_lib_get_counter ${ns_tx} "MPTcpExtMPFailTx")
 222         if [ "$count" != "$fail_tx" ]; then
 223 -               extra_msg="$extra_msg,tx=$count"
 224 +               extra_msg+=",tx=$count"
 225         fi
 226         if [ -z "$count" ]; then
 227                 print_skip
 228 @@ -1327,7 +1327,7 @@ chk_fail_nr()
 229         print_check "failrx"
 230         count=$(mptcp_lib_get_counter ${ns_rx} "MPTcpExtMPFailRx")
 231         if [ "$count" != "$fail_rx" ]; then
 232 -               extra_msg="$extra_msg,rx=$count"
 233 +               extra_msg+=",rx=$count"
 234         fi
 235         if [ -z "$count" ]; then
 236                 print_skip
 237 @@ -1362,7 +1362,7 @@ chk_fclose_nr()
 238         if [ -z "$count" ]; then
 239                 print_skip
 240         elif [ "$count" != "$fclose_tx" ]; then
 241 -               extra_msg="$extra_msg,tx=$count"
 242 +               extra_msg+=",tx=$count"
 243                 fail_test "got $count MP_FASTCLOSE[s] TX expected $fclose_tx"
 244         else
 245                 print_ok
 246 @@ -1373,7 +1373,7 @@ chk_fclose_nr()
 247         if [ -z "$count" ]; then
 248                 print_skip
 249         elif [ "$count" != "$fclose_rx" ]; then
 250 -               extra_msg="$extra_msg,rx=$count"
 251 +               extra_msg+=",rx=$count"
 252                 fail_test "got $count MP_FASTCLOSE[s] RX expected $fclose_rx"
 253         else
 254                 print_ok
 255 @@ -1742,7 +1742,7 @@ chk_rm_nr()
 256                 count=$((count + cnt))
 257                 if [ "$count" != "$rm_subflow_nr" ]; then
 258                         suffix="$count in [$rm_subflow_nr:$((rm_subflow_nr*2))]"
 259 -                       extra_msg="$extra_msg simult"
 260 +                       extra_msg+=" simult"
 261                 fi
 262                 if [ $count -ge "$rm_subflow_nr" ] && \
 263                    [ "$count" -le "$((rm_subflow_nr *2 ))" ]; then