From: Hangbin Liu <liuhangbin@kylinos.cn>

After squash, the new commit description could be:

During the conversion, we retain the same filter and chain names previously
used by iptables/ip6tables. Counters are not added to accept rules because
the test does not inspect them. The syn mark rule is removed as it is
only for debugging, which could be added easily when needed.

After conversion, the generated output matches the original
iptables/ip6tables behavior.

Signed-off-by: Hangbin Liu <liuhangbin@kylinos.cn>
---
 tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
index b4e3eddc9cf2..ef2738720e24 100755
--- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
+++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh
@@ -54,11 +54,6 @@ add_mark_rules()
 			add chain $table filter OUTPUT \
 				{ type filter hook output priority 0; policy accept; }
 
-			# just to debug: check we have multiple subflows connection requests
-			add rule $table filter OUTPUT \
-				tcp flags & (fin | syn | rst | ack) == syn \
-				meta mark $m accept
-
 			# RST packets might be handled by a internal dummy socket
 			add rule $table filter OUTPUT \
 				tcp flags & rst == rst meta mark 0x0 accept

---
base-commit: 5ac58fb7c561392ec051c390479ca746c42ca989
change-id: 20261009-mptcp_rm_debug-27ffeedc78aa

Best regards,
-- 
Hangbin Liu <liuhangbin@kylinos.cn>

Hi Hangbin,

On 09/10/2026 09:27, Hangbin Liu wrote:
> From: Hangbin Liu <liuhangbin@kylinos.cn>
> 
> After squash, the new commit description could be:
> 
> During the conversion, we retain the same filter and chain names previously
> used by iptables/ip6tables. Counters are not added to accept rules because
> the test does not inspect them. The syn mark rule is removed as it is
> only for debugging, which could be added easily when needed.
> 
> After conversion, the generated output matches the original
> iptables/ip6tables behavior.

Thank you, now in our repo:

- 8bec9f45285e: "squashed" in "selftests: mptcp: convert iptables to
nftables for mptcp_sockopt.sh"

Cheers,
Matt
-- 
Sponsored by the NGI0 Core fund.

Hi Hangbin,

Thank you for your modifications, that's great!

Our CI did some validations and here is its report:

- KVM Validation: normal (except selftest_mptcp_join): Success! ✅
- KVM Validation: normal (only selftest_mptcp_join): Success! ✅
- KVM Validation: debug (except selftest_mptcp_join): Unstable: 1 failed test(s): selftest_mptcp_connect_mmap ⚠️ 
- KVM Validation: debug (only selftest_mptcp_join): Success! ✅
- KVM Validation: btf-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Success! ✅
- Perf: Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/37900860669

Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/a09fd9597ecf
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=1182161


If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:

    $ cd [kernel source code]
    $ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
        --pull always mptcp/mptcp-upstream-virtme-docker:latest \
        auto-normal

For more details:

    https://github.com/multipath-tcp/mptcp-upstream-virtme-docker


Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)

Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Low] selftests: mptcp: incorrect squash target in commit message
--

commit 95308d8ced7d193c5aadb0348b4665a25a875b28
Author: Hangbin Liu <liuhangbin@kylinos.cn>

squash to "selftests: mptcp: convert iptables to nftables for mptcp_join.sh"

This commit removes the syn mark rule from the output filter in the mptcp
selftests. It is intended to be squashed into a previous patch converting
iptables to nftables.

> squash to "selftests: mptcp: convert iptables to nftables for mptcp_join.sh"

[Severity: Low]
Is the commit title targeting the correct script for this squash? The title
explicitly states "mptcp_join.sh", but the diff exclusively modifies
"mptcp_sockopt.sh".

If this is squashed into the "mptcp_join.sh" commit, it might cause confusion
about the patch's purpose or result in applying the squash to the wrong target
commit.

-- 
Sashiko AI review · https://sashiko.dev/#/patchset/20261009-mptcp_rm_debug-v1-1-a7b4fdbe1b5f@kylinos.cn?part=1

On Fri, Oct 09, 2026 at 07:31:13AM +0000, sashiko-bot@kernel.org wrote:
> Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
> - [Low] selftests: mptcp: incorrect squash target in commit message
> --
> 
> commit 95308d8ced7d193c5aadb0348b4665a25a875b28
> Author: Hangbin Liu <liuhangbin@kylinos.cn>
> 
> squash to "selftests: mptcp: convert iptables to nftables for mptcp_join.sh"
> 
> This commit removes the syn mark rule from the output filter in the mptcp
> selftests. It is intended to be squashed into a previous patch converting
> iptables to nftables.
> 
> > squash to "selftests: mptcp: convert iptables to nftables for mptcp_join.sh"
> 
> [Severity: Low]
> Is the commit title targeting the correct script for this squash? The title
> explicitly states "mptcp_join.sh", but the diff exclusively modifies
> "mptcp_sockopt.sh".
> 
> If this is squashed into the "mptcp_join.sh" commit, it might cause confusion
> about the patch's purpose or result in applying the squash to the wrong target
> commit.

Oh, sorry for the typo, this patch should target to mptcp_sockopt.sh

Hangbin