From patchwork Tue Nov 14 19:56:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mat Martineau X-Patchwork-Id: 13455861 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 4B9B426AEB; Tue, 14 Nov 2023 19:58:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FPVk0Mga" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FCFFC433C7; Tue, 14 Nov 2023 19:58:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699991903; bh=Vdc2exhmxQ1ZGFtMJ8WZCuBLmIbJmJAtcIK+j8na4o0=; h=From:Subject:Date:To:Cc:From; b=FPVk0MgaJb2asF1Zuq8gxCvKgfvIDytRny1OEEDDkU2ViJTLE/9lJhkJdz5OAaMJd jrWgiB5GtufMDjN8oBfllEXqslVkYKS9scPjiwiGp9CDE2WLoV4oIAKvMYZAhTtR1g Xk4BgJ+4csGsoxcUEjgUyawaRYg4sc2MLisUm3CCMpcVGtpBmIeR21DLUma9+P12p9 1X0F9D1y416nqZ8EyQdKV21BlREWoRkgvzw+aoHFaCEJ4kK/o/PkFu7/Lv0SZmgqXf lKFc8X7W0Vg8ncFrYwFBflcJVe3CRkONvbxLuTXSI1J+lvvt7DbdbnIhe6aOl9iLCB YBDMC41Nk4Bmw== From: Mat Martineau Subject: [PATCH net-next v2 00/15] mptcp: More selftest coverage and code cleanup for net-next Date: Tue, 14 Nov 2023 11:56:42 -0800 Message-Id: <20231114-send-net-next-2023107-v2-0-b650a477362c@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=H4sIAPrQU2UC/4VNSw7CIBC9SjNrx8DUirjyHqaLph1aoqEGCKlpu LsE49rFW7z/DoG95QDXZgfPyQa7ukLo0MC4DG5mtFPhQIJaKUhhYDeh41iwRfzKCjWZYTyri1Z CQum+PBu71d07/NLQF2exIa7+XQ+TrP6f7SRRoGjZGH3qSHfq9mDv+Hlc/Qx9zvkDN0y8QsUAA AA= 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 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 | 129 +++---- 11 files changed, 401 insertions(+), 406 deletions(-) --- base-commit: 89cdf9d556016a54ff6ddd62324aa5ec790c05cc change-id: 20231027-send-net-next-2023107-92fac6789701 Best regards,