From nobody Wed Oct 30 22:15:54 2024 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 5C80B1BA885 for ; Thu, 1 Aug 2024 13:00:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722517245; cv=none; b=G5PvIhL0GJzVFmyLrpOZgV/uk7MyXro5PIoy96Gzq16eEOUvxSRP9XbfMDHygO5YJ1d4GuKLBq0+4dDUcdpeAXLQkzRzFa3eX7Kx+hiTwejTFP4kJe2QDX4bSAsjtMcPlKcD6JLqwHHKB6jUY2mzlp+zxCV7BhYiG4iHH0co2nY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722517245; c=relaxed/simple; bh=wyIZM7mdMCNyUyRsbeUmE+/rtm7RZyhiiKodjcX2+qU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=enIWqxPKYaqPaC76mUg8nzzynuIgXWv9ZDcm7tGPesnRyOy4y/MINRBq6vqSwB4oyd6IK7tJgGbq10SX4DmlxPbq5pggSveo8EzgliWK/uue/O4RQv08JCSqyAfY20hzTxL5keoDbArTHP5Zl1t1oIHLQa6C1T4MONsRCGHBwL8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CUN+relt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CUN+relt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 256BCC4AF09; Thu, 1 Aug 2024 13:00:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722517245; bh=wyIZM7mdMCNyUyRsbeUmE+/rtm7RZyhiiKodjcX2+qU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CUN+reltUCcvnMCpW0HpSdo4OsssDkgWIs+RUq/tTZGQ18wlnYVxv28lnbuQWMv3G T+aVHDtD+/VmyEo7ZkynXaZCdLyJALZojf7Vv9bxAy4+Y+PzqYZQXHleAodVRFosie Dkn3+mLN890pSn96nFeIxgWA+I7yxhu/Gl8LwWzNR0KHOFNmOghMk3z5WvhKqxVPJq hMdM6S1y8huxt7RZ5uC5EN0GgXqN2qwFws6x0oc5rJsNV/D1lEz+w+Il5AyI4WT0Yy rB8sdA9YXJH2PuNPNFu4CwG1gZreQ09+5opI0G0qo97lw0ANNTmu6B8uEVbGHp9P/j 5LRCZHS1mbN/w== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 1/3] Squash to "selftests/bpf: Add mptcp subflow subtest" Date: Thu, 1 Aug 2024 21:00:36 +0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Skip the test with test__skip() for systems that do not support "ip mptcp", so that CI can also pass. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 00f63f3f19f4..a6afced3ca82 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -357,10 +357,11 @@ static int endpoint_init(char *flags) SYS(fail, "ip -net %s link set dev veth1 up", NS_TEST); SYS(fail, "ip -net %s addr add %s/24 dev veth2", NS_TEST, ADDR_2); SYS(fail, "ip -net %s link set dev veth2 up", NS_TEST); - /* It would be better to use "ip -net %s mptcp endpoint add %s %s", - * but the BPF CI is using an old version of IPRoute (5.5.0). - */ - SYS(fail, "ip netns exec %s ./mptcp_pm_nl_ctl add %s flags %s", NS_TEST, = ADDR_2, flags); + if (SYS_NOFAIL("ip -net %s mptcp endpoint add %s %s", NS_TEST, ADDR_2, fl= ags)) { + printf("'ip mptcp' not supported, skip this test.\n"); + test__skip(); + goto fail; + } =20 return 0; fail: @@ -435,7 +436,7 @@ static void test_subflow(void) if (!ASSERT_OK_PTR(nstoken, "create_netns: mptcp_subflow")) goto skel_destroy; =20 - if (!ASSERT_OK(endpoint_init("subflow"), "endpoint_init")) + if (endpoint_init("subflow")) goto close_netns; =20 run_subflow(skel->data->cc); --=20 2.43.0 From nobody Wed Oct 30 22:15:54 2024 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 754FE1A57C1 for ; Thu, 1 Aug 2024 13:00:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722517246; cv=none; b=P3dZOQl69E2kfXSa5PuGR0eDMVEPyL7ik2gWbUCj8FzC3FRqatGBapV9SUxqm7OQbZ0aV9SCuRVrgbWiwBmdLnHi/BPy0FdzwGrKytits8gCpPGrAT4Q3H9MjLg6l1+mqoOTGTlUryszuLgzG5TWvDYW/j5dAEVpIfnJRVq4w38= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722517246; c=relaxed/simple; bh=wEJMaXrxeUFqr+/3AtoOOk4eTAqNIMg6qXT3WsMwoJs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=izI6VP26rw8BFPEOz4LNOb0bLMva0dKjDEyX5ATzmUSiyh6skbXVNQpXq48XOrRiakYbfbE7b+ioC/n1TrmqO7zl06lSQCwG+DUOy2Qqw5JaMXVmNC9lgBgCTyq+IF7p9cHMtUsC6FD0+Q0iGQai7uxPd8D21FZ5yIl0RTG2uHI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L1vn5PnC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="L1vn5PnC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F6A5C4AF09; Thu, 1 Aug 2024 13:00:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722517246; bh=wEJMaXrxeUFqr+/3AtoOOk4eTAqNIMg6qXT3WsMwoJs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L1vn5PnCfsoKXvU1bbGLdGliDwiLkHKG8utCAabzviVjytkPgfTGtInTWsqFz8gNz reyp9LgDdMY4Sfvs8CNAqnuZgFzBRfi519heoFe2Xp2yxRHdogrcbDRqwLQKjvHGkY 4frheCwzjlG10zNEU/JnAvqY3tBXRLih2YP2nHMQbUKCGkrSieY4JBSnUZvpF+X9w7 VPDw2nqCxgsgVnE/0+Ci5UBAkB7U62mEUYt3gZIunGjDBh+DNVc4gOWEmeBmMNXKYg sLR7Wze+ElSmBusIUOu8V2drAN8+0oYCx+BjBdsic4eP4VcTJjjNeikHipwl6Kze0h DqpmCrsXLUNYg== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 2/3] Squash to "selftests/bpf: Add bpf scheduler test" Date: Thu, 1 Aug 2024 21:00:37 +0800 Message-ID: X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Drop ASSERT_OK() and ASSERT_OK_PTR() since endpoint_init() or sched_init() may fail. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index a6afced3ca82..91bad33b0c72 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -457,7 +457,7 @@ static struct nstoken *sched_init(char *flags, char *sc= hed) if (!ASSERT_OK_PTR(nstoken, "create_netns")) return NULL; =20 - if (!ASSERT_OK(endpoint_init("subflow"), "endpoint_init")) + if (endpoint_init("subflow")) goto fail; =20 SYS(fail, "ip netns exec %s sysctl -qw net.mptcp.scheduler=3D%s", NS_TEST= , sched); @@ -519,7 +519,7 @@ static void test_default(void) struct nstoken *nstoken; =20 nstoken =3D sched_init("subflow", "default"); - if (!ASSERT_OK_PTR(nstoken, "sched_init:default")) + if (!nstoken) goto fail; =20 send_data_and_verify("default", WITH_DATA, WITH_DATA); --=20 2.43.0 From nobody Wed Oct 30 22:15:54 2024 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 2A31F1A38D6 for ; Thu, 1 Aug 2024 13:00:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722517248; cv=none; b=h4BK8VJ1K6ekAj06UN41hJ/J3YG5OfXdjY7azkrsQQWZy0fdcmfTZzDULic601WTTX/t9vpRgJ8h3eBPHZAvea30B2fg4nYDT17SBzkGk8lLBCFiovEW0L8QrPrnEvsEb3oQY61e8sx8h2thLjfGBJFTz+P2pKL2C0cFExwNe9U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722517248; c=relaxed/simple; bh=l4jFlCCeEzs8Y5dd2oZ7tUXWy23a0vggfwsGRAsWjew=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Vdh/G975JfX1KjFGM0Phqtjknuo+wOUxpyEorWzPtyk+NAMLcH66TWw9XNZnLGzBkzlqt5yK3exU9VGmz3YNEoUwL7y8TuEnIxZJHLsSQrhkniLNFL3dTiloD1coCfScw1Z/sTas+GcX3KmkWHja4eZ2SjWFC9D+ycqaEhz/8NA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=TYYYrbKC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="TYYYrbKC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E015FC4AF0A; Thu, 1 Aug 2024 13:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1722517247; bh=l4jFlCCeEzs8Y5dd2oZ7tUXWy23a0vggfwsGRAsWjew=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TYYYrbKCTNQ+sxBGBL7W0TjETh/nG0bc6LA9TZl8aAQ23WOGcEHtc8YxBWOrtClsW ymyJ1F8p0uIwZvATsnD1RsNyFq0aMYLAsuINjUA0rDQKJrOwHOyfYkFIYGjQsC1Lhh RyxEEwyY1CrbQmAwe8pl2dLM2V1dNh8I5M2iiP9vzFH3OOtVwzEhAunQoqXmxNMpkF 0+MHeVO9x8sNPzOWgD/nXgVjYoY8N+Na7niSYANKFK3WzAVdFkWnNbZrMTSbglfPI3 rq07iLrBRWuLV4IPZZyar6MO3JBMb+SqfGdpY6v2HSsPfWBfKwmwG8+ueXC0+tqgxm 1WvV/NGSsQSMQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 3/3] Squash to "selftests/bpf: Add bpf_first scheduler & test" Date: Thu, 1 Aug 2024 21:00:38 +0800 Message-ID: <04029c9ad203025fe4b97547afa88a2f3b53e60b.1722517019.git.tanggeliang@kylinos.cn> X-Mailer: git-send-email 2.43.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang Drop CHECK() since sched_init() may fail. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 91bad33b0c72..63722412f847 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -546,7 +546,7 @@ static void test_bpf_sched(struct bpf_object *obj, char= *sched, return; =20 nstoken =3D sched_init("subflow", strcat(bpf_sched, sched)); - if (CHECK(!nstoken, sched, "sched_init: %d\n", errno)) + if (!nstoken) goto fail; =20 send_data_and_verify(sched, addr1, addr2); --=20 2.43.0