From nobody Mon Sep 16 19:29:02 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 6EA8838FA3 for ; Wed, 15 May 2024 06:18: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=1715753927; cv=none; b=MBPNv2Q1xbXt7fuj5KOppiVFfMuriOLNrzUZLf+MLOr6csKiW4HVjTN1MPu3dATcrPWXKfxhZrLOLMX0xmqJ7ZoVkLI91riLBOMktMa6JqLRkYF5+w5Pv2Qso/gRsU50lzrN0fHVhyzZ/LhKXAHZevNfcOkmHb974w/zaevzrRs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715753927; c=relaxed/simple; bh=kvcQipHR1/lz3mcpPYPse7RhXTAUa9CAFsSB54Ymf2g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tlb9Bnxcn6xPvaqufAfn6RSRpMxMRyh3Dd+Wq6jA7LgpMB/hS/iIpfSdwGdiaMCkHsQDCyK+oj4XIjvciGLvubXwFa6jmsxfkZk24q06vtCfbpkVaODbsu6QUX9QCW34PPg/01sMAF3BI2PikwPdN2OqOvGYM3NkHkMSKB+Ix6s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tV+LEaoC; 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="tV+LEaoC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC9B3C116B1; Wed, 15 May 2024 06:18:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715753927; bh=kvcQipHR1/lz3mcpPYPse7RhXTAUa9CAFsSB54Ymf2g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tV+LEaoCO0Wu0Wkl6bEv3nLic2Vk7EQJ6xzZK3wpnooJKdu99v7ivyaaPYyQca8Hj sbcvcrGCFsIOcYkBSUAE9as12QVOPhv+BgL9dlPkHbMPaVw6X6lsuBYWUnbR+3JgSg qp8qhEddPAQhLMx+tvs/RQuRi3XVbZB1EUo2of1AAQBsXAuGq8O6ziH56bh36IOW98 pHumeRelQQTFRh3zEfK7joKTKGyU00Y/dYGKRIBL/9y4Vl+8jFTH5vXC02XbUeXNMM 3WAY0pkc1NennP159WYGiFBARnE1hA8rZxY+7Q3jWThUAHhoAQfOhWFgoMDP8ceesG aQO/exHoBserQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 1/2] selftests/bpf: Add mptcp pm_nl_ctl link Date: Wed, 15 May 2024 14:18: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 This patch adds a link of mptcp pm_nl_ctl tool into bpf selftests, and updates Makefile to compile it. This is useful to run mptcp bpf selftests on a system with an old version of IPRoite2 is installed. When 'ip mptcp' is not supported, this tool pm_nl_ctl can be used instead. MAINTAINERS needs to be updated since a new file is added. Signed-off-by: Geliang Tang --- MAINTAINERS | 1 + tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 120000 tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c diff --git a/MAINTAINERS b/MAINTAINERS index b81b2be60b77..f973f1fb9e18 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15510,6 +15510,7 @@ F: include/trace/events/mptcp.h F: include/uapi/linux/mptcp*.h F: net/mptcp/ F: tools/testing/selftests/bpf/*/*mptcp*.c +F: tools/testing/selftests/bpf/*mptcp*.c F: tools/testing/selftests/net/mptcp/ =20 NETWORKING [TCP] diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests= /bpf/Makefile index b90c718218ae..6fe242275e14 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -131,7 +131,7 @@ TEST_GEN_PROGS_EXTENDED =3D test_sock_addr test_skb_cgr= oup_id_user \ flow_dissector_load test_flow_dissector test_tcp_check_syncookie_user \ test_lirc_mode2_user xdping test_cpp runqslower bench bpf_testmod.ko \ xskxceiver xdp_redirect_multi xdp_synproxy veristat xdp_hw_metadata \ - xdp_features bpf_test_no_cfi.ko + xdp_features bpf_test_no_cfi.ko mptcp_pm_nl_ctl =20 TEST_GEN_FILES +=3D liburandom_read.so urandom_read sign-file uprobe_multi =20 diff --git a/tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c b/tools/testing/= selftests/bpf/mptcp_pm_nl_ctl.c new file mode 120000 index 000000000000..5a08c255b278 --- /dev/null +++ b/tools/testing/selftests/bpf/mptcp_pm_nl_ctl.c @@ -0,0 +1 @@ +../net/mptcp/pm_nl_ctl.c \ No newline at end of file --=20 2.43.0 From nobody Mon Sep 16 19:29:02 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 01D5F3B79F for ; Wed, 15 May 2024 06:18:48 +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=1715753929; cv=none; b=iOhFRyJ+5LXLarilIdjJtaQ0zC4SMCBhSP64yq71M/dYWvE/hTbTWyqyeZyVcbDawoegjngX+axvhC23gfHeaTMmYyt1eKZ1615bS1VpaMo0RlP7jRVw/cxcFfFlii5B2VFLcSthpuwgTw8beOR/qsciG39OzEraLQp2sDV8lC4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715753929; c=relaxed/simple; bh=R5O5q7tUwAI3mtCcrC7G9EaU08Qh+Q+5AiMIMkJM8Mc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QbWDjb9wsCkdvhbnx1kEUbKDohm0uQKpw3TeGeKnVfpAjcjii8YSQnOhoXfynMxASquABmauF3Ly7jjGaonMvq3ztjuTnJzgvq5ToqNOAc47PLZOZfPs3t3zvfUokBfnaPoWao2+HUJEaXe/2Bg63GMH/IZ26qIkU9nn8pz9yow= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=rTYWCU+P; 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="rTYWCU+P" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A708DC2BD11; Wed, 15 May 2024 06:18:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1715753928; bh=R5O5q7tUwAI3mtCcrC7G9EaU08Qh+Q+5AiMIMkJM8Mc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rTYWCU+PEJ3Yatxv1D88STXR5nS2OYJ8l431CTw/7RJ2pWnguoSVhzwW6VxYvk5dP j9nRLtjErhX58HbzpElAu0DKfFtOGYcHMQgN39bXHZ2t8fn5H/98DWbKJaXtnONkCd rHOAsxItAUWHhsMbxSry1S/NzbZa5O8rDEc6JUP4psgs0jD/Qp7HOFswBDmRCzo4Bt r7pXGQQsINZDyurQWaJCKPoK39zKHmVb9ztv6+r90r9SgxzruM2hkcC/3PV3GlZXi/ jG38JWnoDn9od4sM485fMHudQZAPOMbN/S11Lnp3CJBg16dvNzCzUQ1KGt+COWYA4M iwNG9MC4e4ZhQ== From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v5 2/2] Squash to "selftests/bpf: Add mptcp subflow subtest" Date: Wed, 15 May 2024 14:18:38 +0800 Message-ID: <58ef78f498fe0a951cb68ccf6776a8744aaa67b5.1715753802.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 Use pm_nl_ctl instead of 'ip mptcp'. Use SYS_NOFAIL in _ss_search() and drop 'ss -M'. Signed-off-by: Geliang Tang --- tools/testing/selftests/bpf/prog_tests/mptcp.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/mptcp.c b/tools/testing= /selftests/bpf/prog_tests/mptcp.c index 793b4b9c2bd2..4472aa404da0 100644 --- a/tools/testing/selftests/bpf/prog_tests/mptcp.c +++ b/tools/testing/selftests/bpf/prog_tests/mptcp.c @@ -362,7 +362,10 @@ 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); - SYS(fail, "ip -net %s mptcp endpoint add %s %s", NS_TEST, ADDR_2, flags); + /* 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); =20 return 0; fail: @@ -371,16 +374,8 @@ static int endpoint_init(char *flags) =20 static int _ss_search(char *src, char *dst, char *port, char *keyword) { - char cmd[128]; - int n; - - n =3D snprintf(cmd, sizeof(cmd), - "ip netns exec %s ss -Menita src %s dst %s %s %d | grep -q '%s'", - NS_TEST, src, dst, port, PORT_1, keyword); - if (n < 0 || n >=3D sizeof(cmd)) - return -1; - - return system(cmd); + return SYS_NOFAIL("ip netns exec %s ss -enita src %s dst %s %s %d | grep = -q '%s'", + NS_TEST, src, dst, port, PORT_1, keyword); } =20 static int ss_search(char *src, char *keyword) --=20 2.43.0