From nobody Fri May 17 02:41:18 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2056.outbound.protection.outlook.com [40.107.20.56]) (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 5354A134C4 for ; Sat, 16 Sep 2023 12:05:09 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZiYwT3aXcQ+35SUbHpeGQ6X37xSXw/rSOed9OwIPD+vd08jdIuO1e0e9dWgdwHnqU3+aNKBUOecOn4qyr5uR/bMvd3QNSeB1d/SKvm5HYFWdSgvdar6z/Ced317Tvaxxxz3L0hCpmeT6pPG/Sun2IhdTB4+OVBy9uKz/wbzlLhSHVPiCQSnhE1i01+ECkKWeijqjygLC86YJhCfYfhSep2Ejl/N8Bi3MBTgz0W0Senlzy5eh6Fb3tQR5pFb4FE4MEvxud/C73sYZ9a/9f/zToHPpFhj/fSZ8XT8jV8hya5HfiZ0GewqoLle9iCFsI8wwwHEylCKrx4QxqF811SJ5hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=N+7sU6bHLr7iCmoxRXGKuDMiRuGx2iMajuu4tSBvLsQ=; b=eL/kX3aXKVOz3RCa8ViyB80XrH23XS2RMeBnVA1WOUOB2ycKg9AZq1Qcd3KrcdUc8An5s4Y0qhITN5qlcKyZJIvHPvdbEt8oY9fJPjNRIlVE6bY6pxKwUJt4dok+/RRAV9EfPgKvyIZOfWHt7TZli4TjzuBdQp56+sby9q/2M4pOhi4N4B7iUBgYBqbepwdUumbXk01nbUgJaidEPicnaZUiZfK1N9ifs0NozFVL12iTPJRdn60sTC7HXlzlgduPijJYKnGp1dPhPBS7UylSKDgimJS91Mhx8aQN+GR0i4+2XseXcJ9QDtv0EMqnzDALk2gpyZL9ZROQRul6M8/cow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=N+7sU6bHLr7iCmoxRXGKuDMiRuGx2iMajuu4tSBvLsQ=; b=NxQaew3RGxMTL4QSxyO4tQQnY45Q6vtoPx563PJpqgJRn8ufcKo8KdHuCNBMmkaVYmU+6KC9+xhUNv4R+bZDWmkGSBpbNgoFDs0ysrhDXRbPKF2lvsW7aOzgbDkPZ4wFsGe5RSmLmiQD2Srxt1ZWibQNMK9pS/PfBD6cfgolP1QY4dImD6YfVHhkfLq4tw5pkeztoAoVyjlQhlPctvJ+pTrFFAKMZE55leCJWPJn82l0baP7dS4YCMX8tNNr59U3/FmIWUdnGR85Mx+JOkOuDOfbtQZnby0KkChYpv3UcU9t9tVJ44MXNelqbYF+PM3pIa4JYgwhJTjAkLvoJz2mUA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB8772.eurprd04.prod.outlook.com (2603:10a6:20b:42f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.23; Sat, 16 Sep 2023 12:05:07 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.021; Sat, 16 Sep 2023 12:05:07 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 1/2] Squash to "selftests: mptcp: userspace pm remove id 0 subflow" Date: Sat, 16 Sep 2023 20:05:43 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0036.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8772:EE_ X-MS-Office365-Filtering-Correlation-Id: 1b06048a-cdfd-4f94-eab0-08dbb6ad2b0c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9T7NPatbHVYQaqT+uUYkn7/PSChmumDhLHPotzzNkWQPrFrlmnttvmKxVZwOFeoWWl5bSzsbNJWgzHwfKaZr52GIfOkpo5GaNoQ5Xh0nbIo+rJaN3Sq+OwZJUtO0udCCzC/ZARoegG9m8s+MYu60c2nV2MhJwSulcITZg6Q8k6J3nneRa+lQgpx1Tl8FB666WuuWCPhV88lREUz+cpdiqtrsuj+fNKCdjgcwowGINEQpH1ZBIC1cJZ7r1xex92wm1ms118lAyQDF3s0/tfogRfa6v4vu6l2w0yU2B4NAOpapdIelQ9TzxNEoQRYri8HFpBqRpap3P28GBt5TIpSMeC2boZ8hOGqK+g+F2PwDI/ZphbtVrpvEpKIICrHFFu2p2Pl5qLCCx6PVE7Qe4jGwoE8rpBWq70rcHDGczwD/exy9F9ou6Lf7VCoHN2Unh4n9J0HpjZ87m4GriB21DIauLJWdX7xsFdj7A5EyBH58qNG9avnewI3ZnRP9NXZua8pkmbvLTO4hz0e7yYFTs9d8KCs12hTPrzCnbTPzB2iiWVkUCK+EV9xKRCNJ4irq8DlUfY2HJXNA5W1evLaW8JJT0N/qRZfda1tTYDDHI97fZac= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(346002)(396003)(366004)(136003)(451199024)(1800799009)(186009)(6666004)(6506007)(6486002)(86362001)(38100700002)(36756003)(26005)(107886003)(2616005)(2906002)(6512007)(83380400001)(478600001)(5660300002)(8676002)(4326008)(316002)(6916009)(8936002)(41300700001)(44832011)(66476007)(66556008)(66946007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Zm1+fZRZEv/3fbqkKxC1lNi370sXOZZyVmrCXLU0vTrk4IwZ8oVXyN6nJiIR?= =?us-ascii?Q?X80i0sjMr3vxYHwg7JwD3b6R2ARiS2QbTDxyJOfN/fzyLwlgWP75X3sKSuiq?= =?us-ascii?Q?mjfrmOaaYotRFa8F58IRQo3W7x5VQKZLMWcSutJc2Gz8gtnwPYcx8ONUOJdX?= =?us-ascii?Q?Sq4M87ZplY5uygK/x0GCxNwskCOK+f5euQ8VxTHCSVErG0jBS4J7JUS9LQBL?= =?us-ascii?Q?ndxJprMq+PDqs7KewDQJKf+LgccdPxgVRng+WFsk7gArz8/FFEzii7DHoJl4?= =?us-ascii?Q?bmtl/aMoG7HAlm1GJ/BeahGkYLKIcl4UDRY6274GsFEEEhFMqTKrYE+lCjXj?= =?us-ascii?Q?aREc/6nmR6WalD82Yx/LSJ7//+1LmYAwhzpejIuvKZ5WHJARS+F6+I7m3Nta?= =?us-ascii?Q?ONmNYmwhdWBDHAilCvQRVwVlkRhB9lRlBSD1x6CWdWWMJ4ADnPbIyktOFGVw?= =?us-ascii?Q?C9uuCkd+V+8WPmMuLXiHnuWa/BUWhh2pJylrTo2xx3M/G7wjFoeZ5iAmcsc3?= =?us-ascii?Q?7tSIuRwuj3PsXBT0K1YzN1komqwm8MqSFvC0v3HrujhrVjPce0Ks/B67uYDo?= =?us-ascii?Q?08NLVrj48izJT+yXreMyjcngfNOMmZVHe4VdqWPmyO1+hGbBH5X1l7wrBhy6?= =?us-ascii?Q?0pFjcvXDRZg8/Lw6dIn8kJ9fP5ozjiHv8b4voVJnjiSkc/HBO2+tr5oDrwOe?= =?us-ascii?Q?0S0T8+o2ebnmCF9qI72+CQP098mQqUdHjDIST7Dz/KeZZYvoaDVbmiSmmIt7?= =?us-ascii?Q?tSHpxrgJaQw1I1O3Tg9dVxnzvcCE2oYYbvpQ4paL6DVX2ciiEeoWzy3WcbcX?= =?us-ascii?Q?tH4oBoeN3NiiGE42OIPUR7rxcpnnKJRgXzt30us9mKTeSzR3BSVHBkyRosNk?= =?us-ascii?Q?MLV18J5Jj2sEpvo9nvu6dBGflXxsFVshFP/jECmVmS1gVespCDIudX3xCsSV?= =?us-ascii?Q?T8e/CujqoWFefHwzyj6eNBof/VhTXmZh3vAaDh6rIONZpPwz2HBi6AsydGrc?= =?us-ascii?Q?GdosXWyUTlTXCX7A1BCRU7V0u0VuYaz6K9UMln17mCE20ORvBY8+Bol9YqUO?= =?us-ascii?Q?BBbWMZHeZYwq9c8kD/6BEXYdynGyD0qc3AlQLOA1pZhsx+Yr6kVx6yWlbgzD?= =?us-ascii?Q?/uY3265+QhGojuJWipfo6Cj/WZXj95MElxlBzDMBRxUmXQZ/UeqYOeYz5qRw?= =?us-ascii?Q?WqTlxTiIpY85va+6uD58ukAzbaE+TcmqjlqUbHPI4B3NE8TCpARaCibDF9/I?= =?us-ascii?Q?LhFLjuOQ8T90MgU9H1GhJa83vD9Y/b/97CI+fBu8bOVQl6pWeC6H4Sf7Qtyv?= =?us-ascii?Q?RxyyttGnbg5qhiMTq9SSoTBeZMcXrLLNSTBwBeKxvGwgcELgqtN7EMisdyBQ?= =?us-ascii?Q?Axzpi4/W9242JXwRypELOSlsxIzrj+yBiaWyEvsK57L94kEg2n5onxm6IA8P?= =?us-ascii?Q?6oJ5icDjZVgb/etsMI9EAys4XPVG/uUtKiwqaARx5XmD/X1J25w0w2tyrqug?= =?us-ascii?Q?O4Ov+HssHpVUEV/kzxeMPZXc8FhBvtRJDBhrtM+k/z3jdU+8HWsef17mM+29?= =?us-ascii?Q?7ZsH2L5flJG9dDB18rfln0ydXRegyRsVXaVHvIwh?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b06048a-cdfd-4f94-eab0-08dbb6ad2b0c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2023 12:05:07.4245 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: MzaQY0ScH0Dyv+Gq57JtuC0zXX2aqsHFg5RJHL8dzSpuz3tSoeWemHtNJAc0Z7CFxQStXrkdFUgSOYLrc342zA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8772 Content-Type: text/plain; charset="utf-8" Please update the commit log: ''' This patch adds a selftest for userpsace PM to remove id 0 subflow. Use userspace_pm_add_sf() to add a subflow, and pass initial ip address to userspace_pm_rm_sf() to remove id 0 subflow. When closing the initial subflow in __mptcp_close_ssk(), dispose_it is false, then tcp_disconnect is invoked. This will send a MP_RST to close a subflow on the peer too. So chk_rst_nr() is added in this test, and chk_all_subflows after closing the initial subflow is '1 1', not '2 1'. ''' Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 33 +------------------ 1 file changed, 1 insertion(+), 32 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index b65a468e1ec5..9ffc8e061502 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1771,7 +1771,7 @@ chk_mptcp_info() local cnt2 local dump_stats =20 - print_check "mptcp_info ${info1:0:14}=3D$exp1:$exp2" + print_check "mptcp_info ${info1:0:8}=3D$exp1:$exp2" =20 cnt1=3D$(ss -N $ns1 -inmHM | mptcp_lib_get_info_value "$info1" "$info1") cnt2=3D$(ss -N $ns2 -inmHM | mptcp_lib_get_info_value "$info2" "$info2") @@ -1792,37 +1792,6 @@ chk_mptcp_info() fi } =20 -# $1: subflows in ns1 ; $2: subflows in ns2 -# number of all subflows, including the initial subflow. -chk_subflows_total() -{ - local cnt1 - local cnt2 - local info=3D"subflows_total" - - if [ $(ss -N $ns1 -inmHM | mptcp_lib_get_info_value $info $info) ]; then - chk_mptcp_info $info $1 $info $2 - return - fi - - print_check "$info $1:$2" - - cnt1=3D$(ss -N $ns1 -ti | grep -c tcp-ulp-mptcp) - cnt2=3D$(ss -N $ns2 -ti | grep -c tcp-ulp-mptcp) - - if [ "$1" !=3D "$cnt1" ] || [ "$2" !=3D "$cnt2" ]; then - fail_test "got subflows $cnt1:$cnt2 expected $1:$2" - dump_stats=3D1 - else - print_ok - fi - - if [ "$dump_stats" =3D 1 ]; then - ss -N $ns1 -ti - ss -N $ns2 -ti - fi -} - chk_link_usage() { local ns=3D$1 --=20 2.35.3 From nobody Fri May 17 02:41:18 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2043.outbound.protection.outlook.com [40.107.20.43]) (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 00317134C4 for ; Sat, 16 Sep 2023 12:05:20 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SqhVzZToZrGAxpd9cHeTXE/JXscBLY/2qw5iWY+2XMT5MCnW3zxP+bKrPMAlshWb8JCH8tYq2IIGjtLXtbeS4hySRYaov4yh1UFidyOjzqlifjy3WNQDmCwlXidVqoz5dyYBXYMasi5yjXTltpfwbJ8aM0qPvFHwMXvOaFSdRoYHf8zN55BBcDNdCwKFq8uSjjatUYl48j579xE2C0i3dSVTxNgbywjApcS3T8Pslall8mlURqA+PFLut4mbeva4DthbmVX39JIaAQNY6cueyHHbezQR6+QTmtQnRsqg/mKPaa6duKkPH/V4Fjjn0YSGopkCm/TiTMkYhlLMiMs2Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/4h6rJY9JOEnFxreKPuuRgN2XWKVdQUKHm052L9jaL0=; b=nzFCSkFMqIx2Kh+SMRME6mgZ5OHmBroxHFdCTWnhbeDDKRaSLgHHYuDp7fdhzF3aNrIdJtiaQRFW2TSeTtTJt4AASk7DXJ1tzKgPpBca42FwnLszg7mz2b2HB1pY3ckO4g3jbmXSwvRoBp2X3KdTZH5W4IH5IaW30QvfayfDQtl+yIZNGtYyjvDODW+T/zq9TbJFBTF91HhcqAphrskqqpwwshVvebHNANzt/iEZDP9QkcUp0yK4p44e3tXt8x+LFmhg8HOtQu+Fb8L2vYWTrP+vRUUKxNKMleFfHFb1bgWR3CcgTqypRen4DUM984/k787d3Wt9S9YJT+4Ay9o21g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/4h6rJY9JOEnFxreKPuuRgN2XWKVdQUKHm052L9jaL0=; b=FGlUk56ZFqe4OSz2KnY6nj2PNohH3CRFgBId9xL3eFuG6PNEO0zJpHFe/DtNdQ1JOcctdRlN3UJZZJTsBIg4zN+71ZPRz0zI0jfeYM4yTjRnt8QEk1NZ2sve+tgr5pGtcZR7y9tRQN51l0dc2b7O/UHji31kKveJv2AE3H3jDodQxLcTDHL9oPEKtSFakhzeMS7HJ2TL80ghjA1xiwLyIquonHNd4A1efSAMGHfuDH0O1JZ2qx3UuW1wyQxPJHdMiK1zj0BrAdA/oxlxNu3r9ftwyO3970WEF4RBs5lUj/v/aTfA+WC1IYKwO4G0ZG/Acbq9ZWPwVIb1Lh/TWrkGRw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by AS8PR04MB8772.eurprd04.prod.outlook.com (2603:10a6:20b:42f::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.23; Sat, 16 Sep 2023 12:05:18 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.021; Sat, 16 Sep 2023 12:05:18 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 2/2] selftests: mptcp: add chk_subflows_total helper Date: Sat, 16 Sep 2023 20:05:44 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0042.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::18) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS8PR04MB8772:EE_ X-MS-Office365-Filtering-Correlation-Id: a6ae63ad-0ef9-4a70-cbf4-08dbb6ad3185 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2dopLwfU/ioPoZdDc++Vf01nIJz+Hw7Ldb6R/eksigHAFJyKaHaBn94xDpVWtwkCAuWEQMqjSm4PltqzAyJWjUPOZ7RaJaV77VXf5n++oX9CNRlfAE/o9JIUwkSlI4oi3hCvmjTm3KnphKa4xAwQyIr6iZMP5+jCIh+yYLRXsHyGQ9ZUpNn/WMMuT0I0w0Edlr3ddxdDFzF9nFQXCSnS/vAxGrJSth/Lfux4Y/2X+1rIiNayO7KaVeniBMv58r6YxhjBRMZPLlwoDCLugrib7L8dRMCQHZkJKxT28IqycNTxVGQFZb4Z3YRSSHOUR6skDZIUoOXRFk8Ax8ZwywoJree8pCUAzS5aTL/VexKzcR0tEI7OG5BV2tPhlfFBYZfUB5KKtk6eN81rT1MLW9ERo1SnOZFgQEuhD5XNAmpmRWOfzBtTGCUKMfToDvhyofF0S0QCztWZmeibUJE/pcqRBdRZKm8htWjGBaUlfim0GAkNuHRY8HzqoKGoqNxY6qnHgG0qUIIbPU/9N2t7tfwL5J9uaDIZOUvFhvm18hHPvFiNy2rJ3r4mnrkdohja1Ht7CNd/rL9W9YaqYT1f74jZuARwz+42iTzkyCKqbECKduo= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(39860400002)(376002)(346002)(396003)(366004)(136003)(451199024)(1800799009)(186009)(6666004)(6506007)(6486002)(86362001)(38100700002)(36756003)(26005)(107886003)(2616005)(2906002)(6512007)(83380400001)(478600001)(5660300002)(8676002)(4326008)(316002)(6916009)(8936002)(41300700001)(44832011)(66476007)(66556008)(66946007)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?mehkY0R3UN5KxRjlpUahORMTCvl3AiYW9RNgOWVF6xV3UXdYr+3k0Sg5exm2?= =?us-ascii?Q?U3WwLIE7sRI0+Tof0Wck0TkOULWSSj54tkJrQBqo8D36+rMHpeWpyKKxWjah?= =?us-ascii?Q?14xzhV3+6+8XNBwM9ivxzpA2KH1GcFtNlpOca83f9siiRjLpZshZThf1QRMl?= =?us-ascii?Q?bHvzXv9KymzITjk9ipsxkv+2xq295VnU0kbanQXgfh8SfMRYRT0LkZS7vL+Z?= =?us-ascii?Q?yZWHh8l1VeCJMXwslqzEyZfJZQ+/+DKE6HNZXfSZnSiuapfsgq3blDUkiJoD?= =?us-ascii?Q?/XAZSYO6815qW2dqJXBbyHCVWVsPpeaDqBy+OpENQ96RaSJc0h7KBv2dNMKh?= =?us-ascii?Q?gWKMjUExYFfwlHQ7q4C7GPNq3YrKmSjruqik3ORg10u+MJmJbDrPPptaBXaQ?= =?us-ascii?Q?9+UNMJvN36jtoXHQ2ZDUuDZn61w5bV56XPSYQN7VcAda9VVL/5+kgKchtO/e?= =?us-ascii?Q?urZFe3sbBnYn+Jac01RXhpBKN45sx3W07c4WwqFgTebFimyAQ1Crrs5XE08t?= =?us-ascii?Q?dM5DuXW7/XhldGucYcnSmWuM5Xsw2wvoxe1rPo8FzyWsOkWkbSzEQYd5ruK6?= =?us-ascii?Q?FOfq83bdjrLlYmVHtSBTHrmIHmTAAdGGn9dWwP5YpxDx804q1fHFrDv4xEx5?= =?us-ascii?Q?iViLgZwJ1hTR/TVporcbFTdt7Nu3hilD+R0t+LPWWoVB4ZyIudveiuwPQPN9?= =?us-ascii?Q?Idrp3yuOQL3uuYS7xr4EGIPl3nUfgEmOS76PwK/ReXySt++jW7Cqn5ro4Zgf?= =?us-ascii?Q?z0S7Gm4V+eHx17SpdYBt8OCBDkpNbveHjasUAhay/1OmET7N1KBb/T2Gunpi?= =?us-ascii?Q?+AQ5Mvs6XK7ZcspO1TOsGjMxWwNTXsMbo6Kzoe+YfYth3izAGENZ4JG7pWEM?= =?us-ascii?Q?TuGBTC2pi7mo5iI8L9Wtgsl+2/zXWFViqpdHnEACnkrtmpnP7pUYMk3xuwGK?= =?us-ascii?Q?IDAE4zaYJtArXRIZGABs5UCu3fkWqvmePwBhkUj4QHsvPpt4fpizDio+tNtv?= =?us-ascii?Q?vEGrzqmDhQYouFdhh7oFACaFjuB9kvsp8xPaxJmjMZPkQw8CPR6Jkjx8sRv3?= =?us-ascii?Q?AaPVLM5uwJ8sAi79Egv0r5Jx89G3pQP+fG6vYhz12sA4fw/7t5q9+xJpzXeL?= =?us-ascii?Q?YkoznbvEwL6OOfuwj5UWhsMupWCqhz5rM1cK6Tfp866+zcp/mB1Yae1el/IO?= =?us-ascii?Q?MJvcaaEnl48RhQCNdcVnr8dH8ZMDhEIkF3NVlKCJ26gwzOeflyNLaGoDZgmr?= =?us-ascii?Q?LspJHshgcGUbkmBue/Y4BNbdGN14mORiFeFFhgtDAP5aEHPzS6nWnpVV4s+H?= =?us-ascii?Q?yJclI/xQsu9Wg0EQKABr48yA3F5TK3d9kD85D2zY7SLLPqfWwvcBvN99UPHc?= =?us-ascii?Q?F65k6F8fYTR5HieJjW9hADBcoMJkXd/n7v1aauxJ5QZGLiS45DEQ8hLdoDKS?= =?us-ascii?Q?NFYNr3tY0a+7uZQHXxrHj5iOerg3ZyiGv7PzzZbvS12GBTIT0EPIY2EtFC2u?= =?us-ascii?Q?OpebyO+CMxdymm2TAF+Gkh3UHVjFadmIho8HR5QyUf4qkLnTr5adnBfTmRRu?= =?us-ascii?Q?U7aYykaGNRrKhVD8/UrowFSOX41jo8LXD+z9hkaA?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a6ae63ad-0ef9-4a70-cbf4-08dbb6ad3185 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2023 12:05:18.2823 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: nJYDEAHoUU/DmpKB9GnQQZQ2miF4AmyyVNDg1/qb2OP62KG0VPyVDqPyXalcfWiMMPDLSW173wr923SQjcM1jA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB8772 Content-Type: text/plain; charset="utf-8" This patch adds a new helper chk_subflows_total(), in it use the newly added counter mptcpi_subflows_total to get the "correct" amount of subflows, including the initial one. To be compatible with old 'ss' version without this counter, get the total subflows using this 'ss' command: ss -ti | grep -c tcp-ulp-mptcp. Note: This patch should be inserted between the commit mptcp: add mptcpi_subflows_total counter and the commit selftests: mptcp: add evts_get_info helper Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 9ffc8e061502..46a95ff77222 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1771,7 +1771,7 @@ chk_mptcp_info() local cnt2 local dump_stats =20 - print_check "mptcp_info ${info1:0:8}=3D$exp1:$exp2" + print_check "mptcp_info ${info1:0:15}=3D$exp1:$exp2" =20 cnt1=3D$(ss -N $ns1 -inmHM | mptcp_lib_get_info_value "$info1" "$info1") cnt2=3D$(ss -N $ns2 -inmHM | mptcp_lib_get_info_value "$info2" "$info2") @@ -1792,6 +1792,37 @@ chk_mptcp_info() fi } =20 +# $1: subflows in ns1 ; $2: subflows in ns2 +# number of all subflows, including the initial subflow. +chk_subflows_total() +{ + local cnt1 + local cnt2 + local info=3D"subflows_total" + + if [ $(ss -N $ns1 -inmHM | mptcp_lib_get_info_value $info $info) ]; then + chk_mptcp_info $info $1 $info $2 + return + fi + + print_check "$info $1:$2" + + cnt1=3D$(ss -N $ns1 -ti | grep -c tcp-ulp-mptcp) + cnt2=3D$(ss -N $ns2 -ti | grep -c tcp-ulp-mptcp) + + if [ "$1" !=3D "$cnt1" ] || [ "$2" !=3D "$cnt2" ]; then + fail_test "got subflows $cnt1:$cnt2 expected $1:$2" + dump_stats=3D1 + else + print_ok + fi + + if [ "$dump_stats" =3D 1 ]; then + ss -N $ns1 -ti + ss -N $ns2 -ti + fi +} + chk_link_usage() { local ns=3D$1 @@ -3195,11 +3226,13 @@ userspace_tests() chk_join_nr 1 1 1 chk_add_nr 1 1 chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 userspace_pm_rm_addr $ns1 10 userspace_pm_rm_sf $ns1 "::ffff:10.0.2.1" $SUB_ESTABLISHED chk_rm_nr 1 1 invert chk_mptcp_info subflows 0 subflows 0 + chk_subflows_total 1 1 mptcp_lib_evts_kill wait $tests_pid fi @@ -3216,10 +3249,12 @@ userspace_tests() userspace_pm_add_sf $ns2 10.0.3.2 20 chk_join_nr 1 1 1 chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 userspace_pm_rm_addr $ns2 20 userspace_pm_rm_sf $ns2 10.0.3.2 $SUB_ESTABLISHED chk_rm_nr 1 1 chk_mptcp_info subflows 0 subflows 0 + chk_subflows_total 1 1 mptcp_lib_evts_kill wait $tests_pid fi --=20 2.35.3