From nobody Sat May 3 19:56:51 2025
Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232])
(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 47EA521CFF7
for <mptcp@lists.linux.dev>; Mon, 24 Feb 2025 09:02:58 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=124.126.103.232
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1740387784; cv=none;
b=e3N7Oqt6TisGpONxtyEImzlE/+KgTOoT/X8+1kPHAFfuaCGn/XS6mv5hEYsJ2iIBCP7gFe7k70dQjyn1CNt8TcrAggE3ERl4nebNhYdc7z+fR90U3XhANrCHOIwWvuXDEHT8oOJUG+7s9dErSpPlZIJrvkxxmemCbYYLCRLp9Uw=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1740387784; c=relaxed/simple;
bh=m7DgSRVJ1w+uWdt5xwDoRSpOQkzjKLWh9sbeVkHxTiM=;
h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:
MIME-Version;
b=rNolCqze5e70kAPkVMC3sj2zGILXY/fCvdl5WGC3i+Gb+/X9tCYkzl+zQT5N6RkybnUnbP+XUZzKJ5rJJtvQ9xtX44jiZy/HTvnorvR+H205v5KBjliKvUzJtOQG0gJceSzKAFBGefsusf5FwpeT4kauGMsUwudIddaR19F6at8=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=none (p=none dis=none) header.from=kylinos.cn;
spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232
Authentication-Results: smtp.subspace.kernel.org;
dmarc=none (p=none dis=none) header.from=kylinos.cn
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=kylinos.cn
X-UUID: 1d05dcdef28e11efa216b1d71e6e1362-20250224
X-CTIC-Tags:
HR_CC_AS_FROM, HR_CC_COUNT, HR_CC_DOMAIN_COUNT, HR_CC_NAME, HR_CTE_8B
HR_CTT_MISS, HR_DATE_H, HR_DATE_WKD, HR_DATE_ZONE, HR_FROM_NAME
HR_SJ_DIGIT_LEN, HR_SJ_LANG, HR_SJ_LEN, HR_SJ_LETTER, HR_SJ_NOR_SYM
HR_SJ_PHRASE, HR_SJ_PHRASE_LEN, HR_SJ_WS, HR_TO_COUNT, HR_TO_DOMAIN_COUNT
HR_TO_NO_NAME, IP_TRUSTED, SRC_TRUSTED, DN_TRUSTED, SA_EXISTED
SN_EXISTED, SPF_NOPASS, DKIM_NOPASS, DMARC_NOPASS, CIE_BAD
CIE_GOOD_SPF, GTI_FG_BS, GTI_RG_INFO, GTI_C_BU, AMN_T1
AMN_GOOD, AMN_C_TI, AMN_C_BU, ABX_MISS_RDNS
X-CID-O-RULE: Release_Ham
X-CID-RULE: Release_Ham
X-CID-O-INFO: VERSION:1.1.45,REQID:88546c68-ea81-4961-b737-3e7373dba60b,IP:10,
URL:0,TC:0,Content:0,EDM:0,RT:0,SF:-5,FILE:0,BULK:0,RULE:Release_Ham,ACTIO
N:release,TS:5
X-CID-INFO: VERSION:1.1.45,REQID:88546c68-ea81-4961-b737-3e7373dba60b,IP:10,UR
L:0,TC:0,Content:0,EDM:0,RT:0,SF:-5,FILE:0,BULK:0,RULE:Release_Ham,ACTION:
release,TS:5
X-CID-META: VersionHash:6493067,CLOUDID:ffc678da6b7404bd6c4166468a2e4caa,BulkI
D:250224170246Z2XFM3NX,BulkQuantity:0,Recheck:0,SF:19|24|44|66|72|78|81|82
|102,TC:nil,Content:0|50,EDM:-3,IP:-2,URL:11|1,File:nil,RT:nil,Bulk:nil,QS
:nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,A
RC:0
X-CID-BVR: 0
X-CID-BAS: 0,_,0,_
X-CID-FACTOR: TF_CID_SPAM_ULN,TF_CID_SPAM_SNR,TF_CID_SPAM_FSD,TF_CID_SPAM_FSI
X-UUID: 1d05dcdef28e11efa216b1d71e6e1362-20250224
X-User: yangang@kylinos.cn
Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn
(envelope-from <yangang@kylinos.cn>)
(Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256)
with ESMTP id 719073021; Mon, 24 Feb 2025 17:02:45 +0800
From: Gang Yan <yangang@kylinos.cn>
To: mptcp@lists.linux.dev
Cc: Gang Yan <yangang@kylinos.cn>
Subject: [mptcp-next v4 1/2] selftests: mptcp: Add a tool to get specific
msk_info
Date: Mon, 24 Feb 2025 17:02:34 +0800
Message-Id:
<4b060bd673858f11981e91956a34d1a42478b869.1740385876.git.yangang@kylinos.cn>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <cover.1740385876.git.yangang@kylinos.cn>
References: <cover.1740385876.git.yangang@kylinos.cn>
Precedence: bulk
X-Mailing-List: mptcp@lists.linux.dev
List-Id: <mptcp.lists.linux.dev>
List-Subscribe: <mailto:mptcp+subscribe@lists.linux.dev>
List-Unsubscribe: <mailto:mptcp+unsubscribe@lists.linux.dev>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"
This patch enables the retrieval of the mptcp_info structure corresponding
to a specified MPTCP socket (msk). When multiple MPTCP connections are
present, specific information can be obtained for a given connection
through the 'mptcp_diag_dump_one' by using the 'token' associated with
the msk.
Signed-off-by: Gang Yan <yangang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Notes:
- v4:
- With reference to include/uapi/linux/mptcp.h, the structure members
of mptcp_info have been supplemented.
- Improve the code style of 'print_info_msg'
- With reference to iproute2, make 'parse_nlmsg' compatible with older
kernel versions.
- Check argc in 'parse_opts' to make sure '-t' is passed.
---
tools/testing/selftests/net/mptcp/Makefile | 2 +-
.../testing/selftests/net/mptcp/mptcp_diag.c | 271 ++++++++++++++++++
2 files changed, 272 insertions(+), 1 deletion(-)
create mode 100644 tools/testing/selftests/net/mptcp/mptcp_diag.c
diff --git a/tools/testing/selftests/net/mptcp/Makefile b/tools/testing/sel=
ftests/net/mptcp/Makefile
index c76525fe2b84..340e1a777e16 100644
--- a/tools/testing/selftests/net/mptcp/Makefile
+++ b/tools/testing/selftests/net/mptcp/Makefile
@@ -7,7 +7,7 @@ CFLAGS +=3D -Wall -Wl,--no-as-needed -O2 -g -I$(top_srcdir)=
/usr/include $(KHDR_INC
TEST_PROGS :=3D mptcp_connect.sh pm_netlink.sh mptcp_join.sh diag.sh \
simult_flows.sh mptcp_sockopt.sh userspace_pm.sh
=20
-TEST_GEN_FILES =3D mptcp_connect pm_nl_ctl mptcp_sockopt mptcp_inq
+TEST_GEN_FILES =3D mptcp_connect pm_nl_ctl mptcp_sockopt mptcp_inq mptcp_d=
iag
=20
TEST_FILES :=3D mptcp_lib.sh settings
=20
diff --git a/tools/testing/selftests/net/mptcp/mptcp_diag.c b/tools/testing=
/selftests/net/mptcp/mptcp_diag.c
new file mode 100644
index 000000000000..6dc53ab867c5
--- /dev/null
+++ b/tools/testing/selftests/net/mptcp/mptcp_diag.c
@@ -0,0 +1,271 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2025, Kylin Software */
+
+#include <linux/sock_diag.h>
+#include <linux/rtnetlink.h>
+#include <linux/inet_diag.h>
+#include <linux/netlink.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <linux/tcp.h>
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <stdio.h>
+
+#ifndef IPPROTO_MPTCP
+#define IPPROTO_MPTCP 262
+#endif
+
+struct mptcp_info {
+ __u8 mptcpi_subflows;
+ __u8 mptcpi_add_addr_signal;
+ __u8 mptcpi_add_addr_accepted;
+ __u8 mptcpi_subflows_max;
+ __u8 mptcpi_add_addr_signal_max;
+ __u8 mptcpi_add_addr_accepted_max;
+ __u32 mptcpi_flags;
+ __u32 mptcpi_token;
+ __u64 mptcpi_write_seq;
+ __u64 mptcpi_snd_una;
+ __u64 mptcpi_rcv_nxt;
+ __u8 mptcpi_local_addr_used;
+ __u8 mptcpi_local_addr_max;
+ __u8 mptcpi_csum_enabled;
+ __u32 mptcpi_retransmits;
+ __u64 mptcpi_bytes_retrans;
+ __u64 mptcpi_bytes_sent;
+ __u64 mptcpi_bytes_received;
+ __u64 mptcpi_bytes_acked;
+ __u8 mptcpi_subflows_total;
+ __u8 reserved[3];
+ __u32 mptcpi_last_data_sent;
+ __u32 mptcpi_last_data_recv;
+ __u32 mptcpi_last_ack_recv;
+};
+
+static void die_perror(const char *msg)
+{
+ perror(msg);
+ exit(1);
+}
+
+static void die_usage(int r)
+{
+ fprintf(stderr, "Usage: mptcp_diag -t\n");
+ exit(r);
+}
+
+static void send_query(int fd, __u32 token)
+{
+ struct sockaddr_nl nladdr =3D {
+ .nl_family =3D AF_NETLINK
+ };
+ struct {
+ struct nlmsghdr nlh;
+ struct inet_diag_req_v2 r;
+ } req =3D {
+ .nlh =3D {
+ .nlmsg_len =3D sizeof(req),
+ .nlmsg_type =3D SOCK_DIAG_BY_FAMILY,
+ .nlmsg_flags =3D NLM_F_REQUEST
+ },
+ .r =3D {
+ .sdiag_family =3D AF_INET,
+ .sdiag_protocol =3D IPPROTO_MPTCP,
+ .id.idiag_cookie[0] =3D token,
+ }
+ };
+ struct rtattr rta_proto;
+ struct iovec iov[6];
+ int iovlen =3D 1;
+ __u32 proto;
+
+ req.r.idiag_ext |=3D (1 << (INET_DIAG_INFO - 1));
+ proto =3D IPPROTO_MPTCP;
+ rta_proto.rta_type =3D INET_DIAG_REQ_PROTOCOL;
+ rta_proto.rta_len =3D RTA_LENGTH(sizeof(proto));
+
+ iov[0] =3D (struct iovec) {
+ .iov_base =3D &req,
+ .iov_len =3D sizeof(req)
+ };
+ iov[iovlen] =3D (struct iovec){ &rta_proto, sizeof(rta_proto)};
+ iov[iovlen + 1] =3D (struct iovec){ &proto, sizeof(proto)};
+ req.nlh.nlmsg_len +=3D RTA_LENGTH(sizeof(proto));
+ iovlen +=3D 2;
+ struct msghdr msg =3D {
+ .msg_name =3D &nladdr,
+ .msg_namelen =3D sizeof(nladdr),
+ .msg_iov =3D iov,
+ .msg_iovlen =3D iovlen
+ };
+
+ for (;;) {
+ if (sendmsg(fd, &msg, 0) < 0) {
+ if (errno =3D=3D EINTR)
+ continue;
+ die_perror("sendmsg");
+ }
+ break;
+ }
+}
+
+static void parse_rtattr_flags(struct rtattr *tb[], int max, struct rtattr=
*rta,
+ int len, unsigned short flags)
+{
+ unsigned short type;
+
+ memset(tb, 0, sizeof(struct rtattr *) * (max + 1));
+ while (RTA_OK(rta, len)) {
+ type =3D rta->rta_type & ~flags;
+ if (type <=3D max && !tb[type])
+ tb[type] =3D rta;
+ rta =3D RTA_NEXT(rta, len);
+ }
+}
+
+static void print_info_msg(struct mptcp_info *info)
+{
+ printf("Token & Flags\n");
+ printf("token: %x\n", info->mptcpi_token);
+ printf("flags: %x\n", info->mptcpi_flags);
+ printf("csum_enabled: %u\n", info->mptcpi_csum_enabled);
+
+ printf("\nBasic Info\n");
+ printf("subflows: %u\n", info->mptcpi_subflows);
+ printf("subflows_max: %u\n", info->mptcpi_subflows_max);
+ printf("subflows_total: %u\n", info->mptcpi_subflows_total);
+ printf("local_addr_used: %u\n", info->mptcpi_local_addr_used);
+ printf("local_addr_max: %u\n", info->mptcpi_local_addr_max);
+ printf("add_addr_signal: %u\n", info->mptcpi_add_addr_signal);
+ printf("add_addr_accepted: %u\n", info->mptcpi_add_addr_accepted);
+ printf("add_addr_signal_max: %u\n", info->mptcpi_add_addr_signal_max);
+ printf("add_addr_accepted_max: %u\n", info->mptcpi_add_addr_accepted_max);
+
+ printf("\nTransmission Info\n");
+ printf("write_seq: %llx\n", info->mptcpi_write_seq);
+ printf("snd_una: %llx\n", info->mptcpi_snd_una);
+ printf("rcv_nxt: %llx\n", info->mptcpi_rcv_nxt);
+ printf("last_data_sent: %x\n", info->mptcpi_last_data_sent);
+ printf("last_data_recv: %x\n", info->mptcpi_last_data_recv);
+ printf("last_ack_recv: %x\n", info->mptcpi_last_ack_recv);
+ printf("retransmits: %u\n", info->mptcpi_retransmits);
+ printf("retransmit bytes: %llu\n", info->mptcpi_bytes_retrans);
+ printf("bytes_sent: %llu\n", info->mptcpi_bytes_sent);
+ printf("bytes_received: %llu\n", info->mptcpi_bytes_received);
+ printf("bytes_acked: %llu\n", info->mptcpi_bytes_acked);
+}
+
+static void parse_nlmsg(struct nlmsghdr *nlh)
+{
+ struct inet_diag_msg *r =3D NLMSG_DATA(nlh);
+ struct rtattr *tb[INET_DIAG_MAX + 1];
+
+ parse_rtattr_flags(tb, INET_DIAG_MAX, (struct rtattr *)(r + 1),
+ nlh->nlmsg_len - NLMSG_LENGTH(sizeof(*r)),
+ NLA_F_NESTED);
+
+ if (tb[INET_DIAG_INFO]) {
+ struct mptcp_info *info;
+ int len;
+
+ len =3D RTA_PAYLOAD(tb[INET_DIAG_INFO]);
+ /* workaround fort older kernels with less fields */
+ if (len < sizeof(*info)) {
+ info =3D alloca(sizeof(*info));
+ memcpy(info, RTA_DATA(tb[INET_DIAG_INFO]), len);
+ memset((char *)info + len, 0, sizeof(*info) - len);
+ } else
+ info =3D RTA_DATA(tb[INET_DIAG_INFO]);
+ print_info_msg(info);
+ }
+}
+
+static void recv_nlmsg(int fd, struct nlmsghdr *nlh)
+{
+ char rcv_buff[8192];
+ struct sockaddr_nl rcv_nladdr =3D {
+ .nl_family =3D AF_NETLINK
+ };
+ struct iovec rcv_iov =3D {
+ .iov_base =3D rcv_buff,
+ .iov_len =3D sizeof(rcv_buff)
+ };
+ struct msghdr rcv_msg =3D {
+ .msg_name =3D &rcv_nladdr,
+ .msg_namelen =3D sizeof(rcv_nladdr),
+ .msg_iov =3D &rcv_iov,
+ .msg_iovlen =3D 1
+ };
+ int len;
+
+ len =3D recvmsg(fd, &rcv_msg, 0);
+ nlh =3D (struct nlmsghdr *)rcv_buff;
+
+ while (NLMSG_OK(nlh, len)) {
+ if (nlh->nlmsg_type =3D=3D NLMSG_DONE) {
+ printf("NLMSG_DONE\n");
+ break;
+ } else if (nlh->nlmsg_type =3D=3D NLMSG_ERROR) {
+ struct nlmsgerr *err;
+
+ err =3D (struct nlmsgerr *)NLMSG_DATA(nlh);
+ printf("Error %d:%s\n",
+ -(err->error), strerror(-(err->error)));
+ break;
+ }
+ parse_nlmsg(nlh);
+ nlh =3D NLMSG_NEXT(nlh, len);
+ }
+}
+
+static void get_mptcpinfo(__u32 token)
+{
+ struct nlmsghdr *nlh =3D NULL;
+ int fd;
+
+ fd =3D socket(AF_NETLINK, SOCK_RAW, NETLINK_SOCK_DIAG);
+ if (fd < 0)
+ die_perror("Netlink socket");
+
+ send_query(fd, token);
+ recv_nlmsg(fd, nlh);
+
+ close(fd);
+}
+
+static void parse_opts(int argc, char **argv, __u32 *target_token)
+{
+ int c;
+
+ if (argc < 2)
+ die_usage(1);
+
+ while ((c =3D getopt(argc, argv, "ht:")) !=3D -1) {
+ switch (c) {
+ case 'h':
+ die_usage(0);
+ break;
+ case 't':
+ sscanf(optarg, "%x", target_token);
+ break;
+ default:
+ die_usage(1);
+ break;
+ }
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ __u32 target_token;
+
+ parse_opts(argc, argv, &target_token);
+ get_mptcpinfo(target_token);
+
+ return 0;
+}
+
--=20
2.43.0
From nobody Sat May 3 19:56:51 2025
Received: from mailgw.kylinos.cn (mailgw.kylinos.cn [124.126.103.232])
(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 0B27FEEB5
for <mptcp@lists.linux.dev>; Mon, 24 Feb 2025 09:03:00 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=124.126.103.232
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1740387783; cv=none;
b=aPepGtVgsInQa6puJA4C5fFwm8DGLjizRsWuqU5Y7FA07vREmkkYQZuKmiDWnjI9iivD1jhs95U4i9hqeGwAUhmnkg6EsT9XJKywg94dx4AsqJg8CAO1TYZb9xcnJWfwRxMH4QyJb5dhvm1sOopWN+/P31kbjF3E1ZvdEwQXmHI=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1740387783; c=relaxed/simple;
bh=1V+YvU9LKWPu6gtIIRrix2+bfYt8H3jk93eivspOYN4=;
h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:
MIME-Version:Content-Type;
b=cD+uq/IilTk6H9vlA2TeBftQgWyHcQ/Ve1qB++2G112gRKVvLjZi9qHE9qfVcap3RrGQyv7Lp5uu9HXmVbLw5S5UwMf5XEmiz+pqQpbZhDJUPaOJPSEBEjSh2sewvBjsJCxtCws+oNdoffizl6vjBhA21qrzQDs6W+GLojxTJxc=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=none (p=none dis=none) header.from=kylinos.cn;
spf=pass smtp.mailfrom=kylinos.cn; arc=none smtp.client-ip=124.126.103.232
Authentication-Results: smtp.subspace.kernel.org;
dmarc=none (p=none dis=none) header.from=kylinos.cn
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=kylinos.cn
X-UUID: 1d914d64f28e11efa216b1d71e6e1362-20250224
X-CTIC-Tags:
HR_CC_AS_FROM, HR_CC_COUNT, HR_CC_DOMAIN_COUNT, HR_CC_NAME, HR_CTE_8B
HR_CTT_TXT, HR_DATE_H, HR_DATE_WKD, HR_DATE_ZONE, HR_FROM_NAME
HR_SJ_DIGIT_LEN, HR_SJ_LANG, HR_SJ_LEN, HR_SJ_LETTER, HR_SJ_NOR_SYM
HR_SJ_PHRASE, HR_SJ_PHRASE_LEN, HR_SJ_WS, HR_TO_COUNT, HR_TO_DOMAIN_COUNT
HR_TO_NO_NAME, IP_TRUSTED, SRC_TRUSTED, DN_TRUSTED, SA_EXISTED
SN_EXISTED, SPF_NOPASS, DKIM_NOPASS, DMARC_NOPASS, UD_TRUSTED
CIE_BAD, CIE_GOOD_SPF, GTI_FG_BS, GTI_C_CI, GTI_FG_IC
GTI_FG_IT, GTI_RG_INFO, GTI_C_BU, AMN_T1, AMN_GOOD
AMN_C_TI, AMN_C_BU, ABX_MISS_RDNS
X-CID-O-RULE: Release_Ham
X-CID-RULE: EDM_GN8D19FE
X-CID-O-INFO: VERSION:1.1.45,REQID:61d41c7f-66d3-4251-95b6-475934287a28,IP:10,
URL:0,TC:0,Content:-25,EDM:-30,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,
ACTION:release,TS:-60
X-CID-INFO: VERSION:1.1.45,REQID:61d41c7f-66d3-4251-95b6-475934287a28,IP:10,UR
L:0,TC:0,Content:-25,EDM:-30,RT:0,SF:-15,FILE:0,BULK:0,RULE:EDM_GN8D19FE,A
CTION:release,TS:-60
X-CID-META: VersionHash:6493067,CLOUDID:00aac75e0924b768dd21a591297d4acb,BulkI
D:250224170249PVY4ZXEC,BulkQuantity:0,Recheck:0,SF:17|19|24|44|66|78|81|82
|102,TC:nil,Content:0|50,EDM:2,IP:-2,URL:11|1,File:nil,RT:nil,Bulk:nil,QS:
nil,BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,AR
C:0
X-CID-BVR: 0
X-CID-BAS: 0,_,0,_
X-CID-FACTOR: TF_CID_SPAM_SNR,TF_CID_SPAM_FAS,TF_CID_SPAM_FSD,TF_CID_SPAM_FSI,
TF_CID_SPAM_ULN
X-UUID: 1d914d64f28e11efa216b1d71e6e1362-20250224
X-User: yangang@kylinos.cn
Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn
(envelope-from <yangang@kylinos.cn>)
(Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256)
with ESMTP id 1197798771; Mon, 24 Feb 2025 17:02:46 +0800
From: Gang Yan <yangang@kylinos.cn>
To: mptcp@lists.linux.dev
Cc: Gang Yan <yangang@kylinos.cn>
Subject: [mptcp-next v4 2/2] selftests: mptcp: add a test for
mptcp_diag_dump_one
Date: Mon, 24 Feb 2025 17:02:35 +0800
Message-Id:
<2a1f8438f2ac18d885e067bc13dcc3ba0ff70d0b.1740385876.git.yangang@kylinos.cn>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <cover.1740385876.git.yangang@kylinos.cn>
References: <cover.1740385876.git.yangang@kylinos.cn>
Precedence: bulk
X-Mailing-List: mptcp@lists.linux.dev
List-Id: <mptcp.lists.linux.dev>
List-Subscribe: <mailto:mptcp+subscribe@lists.linux.dev>
List-Unsubscribe: <mailto:mptcp+unsubscribe@lists.linux.dev>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
This patch introduces a new 'chk_diag' test in diag.sh. It retrieves
the token for a specified MPTCP socket (msk) using the 'ss' command and
then accesses the 'mptcp_diag_dump_one' in kernel via ./mptcp_diag
to verify if the correct token is returned.
Link: https://github.com/multipath-tcp/mptcp_net-next/issues/524
Signed-off-by: Gang Yan <yangang@kylinos.cn>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Notes:
- v4:
- Optimized the check logic for 'ss_token' and 'token=E2=80=B2, and before
that,first check if 'ss_token' is empty.
---
tools/testing/selftests/net/mptcp/diag.sh | 27 +++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self=
tests/net/mptcp/diag.sh
index 2bd0c1eb70c5..4f55477ffe08 100755
--- a/tools/testing/selftests/net/mptcp/diag.sh
+++ b/tools/testing/selftests/net/mptcp/diag.sh
@@ -200,6 +200,32 @@ chk_msk_cestab()
"${expected}" "${msg}" ""
}
=20
+chk_dump_one()
+{
+ local ss_token
+ local token
+ local msg
+
+ ss_token=3D"$(ss -inmHMN $ns | grep 'token:' |\
+ head -n 1 |\
+ sed 's/.*token:\([0-9a-f]*\).*/\1/')"
+
+ token=3D"$(ip netns exec $ns ./mptcp_diag -t $ss_token |\
+ awk -F':[ \t]+' '/^token/ {print $2}')"
+
+ msg=3D"....chk dump_one"
+
+ mptcp_lib_print_title "$msg"
+ if [ -n "$ss_token" ] && [ "$ss_token" =3D "$token" ]; then
+ mptcp_lib_pr_ok
+ mptcp_lib_result_pass "${msg}"
+ else
+ mptcp_lib_pr_fail "expected $ss_token found $token"
+ mptcp_lib_result_fail "${msg}"
+ ret=3D${KSFT_FAIL}
+ fi
+}
+
msk_info_get_value()
{
local port=3D"${1}"
@@ -290,6 +316,7 @@ chk_msk_remote_key_nr 2 "....chk remote_key"
chk_msk_fallback_nr 0 "....chk no fallback"
chk_msk_inuse 2
chk_msk_cestab 2
+chk_dump_one
flush_pids
=20
chk_msk_inuse 0 "2->0"
--=20
2.43.0