From nobody Mon Jun 8 18:57:47 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 942DD3D0916; Wed, 27 May 2026 12:11:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779883913; cv=none; b=cC+LZlEJehP8Tz+RXV3zjRaw5UHXttCeMt2YowZ/uCfYN0hv8nlXDj9f/19mTsHXHUqi6NfB2K3Vs2LHAEO+0Us1X72s5GzWl+v6n8/xrYmvEU+KRVjy+PqWbeBat35rjl1jXYhnfHXPlNhWS9KWYRvG8e8B9iUncRtA1RgjqLg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779883913; c=relaxed/simple; bh=RYIDjrEfJBYUVSAnxHn0tx1K+k8od9awJynnjb21W5Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=LX+R07L776M058K3gk+U8BLP0xoQkx9EP4ThgYXR9sSXBbmvOxbKP0Z6MbvGwRAD/n7z9uYe9FSdwmWmPL5heu+A1FOS9X7orns77+5XRhAB1U3ii93L0xM8sC66FVZmwe+G2vM8x3f0+idawpSQb6hUE97aICtULPcfblf+rcU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=QLP/Hknf; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="QLP/Hknf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7406B1F000E9; Wed, 27 May 2026 12:11:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779883912; bh=EdfE770oCWwZcXp3tFdT9tPM6V9B1ew6o8mYvy+gkL4=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=QLP/Hknfb6HJTYNXw8t2s8xNJCbI0wpdpNg7/sxv+hoU74xO0IKuQSuSlht82Z5Xm b/YqnMMT5rNRCIAep7OY0EOIHHSTyTL5DKlqYKILNs+aUNwu7DxY50Jv59WC9WxlXR 55zADtpOESqBzK4tx0s0u5cKn2bNkWIMSzTZuTuUzHnAuqb53m+vC9s0e23XFnOKB6 usRhWRcFUtodgSBR7HCDJ+vmsB9xnrDgZRu6iS8dW6Q3gHSDhVq8pNxFGbtuDl3yuO rKlohGBQw8bJGhAfv0jeSGqwAUq4cWEaNspP5lMz20RIoH9piyl6V2f83+o0IHfrbA uI02W4h3I4Sug== From: "Matthieu Baerts (NGI0)" Date: Wed, 27 May 2026 22:11:34 +1000 Subject: [PATCH net 1/3] selftests: mptcp: simult_flows: disable GSO Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260527-net-mptcp-sft-bufferbloat-exit-v1-1-9afc4e742090@kernel.org> References: <20260527-net-mptcp-sft-bufferbloat-exit-v1-0-9afc4e742090@kernel.org> In-Reply-To: <20260527-net-mptcp-sft-bufferbloat-exit-v1-0-9afc4e742090@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , Florian Westphal Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2795; i=matttbe@kernel.org; h=from:subject:message-id; bh=RYIDjrEfJBYUVSAnxHn0tx1K+k8od9awJynnjb21W5Q=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBqFt99Bu8hhvt2pqi4T+jbP9iCsu2LdwNfQx6ji 6wxPsMZEuuJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCahbffQAKCRD2t4JPQmmg c4r/D/9p6G64Hyt/OW+1dTEPz/UVzyk134fLqjlO4NKwgjDW+aF4oXtI3haVu9hSoS3ZZaXZSuS ZvbXiXqHduIfhDQ2K4mw7ekUsXiy+MCd4SUuuiXKqozg2mlifZDA8DxilqdYGmE4N3ofO7Tj68j 1Fqcv7kJwsLxDt+MODR1U8xvDOsFqWhPI0MXQKgq7pa3nVkDFCc4lveAMYNKIbL3JhlwVPYwrn8 VgJ7IOVq1I2h01cZc3Tn/5KF0L9DDHSY886DLb0dLbj1Ms3w9kE1uBVaK5bGvnRS/qSZsn5L3jc aHfeRMbXtiLqvRqpbHiLSNv69T0vZ/nJM1YGbPrKj4UbSlWNLEcOgjIor2DOgcnNk8MV973T7K0 y2zNRTaMRY/QFYtVu4LhpQr3KbhgrdMRqv8eZdygPFPd2WwWx9XSHGZinQYYCVCo/97hZett/Iy NXK5kwAXyl5tMRCGAE4P00b1GCJjfa93MU3IBXsyDHLx1VrnxeRvTf+7dsk1JHGHoscvFBDpbkF DQAhZD+z/L8pV/a4WLIcyTyg80RnxXakqzWQj/dWolwGNPEIYPzUb66Q+qW5QOPvKiHgRVuo2kR y0lPpK2jk74QFHtafZ+EeRmX6CmBxL/VPaN2ENj/qZbkxMxu4YbYX/wysRQXiVyIxvU3urIfS5E 1NFQKC5r3mXUqXg== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Netem is used to apply a rate limit, and its 'limit' option is per packet. Disable GSO on both sides to work with packets of a specific size. That increases the number of packets, but stabilise the throughput. As a consequence, limits are more adapted, and the bufferbloat is reduced. Fixes: 8c09412e584d ("selftests: mptcp: more stable simult_flows tests") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/simult_flows.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index d11a8b949aab..345cf200c653 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -76,13 +76,13 @@ setup() =20 ip -net "$ns1" addr add 10.0.1.1/24 dev ns1eth1 ip -net "$ns1" addr add dead:beef:1::1/64 dev ns1eth1 nodad - ip -net "$ns1" link set ns1eth1 up mtu 1500 + ip -net "$ns1" link set ns1eth1 up mtu 1500 gso_max_segs 0 ip -net "$ns1" route add default via 10.0.1.2 ip -net "$ns1" route add default via dead:beef:1::2 =20 ip -net "$ns1" addr add 10.0.2.1/24 dev ns1eth2 ip -net "$ns1" addr add dead:beef:2::1/64 dev ns1eth2 nodad - ip -net "$ns1" link set ns1eth2 up mtu 1500 + ip -net "$ns1" link set ns1eth2 up mtu 1500 gso_max_segs 0 ip -net "$ns1" route add default via 10.0.2.2 metric 101 ip -net "$ns1" route add default via dead:beef:2::2 metric 101 =20 @@ -91,21 +91,21 @@ setup() =20 ip -net "$ns2" addr add 10.0.1.2/24 dev ns2eth1 ip -net "$ns2" addr add dead:beef:1::2/64 dev ns2eth1 nodad - ip -net "$ns2" link set ns2eth1 up mtu 1500 + ip -net "$ns2" link set ns2eth1 up mtu 1500 gso_max_segs 0 =20 ip -net "$ns2" addr add 10.0.2.2/24 dev ns2eth2 ip -net "$ns2" addr add dead:beef:2::2/64 dev ns2eth2 nodad - ip -net "$ns2" link set ns2eth2 up mtu 1500 + ip -net "$ns2" link set ns2eth2 up mtu 1500 gso_max_segs 0 =20 ip -net "$ns2" addr add 10.0.3.2/24 dev ns2eth3 ip -net "$ns2" addr add dead:beef:3::2/64 dev ns2eth3 nodad - ip -net "$ns2" link set ns2eth3 up mtu 1500 + ip -net "$ns2" link set ns2eth3 up mtu 1500 gso_max_segs 0 ip netns exec "$ns2" sysctl -q net.ipv4.ip_forward=3D1 ip netns exec "$ns2" sysctl -q net.ipv6.conf.all.forwarding=3D1 =20 ip -net "$ns3" addr add 10.0.3.3/24 dev ns3eth1 ip -net "$ns3" addr add dead:beef:3::3/64 dev ns3eth1 nodad - ip -net "$ns3" link set ns3eth1 up mtu 1500 + ip -net "$ns3" link set ns3eth1 up mtu 1500 gso_max_segs 0 ip -net "$ns3" route add default via 10.0.3.2 ip -net "$ns3" route add default via dead:beef:3::2 =20 --=20 2.53.0 From nobody Mon Jun 8 18:57:47 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F155C3D47D2; Wed, 27 May 2026 12:11:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779883919; cv=none; b=UDFbm4IYposHkTqEb1fnp0IQ+/eYNZok72bSF3DECYB7E6n2+g0tji8aOq1CvakRnS1r/s8QzZBLTVg2P341fAY85nUyNcJJJGeIFIhaa7QdGgExWdenXpqND31cxfuP27UJYdbI1kJjb825MJLdkJZuGs8/BqWyN+f+ByaCLdM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779883919; c=relaxed/simple; bh=DSfJEhyFz5JcQxPtsjcDZYUREpXS5tvUrTCCUgK9eHc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=FqNwubvWl9U3lUEffuITvZ0tAczCa9T0x6WqNIFGH7Rfej1w+02stn1HNXG3569OsOjxUe1eix74l/XQJKPpGJ0z/rl2MSdsX87nbhrl64iwikAoYZcDBMRTwMTQG7lnuaUsKFfTbFZV3WkmNZTRLU7aQ4qQXrx/1aDAHC0IB2E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=f53mB16b; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="f53mB16b" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 026CF1F00A3A; Wed, 27 May 2026 12:11:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779883917; bh=zRzHK/ANAnp6BfLWf0jTTE7Q5eI2n1f1hLM1/8Hho94=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=f53mB16bC8YEMtmHesBH2XKHorf7penVlBi4suDkvZsQtQ7fA5bANCicXjVjAaCAe SvOIqd0kPL+0iu3XDqoSEtMCMG0s/p+fXqETfuh6fyb0p/h2MGAyQgPCU5Zz3s/mOG IWoosGknYxV6kCfy9QoM/tx/KWht0wNEJ2dSOmsq1+7WlBcjoVZGumZ9YgBaWyezcb /vGoi5gw2FHSa0dEQZYDUoRKIIeBFtptBQI6Q0nt9QVFalzpoMdUHdBbWJhCB8Ld4O VOvzvm9OxzBYZEkrUBYZ3w7u/Qp0gIYKxfNCeY3cDKlrQJIVnCPT77VGI0vUgwwyTG YzruRramKAN9g== From: "Matthieu Baerts (NGI0)" Date: Wed, 27 May 2026 22:11:35 +1000 Subject: [PATCH net 2/3] selftests: mptcp: simult_flows: adapt limits Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260527-net-mptcp-sft-bufferbloat-exit-v1-2-9afc4e742090@kernel.org> References: <20260527-net-mptcp-sft-bufferbloat-exit-v1-0-9afc4e742090@kernel.org> In-Reply-To: <20260527-net-mptcp-sft-bufferbloat-exit-v1-0-9afc4e742090@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , Florian Westphal Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3041; i=matttbe@kernel.org; h=from:subject:message-id; bh=DSfJEhyFz5JcQxPtsjcDZYUREpXS5tvUrTCCUgK9eHc=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBqFt99CVOu713yiMuaL+6BxJaQSz9sF+uCy+fbs 4082TzsbnOJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCahbffQAKCRD2t4JPQmmg czU1EACXtTMh0YELnfDHNS4oZEmKA7k2FCnXZenDMpMjDvnk7c39KLrZz+kMRNBrqvol+Ru/J8X wMH6wYKBuobpxrBjdk39WaRxl/9KpYI/V8M3a11Lg33CM/7l8oXzzhdGZkayMUm/Ia5itHHGnRo btVDXUkQ3bC2tYtXXEf1cfOpdxRyogu/EKT3XmCMynt7G77nPyOtF0pf7UncxcIBD+0qbqMjIpj Q4LDefysLaMY76qKQWSKxgKTV8RPZYz6NJA4F7aEeBUtzTieJin0wenBE9ZTLy0Pveuuppfkl23 FXAjJTuNWsjFkhWV0IqADmN5vkU5OL4q4V5LZ8Lkh2ykjPT7aG2/Qadxvbly7K9ooFiTUU3GW4w NMV/1GVh3RHBD+fLYWvAzoO4qB2hKut4mGgFCurSldfF411xHv+4toypwz9LsQ1GQZTf6FLARva 46KvhIoLhGI07nNpL/3WaksXKQh6Vipux7RPuRqbR0wU3VGkyufZUHIYPi/SO4QPOa2yPKXPWv1 9FQXCriiRw4/fszc/TmG0l8PCXi/JPkAhzLPOrf2eMlhqzn8J/zW9wcu9Ig4NeYYPyGzkfHEq8I B973XXdlGkJ9WFLJnb82kFhFKuEFxWKvV9kH95R7sGglZC43hwDIxdTwgqvbU+6xhZoUGweYg/c 7TKoFLrvjCfDQ2w== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Avoid using a fixed limit, no matter the setup. This was causing too high bufferbloat in some situations, e.g. with a low bandwidth and very low delay because the default limit was too high for this case. Instead, use more appropriated limits. Note that unbalanced bandwidth modes seem to require slightly higher limits to cope with the different bursts. Fixes: 8c09412e584d ("selftests: mptcp: more stable simult_flows tests") Cc: stable@vger.kernel.org Reviewed-by: Mat Martineau Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/simult_flows.sh | 22 ++++++++++++-------= --- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index 345cf200c653..7b9aabe10170 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -223,9 +223,11 @@ run_test() local rate2=3D$2 local delay1=3D$3 local delay2=3D$4 + local limit1=3D$5 + local limit2=3D$6 local lret local dev - shift 4 + shift 6 local msg=3D$* =20 [ $delay1 -gt 0 ] && delay1=3D"delay ${delay1}ms" || delay1=3D"" @@ -240,10 +242,10 @@ run_test() =20 # keep the queued pkts number low, or the RTT estimator will see # increasing latency over time. - tc -n $ns1 qdisc add dev ns1eth1 root netem rate ${rate1}mbit $delay1 lim= it 50 - tc -n $ns1 qdisc add dev ns1eth2 root netem rate ${rate2}mbit $delay2 lim= it 50 - tc -n $ns2 qdisc add dev ns2eth1 root netem rate ${rate1}mbit $delay1 lim= it 50 - tc -n $ns2 qdisc add dev ns2eth2 root netem rate ${rate2}mbit $delay2 lim= it 50 + tc -n $ns1 qdisc add dev ns1eth1 root netem rate ${rate1}mbit $delay1 lim= it ${limit1} + tc -n $ns1 qdisc add dev ns1eth2 root netem rate ${rate2}mbit $delay2 lim= it ${limit2} + tc -n $ns2 qdisc add dev ns2eth1 root netem rate ${rate1}mbit $delay1 lim= it ${limit1} + tc -n $ns2 qdisc add dev ns2eth2 root netem rate ${rate2}mbit $delay2 lim= it ${limit2} =20 # time is measured in ms, account for transfer size, aggregated link speed # and header overhead (10%) @@ -301,13 +303,13 @@ done =20 setup mptcp_lib_subtests_last_ts_reset -run_test 10 10 0 0 "balanced bwidth" -run_test 10 10 1 25 "balanced bwidth with unbalanced delay" +run_test 10 10 0 0 20 20 "balanced bwidth" +run_test 10 10 1 25 20 50 "balanced bwidth with unbalanced delay" =20 # we still need some additional infrastructure to pass the following test-= cases -MPTCP_LIB_SUBTEST_FLAKY=3D1 run_test 10 3 0 0 "unbalanced bwidth" -run_test 10 3 1 25 "unbalanced bwidth with unbalanced delay" -run_test 10 3 25 1 "unbalanced bwidth with opposed, unbalanced delay" +MPTCP_LIB_SUBTEST_FLAKY=3D1 run_test 10 3 0 0 30 20 "unbalanced bwidth" +run_test 10 3 1 25 40 30 "unbalanced bwidth with unbalanced delay" +run_test 10 3 25 1 50 30 "unbalanced bwidth with opposed, unbalanced delay" =20 mptcp_lib_result_print_all_tap exit $ret --=20 2.53.0 From nobody Mon Jun 8 18:57:47 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8B3B33D0916; Wed, 27 May 2026 12:12:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779883924; cv=none; b=hS0++RUQBMnRit2TiMhgXew9Qu6AXA7gWiOP/NziQA7P+KoVlkysh+aw8L1iDq0ECM5i4dHMrtPTE0ohn9bgTaXBOE1MIMI5IdzO0OsaDQSzkUeSiFiriaD8TIqpD8CK3y2a5QPaYbNnWVV3YA9I5YaJRl8pzH6vOT+lqxLOFac= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779883924; c=relaxed/simple; bh=vsTntsTjWJE4HuMZwz55v9CiJmNGj8blvpyMNjyg0ac=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PxJzOLqD7hcVOnpxGZz4qDwvnKlCncwLV6REJc/U4+cQ4fP/wosISCgEYfs3s115Osz4cXXh7/JZYqd1hYc80rOzN57vDThcRQoWBO1/sR4m8VId77f9i5oZLmxo2UooZKmgsoN6NUAV2Se44Fm//1K+gt/wbYCp62MQlkEmMLo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TOWBMXYr; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TOWBMXYr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8409E1F000E9; Wed, 27 May 2026 12:11:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779883923; bh=AYVtaiqiIIDwyxFkeevLwHzRNA/ebS1U0PQqYPct23I=; h=From:Date:Subject:References:In-Reply-To:To:Cc; b=TOWBMXYrcfMHoaIgNw61uoZ1po+MFhmKiHArv6erxu0yNh0YHx96XscYwfB5MuVzv bK8x0jYbbt733kh1X6IyukqviaMYlDSOQx7tftJYTjYm8Ut3057BifPkPZzVsvPxqE sRv4FUfhTpfMlEMqh0a7SwJlCoMKRy96Epph3nErX/ocjOiXrrlbDm/EhrSk+hhUuv DsmW7h9WWXphDd24LPmvBmGuyZPWn5ynYY4jG7uBIyhO4unMs+30DRyxl57h9fAM3x L+CkKDr7hP3LLykcubazRVJCC7SDkWJwnomO5eDoG5Ae6Gcn1EoATSLW/9hqVtM1pX HTCh6zysfJWTA== From: "Matthieu Baerts (NGI0)" Date: Wed, 27 May 2026 22:11:36 +1000 Subject: [PATCH net 3/3] selftests: mptcp: sockopt: set EXIT trap earlier Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260527-net-mptcp-sft-bufferbloat-exit-v1-3-9afc4e742090@kernel.org> References: <20260527-net-mptcp-sft-bufferbloat-exit-v1-0-9afc4e742090@kernel.org> In-Reply-To: <20260527-net-mptcp-sft-bufferbloat-exit-v1-0-9afc4e742090@kernel.org> To: Mat Martineau , Geliang Tang , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Shuah Khan , Florian Westphal Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" , stable@vger.kernel.org, Geliang Tang X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1136; i=matttbe@kernel.org; h=from:subject:message-id; bh=MK44442Y4GoOT8uW9O86ZnxBnXXBd/Ke3NWWnIJImtc=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBqFt99E/qu5U1ifj1gprAjbginxvFREUDz3f3hK 78XyL3AhOqJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCahbffQAKCRD2t4JPQmmg czKtEADEFBgMs6FTGTPNpqwoO7jrUilBjcXIcShBesy30XjmfeZb+CbXr523TguNfXPiwfn2tr1 nxrnUzWvV6PRCu4Ck0yOuJqYuTjo5YJjVXT1zelud76GTyhWXTigyxzCR/+MGczrP58Zm69os1v Cur4zl/JHoicVTwsKFO5mCobRilG5V9YV65guS2+bWH9NSNzM4THeCUicTB2so1ygkuHB5IxJ5h TWfUpGuN175V3rtNO25NBzmz6eYxKRrbaLetLfzUWEXZCF/r6jNqez8cfPCKR8O0T5MirWrDnvW MsoQarIil5HoxeC/FQe3rFn+8U756wccGDevkNmMuaskFX8T41KrLZkDP2jlNahM3frB8CrV3Wo srblLyu+nWpYQvvc1Kt5vS0ZhMTx8Ua47q74WpcWcsgPeWZ6bqAlJWip2nPTFf0lCFGRL8gXwTD +XUiT6iz207wSP48w/s2BRkzjn3bD2t2s4TL4j8wUyZ9kx6/rB+ZYU/6UNdzUgru8HDstlV66iA grmeggt4etcOaQHbe3lGzWs7gGIBGjiEO3HNisYkNt5pBdOPRHz2lO5U+tgxm8WxPTMlBEY9b0A dMFt6ccG8TUsfujXegmfWhcGkeJptr+hy9jLUgujqI/NMytUwJ6Pi0yiuhq6qd9uWSybwn4wqdZ E+tgo2CiTqypcFQ== X-Developer-Key: i=matttbe@kernel.org; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 From: Geliang Tang Set the EXIT trap for cleanup immediately after creating temporary file variables, before init and make_file, to ensure cleanup runs on any failure or interruption during the early setup phase. Fixes: dc65fe82fb07 ("selftests: mptcp: add packet mark test case") Cc: stable@vger.kernel.org Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts (NGI0) Signed-off-by: Matthieu Baerts (NGI0) --- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index ab8bce06b262..e850a87429b6 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -355,10 +355,10 @@ sin=3D$(mktemp) sout=3D$(mktemp) cin=3D$(mktemp) cout=3D$(mktemp) +trap cleanup EXIT init make_file "$cin" "client" 1 make_file "$sin" "server" 1 -trap cleanup EXIT mptcp_lib_subtests_last_ts_reset =20 run_tests $ns1 $ns2 10.0.1.1 --=20 2.53.0