From nobody Thu Dec 18 23:00:17 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 544B4233D99 for ; Wed, 16 Apr 2025 09:00:05 +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=1744794008; cv=none; b=qTHcpKxyDlSgb2XmRrlz3dF0q20ufuxgRmjBuF2fe+NtU8+AiWN3qM879v409yUJjTQ4sij+E2jQkQGgI1QAR0/mOFahtRcWmI2wyoSCoMVChYVbmqlVnvAXOmJb6q7/bfMYfBuH7aMVKFgSKRIwkocuqm6XSVIvdu6kDncpgzk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744794008; c=relaxed/simple; bh=bJ3w9T5d01j5OUcWOA7t1Yn36CKIiTEy1rNkGjtJygU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BsyioF/RzYm2NW2N3EzsDAonghKU2fdf4Y0yEIJD2j8NJzQF3Gwb6YgeEw4ij4Uaqi/KlKRHl9R9iDEQil7xZ6dDCl/ZktFT5Gnd2tiUzaVvIswIwd1SiXEPJPhvXkVvRIXuOXq2KtUafq6HTqzRxBe8kszXje+j1Z2ARdA0efw= 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: 2ace77be1aa111f0a216b1d71e6e1362-20250416 X-CTIC-Tags: 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_TRUSTED, SA_EXISTED SN_EXISTED, SPF_NOPASS, DKIM_NOPASS, DMARC_NOPASS, CIE_BAD CIE_GOOD, 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-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.45,REQID:660a93b6-2903-4d4a-95e8-910feb34a6a4,IP:10, URL:0,TC:0,Content:0,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACT ION:release,TS:20 X-CID-INFO: VERSION:1.1.45,REQID:660a93b6-2903-4d4a-95e8-910feb34a6a4,IP:10,UR L:0,TC:0,Content:0,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:20 X-CID-META: VersionHash:6493067,CLOUDID:54f898e3570065d8c4f7e91e503574e4,BulkI D:25041615352166EMH78U,BulkQuantity:1,Recheck:0,SF:17|19|24|44|66|78|81|82 |102,TC:nil,Content:0|50,EDM:5,IP:-2,URL:0,File:nil,RT:nil,Bulk:41,QS:nil, BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC: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 X-UUID: 2ace77be1aa111f0a216b1d71e6e1362-20250416 X-User: yangang@kylinos.cn Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 766830309; Wed, 16 Apr 2025 16:59:55 +0800 From: Gang Yan To: mptcp@lists.linux.dev Cc: Gang Yan , Geliang Tang Subject: [mptcp-next v2 1/7] selftests: mptcp: add struct params in mptcp_diag Date: Wed, 16 Apr 2025 16:59:43 +0800 Message-Id: <6a4ff59fc2440ed70d359113f72756e895d812ab.1744793332.git.yangang@kylinos.cn> X-Mailer: git-send-email 2.25.1 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" This patch adds a struct named 'params' to save 'target_token' and other future parameters. This structure facilitates future function expansions. Co-developed-by: Geliang Tang Signed-off-by: Geliang Tang Signed-off-by: Gang Yan --- tools/testing/selftests/net/mptcp/mptcp_diag.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_diag.c b/tools/testing= /selftests/net/mptcp/mptcp_diag.c index 37d5015ad08c..ea7cb1128044 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_diag.c +++ b/tools/testing/selftests/net/mptcp/mptcp_diag.c @@ -19,6 +19,10 @@ #define IPPROTO_MPTCP 262 #endif =20 +struct params { + __u32 target_token; +}; + struct mptcp_info { __u8 mptcpi_subflows; __u8 mptcpi_add_addr_signal; @@ -237,7 +241,7 @@ static void get_mptcpinfo(__u32 token) close(fd); } =20 -static void parse_opts(int argc, char **argv, __u32 *target_token) +static void parse_opts(int argc, char **argv, struct params *p) { int c; =20 @@ -250,7 +254,7 @@ static void parse_opts(int argc, char **argv, __u32 *ta= rget_token) die_usage(0); break; case 't': - sscanf(optarg, "%x", target_token); + sscanf(optarg, "%x", &p->target_token); break; default: die_usage(1); @@ -261,10 +265,12 @@ static void parse_opts(int argc, char **argv, __u32 *= target_token) =20 int main(int argc, char *argv[]) { - __u32 target_token; + struct params p =3D { 0 }; + + parse_opts(argc, argv, &p); =20 - parse_opts(argc, argv, &target_token); - get_mptcpinfo(target_token); + if (p.target_token) + get_mptcpinfo(p.target_token); =20 return 0; } --=20 2.25.1 From nobody Thu Dec 18 23:00:17 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 6B069233722 for ; Wed, 16 Apr 2025 09:00:03 +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=1744794006; cv=none; b=UqNBK4/3C+Czl8lArVbBi6+Cwh3sQUqCqr/BvRp+5qHFyj1Vdby2D6TCmY+44/QNkTBBjJYa6UbL9CJmfWaZOGQ+N3TmidVr6xARpHrkgZ2hUQoWlaU8LH/dpVo0ezeiCqVkgJwrvjmYDZJ6NG1GkpuKor/MSQY9kQfcHjW2sdM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744794006; c=relaxed/simple; bh=HWFxL02gyAEjllc4b1cFVoH1UM1yfqTRaOIc+AZK8rA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qpJXX7qbERQVvPABh8JoftL1FzU7vNC7aIDbyX7o6adDpdM+ss1q3ag7vs3//ZVaeCzPB7wzbPC6TZ5qffNgbweeyRB1d7iIi2ZoLrFZ9+5wrNHQUWUP8FqX45jTYvQ6/2EBiuQl8xTP1iUjCjqb8LZf56PPd9VkVcd8IHtvz20= 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: 2b36ae421aa111f0a216b1d71e6e1362-20250416 X-CTIC-Tags: 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_TRUSTED, SA_EXISTED SN_EXISTED, SPF_NOPASS, DKIM_NOPASS, DMARC_NOPASS, CIE_BAD CIE_GOOD, 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-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.45,REQID:56c38cc2-aa41-4562-bfbc-b0915c08998d,IP:10, URL:0,TC:0,Content:-5,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,AC TION:release,TS:15 X-CID-INFO: VERSION:1.1.45,REQID:56c38cc2-aa41-4562-bfbc-b0915c08998d,IP:10,UR L:0,TC:0,Content:-5,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:15 X-CID-META: VersionHash:6493067,CLOUDID:f8a77b79a38125b40b03750e120b4c4f,BulkI D:250416153524DZ7LI12W,BulkQuantity:1,Recheck:0,SF:17|19|24|44|66|78|81|82 |102,TC:nil,Content:0|50,EDM:5,IP:-2,URL:0,File:nil,RT:nil,Bulk:41,QS:nil, BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC: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 X-UUID: 2b36ae421aa111f0a216b1d71e6e1362-20250416 X-User: yangang@kylinos.cn Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 1972895071; Wed, 16 Apr 2025 16:59:56 +0800 From: Gang Yan To: mptcp@lists.linux.dev Cc: Gang Yan , Geliang Tang Subject: [mptcp-next v2 2/7] selftests: mptcp: refactor send_query parameters for code clarity Date: Wed, 16 Apr 2025 16:59:44 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 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" This patch use 'inet_diag_req_v2' instead of 'token' as parameters of send_query, and construct the req in 'get_mptcpinfo'. This modification can enhance the enhancing clarity of the code, and prepare for the dump_subflow_info. Co-developed-by: Geliang Tang Signed-off-by: Geliang Tang Signed-off-by: Gang Yan --- .../testing/selftests/net/mptcp/mptcp_diag.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_diag.c b/tools/testing= /selftests/net/mptcp/mptcp_diag.c index ea7cb1128044..8a5b7745c58c 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_diag.c +++ b/tools/testing/selftests/net/mptcp/mptcp_diag.c @@ -62,7 +62,7 @@ static void die_usage(int r) exit(r); } =20 -static void send_query(int fd, __u32 token) +static void send_query(int fd, struct inet_diag_req_v2 *r) { struct sockaddr_nl nladdr =3D { .nl_family =3D AF_NETLINK @@ -76,19 +76,13 @@ static void send_query(int fd, __u32 token) .nlmsg_type =3D SOCK_DIAG_BY_FAMILY, .nlmsg_flags =3D NLM_F_REQUEST }, - .r =3D { - .sdiag_family =3D AF_INET, - /* Real proto is set via INET_DIAG_REQ_PROTOCOL */ - .sdiag_protocol =3D IPPROTO_TCP, - .id.idiag_cookie[0] =3D token, - } + .r =3D *r }; struct rtattr rta_proto; struct iovec iov[6]; int iovlen =3D 1; __u32 proto; =20 - 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)); @@ -229,13 +223,20 @@ static void recv_nlmsg(int fd) =20 static void get_mptcpinfo(__u32 token) { + struct inet_diag_req_v2 r =3D { + .sdiag_family =3D AF_INET, + /* Real proto is set via INET_DIAG_REQ_PROTOCOL */ + .sdiag_protocol =3D IPPROTO_TCP, + .id.idiag_cookie[0] =3D token, + }; int fd; =20 fd =3D socket(AF_NETLINK, SOCK_RAW, NETLINK_SOCK_DIAG); if (fd < 0) die_perror("Netlink socket"); =20 - send_query(fd, token); + r.idiag_ext |=3D (1 << (INET_DIAG_INFO - 1)); + send_query(fd, &r); recv_nlmsg(fd); =20 close(fd); --=20 2.25.1 From nobody Thu Dec 18 23:00:17 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 90DEF233716 for ; Wed, 16 Apr 2025 09:00:03 +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=1744794006; cv=none; b=c3GLRsOM2NV9zwbbo5khuYB46mh1zQ9AUna5eOMxpcy9jl+N12K1cT81I0BVmLh148iM7h5ReeF/rOlK/AZyL1kJ6uWZUa6DaCrZyJXBm/95hTdN0dJ1O1JHTvz2i67iuM6fQM9eoGhaf0COYu2brNPu6FTwbc+Cviovw8+tEG4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744794006; c=relaxed/simple; bh=BW6NpZnCo+0deIKmd/Q2TPg/qSM7niTHSnwsq72ec+I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BHHDOjlK6nxIXybJUg3tMjvrCd2Uwy36Z6O10YVkV1y+u+yOtMn+uAHLesysee5mvrcqPlWwNsq//NqG7DT7lD83vukbxEti7QM+MyOI5H51+oee7hmhvNZz7zpnrYWv/Cj4H0g1yAumkZcb380tsj9hwkImRoKLrG8HrT4W71E= 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: 2b929d381aa111f0a216b1d71e6e1362-20250416 X-CTIC-Tags: 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_TRUSTED, SA_EXISTED SN_EXISTED, SPF_NOPASS, DKIM_NOPASS, DMARC_NOPASS, CIE_BAD CIE_GOOD, 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-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.45,REQID:9dd1f189-de80-490e-b412-7be355665c62,IP:10, URL:0,TC:0,Content:-5,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,AC TION:release,TS:15 X-CID-INFO: VERSION:1.1.45,REQID:9dd1f189-de80-490e-b412-7be355665c62,IP:10,UR L:0,TC:0,Content:-5,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:15 X-CID-META: VersionHash:6493067,CLOUDID:4e3ac0fafaa599b07abbc93f34459761,BulkI D:250416153523YMAXUWZ0,BulkQuantity:1,Recheck:0,SF:17|19|24|44|66|78|81|82 |102,TC:nil,Content:0|50,EDM:5,IP:-2,URL:0,File:nil,RT:nil,Bulk:41,QS:nil, BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_FAS,TF_CID_SPAM_FSD,TF_CID_SPAM_FSI,TF_CID_SPAM_SNR X-UUID: 2b929d381aa111f0a216b1d71e6e1362-20250416 X-User: yangang@kylinos.cn Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 1077221473; Wed, 16 Apr 2025 16:59:57 +0800 From: Gang Yan To: mptcp@lists.linux.dev Cc: Gang Yan , Geliang Tang Subject: [mptcp-next v2 3/7] selftests: mptcp: refine the 'iovlen' handling logic Date: Wed, 16 Apr 2025 16:59:45 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 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" In the original version, the handling logic for the 'iovlen' appeared somewhat redundant. Therefore, 'iovlen++' is used to simpify this portion of the code and improve its readaility. Co-developed-by: Geliang Tang Signed-off-by: Geliang Tang Signed-off-by: Gang Yan --- tools/testing/selftests/net/mptcp/mptcp_diag.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_diag.c b/tools/testing= /selftests/net/mptcp/mptcp_diag.c index 8a5b7745c58c..2bf13bce59a5 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_diag.c +++ b/tools/testing/selftests/net/mptcp/mptcp_diag.c @@ -91,10 +91,9 @@ static void send_query(int fd, struct inet_diag_req_v2 *= r) .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)}; + iov[iovlen++] =3D (struct iovec){ &rta_proto, sizeof(rta_proto)}; + iov[iovlen++] =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), --=20 2.25.1 From nobody Thu Dec 18 23:00:17 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 54455233D93 for ; Wed, 16 Apr 2025 09:00:05 +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=1744794009; cv=none; b=A4CsSjMQGWFzwIURp8iX8DODMwRXFn4MzI2hkXVmCDgZfyL7R77IOVnDpvDghH09ZSx5gbL/E+fDutP3Azlr2A25MC2RJ3ooQa9JF1f6APj92TVny/n2yO4qxi/+DCvNbSZ7WnCcYy38dREcGxpyAmQD0OGDby3VgHVGXgOUoy0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744794009; c=relaxed/simple; bh=szdCIUhh36euvta9ld5fXdLJU53+1uLSY44TeKLyhpc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dtw7ILs9/IE5A6NY6P8WfS0NjGR5zOeG41XPLmApFH+5G48ViPtBzjjl/7q6B8VTaCYxvwqrpKA6FeLag5gFCiOfcyqZD0wzFB2DO1F5LY06YcKUeYOcHdlHryBxCBEwVf5QFXohOu+ps+1Ro293rGPbtozCFRcI7t0n8NBThQk= 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: 2bd024781aa111f0a216b1d71e6e1362-20250416 X-CTIC-Tags: 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_TRUSTED, SA_EXISTED SN_EXISTED, SPF_NOPASS, DKIM_NOPASS, DMARC_NOPASS, CIE_BAD CIE_GOOD, 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-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.45,REQID:c9740fcd-a59b-4774-a787-2f66d9e37e5a,IP:10, URL:0,TC:0,Content:-5,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,AC TION:release,TS:15 X-CID-INFO: VERSION:1.1.45,REQID:c9740fcd-a59b-4774-a787-2f66d9e37e5a,IP:10,UR L:0,TC:0,Content:-5,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTI ON:release,TS:15 X-CID-META: VersionHash:6493067,CLOUDID:7508972a49617582989958dfb17a015e,BulkI D:250416153524UFUMVPOK,BulkQuantity:1,Recheck:0,SF:17|19|24|44|66|78|81|82 |102,TC:nil,Content:0|50,EDM:5,IP:-2,URL:0,File:nil,RT:nil,Bulk:41,QS:nil, BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC: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 X-UUID: 2bd024781aa111f0a216b1d71e6e1362-20250416 X-User: yangang@kylinos.cn Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 1805281130; Wed, 16 Apr 2025 16:59:57 +0800 From: Gang Yan To: mptcp@lists.linux.dev Cc: Gang Yan , Geliang Tang Subject: [mptcp-next v2 4/7] selftests: mptcp: refactor NLMSG handling with 'proto' Date: Wed, 16 Apr 2025 16:59:46 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 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" This patch introduces the '__u32 proto' variable to the 'send_query' and 'recv_nlmsg' functions for further extending function. In the 'send_query' function, the inclusion of this variable makes the structure clearer and more readable. In the 'recv_nlmsg' function, the '__u32 proto' variable ensures that the 'diag_info' field remains unmodified when processing IPPROTO_TCP data, thereby preventing unintended transformation into 'mptcp_info' format. Co-developed-by: Geliang Tang Signed-off-by: Geliang Tang Signed-off-by: Gang Yan --- .../testing/selftests/net/mptcp/mptcp_diag.c | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_diag.c b/tools/testing= /selftests/net/mptcp/mptcp_diag.c index 2bf13bce59a5..2116b40bc927 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_diag.c +++ b/tools/testing/selftests/net/mptcp/mptcp_diag.c @@ -62,7 +62,7 @@ static void die_usage(int r) exit(r); } =20 -static void send_query(int fd, struct inet_diag_req_v2 *r) +static void send_query(int fd, struct inet_diag_req_v2 *r, __u32 proto) { struct sockaddr_nl nladdr =3D { .nl_family =3D AF_NETLINK @@ -81,19 +81,21 @@ static void send_query(int fd, struct inet_diag_req_v2 = *r) struct rtattr rta_proto; struct iovec iov[6]; int iovlen =3D 1; - __u32 proto; - - proto =3D IPPROTO_MPTCP; - rta_proto.rta_type =3D INET_DIAG_REQ_PROTOCOL; - rta_proto.rta_len =3D RTA_LENGTH(sizeof(proto)); =20 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++] =3D (struct iovec){ &proto, sizeof(proto)}; - req.nlh.nlmsg_len +=3D RTA_LENGTH(sizeof(proto)); + + if (proto =3D=3D IPPROTO_MPTCP) { + rta_proto.rta_type =3D INET_DIAG_REQ_PROTOCOL; + rta_proto.rta_len =3D RTA_LENGTH(sizeof(proto)); + + iov[iovlen++] =3D (struct iovec){ &rta_proto, sizeof(rta_proto)}; + iov[iovlen++] =3D (struct iovec){ &proto, sizeof(proto)}; + req.nlh.nlmsg_len +=3D RTA_LENGTH(sizeof(proto)); + } + struct msghdr msg =3D { .msg_name =3D &nladdr, .msg_namelen =3D sizeof(nladdr), @@ -157,7 +159,7 @@ static void print_info_msg(struct mptcp_info *info) printf("bytes_acked: %llu\n", info->mptcpi_bytes_acked); } =20 -static void parse_nlmsg(struct nlmsghdr *nlh) +static void parse_nlmsg(struct nlmsghdr *nlh, __u32 proto) { struct inet_diag_msg *r =3D NLMSG_DATA(nlh); struct rtattr *tb[INET_DIAG_MAX + 1]; @@ -166,7 +168,7 @@ static void parse_nlmsg(struct nlmsghdr *nlh) nlh->nlmsg_len - NLMSG_LENGTH(sizeof(*r)), NLA_F_NESTED); =20 - if (tb[INET_DIAG_INFO]) { + if (proto =3D=3D IPPROTO_MPTCP && tb[INET_DIAG_INFO]) { int len =3D RTA_PAYLOAD(tb[INET_DIAG_INFO]); struct mptcp_info *info; =20 @@ -182,7 +184,7 @@ static void parse_nlmsg(struct nlmsghdr *nlh) } } =20 -static void recv_nlmsg(int fd) +static void recv_nlmsg(int fd, __u32 proto) { char rcv_buff[8192]; struct nlmsghdr *nlh =3D (struct nlmsghdr *)rcv_buff; @@ -215,7 +217,7 @@ static void recv_nlmsg(int fd) -(err->error), strerror(-(err->error))); break; } - parse_nlmsg(nlh); + parse_nlmsg(nlh, proto); nlh =3D NLMSG_NEXT(nlh, len); } } @@ -228,6 +230,7 @@ static void get_mptcpinfo(__u32 token) .sdiag_protocol =3D IPPROTO_TCP, .id.idiag_cookie[0] =3D token, }; + __u32 proto =3D IPPROTO_MPTCP; int fd; =20 fd =3D socket(AF_NETLINK, SOCK_RAW, NETLINK_SOCK_DIAG); @@ -235,8 +238,8 @@ static void get_mptcpinfo(__u32 token) die_perror("Netlink socket"); =20 r.idiag_ext |=3D (1 << (INET_DIAG_INFO - 1)); - send_query(fd, &r); - recv_nlmsg(fd); + send_query(fd, &r, proto); + recv_nlmsg(fd, proto); =20 close(fd); } --=20 2.25.1 From nobody Thu Dec 18 23:00:17 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 728C93A1BA for ; Wed, 16 Apr 2025 09:00:07 +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=1744794010; cv=none; b=e6E5qfF3IzJpdEyScJahjpHHGtdCSH/r3toxLDZswCZhAnprL5F0ut+3jLaREjczSPIaFKVw0Q89bD5cecSdZrV/5bUsJRoOs5A97PwhXXiHQPvtbkx1f8GqhpQromzBjaex6hnVj+WRdO7KfgELeAub0O0meKHllcmc5Rqx6Ck= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744794010; c=relaxed/simple; bh=XkBkSfwoyqXe+jLbzCoaJT0BvcNB1HorYGeEVUOPY58=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KrkuzibzeFkGkPzo6CzJob/MtxF8hnWcg7/G9TbgjqGN3ZqmZ6MNJCMw4jhvn6AovLtXD9zp2uz6jfMfQo8j6nro/sNyeTJBuE6xpM/lSsBAgu38A31T3vUslbJ2h9luS93HIsM9a9e9xFVzT2TfAjP1/c2RZunYogLaXOuqGAk= 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: 2c4ea9ec1aa111f0a216b1d71e6e1362-20250416 X-CTIC-Tags: 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_TRUSTED, SA_EXISTED SN_EXISTED, SPF_NOPASS, DKIM_NOPASS, DMARC_NOPASS, CIE_BAD CIE_GOOD, 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-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.45,REQID:660265da-d9da-46dc-a405-71e627870f6b,IP:10, URL:0,TC:0,Content:0,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACT ION:release,TS:20 X-CID-INFO: VERSION:1.1.45,REQID:660265da-d9da-46dc-a405-71e627870f6b,IP:10,UR L:0,TC:0,Content:0,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:20 X-CID-META: VersionHash:6493067,CLOUDID:cbb4f8ae20492c638ce3a250f6a32291,BulkI D:25041617000102N1OB4P,BulkQuantity:1,Recheck:0,SF:17|19|24|44|66|78|81|82 |102,TC:nil,Content:0|50,EDM:5,IP:-2,URL:0,File:nil,RT:nil,Bulk:43,QS:nil, BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC: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 X-UUID: 2c4ea9ec1aa111f0a216b1d71e6e1362-20250416 X-User: yangang@kylinos.cn Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 1860889600; Wed, 16 Apr 2025 16:59:58 +0800 From: Gang Yan To: mptcp@lists.linux.dev Cc: Gang Yan , Geliang Tang Subject: [mptcp-next v2 5/7] selftests: mptcp: add a helper to get subflow_info Date: Wed, 16 Apr 2025 16:59:47 +0800 Message-Id: <376ac5afbb35463387e8db2f009ff5b628cd69c7.1744793332.git.yangang@kylinos.cn> X-Mailer: git-send-email 2.25.1 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" This patch adds 'get_subflow_info' in 'mptcp_diag', which can check whether a TCP connection is an MPTCP subflow based on the "INET_ULP_INFO_MPTCP" with tcp_diag method. Co-developed-by: Geliang Tang Signed-off-by: Geliang Tang Signed-off-by: Gang Yan --- .../testing/selftests/net/mptcp/mptcp_diag.c | 86 ++++++++++++++++++- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_diag.c b/tools/testing= /selftests/net/mptcp/mptcp_diag.c index 2116b40bc927..28b1704d0c78 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_diag.c +++ b/tools/testing/selftests/net/mptcp/mptcp_diag.c @@ -8,6 +8,7 @@ #include #include #include +#include =20 #include #include @@ -19,8 +20,13 @@ #define IPPROTO_MPTCP 262 #endif =20 +#define parse_rtattr_nested(tb, max, rta) \ + (parse_rtattr_flags((tb), (max), RTA_DATA(rta), RTA_PAYLOAD(rta), \ + NLA_F_NESTED)) + struct params { __u32 target_token; + char subflow_addr[1024]; }; =20 struct mptcp_info { @@ -50,6 +56,24 @@ struct mptcp_info { __u32 mptcpi_last_ack_recv; }; =20 +enum { + MPTCP_SUBFLOW_ATTR_UNSPEC, + MPTCP_SUBFLOW_ATTR_TOKEN_REM, + MPTCP_SUBFLOW_ATTR_TOKEN_LOC, + MPTCP_SUBFLOW_ATTR_RELWRITE_SEQ, + MPTCP_SUBFLOW_ATTR_MAP_SEQ, + MPTCP_SUBFLOW_ATTR_MAP_SFSEQ, + MPTCP_SUBFLOW_ATTR_SSN_OFFSET, + MPTCP_SUBFLOW_ATTR_MAP_DATALEN, + MPTCP_SUBFLOW_ATTR_FLAGS, + MPTCP_SUBFLOW_ATTR_ID_REM, + MPTCP_SUBFLOW_ATTR_ID_LOC, + MPTCP_SUBFLOW_ATTR_PAD, + + __MPTCP_SUBFLOW_ATTR_MAX +}; +#define MPTCP_SUBFLOW_ATTR_MAX (__MPTCP_SUBFLOW_ATTR_MAX - 1) + static void die_perror(const char *msg) { perror(msg); @@ -58,7 +82,9 @@ static void die_perror(const char *msg) =20 static void die_usage(int r) { - fprintf(stderr, "Usage: mptcp_diag -t\n"); + fprintf(stderr, "Usage:\n" + "mptcp_diag -t \n" + "mptcp_diag -s \" \"\n"); exit(r); } =20 @@ -182,6 +208,21 @@ static void parse_nlmsg(struct nlmsghdr *nlh, __u32 pr= oto) } print_info_msg(info); } + if (proto =3D=3D IPPROTO_TCP && tb[INET_DIAG_ULP_INFO]) { + struct rtattr *ulpinfo[INET_ULP_INFO_MAX + 1] =3D { 0 }; + + parse_rtattr_nested(ulpinfo, INET_ULP_INFO_MAX, + tb[INET_DIAG_ULP_INFO]); + + if (ulpinfo[INET_ULP_INFO_MPTCP]) { + struct rtattr *sfinfo[MPTCP_SUBFLOW_ATTR_MAX + 1] =3D { 0 }; + + parse_rtattr_nested(sfinfo, MPTCP_SUBFLOW_ATTR_MAX, + ulpinfo[INET_ULP_INFO_MPTCP]); + } else { + printf("It's a normal TCP!\n"); + } + } } =20 static void recv_nlmsg(int fd, __u32 proto) @@ -244,6 +285,41 @@ static void get_mptcpinfo(__u32 token) close(fd); } =20 +static void get_subflow_info(char *subflow_addr) +{ + struct inet_diag_req_v2 r =3D { + .sdiag_family =3D AF_INET, + .sdiag_protocol =3D IPPROTO_TCP, + }; + int sport, dport; + char saddr[64]; // Take ipv6 into consideration + char daddr[64]; + int ret; + int fd; + + ret =3D sscanf(subflow_addr, "%s %d %s %d", saddr, &sport, daddr, &dport); + if (ret !=3D 4) + die_perror("IP PORT Pairs has style problems!"); + + printf("%s:%d -> %s:%d\n", saddr, sport, daddr, dport); + + fd =3D socket(AF_NETLINK, SOCK_RAW, NETLINK_SOCK_DIAG); + if (fd < 0) + die_perror("Netlink socket"); + + r.id.idiag_cookie[0] =3D INET_DIAG_NOCOOKIE; + r.id.idiag_cookie[1] =3D INET_DIAG_NOCOOKIE; + r.id.idiag_sport =3D htons(sport); + r.id.idiag_dport =3D htons(dport); + r.id.idiag_if =3D 0; + + inet_pton(AF_INET, saddr, &r.id.idiag_src); + inet_pton(AF_INET, daddr, &r.id.idiag_dst); + r.idiag_ext |=3D (1 << (INET_DIAG_INFO - 1)); + send_query(fd, &r, IPPROTO_TCP); + recv_nlmsg(fd, IPPROTO_TCP); +} + static void parse_opts(int argc, char **argv, struct params *p) { int c; @@ -251,7 +327,7 @@ static void parse_opts(int argc, char **argv, struct pa= rams *p) if (argc < 2) die_usage(1); =20 - while ((c =3D getopt(argc, argv, "ht:")) !=3D -1) { + while ((c =3D getopt(argc, argv, "ht:s:")) !=3D -1) { switch (c) { case 'h': die_usage(0); @@ -259,6 +335,9 @@ static void parse_opts(int argc, char **argv, struct pa= rams *p) case 't': sscanf(optarg, "%x", &p->target_token); break; + case 's': + snprintf(p->subflow_addr, strlen(optarg) + 1, "%s", optarg); + break; default: die_usage(1); break; @@ -275,6 +354,9 @@ int main(int argc, char *argv[]) if (p.target_token) get_mptcpinfo(p.target_token); =20 + if (strlen(p.subflow_addr) !=3D 0) + get_subflow_info(p.subflow_addr); + return 0; } =20 --=20 2.25.1 From nobody Thu Dec 18 23:00:17 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 19067233738 for ; Wed, 16 Apr 2025 09:00:06 +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=1744794010; cv=none; b=grubLbguYmUxpSl9TI1Oucd+FAonJ/HkaY1CpM2SDvPTePaZUi+zmXsH29WzdDUjPykBucJ/atwYyimUwZaicXCKx28pe/rzBxOd2vRYhDCElsvmkjlgnQw81ffQF9xklGHnRuqkJM/czvZSv0UdvFpyYrRcjkoZ2hMFU9vyR6Y= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744794010; c=relaxed/simple; bh=hzKNhscZ/BshVd42eVBCY/kuYPpBLAvyh2E5gtHr2f4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=csNl41POcQrj/v9mxWwGE1jJrUTJnZrxaxp9OD7FGt1JcTCUb9qmCPGD5I+1xQSZcI4cwtu1+IH/WeVwdpDmGGe6GUXVEUWZn0Dwe0fSoaxpYTYfQJ1wFSvM+yl00PSxEQ+hWbZQ8qv+QZeeqMzCiQA+TsGg9pj66DtPnpYaIAs= 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: 2c9b0c7e1aa111f0a216b1d71e6e1362-20250416 X-CTIC-Tags: 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_TRUSTED, SA_EXISTED SN_EXISTED, SPF_NOPASS, DKIM_NOPASS, DMARC_NOPASS, CIE_BAD CIE_GOOD, 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-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.45,REQID:c174808e-0cbc-48b0-9eb8-9ec9487043d6,IP:10, URL:0,TC:0,Content:0,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACT ION:release,TS:20 X-CID-INFO: VERSION:1.1.45,REQID:c174808e-0cbc-48b0-9eb8-9ec9487043d6,IP:10,UR L:0,TC:0,Content:0,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:20 X-CID-META: VersionHash:6493067,CLOUDID:b5ba829ba947bcb71af4d220043f86ad,BulkI D:25041617000102N1OB4P,BulkQuantity:0,Recheck:0,SF:17|19|24|44|66|78|81|82 |102,TC:nil,Content:0|50,EDM:5,IP:-2,URL:0,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,ARC:0 X-CID-BVR: 0 X-CID-BAS: 0,_,0,_ X-CID-FACTOR: TF_CID_SPAM_FSD,TF_CID_SPAM_FSI,TF_CID_SPAM_SNR,TF_CID_SPAM_FAS X-UUID: 2c9b0c7e1aa111f0a216b1d71e6e1362-20250416 X-User: yangang@kylinos.cn Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 1614516798; Wed, 16 Apr 2025 16:59:58 +0800 From: Gang Yan To: mptcp@lists.linux.dev Cc: Gang Yan , Geliang Tang Subject: [mptcp-next v2 6/7] selftests: mptcp: add a helper to print subflow_info Date: Wed, 16 Apr 2025 16:59:48 +0800 Message-Id: <69ec06b8a1a16cec85b06bb93150e53de0ffdaf5.1744793332.git.yangang@kylinos.cn> X-Mailer: git-send-email 2.25.1 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" This patch adds 'print_subflow_info' in 'mptcp_diag', which can print the subflow_filed of an MPTCP subflow. This function is for further checking the 'subflow_info' through inet_diag method. Co-developed-by: Geliang Tang Signed-off-by: Geliang Tang Signed-off-by: Gang Yan --- .../testing/selftests/net/mptcp/mptcp_diag.c | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_diag.c b/tools/testing= /selftests/net/mptcp/mptcp_diag.c index 28b1704d0c78..25495c7e1c74 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_diag.c +++ b/tools/testing/selftests/net/mptcp/mptcp_diag.c @@ -74,6 +74,18 @@ enum { }; #define MPTCP_SUBFLOW_ATTR_MAX (__MPTCP_SUBFLOW_ATTR_MAX - 1) =20 +#define MPTCP_SUBFLOW_FLAG_MCAP_REM _BITUL(0) +#define MPTCP_SUBFLOW_FLAG_MCAP_LOC _BITUL(1) +#define MPTCP_SUBFLOW_FLAG_JOIN_REM _BITUL(2) +#define MPTCP_SUBFLOW_FLAG_JOIN_LOC _BITUL(3) +#define MPTCP_SUBFLOW_FLAG_BKUP_REM _BITUL(4) +#define MPTCP_SUBFLOW_FLAG_BKUP_LOC _BITUL(5) +#define MPTCP_SUBFLOW_FLAG_FULLY_ESTABLISHED _BITUL(6) +#define MPTCP_SUBFLOW_FLAG_CONNECTED _BITUL(7) +#define MPTCP_SUBFLOW_FLAG_MAPVALID _BITUL(8) + +#define rta_getattr(type, value) (*(type *)RTA_DATA(value)) + static void die_perror(const char *msg) { perror(msg); @@ -185,6 +197,65 @@ static void print_info_msg(struct mptcp_info *info) printf("bytes_acked: %llu\n", info->mptcpi_bytes_acked); } =20 +/* + * 'print_subflow_info' is from 'mptcp_subflow_info' + * which is a function in 'misc/ss.c' of iproute2. + */ +static void print_subflow_info(struct rtattr *tb[]) +{ + u_int32_t flags =3D 0; + + printf("It's a mptcp subflow, the subflow info:\n"); + if (tb[MPTCP_SUBFLOW_ATTR_FLAGS]) { + char caps[32 + 1] =3D { 0 }, *cap =3D &caps[0]; + + flags =3D rta_getattr(__u32, tb[MPTCP_SUBFLOW_ATTR_FLAGS]); + + if (flags & MPTCP_SUBFLOW_FLAG_MCAP_REM) + *cap++ =3D 'M'; + if (flags & MPTCP_SUBFLOW_FLAG_MCAP_LOC) + *cap++ =3D 'm'; + if (flags & MPTCP_SUBFLOW_FLAG_JOIN_REM) + *cap++ =3D 'J'; + if (flags & MPTCP_SUBFLOW_FLAG_JOIN_LOC) + *cap++ =3D 'j'; + if (flags & MPTCP_SUBFLOW_FLAG_BKUP_REM) + *cap++ =3D 'B'; + if (flags & MPTCP_SUBFLOW_FLAG_BKUP_LOC) + *cap++ =3D 'b'; + if (flags & MPTCP_SUBFLOW_FLAG_FULLY_ESTABLISHED) + *cap++ =3D 'e'; + if (flags & MPTCP_SUBFLOW_FLAG_CONNECTED) + *cap++ =3D 'c'; + if (flags & MPTCP_SUBFLOW_FLAG_MAPVALID) + *cap++ =3D 'v'; + + if (flags) + printf(" flags:%s", caps); + } + if (tb[MPTCP_SUBFLOW_ATTR_TOKEN_REM] && + tb[MPTCP_SUBFLOW_ATTR_TOKEN_LOC] && + tb[MPTCP_SUBFLOW_ATTR_ID_REM] && + tb[MPTCP_SUBFLOW_ATTR_ID_LOC]) + printf(" token:%04x(id:%u)/%04x(id:%u)", + rta_getattr(__u32, tb[MPTCP_SUBFLOW_ATTR_TOKEN_REM]), + rta_getattr(__u8, tb[MPTCP_SUBFLOW_ATTR_ID_REM]), + rta_getattr(__u32, tb[MPTCP_SUBFLOW_ATTR_TOKEN_LOC]), + rta_getattr(__u8, tb[MPTCP_SUBFLOW_ATTR_ID_LOC])); + if (tb[MPTCP_SUBFLOW_ATTR_MAP_SEQ]) + printf(" seq:%llu", + rta_getattr(__u64, tb[MPTCP_SUBFLOW_ATTR_MAP_SEQ])); + if (tb[MPTCP_SUBFLOW_ATTR_MAP_SFSEQ]) + printf(" sfseq:%u", + rta_getattr(__u32, tb[MPTCP_SUBFLOW_ATTR_MAP_SFSEQ])); + if (tb[MPTCP_SUBFLOW_ATTR_SSN_OFFSET]) + printf(" ssnoff:%u", + rta_getattr(__u32, tb[MPTCP_SUBFLOW_ATTR_SSN_OFFSET])); + if (tb[MPTCP_SUBFLOW_ATTR_MAP_DATALEN]) + printf(" maplen:%u", + rta_getattr(__u32, tb[MPTCP_SUBFLOW_ATTR_MAP_DATALEN])); +} + static void parse_nlmsg(struct nlmsghdr *nlh, __u32 proto) { struct inet_diag_msg *r =3D NLMSG_DATA(nlh); @@ -219,6 +290,7 @@ static void parse_nlmsg(struct nlmsghdr *nlh, __u32 pro= to) =20 parse_rtattr_nested(sfinfo, MPTCP_SUBFLOW_ATTR_MAX, ulpinfo[INET_ULP_INFO_MPTCP]); + print_subflow_info(sfinfo); } else { printf("It's a normal TCP!\n"); } --=20 2.25.1 From nobody Thu Dec 18 23:00:17 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 91819230BD5 for ; Wed, 16 Apr 2025 09:00:07 +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=1744794009; cv=none; b=TcHvTBb+qKvP+56K+Qd1v/kACAlfyRrxyHvOMAVwIT0yuBRKn4bdSJc3GP0lDT6VZBdscQVjVobkJ8G0Aq489zlJq9W6wGQ1iYeOzNYtUbG6QpdIBensaBtNJbu/CpRTaVnNf1fniYMoke8c8qDEVDFtlFZW07nFHqKrD946oZI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744794009; c=relaxed/simple; bh=y25mIN42cxf2iz8vIUfuIIiD3UCSrJgmCW16h4TnS5I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=RaVDcBoCFnQ5umyjy5/ou/k7b+JhZjRmyxKqlvADUMbDaP3aozsNtXUJWBcb+K0JbsO1N9fqfH2nGhmUtbf+UapXSXv/4CQzPJH7ZaHoLRpzWI+E4F+I7LfXh5hh+dVQ38HGAKjV5QFzzMbQB4zuLZiLiw/b/y1ycrX2bHQ8if0= 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: 2ceb54e01aa111f0a216b1d71e6e1362-20250416 X-CTIC-Tags: 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_TRUSTED, SA_EXISTED SN_EXISTED, SPF_NOPASS, DKIM_NOPASS, DMARC_NOPASS, CIE_BAD CIE_GOOD, 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-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.45,REQID:0d56dd84-ebce-4caf-89bd-8dedc01285c4,IP:10, URL:0,TC:0,Content:0,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACT ION:release,TS:20 X-CID-INFO: VERSION:1.1.45,REQID:0d56dd84-ebce-4caf-89bd-8dedc01285c4,IP:10,UR L:0,TC:0,Content:0,EDM:25,RT:0,SF:-15,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:20 X-CID-META: VersionHash:6493067,CLOUDID:837f89790c3f82ab574a3adacfa56341,BulkI D:2504161535279QFJQ3KQ,BulkQuantity:1,Recheck:0,SF:17|19|24|44|66|78|81|82 |102,TC:nil,Content:0|50,EDM:5,IP:-2,URL:0,File:nil,RT:nil,Bulk:41,QS:nil, BEC:nil,COL:0,OSI:0,OSA:0,AV:0,LES:1,SPR:NO,DKR:0,DKP:0,BRR:0,BRE:0,ARC: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 X-UUID: 2ceb54e01aa111f0a216b1d71e6e1362-20250416 X-User: yangang@kylinos.cn Received: from localhost.localdomain [(223.70.159.239)] by mailgw.kylinos.cn (envelope-from ) (Generic MTA with TLSv1.3 TLS_AES_256_GCM_SHA384 256/256) with ESMTP id 69155629; Wed, 16 Apr 2025 16:59:59 +0800 From: Gang Yan To: mptcp@lists.linux.dev Cc: Gang Yan , Geliang Tang Subject: [mptcp-next v2 7/7] selftests: mptcp: add chk_sublfow in diag.sh Date: Wed, 16 Apr 2025 16:59:49 +0800 Message-Id: <6be98516e035e73e9523e4fb8c301bc482e65133.1744793332.git.yangang@kylinos.cn> X-Mailer: git-send-email 2.25.1 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" This patch aims to add chk_dump_subflow in diag.sh. The subflow's info can be obtained through "ss -tin", then use the 'mptcp_diag' to verify the token in subflow_info. Co-developed-by: Geliang Tang Signed-off-by: Geliang Tang Signed-off-by: Gang Yan --- tools/testing/selftests/net/mptcp/diag.sh | 55 +++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/diag.sh b/tools/testing/self= tests/net/mptcp/diag.sh index e7a75341f0f3..20de007e44cd 100755 --- a/tools/testing/selftests/net/mptcp/diag.sh +++ b/tools/testing/selftests/net/mptcp/diag.sh @@ -225,6 +225,60 @@ chk_dump_one() fi } =20 +get_endpoint_addr() +{ + echo $1 | cut -d ":" -f 1 +} + +get_endpoint_port() +{ + echo $1 | cut -d ":" -f 2 +} + +chk_dump_subflow() +{ + local inet_diag_token + local subflow_line + local remote_addr + local remote_port + local local_addr + local local_port + local ss_token + local msg + + subflow_line=3D$(ss -tnN $ns | \ + grep -m1 -Eo '[0-9.]+:[0-9].+ +[0-9.]+:[0-9.]+') + + if [ -n "$subflow_line" ]; then + read -r local_endpoint remote_endpoint <<< $subflow_line + + local_addr=3D$(get_endpoint_addr $local_endpoint) + local_port=3D$(get_endpoint_port $local_endpoint) + + remote_addr=3D$(get_endpoint_addr $remote_endpoint) + remote_port=3D$(get_endpoint_port $remote_endpoint) + fi + + ss_token=3D$(ss -tniN $ns | \ + grep -m1 -Eo 'token:[^ ]+') + + inet_diag_token=3D$(ip netns exec $ns ./mptcp_diag -s \ + "$local_addr $local_port $remote_addr $remote_port" | \ + grep -Eo 'token:[^ ]+') + + msg=3D"....chk dump_subflow" + + mptcp_lib_print_title "$msg" + if [[ $ss_token =3D=3D $inet_diag_token ]]; then + mptcp_lib_pr_ok + mptcp_lib_result_pass "${msg}" + else + mptcp_lib_pr_fail "expected $ss_token but $inet_diag_token" + mptcp_lib_result_fail "${msg}" + ret=3D${KSFT_FAIL} + fi +} + msk_info_get_value() { local port=3D"${1}" @@ -316,6 +370,7 @@ chk_msk_fallback_nr 0 "....chk no fallback" chk_msk_inuse 2 chk_msk_cestab 2 chk_dump_one +chk_dump_subflow flush_pids =20 chk_msk_inuse 0 "2->0" --=20 2.25.1