From patchwork Thu Nov 16 00:31:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mat Martineau X-Patchwork-Id: 13457438 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 E7F2DA49; Thu, 16 Nov 2023 00:31:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="JN4nnd3Z" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 36406C433C8; Thu, 16 Nov 2023 00:31:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700094710; bh=CNUAOWR1w/IUn5WlrVt0SaeCfOhOT/KbgQVs5ydqFVk=; h=From:Subject:Date:To:Cc:From; b=JN4nnd3ZSedgmtXd3GRXgToarbdHxTaW/ODlBxFNvee511NjhmhVbkAcwOUF/Q7mz As1TSS5BLpQV15LTD6dkv5BnV8j2gVuUuEvImkDaTJYZaawI1zynu2+zk/L17LBZHu 1/ag9MEVdoo60iBameRKtIGWcvja3AqozX9WqbJlmlig7yw2oyRdRIR1nnrxVB66uy LwBn01p7PXCGjfxxy05N/5iGbjFf9H2zoZENkVFhrrze5P66QV+5Ml7ALYwx/k7HIZ qIrjXrkWgZVM3PxR74lVyndNYjwB7AveOb0VcgE8PppeRtNze8995pBRAkhENqsEu1 0kUlkpfYmQmMg== From: Mat Martineau Subject: [PATCH net-next v3 00/15] mptcp: More selftest coverage and code cleanup for net-next Date: Wed, 15 Nov 2023 16:31:28 -0800 Message-Id: <20231115-send-net-next-2023107-v3-0-1ef58145a882@kernel.org> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-B4-Tracking: v=1; b=H4sIAOBiVWUC/4XNSw6CMBAG4KuQWVvTToFaV97DuECYQqMppCUNh nB3mxpjXBgXs/jn8c0KgbylAMdiBU/RBju6FOSugHZoXE/MdikDcpSCo2KBXMcczamWmb3aimk 0TVurg1ZcQLqdPBm7ZPcM7224pMlgwzz6R34YRZ7/saNgnHFJxuiyQl2p0428o/t+9H0mI34YI cpfDCbmWle8KZWSNbZfzLZtT3/Od6EMAQAA To: Matthieu Baerts , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: netdev@vger.kernel.org, mptcp@lists.linux.dev, Mat Martineau , Geliang Tang X-Mailer: b4 0.12.4 X-Patchwork-Delegate: kuba@kernel.org 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 --- 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 | 375 ++++++++++++--------- tools/testing/selftests/net/mptcp/mptcp_lib.sh | 92 +++++ 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: e316dd1cf1358ff9c44b37c7be273a7dc4349986 change-id: 20231027-send-net-next-2023107-92fac6789701 Best regards,