Received-SPF: pass (google.com: domain of linux-kernel+bounces-79082-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
From: "Matthieu Baerts (NGI0)" <matttbe@kernel.org>
Subject: [PATCH net-next 0/8] mptcp: various small improvements
Date: Fri, 23 Feb 2024 21:17:52 +0100
Message-Id: <20240223-upstream-net-next-20240223-misc-improvements-v1-0-b6c8a10396bd@kernel.org>
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
To: mptcp@lists.linux.dev, Mat Martineau <martineau@kernel.org>, 
 Geliang Tang <geliang@kernel.org>, "David S. Miller" <davem@davemloft.net>, 
 Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, 
 Paolo Abeni <pabeni@redhat.com>, Shuah Khan <shuah@kernel.org>
Cc: netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, 
 linux-kernel@vger.kernel.org, "Matthieu Baerts (NGI0)" <matttbe@kernel.org>, 
 Geliang Tang <tanggeliang@kylinos.cn>

This series brings various small improvements to MPTCP and its
selftests:

Patch 1 prints an error if there are duplicated subtests names. It is
important to have unique (sub)tests names in TAP, because some CI
environments drop (sub)tests with duplicated names.

Patch 2 is a preparation for patches 3 and 4, which check the protocol
in tcp_sk() and mptcp_sk() with DEBUG_NET, only in code from net/mptcp/.
We recently had the case where an MPTCP socket was wrongly treated as a
TCP one, and fuzzers and static checkers never spot the issue. This
would prevent such issues in the future.

Patches 5 to 7 are some cleanup for the MPTCP selftests. These patches
are not supposed to change the behaviour.

Patch 8 sets the poll timeout in diag selftest to the same value as the
one used in the other selftests.

Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Geliang Tang (4):
      selftests: mptcp: netlink: drop duplicate var ret
      selftests: mptcp: simult flows: define missing vars
      selftests: mptcp: join: change capture/checksum as bool
      selftests: mptcp: diag: change timeout_poll to 30

Matthieu Baerts (NGI0) (4):
      selftests: mptcp: lib: catch duplicated subtest entries
      mptcp: token kunit: set protocol
      mptcp: check the protocol in tcp_sk() with DEBUG_NET
      mptcp: check the protocol in mptcp_sk() with DEBUG_NET

 net/mptcp/protocol.h                              | 16 ++++++++++++++++
 net/mptcp/token_test.c                            |  7 ++++++-
 tools/testing/selftests/net/mptcp/diag.sh         |  2 +-
 tools/testing/selftests/net/mptcp/mptcp_join.sh   | 22 +++++++++++-----------
 tools/testing/selftests/net/mptcp/mptcp_lib.sh    | 21 +++++++++++++++++++++
 tools/testing/selftests/net/mptcp/pm_netlink.sh   |  1 -
 tools/testing/selftests/net/mptcp/simult_flows.sh |  6 ++++++
 7 files changed, 61 insertions(+), 14 deletions(-)
---
base-commit: a818bd12538c1408c7480de31573cdb3c3c0926f
change-id: 20240223-upstream-net-next-20240223-misc-improvements-7d64a076bca8

Best regards,
-- 
Matthieu Baerts (NGI0) <matttbe@kernel.org>