[PATCH net-next v4 00/15] mptcp: More selftest coverage and code cleanup for net-next

Mat Martineau posted 15 patches 5 months ago
Failed in applying to current master (apply log)
include/uapi/linux/mptcp.h                         |   1 +
net/mptcp/pm_userspace.c                           |   8 +-
net/mptcp/protocol.h                               |   9 +
net/mptcp/sockopt.c                                |   2 +
tools/testing/selftests/net/mptcp/diag.sh          |  23 +-
tools/testing/selftests/net/mptcp/mptcp_connect.sh | 110 ++----
tools/testing/selftests/net/mptcp/mptcp_join.sh    | 376 ++++++++++++---------
tools/testing/selftests/net/mptcp/mptcp_lib.sh     |  91 +++++
tools/testing/selftests/net/mptcp/mptcp_sockopt.sh |  39 +--
tools/testing/selftests/net/mptcp/simult_flows.sh  |  19 +-
tools/testing/selftests/net/mptcp/userspace_pm.sh  | 143 ++++----
11 files changed, 409 insertions(+), 412 deletions(-)
[PATCH net-next v4 00/15] mptcp: More selftest coverage and code cleanup for net-next
Posted by Mat Martineau 5 months ago
Patches 1-5 and 7-8 add selftest coverage (and an associated subflow
counter in the kernel) to validate the recently-updated handling of
subflows with ID 0.

Patch 6 renames a label in the userspace path manager for clarity.

Patches 9-11 and 13-15 factor out common selftest code by moving certain
functions to mptcp_lib.sh

Patch 12 makes sure the random data file generated for selftest
payloads has the intended size.

Signed-off-by: Mat Martineau <martineau@kernel.org>
---
Changes in v4:
- Include Geliang's fixup for patch 3, to fix test script variable scope
- Include Geliang's fixup for patch 14 for consistent whitespace
- Rebased
- Link to v3: https://lore.kernel.org/r/20231115-send-net-next-2023107-v3-0-1ef58145a882@kernel.org

Changes in v3:
- Include Geliang's fixup for patch 11, to include test_prio in the refactor
- Rebased
- Link to v2: https://lore.kernel.org/r/20231114-send-net-next-2023107-v2-0-b650a477362c@kernel.org

Changes in v2:
- Rebased on current net-next (v1 was deferred due to net-next PR timing)
- Link to v1: https://lore.kernel.org/r/20231027-send-net-next-2023107-v1-0-03eff9452957@kernel.org

---
Geliang Tang (15):
      mptcp: add mptcpi_subflows_total counter
      selftests: mptcp: add evts_get_info helper
      selftests: mptcp: add chk_subflows_total helper
      selftests: mptcp: update userspace pm test helpers
      selftests: mptcp: userspace pm create id 0 subflow
      mptcp: userspace pm rename remove_err to out
      selftests: mptcp: userspace pm remove initial subflow
      selftests: mptcp: userspace pm send RM_ADDR for ID 0
      selftests: mptcp: add mptcp_lib_kill_wait
      selftests: mptcp: add mptcp_lib_is_v6
      selftests: mptcp: add mptcp_lib_get_counter
      selftests: mptcp: add missing oflag=append
      selftests: mptcp: add mptcp_lib_make_file
      selftests: mptcp: add mptcp_lib_check_transfer
      selftests: mptcp: add mptcp_lib_wait_local_port_listen

 include/uapi/linux/mptcp.h                         |   1 +
 net/mptcp/pm_userspace.c                           |   8 +-
 net/mptcp/protocol.h                               |   9 +
 net/mptcp/sockopt.c                                |   2 +
 tools/testing/selftests/net/mptcp/diag.sh          |  23 +-
 tools/testing/selftests/net/mptcp/mptcp_connect.sh | 110 ++----
 tools/testing/selftests/net/mptcp/mptcp_join.sh    | 376 ++++++++++++---------
 tools/testing/selftests/net/mptcp/mptcp_lib.sh     |  91 +++++
 tools/testing/selftests/net/mptcp/mptcp_sockopt.sh |  39 +--
 tools/testing/selftests/net/mptcp/simult_flows.sh  |  19 +-
 tools/testing/selftests/net/mptcp/userspace_pm.sh  | 143 ++++----
 11 files changed, 409 insertions(+), 412 deletions(-)
---
base-commit: a379972973a80924b1d03443e20f113ff76a94c7
change-id: 20231027-send-net-next-2023107-92fac6789701

Best regards,
-- 
Mat Martineau <martineau@kernel.org>