From nobody Tue May 14 04:36:08 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2044.outbound.protection.outlook.com [40.107.20.44]) (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 DF93923C2 for ; Fri, 16 Jun 2023 07:31:19 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Qe+Bhm/puDCn8Ar02lteSBNy+1n5HWMb4E9vwbfSk/5+VJ3CzIwJv6WMDrhqXo7HPnerhbOk4f2sQhf+rmZDEktjsrYOIWFCh2Jf3vraP2vz5jrI3ChfHNg/eUXwpHlux8SprBOLudmwiR1r9Cu4GHglSZtvbAZS3aVCda+I3gNAQOPRYMhb8C4xJHMAX30Kf/j0+O5AyaYOIRijABalG12ci/384R4VRKTJvxlsHPG7AvNwC+nYrwTRNtYoP8yxIRRq/960GMIeioJQEVfRaR1AHDDvgO7mgy/dvSyCQlU5ypEzcT5NKJHvYFTDOw9xdDodRDbgLIjltflUmijB7g== 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=CcZWCY/fbXoVGBbZNNwge90JtegL8LSJiEtTdd+w/+0=; b=lXY8RuMgsHLCdUDJih59NTl6+GMLhMQ/fiF2Djbc+77vUqTfbgS+KV8Px661C8XbbNrMhKbrUoPzdzlTBQAOtU2FrdT1Z1g3jjhrbIPiHNKMW7gt4CPpmcpJd2AmH8cD8oVIBQq83UIFRLKW6xFuvt6qywh07lIQxwmBmaEJ/9Yj6PyygbZWjKm/578OpnAOk4X2DIHHc/IkzrmT00hQ15ePp9nZqvyMWEp3snmeNiAzKdoeivdYvRE/4EVPOkk/kwbJpjZ6QhW75TY2/vlTs7uDpkW21ofgHoNoge61uW3SYcsaZJAvevN4t0g2ZQZ0ZXac3zhzV6koU212bJbI8A== 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=CcZWCY/fbXoVGBbZNNwge90JtegL8LSJiEtTdd+w/+0=; b=B4Mt0KjBCBCW0hjHC1Qx6RrD+elgGgnzQz33iyAJDDe4/Z4pmrKocu/cH7Uus/uZ0PTEh/3rt9Wbb+1a3QIc9U9ze5fJeLfRQpvHW/V35RxhpCwIlF1Itei0I3X4xfmOdHqdC6zxiNW0BRzkvWejPST8pfLL+Es1euDFcstCxeA+N22fBbBPksZpWjkuYCHlcbPWzcClI/5VwjcjrhYj6a24tVeojiqbudKejGzE0Eu8RofhRNiRq6BGYtgXp+A+JOa1LFgIQDdYht6QFfK0G7ZP1xiTUUqTcuFvddSh/tbvologaoQsPcwhJ7ptHfTZGtohgwrxU4KVnEkk7jHHcA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM9PR04MB8226.eurprd04.prod.outlook.com (2603:10a6:20b:3ea::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.29; Fri, 16 Jun 2023 07:31:15 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59%4]) with mapi id 15.20.6455.039; Fri, 16 Jun 2023 07:31:15 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 01/10] mptcp: pass addr to mptcp_pm_alloc_anno_list Date: Fri, 16 Jun 2023 15:30:53 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0123.apcprd01.prod.exchangelabs.com (2603:1096:4:40::27) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: VI1PR0402MB3503:EE_|AM9PR04MB8226:EE_ X-MS-Office365-Filtering-Correlation-Id: 6bfd9654-c1d7-4d34-f215-08db6e3bab3a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cGStYHR0Q9tWtRgZmhjcRaqUthHYUJRDhK2KedWmHpjdx4plMlzyw87rQTpO+/EUi1BlT1zFv83KhrIq0AwHAs9jW5kKfXeRRYz9FiW9cA0lPxcAcJFKfKhY5wLEQQuUOPB3GmK+ffKYMZS7A54fwHWxIeH/yLLOWwioFEObt/qOBumR0Ji7kG4B/7MHU7kirNyvDUdK1SabN5T1lmKy+f4cpEjRF/U2Ppz5oG6c05W+HEJjAEaoSrMGDeZMPjAs/bu954UpJQqgLlToPNXJjDRKnvgZR4QlJPAMfd7yH4QF5wTPmMLfF3MPnB7AZ5HlQ1M+aGYrpQBS4M30Al+RNHHceyPSFknbjW6sz9v/XaTTWif8GYy8APT8YmUlxr1noJVZ2935qbGVBrOfMwFKerGwu6/L0Fg+sIQQApye+xiYggYTAaKZk248wzJZZZiPmMhH5msIS7Iw6ClSpnsIpbnZLoZigYhJeqiDMTB0zcS+XAhS9s3PsiFQa12y65e8F5cdtu1Estvxl6amYDHj6HkVyKerl8QziIcBmkkuEoEowLx/msh6zq1wjQvZEnAz X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(346002)(136003)(376002)(39860400002)(366004)(451199021)(478600001)(6666004)(4326008)(8936002)(5660300002)(8676002)(6486002)(41300700001)(6512007)(6506007)(26005)(44832011)(107886003)(86362001)(66476007)(66946007)(6916009)(66556008)(316002)(186003)(83380400001)(2616005)(2906002)(36756003)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rQJTuZ3jQiBcxeur38L3ac/YGDjBePtFvAuozAtmuXc0TfE2LG+DUBhsMaOg?= =?us-ascii?Q?LvW6dfFX5qnAQZrTJbNlCMVpGx4gIIUY8tQTtVOPAzYG8EBlYUdElnk/j9Yg?= =?us-ascii?Q?yg8nPUSwHCEGbbv6wOeO202wdiVb8mVC+EipSNUhWx1iMMmWlClM2Azw70aT?= =?us-ascii?Q?p9rdFje0SnoVgZx2IP7Ct81u3arTEVzfWjMDuFQEWmRa8QBo+c3E6ONGiahi?= =?us-ascii?Q?COuUMBQq+Cla6DQ2hGy6jrw3SGJGq7apkYdKfFB2Rc+m1BwMXpmN05JCjYml?= =?us-ascii?Q?+bEtZ2DtUWxe9ziSglGf05yPlwmBRdBBEAY9KimuaDQklVcFNPf9TNsavv4U?= =?us-ascii?Q?bZnpQg2VVVJ7RsnMCCeJYlKjtV7XIYo738KbDmK2kmWz0q9m3eXYLVFyaegu?= =?us-ascii?Q?apSCqTuR118UxLSOWX1TNNFWCP2lMkNqSj8AKEf8ihzS1aJ7WBiX69ozrHR9?= =?us-ascii?Q?LVTdMKSNPsnZJnPVUxYWSJcm2JykcsMbUGRF3m+HU48viPXJGLys7JeWePA3?= =?us-ascii?Q?lATSkBmqJxAgbFoPILSjSLEw0/cyyfJHaSeaON4vUfl6zOdMzzQSNpk0OhLF?= =?us-ascii?Q?8h0f1lolv6FROBLMQ0tOmrEZehxuoKuOy3mC0jPSgMBbbWH8LifyPHWbBhnJ?= =?us-ascii?Q?ia2PZRzpVHhevth8FzbkWZXQuVkXRQ1Y5/glLLhsQDDk5KTUjtkpNVUL+rQi?= =?us-ascii?Q?0keA31Kj98js+bDUGT1SjLMzObGsVMTEXQl8ghoDensEJtlJ8pnWBhxuvhUL?= =?us-ascii?Q?RlWBWrB+WGWyYEZaaM75SG0Aly1c5q2VDi5n0q3denbuTo17Y3GufK+o/6my?= =?us-ascii?Q?IsL/r4CXj0vuUWOwd559JuyKDyoIAo6XEjIFvJ9BJpHRXCzkzAjM8Elq9O2L?= =?us-ascii?Q?dHMNQLFtm8Lq1d2iclQHRFI/kEywxZZ4khZWpCGDbUQ5EnYP86pet/pE42kP?= =?us-ascii?Q?+pTf1faZzDegBXmKLvseD62ZHyMvYd56RGm1Ba8cIIeamAvpospCF1SrzPrN?= =?us-ascii?Q?mSZENOTS9+fjdHPWHloYwWv6P17pht3M1pfOV09ShDG2ICLW84UVOGR412HP?= =?us-ascii?Q?WcciioNxmLKQ7WIrJrEL0HBl5TEjWBh+1tTBrLOl3uEjSldT5zHGPqL7BByh?= =?us-ascii?Q?Ly+Pee6hu5Zb7WJSaemgcoZdiwSV9QML2az1bySSPMCC85l3cqvK+MwzcM/J?= =?us-ascii?Q?OgtJIySTGr0x42NTbuoXbj2Ztf04lYhEJ8vibOZVMYKvZ224gEAihdy1ZkCc?= =?us-ascii?Q?paBOD23puWxIiqxLjX8PnvLQqwGLI/W2ty//kVi28DNiEZVY3E4hncShHJwx?= =?us-ascii?Q?iQL709Iovss62w7ke2kLfF8rxFMsSwUyhTXaUKGl0GjvOM85aC6MieJ8D5MY?= =?us-ascii?Q?BMi9oHiN0t1R0JIIk5poMKX+O65i0TN1sepBstN77kWDSdw0VdDwQMobMxmC?= =?us-ascii?Q?aVvzJUUv/a9O6opFYsnXdxxwmQG/OXF7y+lhfBsg2bhB3NH06yj5EfqzpFWy?= =?us-ascii?Q?cFRRR5eBTEVbtgoV7mB4PQUuv5N5Ktx0SiYJ2GyRuSo520O0f9nx5eSB7SDr?= =?us-ascii?Q?+X+MIVRWhPJTEQL7g4cUG5b6D8O9Icd5pnV0y/eK?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6bfd9654-c1d7-4d34-f215-08db6e3bab3a X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 07:31:15.8880 (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: gjnJpTTaQ8ybJp0o6JczPG+o7uYNlZtXS91AMy4teu/sIhrR0h/nIocyhDm0gqEGh398hCZHyRyjH+wmrVJQkw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8226 Content-Type: text/plain; charset="utf-8" Pass addr parameter to mptcp_pm_alloc_anno_list() instead of entry. We can reduce the scope, e.g. in mptcp_pm_alloc_anno_list(), we only access "entry->addr", we can then restrict to the pointer to "addr" then. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts --- net/mptcp/pm_netlink.c | 8 ++++---- net/mptcp/pm_userspace.c | 2 +- net/mptcp/protocol.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index ba1406e601e4..724b652876cf 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -341,7 +341,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, } =20 bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, - const struct mptcp_pm_addr_entry *entry) + const struct mptcp_addr_info *addr) { struct mptcp_pm_add_entry *add_entry =3D NULL; struct sock *sk =3D (struct sock *)msk; @@ -349,7 +349,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, =20 lockdep_assert_held(&msk->pm.lock); =20 - add_entry =3D mptcp_lookup_anno_list_by_saddr(msk, &entry->addr); + add_entry =3D mptcp_lookup_anno_list_by_saddr(msk, addr); =20 if (add_entry) { if (mptcp_pm_is_kernel(msk)) @@ -366,7 +366,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, =20 list_add(&add_entry->list, &msk->pm.anno_list); =20 - add_entry->addr =3D entry->addr; + add_entry->addr =3D *addr; add_entry->sock =3D msk; add_entry->retrans_times =3D 0; =20 @@ -573,7 +573,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(stru= ct mptcp_sock *msk) return; =20 if (local) { - if (mptcp_pm_alloc_anno_list(msk, local)) { + if (mptcp_pm_alloc_anno_list(msk, &local->addr)) { __clear_bit(local->addr.id, msk->pm.id_avail_bitmap); msk->pm.add_addr_signaled++; mptcp_pm_announce_addr(msk, &local->addr, false); diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 47a883a16c11..b5a8aa4c1ebd 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -193,7 +193,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct g= enl_info *info) lock_sock((struct sock *)msk); spin_lock_bh(&msk->pm.lock); =20 - if (mptcp_pm_alloc_anno_list(msk, &addr_val)) { + if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) { msk->pm.add_addr_signaled++; mptcp_pm_announce_addr(msk, &addr_val.addr, false); mptcp_pm_nl_addr_send_ack(msk); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index d2e59cf33f57..3ba62f1154d3 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -833,7 +833,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, struct mptcp_addr_info *rem, u8 bkup); bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, - const struct mptcp_pm_addr_entry *entry); + const struct mptcp_addr_info *addr); void mptcp_pm_free_anno_list(struct mptcp_sock *msk); bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock= *sk); struct mptcp_pm_add_entry * --=20 2.35.3 From nobody Tue May 14 04:36:08 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2059.outbound.protection.outlook.com [40.107.20.59]) (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 CFD0723C2 for ; Fri, 16 Jun 2023 07:31:26 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EQ5BG9KVGYizKFXj1Azo7ET6BwpFhx1qfw+iaGlnGkQ6bFnba/9XINQ56I9vVhHALiifu49f5BxXSwu1+x7aX+dcmgfhWenenJcJrtCVTBuOAKlc9yqfOjD5sugnCSLiO5qs3hO59u4ZF3xNTorOBwblEeexzh04CasyUsKbmxBVBLPzy+wNcIw4K5S9H+zq3RPlI5DQp2P4+ZaMhI90LIXMSoh3j8vThIFfSDGiJDy4RvmfNGIexda1S67U86ilYL0Xj312DjR/43OHFL7CnQGe3iAA7zRr/eqPFcQS8Fefs6SxAKYPlDlrMb9y1wzp0oPYk9GZN4BsovE+/1Ixqw== 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=I9Nwn73aXNohQPkPK8xE+JEiezsFIiKVCPWqvAb8XNE=; b=SlN+w+/L8cNu8QbZ4+8jrLPhrgZwYE33RTj5nIudNh1mYnxjMAc/oDAFkOLy5rGEPZWxF2I6/v1L2HE414+0neRamwpqri2pKiomfEhtmR3kmPK8N5+XqB3CThhfIbA+dbLhsr1hOV5edpt1388nvvFmcRFCpT/ShOcfvLn2mHHphzF57y1AQXY8zCJTfx9kHInETWSxCeMduOJ63x9BaybtbjGjrxHuzyuQLPwGXHAuiRGGUe0DJqypxzYT4iapPdlGMgJrd/2zKmAWB/0Ij25u7Oyipz6OgftqWfH1Xfsng+23jAHvvrydBKB9g588WA4Y5bdFjXgtaz8D9W4JWg== 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=I9Nwn73aXNohQPkPK8xE+JEiezsFIiKVCPWqvAb8XNE=; b=MBe8wFpQy8uZq6zDbOx0MZEHbk1Sa33B0ncLquBxgtm/nCL/zS8qXHc/W+VOKlPXrn8spsxLl8kGXfCwsUDsaDnXJpVEYjOmSlRf4B/H997HlDFXZHGsSMpH5rheTmVlkRu/9/uFxlTv3Wz0P+lyBaHXhVYXThuRBdfrSM4GLtpOyOgUdGbppP9xuWKvmnwe8FSX7brcPR04xs5ZJfFONSUlADvDLL76nJTAgtTJXGq3ufeUoi68RNJ2DkuTqM/cq8ymmCnpDW0qsCM5Tmj57fhWR5AAsu6UFJB+UAJESWMAvlxgsbuNsayDWvbgJqf4KhhF7YCakIEVRe6OT5Z+Rw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM9PR04MB8226.eurprd04.prod.outlook.com (2603:10a6:20b:3ea::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.29; Fri, 16 Jun 2023 07:31:24 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59%4]) with mapi id 15.20.6455.039; Fri, 16 Jun 2023 07:31:24 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 02/10] selftests: mptcp: test userspace pm out of transfer Date: Fri, 16 Jun 2023 15:30:54 +0800 Message-Id: <14db7188122fe7a2a13ca01e78225cd76b576a8b.1686900596.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR01CA0118.apcprd01.prod.exchangelabs.com (2603:1096:4:40::22) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: VI1PR0402MB3503:EE_|AM9PR04MB8226:EE_ X-MS-Office365-Filtering-Correlation-Id: 15fef9e8-cf89-4c1d-6af0-08db6e3baff8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EUr6d0db56pSs3uA5ovQM35fbD6sDXaX7D59u4yYpRqQGJksJW7WY+8pNAtXsNDb2S5fJNdD5j8oTA4AIPzRJxQ7mYQ0XqoDGllpDSAma/Q/x4LYYV1pXvBF3kRqIg969gh0ib8+CZ02nKURVZAKN6s0RnnjdcMGJE8bO6kX05rnqBimohvfTR7YYCQLt/Wc0vN8nTXKG8DDWEmIzC6nbD0P7PSZlK/A/DZFyHJGV69/0G2YIoTBcUPRBZBvyWIBfRzMc0M4R6bPZiLBXJVCXbrjRQEz7v3QueJSGyykvFF8+Aq5jCyls2UxJq0pq6b5YNQT7vFW9h7sq0p7iIP0aWMmU9478r11X4zvSzhBf4aPLFuGTyryjoPJrRbG+m/YubfJ3ADQJ0PIHum/DFAsq89zC8yLnuPz4yJozwtXYYG0wKOYmSWPyUCE3ARM67mh/CdXArSc6ipmhTDM2OFf8vecSLyvvZGSuqFYTdITf5dsNw0WUVUoeHqTe+sK22HTB9szrnI/up35rpz/814JPsbGG6prGREFQlHJIRLhYwdOg3qGakeaZvEFLL9iy12+ X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(346002)(136003)(376002)(39860400002)(366004)(451199021)(478600001)(6666004)(4326008)(8936002)(5660300002)(8676002)(6486002)(41300700001)(6512007)(6506007)(26005)(44832011)(107886003)(86362001)(66476007)(66946007)(6916009)(66556008)(316002)(186003)(83380400001)(2616005)(2906002)(36756003)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?hrmkIi8HnofOp9Rlz0sWLch66nFFOePwt/0OfsVyZ4SyM4oZqucwiWlWj/3f?= =?us-ascii?Q?IIl01y4k4T1hDfWiOjnMyRsWT9BGCBZzmfuV7+3YXoQVbfeVYB8vD6Ga0p0d?= =?us-ascii?Q?Y8OWK98MckGT7muVXLYcUJbBvi33WzLLqmc7gbwtFD3O5j8xxPJmp3yM/G25?= =?us-ascii?Q?Yb9jRryT1mC2VVi1Do/D/fqTlUhcsHAKqXtYTC/HxDwynWYIqXC1v7PnPFv0?= =?us-ascii?Q?64/c4gQC2b1pk9FAa5nPJum7WnZfba3rC3kqEVHmd5qRzoBm8FjKZDvfB9an?= =?us-ascii?Q?lf1Aj9ATyiiGnm0yXvzSEgmRNx1C8LfHqAQ8Y07RSbbBrFkIIrp/z1rViKe0?= =?us-ascii?Q?uGgRkGrL8WyJF9T+NDxIvKde5KPs0teGxNbYeGJJR8HkhryWP1j015rT32Lh?= =?us-ascii?Q?yuQru75XYi4tWXrT2b8OhyxvdE0mUs258BbDbY0PzD6ln/yB5O4zorbTBj0P?= =?us-ascii?Q?bPDF7Yjp8AqFhKUday8bkAScO55M+/wMswEDTK4UrfDKcgLEkO72ff4Y5drs?= =?us-ascii?Q?WfRj1OGhjqDUioi7yE4L9jbE2BN/Fiz6kUjE4yEXMCrX90c798juommGqALY?= =?us-ascii?Q?qSCclbW9VgRdKuEjAKW34kQCY9n6VxX2Bv7nXFlQiGQRL63NptVulcCjNTkX?= =?us-ascii?Q?MQAUn6K9Z1qrcNuZyrAqGCDZ/64LwCIag9ClnyMom7TmdSmnQAS4kvS9PCOf?= =?us-ascii?Q?g7Qbfzz4frJQpcvREyxYvHejaudINqG3swqotQPjJHkSWA28eWoteW5ByTXX?= =?us-ascii?Q?mqbjlm6qCOK4Jicb084X54Rv+zrSOEBwGRWpoEz7z9+W0xWOZdcS/eXetZ+F?= =?us-ascii?Q?wJqgv2JK1RfM6Y6JE1FKspehXJcqlXotiK3iDNbjXi4mL0e8MNDI4Vm3D0i+?= =?us-ascii?Q?mZG74Crq11/rtXceMJEbimDCzvGEucJOwaTFb5n5VH+KRqsWgpTvbXtLQzz+?= =?us-ascii?Q?fpjHuEdA7VtIUyXNjWrE+ptlYwtm9D8ynvToZy1HsXl+3UY54rOiput6u+y2?= =?us-ascii?Q?R7CYkT1+1wb6WHvjeaLtAb6SYE3+brEqrpLGU7XNIPjpqLLFfmTV102uGSqv?= =?us-ascii?Q?uyiY4KSK++NqBX6K6+ZOVnfcdiWSgqAGPhdyBcDvJfm8ZOV8DPhMAUEngzSv?= =?us-ascii?Q?ZTpnneUcvlBFcjhDOSR20qONXIcjXn6X2iS+RKCMo8vLEgG87RfJ1CVrbeCX?= =?us-ascii?Q?0n/cf9WRf/covjmgngBdpa2hEm8zOvD8qib71YVZjvUrFuGxzVOHAvPHMOTi?= =?us-ascii?Q?+kC565krmdPsjE86MCD1Puid1aAUt0ivD6njY32Nlojc72k8/cKUL9s3LkgX?= =?us-ascii?Q?4yscovjdVUpqQ1uvjnBlS4y7aucvsYhhYCho8l783FCyrpw0JK/c6hctEBol?= =?us-ascii?Q?/wUsVLJHLvI94SijNKQjwQOoO2Xt309k90N1XvgDWms6QCBZyFOgPlVhQwzP?= =?us-ascii?Q?g12hGFR0Qemq5OagZwvjf1DXB2DFoH9xt99+0kdePp6oZrO+SStdwb70pPnA?= =?us-ascii?Q?kGGuYWvC+skbOhNxQGoqI/plzYKQ9VyrY/QVQKegyu7egC52u++IRDKkoYcQ?= =?us-ascii?Q?Lwmjj5XWVRsOnhwH63fDxHJGea4yoKfrOcPigY9W?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 15fef9e8-cf89-4c1d-6af0-08db6e3baff8 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 07:31:24.0200 (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: dRyODwDA6Q+AL5ItdXKiVOBB/E6m+q5iLwWERCTwfRN8e7oKD3sPiFIMSpn8yzfm6apLCY+Ys4CJfZlpdXkMYw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8226 Content-Type: text/plain; charset="utf-8" This patch moves userspace pm tests out of do_transfer(). Move add addrese test into a new function userspace_pm_add_addr(), and remove address test into userspace_pm_rm_sf_addr_ns1(). Move add subflow test into userspace_pm_add_sf() and remove subflow into userspace_pm_rm_sf_addr_ns2(). Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts --- .../testing/selftests/net/mptcp/mptcp_join.sh | 145 ++++++++++++------ 1 file changed, 99 insertions(+), 46 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index a7973d6a40a0..3baa6ac3b03e 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -589,6 +589,26 @@ wait_rm_addr() done } =20 +rm_sf_count() +{ + get_counter "${1}" "MPTcpExtRmSubflow" +} + +# $1: ns, $2: old rm_sf counter in $ns +wait_rm_sf() +{ + local ns=3D"${1}" + local old_cnt=3D"${2}" + local cnt + + local i + for i in $(seq 10); do + cnt=3D$(rm_sf_count ${ns}) + [ "$cnt" =3D "${old_cnt}" ] || break + sleep 0.1 + done +} + wait_mpj() { local ns=3D"${1}" @@ -813,7 +833,6 @@ do_transfer() =20 local port=3D$((10000 + TEST_COUNT - 1)) local cappid - local userspace_pm=3D0 =20 :> "$cout" :> "$sout" @@ -850,11 +869,6 @@ do_transfer() extra_args=3D"-r ${speed:6}" fi =20 - if [[ "${addr_nr_ns1}" =3D "userspace_"* ]]; then - userspace_pm=3D1 - addr_nr_ns1=3D${addr_nr_ns1:10} - fi - local flags=3D"subflow" local extra_cl_args=3D"" local extra_srv_args=3D"" @@ -882,9 +896,6 @@ do_transfer() return 1 fi addr_nr_ns2=3D0 - elif [[ "${addr_nr_ns2}" =3D "userspace_"* ]]; then - userspace_pm=3D1 - addr_nr_ns2=3D${addr_nr_ns2:10} elif [[ "${addr_nr_ns2}" =3D "fullmesh_"* ]]; then flags=3D"${flags},fullmesh" addr_nr_ns2=3D${addr_nr_ns2:9} @@ -938,7 +949,6 @@ do_transfer() local counter=3D2 local add_nr_ns1=3D${addr_nr_ns1} local id=3D10 - local tk while [ $add_nr_ns1 -gt 0 ]; do local addr if is_v6 "${connect_addr}"; then @@ -946,24 +956,7 @@ do_transfer() else addr=3D"10.0.$counter.1" fi - if [ $userspace_pm -eq 0 ]; then - pm_nl_add_endpoint $ns1 $addr flags signal - else - tk=3D$(grep "type:1," "$evts_ns1" | - sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q') - ip netns exec ${listener_ns} ./pm_nl_ctl ann $addr token $tk id $id - sleep 1 - sp=3D$(grep "type:10" "$evts_ns1" | - sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') - da=3D$(grep "type:10" "$evts_ns1" | - sed -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q') - dp=3D$(grep "type:10" "$evts_ns1" | - sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q') - ip netns exec ${listener_ns} ./pm_nl_ctl rem token $tk id $id - ip netns exec ${listener_ns} ./pm_nl_ctl dsf lip "::ffff:$addr" \ - lport $sp rip $da rport $dp token $tk - fi - + pm_nl_add_endpoint $ns1 $addr flags signal counter=3D$((counter + 1)) add_nr_ns1=3D$((add_nr_ns1 - 1)) id=3D$((id + 1)) @@ -1008,7 +1001,6 @@ do_transfer() local add_nr_ns2=3D${addr_nr_ns2} local counter=3D3 local id=3D20 - local tk da dp sp while [ $add_nr_ns2 -gt 0 ]; do local addr if is_v6 "${connect_addr}"; then @@ -1016,21 +1008,7 @@ do_transfer() else addr=3D"10.0.$counter.2" fi - if [ $userspace_pm -eq 0 ]; then - pm_nl_add_endpoint $ns2 $addr flags $flags - else - tk=3D$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") - da=3D$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evts_ns2") - dp=3D$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") - ip netns exec ${connector_ns} ./pm_nl_ctl csf lip $addr lid $id \ - rip $da rport $dp token $tk - sleep 1 - sp=3D$(grep "type:10" "$evts_ns2" | - sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') - ip netns exec ${connector_ns} ./pm_nl_ctl rem token $tk id $id - ip netns exec ${connector_ns} ./pm_nl_ctl dsf lip $addr lport $sp \ - rip $da rport $dp token $tk - fi + pm_nl_add_endpoint $ns2 $addr flags $flags counter=3D$((counter + 1)) add_nr_ns2=3D$((add_nr_ns2 - 1)) id=3D$((id + 1)) @@ -3205,6 +3183,71 @@ fail_tests() fi } =20 +userspace_pm_add_addr() +{ + local addr=3D$1 + local id=3D$2 + local tk + + tk=3D$(grep "type:1," "$evts_ns1" | + sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q') + ip netns exec $ns1 ./pm_nl_ctl ann $addr token $tk id $id + sleep 1 +} + +userspace_pm_rm_sf_addr_ns1() +{ + local addr=3D$1 + local id=3D$2 + local tk sp da dp + + tk=3D$(grep "type:1," "$evts_ns1" | + sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q') + sp=3D$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + da=3D$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q') + dp=3D$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q') + ip netns exec $ns1 ./pm_nl_ctl rem token $tk id $id + ip netns exec $ns1 ./pm_nl_ctl dsf lip "::ffff:$addr" \ + lport $sp rip $da rport $dp token $tk + wait_rm_addr $ns1 1 + wait_rm_sf $ns1 1 +} + +userspace_pm_add_sf() +{ + local addr=3D$1 + local id=3D$2 + local tk da dp + + tk=3D$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") + da=3D$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evts_ns2") + dp=3D$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") + ip netns exec $ns2 ./pm_nl_ctl csf lip $addr lid $id \ + rip $da rport $dp token $tk + sleep 1 +} + +userspace_pm_rm_sf_addr_ns2() +{ + local addr=3D$1 + local id=3D$2 + local tk da dp sp + + tk=3D$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") + da=3D$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evts_ns2") + dp=3D$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") + sp=3D$(grep "type:10" "$evts_ns2" | + sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + ip netns exec $ns2 ./pm_nl_ctl rem token $tk id $id + ip netns exec $ns2 ./pm_nl_ctl dsf lip $addr lport $sp \ + rip $da rport $dp token $tk + wait_rm_addr $ns2 1 + wait_rm_sf $ns2 1 +} + userspace_tests() { # userspace pm type prevents add_addr @@ -3283,11 +3326,16 @@ userspace_tests() continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then set_userspace_pm $ns1 pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 0 userspace_1 0 slow + run_tests $ns1 $ns2 10.0.1.1 0 0 0 speed_10 & + local tests_pid=3D$! + wait_mpj $ns1 + userspace_pm_add_addr 10.0.2.1 10 chk_join_nr 1 1 1 chk_add_nr 1 1 + userspace_pm_rm_sf_addr_ns1 10.0.2.1 10 chk_rm_nr 1 1 invert kill_events_pids + wait $tests_pid fi =20 # userspace pm create destroy subflow @@ -3295,10 +3343,15 @@ userspace_tests() continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then set_userspace_pm $ns2 pm_nl_set_limits $ns1 0 1 - run_tests $ns1 $ns2 10.0.1.1 0 0 userspace_1 slow + run_tests $ns1 $ns2 10.0.1.1 0 0 0 speed_10 & + local tests_pid=3D$! + wait_mpj $ns2 + userspace_pm_add_sf 10.0.3.2 20 chk_join_nr 1 1 1 + userspace_pm_rm_sf_addr_ns2 10.0.3.2 20 chk_rm_nr 1 1 kill_events_pids + wait $tests_pid fi } =20 --=20 2.35.3 From nobody Tue May 14 04:36:08 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2075.outbound.protection.outlook.com [40.107.20.75]) (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 3163023C2 for ; Fri, 16 Jun 2023 07:31:32 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nrx5fPhpwMop5zVvHvQ+YMQeaWNZJJM3o7HH1/d5NyGiz2jUi/Zjc2JXyw/KLr+CmGBEr8rkoHeI5ido4q5ugWtznPgg0FSvYjjvtpLrVf0C4vDngbOXBox/Mdy+gL/gUct72wUaffUxzC5GuTjr1vV7qX1xAmD8d6a1BxEmlWDCLZ+sOHuJjWWEC5sznracvKzZNAtwCqzgh/P79i7uEyNKvzbqPsKZjGjD5hhUrt4y4aBiiQp4Men2+1xwWtF1f0s99pJqleu9RisKIJY+xPWAy/WkYXGlaX+8kTc2ARXPYRKjdw0wDGiLBwq+3EneuJfcHBagrB3uaKCWkVBU+A== 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=8xfYBOULAAaND3fEHyQYYm3zNDbHpcTFCPlre/tlbhc=; b=WX20alguUiVNo+GT/aVG9Qxdc/LKPpO3UhiEXwVGfbsXKqCems33tz5M0c/ACWPhwglqV8ALfk5zrgZUZTeH4YreH6eOTorZNi0YfgvyTzfZw1XXYO5lvjN2z+c+7xNhj5/iurw78ZVYH0/tGWIbS2CZLsteRTmek0lhKZIsFXwiKPn9QK4V2NgWY86S/xDw5bvK4BlTy6d1Od+DwkomPIEYNdpNH+vvOOvKSejL4ob0rKn6wamixRzi6F5DU/ItdfScwYEU7Pe8Un2mjnchnMjVkcmao//rt4pJivapGzdM53zw+NIS5HYassW/4vqMSsDHcmaQEx/dsbUfrgYlcA== 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=8xfYBOULAAaND3fEHyQYYm3zNDbHpcTFCPlre/tlbhc=; b=Abc9SlPbOAQ736eR2JG8kMoFaOIagcideXduQ5xrGaFKu5uP3sxfHkXarECYWyH0H92U8mychcysZ+SGMaDG2M2Nwqav8FSVC3FDUlTd3gNAhWrMjS0Vu0Yl5oEvEJw5fmUoHi2vGpCsBlQUztb/7vJhEF7QPUw2F5cjeH+1e14dRerlw5WqucUAJfxmMiiMe5ikIiiwjRQ5oTLoQbudYDwLwpov33RWe9jyzzIpwzJE0IBawYCzn90Z1q9UPxz0AWhodLSfzEP9E2hT4lPTwXRO9AlP7qu/ncUbvDb0S8cK138NQ37+hR9RgaxloFr0awZYkYoSGxXYpkW7mV7G5g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM9PR04MB8226.eurprd04.prod.outlook.com (2603:10a6:20b:3ea::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.29; Fri, 16 Jun 2023 07:31:30 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59%4]) with mapi id 15.20.6455.039; Fri, 16 Jun 2023 07:31:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 03/10] selftests: mptcp: check subflow and addr infos Date: Fri, 16 Jun 2023 15:30:55 +0800 Message-Id: <91c10944663b947b6ccb8b3be5b2f8581295ba73.1686900596.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0024.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::13) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: VI1PR0402MB3503:EE_|AM9PR04MB8226:EE_ X-MS-Office365-Filtering-Correlation-Id: fda36468-6471-4d24-b7e3-08db6e3bb3c2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2L+4H+vtB0kOkfTUoODgoas19soVMdPUhtj9Wanvh/z01OmVvzvx1reP38/ZGi2DgvoCd03d0rYWk014YciXi9FNclNpd5PctyUqpn3Eh+cK2hIPp0g9DyR4r0UE4r77J1JdvARFUv4+cW36W+AGat23UCG1OqvsTSYA3ziC+WLgA5xeHNucL6w+J8CXKVKD2dwJ6onrbknLth3UPJyB4UMRKjLw4b7bo8W3RX8zcCcblXMKLOfX3w7nuqdmMjq9JRM3rx6Y3N6Yd84ezNZqZYfPiWqolSe6iSQJS43X/93uuz2Z0KzJtqE7HLkngTR9FdwKXsg2h0tEjy6D/wO0lL0ApQ6eFs2aILM5EXgwBa6/qs56yHzeizDQLOANPGAuBIEZXBLC5UeUFuUgGjkMCd/Z9L+SZCtMUVUFRg+G4Jp/vJevSiWs11Cf/E+oLZkMnTTIdjCmCkaBIejOnugxnb9df9d0ikt/V2YTe+2ZDPfd/yAbqRphqmlzwwJhK/GgvNGWGioMxFV0lofAhRsUxviiTaRkAbP4izlcduVQybQL5Q+zC12ppWZeoUxnXj/0 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(346002)(136003)(376002)(39860400002)(366004)(451199021)(478600001)(6666004)(4326008)(8936002)(5660300002)(8676002)(6486002)(41300700001)(6512007)(6506007)(26005)(44832011)(107886003)(86362001)(66476007)(66946007)(6916009)(66556008)(316002)(186003)(83380400001)(2616005)(2906002)(36756003)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ON2YxDaB0ZZj37n0F8xjjO4sHEn59MDzYZppD8hT7YUpdEWgqka5aj61jFEx?= =?us-ascii?Q?sVrLC9QQsbLgKJs7dXWq9s/bXZ6EgBXd8eV07jm0VLKpSmyFA6Wq51UMJnhJ?= =?us-ascii?Q?OT0HzAxQGZhf+dip9QOCSbFuqgUltYx/183CSHK0lqKvfSyY1rP05vStIlP+?= =?us-ascii?Q?UOdXT0v/x1+m++ReOtYnV//fuYNVrNmZGA83Z5YSm6YVEfoctZg6ACC7d1hH?= =?us-ascii?Q?3JPXYkb0vkMu+aqVIfMEtKHr2fIsUpfajRNE1m0Koj4vJs7ZJbB9ODyKRSeC?= =?us-ascii?Q?+oB/NppGvEbouFjWHL4rEEUPR56pwrriayg+iTFe6h4BOv7JBs5jKIxRJKAU?= =?us-ascii?Q?U80BUBW/fg2O6DJ9Py46t3H8J8FdUU3TRTYT+isJxSdAwPpkSdaGyNdjT6iK?= =?us-ascii?Q?/AfXEsLJycak4w4/mr32kmppsLaMaAOmlNDSroJfBayqV2IvqC8XAq+OVfdP?= =?us-ascii?Q?e3+5v75dPdpz5W9xtS7A9izKnU68SjtUYOfpG4nE+sdgHtwYVuLt74Bc09RG?= =?us-ascii?Q?iB38reiEkYQ/oK7VGBCkMhobobAgVOVXGKX/2c7dNzN9TK5BtlGWUZBN1wKt?= =?us-ascii?Q?mtPka2pkq71+p+1H+aVa5qGl4P6yYhZIVY9xHGll/99VaaLDFqV2IOnAUYeF?= =?us-ascii?Q?KxpR4XMjq1qRx0CwXR7tGeNm98bL8gTkHBya2MZcl+8tnh6hUdLbuYHYsKdF?= =?us-ascii?Q?jQMVRGXNltCCaJ+lrovmsdGdzJGk+yh0F9MveC47cVMpPlGCcDgyfVgufzit?= =?us-ascii?Q?pEGgRCjgX6832dEomxIh27OqMZhAOiFVtTBffy/LicTjNwJIqpeh5YnxjrnB?= =?us-ascii?Q?8NMmyJiyldsJGxj2GIXmuHpJ7y/n7W3q6VctMKLOtHxD1R+AU1/BLNrJtz4X?= =?us-ascii?Q?2Kn36AsB7RJd1rxSsbLfDtkfESsTn1Hq6BKAPWlgcg7Zjy0bnYbkj4/jr5pt?= =?us-ascii?Q?W0yly1+yBsPWzMe/xoSXF0VjzX2q2l+VqKV3Gl5jTLshOghK930c1BUIfp1Z?= =?us-ascii?Q?fShkrz0bu3EEvM5CW2RuuB2Bx90kzaD54g6WpP3vf7TCko8zqykKz6RfKhaM?= =?us-ascii?Q?un+TqH6gVMGmyXWXizJDRbwG8L6EdiGcth3C5OkJw6fMZcHZ78OO+e1IFGfU?= =?us-ascii?Q?5owEl7ogKOvl7vmc+dnEhI8GUDjMzIFWFV+qdpUTdCaQHifspqLahR6Xy8QA?= =?us-ascii?Q?mtge0TkAn5FVTSC4yRStkkDHblhz1aQRZP+E4Pr4lPHRPuB7AvGKbTx0FSwQ?= =?us-ascii?Q?PueGF4BCzVyJJhEGET1IXONfceP22QhnU7SvmYh+qhfvqYMZvE2ec/N3BPc/?= =?us-ascii?Q?o937An8FcSwQfVzgTegB82heT4Awai27N8cCGeXJvyrqIRmG9isNmadYNhFb?= =?us-ascii?Q?sdsp6YqQ5REGEh5Slyp0H/yuooq7KY5meSLXwwBu+Lqaw2FzZ20JoZoOlNIX?= =?us-ascii?Q?sQOdAsobPob1iRajo5Jo9tUte0OliwvgZ5kvydy1Scrw9IuHtrB87Ps2Rq+v?= =?us-ascii?Q?phlWDui7OjEtTx+1BEOgcpBLDYqrZ3GZSXNB9Z4kfhUYVrQ+zN5ZccvAby+2?= =?us-ascii?Q?FngzjWRx0M4h+DWIWDp3hkBo2n4BE2//pOG7ofRO?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fda36468-6471-4d24-b7e3-08db6e3bb3c2 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 07:31:30.3885 (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: JVpACfGZrDAONHZrURyvxdL5odxrCVVpUZXLt3h9mR8WtnYC2d8gPBjsbbX/d35uM13YWAKmGGZceN0iLugOCw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8226 Content-Type: text/plain; charset="utf-8" This patch adds more arguments for chk_mptcp_info() to check subflows, add_addr_signal and add_addr_accepted infos of different namespaces. And invokes chk_mptcp_info() to check subflows infos of userspace PM tests and endpoint tests. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts --- .../testing/selftests/net/mptcp/mptcp_join.sh | 48 +++++++++++-------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 3baa6ac3b03e..3811a6c3dc5d 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1832,31 +1832,32 @@ chk_subflow_nr() =20 chk_mptcp_info() { - local nr_info=3D$1 - local info + local info1=3D$1 + local nr1=3D$2 + local info2=3D$3 + local nr2=3D$4 local cnt1 local cnt2 local dump_stats =20 - if [[ $nr_info =3D "subflows_"* ]]; then - info=3D"subflows" - nr_info=3D${nr_info:9} - else - echo "[fail] unsupported argument: $nr_info" - fail_test - return 1 - fi + printf "%-${nr_blank}s %-30s" " " "mptcp_info $info1:$info2=3D$nr1:$nr2" =20 - printf "%-${nr_blank}s %-30s" " " "mptcp_info $info=3D$nr_info" + cnt1=3D"$(ss -N $ns1 -inmHM)" + cnt2=3D"$(ss -N $ns2 -inmHM)" + if [ -z "${cnt1}" ] || [ -z "${cnt2}" ]; then + mptcp_lib_fail_if_expected_feature "$info1:$info2 SS counter" + echo "[skip]" + return + fi =20 - cnt1=3D$(ss -N $ns1 -inmHM | grep "$info:" | - sed -n 's/.*\('"$info"':\)\([[:digit:]]*\).*$/\2/p;q') + cnt1=3D$(echo "$cnt1" | grep "$info1:" | + sed -n 's/.*\('"$info1"':\)\([[:digit:]]*\).*$/\2/p;q') [ -z "$cnt1" ] && cnt1=3D0 - cnt2=3D$(ss -N $ns2 -inmHM | grep "$info:" | - sed -n 's/.*\('"$info"':\)\([[:digit:]]*\).*$/\2/p;q') + cnt2=3D$(echo "$cnt2" | grep "$info2:" | + sed -n 's/.*\('"$info2"':\)\([[:digit:]]*\).*$/\2/p;q') [ -z "$cnt2" ] && cnt2=3D0 - if [ "$cnt1" !=3D "$nr_info" ] || [ "$cnt2" !=3D "$nr_info" ]; then - echo "[fail] got $cnt1:$cnt2 $info expected $nr_info" + if [ "$cnt1" !=3D "$nr1" ] || [ "$cnt2" !=3D "$nr2" ]; then + echo "[fail] got $cnt1:$cnt2 $info1:$info2 expected $nr1:$nr2" fail_test dump_stats=3D1 else @@ -3332,8 +3333,11 @@ userspace_tests() userspace_pm_add_addr 10.0.2.1 10 chk_join_nr 1 1 1 chk_add_nr 1 1 + chk_mptcp_info subflows 1 subflows 1 + chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 userspace_pm_rm_sf_addr_ns1 10.0.2.1 10 chk_rm_nr 1 1 invert + chk_mptcp_info subflows 0 subflows 0 kill_events_pids wait $tests_pid fi @@ -3348,8 +3352,10 @@ userspace_tests() wait_mpj $ns2 userspace_pm_add_sf 10.0.3.2 20 chk_join_nr 1 1 1 + chk_mptcp_info subflows 1 subflows 1 userspace_pm_rm_sf_addr_ns2 10.0.3.2 20 chk_rm_nr 1 1 + chk_mptcp_info subflows 0 subflows 0 kill_events_pids wait $tests_pid fi @@ -3369,6 +3375,8 @@ endpoint_tests() wait_mpj $ns1 pm_nl_check_endpoint 1 "creation" \ $ns2 10.0.2.2 id 1 flags implicit + chk_mptcp_info subflows 1 subflows 1 + chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 =20 pm_nl_add_endpoint $ns2 10.0.2.2 id 33 pm_nl_check_endpoint 0 "ID change is prevented" \ @@ -3389,17 +3397,17 @@ endpoint_tests() =20 wait_mpj $ns2 chk_subflow_nr needtitle "before delete" 2 - chk_mptcp_info subflows_1 + chk_mptcp_info subflows 1 subflows 1 =20 pm_nl_del_endpoint $ns2 2 10.0.2.2 sleep 0.5 chk_subflow_nr "" "after delete" 1 - chk_mptcp_info subflows_0 + chk_mptcp_info subflows 0 subflows 0 =20 pm_nl_add_endpoint $ns2 10.0.2.2 dev ns2eth2 flags subflow wait_mpj $ns2 chk_subflow_nr "" "after re-add" 2 - chk_mptcp_info subflows_1 + chk_mptcp_info subflows 1 subflows 1 kill_tests_wait fi } --=20 2.35.3 From nobody Tue May 14 04:36:08 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2041.outbound.protection.outlook.com [40.107.20.41]) (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 F1E9023C2 for ; Fri, 16 Jun 2023 07:31:39 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=g8WBfrIpVbG68gadDwsoDyao9oDSXy+bQV9yPLwXZiaoGxMzEdZhZi6SA0Cf4lFOoqh99PsOSISRkJLEDpCE4rC19yHPjcmee/UWrXqtEcOC4NeCaNRV0e2PE61FgH1g5X2N4y5YHJkY0+e7AFzwQDNeKy6GRcSBm2jMGky4955+uxEvkQoVnLHhTFV8FrXIFHDVLX8ByaG5K37n3EAVCM8lYKvG6zXYTxdAHeeBldhlbwVIBK0snAtiJUvAt+d/T6G3kM9eBLzU3pADQF+lfXDw/pqTR3nuVZGP8PhLEeuM+szdwRHq2A+h1A8IJKWcYvWzmF/OQeTFFzUMK9592w== 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=cm5fqmsWsiZaUfU01wbqQfyei4qFYcVVH/OvWxBR9oM=; b=SCR1L+rvRpgTE5Bt7ov7uWGVNOywAky58RDTESmaepgwffFIBnrMsRkMaZf76PoIxsvywfPzWchwVz3zxHGns9v0wEmYgnH04exD6W0U9PwQirxAJ78p0pR2IxWsU+Y6Nbmcas1E/uWn6pFA2NnJ3YBvFM6gJZU+Bx4wzyOUG3Em9cmu3qQV8Wl0Fu+n0qVE31dhHS9Uhl6QH9ifJXTmoBHQoRlp5v2aX6RSfsmJCWP6HCPwFmrVj1OQOBrTzVXDXOGpbDTqgmAHBxKLUuxjfZzmk74InY2FrlJq1+hvzVbHLgVf1OvfTyI/7FkG2luQwRYKO4sgHzjLf9/tCgxqAw== 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=cm5fqmsWsiZaUfU01wbqQfyei4qFYcVVH/OvWxBR9oM=; b=tbvdzm2wLNZiqGWIT52R9N6ubRN3lFydn4RShSsGsW2JpBzw2KFCdGxMy2L3h6ueiVGjOSYLFrm/2llJBivlAdZg/I0TNYT3jlKDn+8mNfZaqnwK/fKzLYobIl2JRcva55kJPGFblDf7vJa8MlpqNbImiMfmGAq27rZTMyhSNRQlbq2EFZRr3owaNRInml6yq6N8JFbTZIewnQejp5YSvWgUtaimNDxvqldkKGhLm6RTfJ7YGCKqTrzDfGFojcn54nCJEAfn8REV5++SFOwvBI/1zwgcLjj1HksUL8pTEAziIKEg73soyww3RJH+07Pp4AWov1dcDge3I34icR09dw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM9PR04MB8226.eurprd04.prod.outlook.com (2603:10a6:20b:3ea::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.29; Fri, 16 Jun 2023 07:31:36 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59%4]) with mapi id 15.20.6455.039; Fri, 16 Jun 2023 07:31:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 04/10] selftests: mptcp: set FAILING_LINKS in run_tests Date: Fri, 16 Jun 2023 15:30:56 +0800 Message-Id: <1d167a3c6f9d31a691d28f7bbca8b348964a9610.1686900596.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0026.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::18) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: VI1PR0402MB3503:EE_|AM9PR04MB8226:EE_ X-MS-Office365-Filtering-Correlation-Id: 9c3429bf-834a-4f6f-04e8-08db6e3bb78d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3DAAnBrijZVr/llrS+fmTMdYGFIVopI42Qgm0wqlwRG00gM9E5bQr/4UPPo0Awk/TnATPIeePGyjDdr7lECHyBAXpFnMxzOe+asb2/w/CACsvmlZcqsTCTE9CHKeqJFuWVitGiU5GYaTCqQck93bImV8kMgOYhkdNrjlkU+gl9t3cXTCjQolkoij2pRSkrVmj8WNgDDYPNGDAmIJfuOGifhxbNSqR9Oy73kCO5xiq+D1HZnt98GmAmJnB+ycYdTIuLnRkHpZ/sJvMeI3OF61R/SlhBwyjL9ySVID/SJ4TsizYuei234WbC4GlLfSV5jm1Q6MJw9ew0M4iUXIBXACjss/jIsSOR1LZy+U/zL+RaaIwr9u3GrA1623Cay2aGfZsO4mALW+8Wru9lKFnHVcztQM0VEsD0qv8QeoetOtRYcEXl9izzoMrGRpPeuSVbswucBbiSPVdUidhxZtfA8Mtz18pzpSD5vseuDwWIVEBnL+6LyIoXA517YZzta+K4WWCX84pU3DxXhw+1D75wH8z2ePgDgdOfkI7sXhCCGgSKiW1E/vllZ5t8C2wqA3/yoc X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(346002)(136003)(376002)(39860400002)(366004)(451199021)(478600001)(6666004)(4326008)(8936002)(5660300002)(8676002)(6486002)(41300700001)(6512007)(6506007)(26005)(44832011)(107886003)(86362001)(66476007)(66946007)(6916009)(66556008)(316002)(186003)(83380400001)(2616005)(2906002)(36756003)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4yODxyXqz70ndx//X082BPsOzn7lWNuvDlDisV+XQABD41e0Js92RiFV0xv3?= =?us-ascii?Q?49WBWuCNCFMxQ0874DUwTe6PGYOSkcmmpWlONs3cE+OUZbNjapIXFXQqYWir?= =?us-ascii?Q?ytQZZG/QdvrNkJUNFZg3fw4wh0mh/rW0huP4+MUGCxxoKBUBhgVMgfOosIIP?= =?us-ascii?Q?gcAMLGR2NesblqTw6gbweR0qGFND4OwafQOweNC66ihqJB24ZLaJbrd8fv3l?= =?us-ascii?Q?U7tclj6p3tbEJO8sEGkE0MBDfcGDjMepEWSRSLBt4Z/FomBqnJOp9VMdoaxe?= =?us-ascii?Q?Z5WROd5V6/0PbnCHceXgaZ3r6HzIbjCiIKtevY7AXKI3EnsUc2kkuJQ/OG5C?= =?us-ascii?Q?GRrGceuZgomhJbmMVQkkeSUaqtdrdyXTXgK/IZovchUNNaYur/jethL8TpQf?= =?us-ascii?Q?YXHBuFl6X8rvpe/VCdLIy4FXnxYld6rX0fGVF7x53Qq/Wm9T24Kt+yvFOEg5?= =?us-ascii?Q?u0G7kwxpKYNMYp3PyzRzAzlGmZ0OFkc2lRZHCFHTj1GFppbsJoD6PLnVRYqy?= =?us-ascii?Q?KY19gYV0ftZjppzv71ywtfZeruahA8AmofCc7eeT/oxnf9O7bdfpI/Q+IEWd?= =?us-ascii?Q?Ps/7UPYE0kCTeWtxvAMg06an/Mr0WUsuAN31lgqZJ8g9UcnLmVAjmSUYb3Ky?= =?us-ascii?Q?PiYOZGuPTmphMRPqnfo+1305pYr/xVZOjt2XJfi0yfz4uHlODgH5eW2dYj+y?= =?us-ascii?Q?ijIbYj/tbAhSJcqfeLpdgzEq2Oa30oVHwhuMYN5dDNc7MF8AdQ6ojdN7MRFu?= =?us-ascii?Q?BT8NIRXeGVgrqHGNgsDIeDBu3nPJBkQpohe0Sagv7hjusiFwkoQD7Er0PSGQ?= =?us-ascii?Q?wzHno93Bjgnd4+RgUAD0KlNLEbf6Vpn1S+PYUYId0XBNUm14Qnye9zRrfwRp?= =?us-ascii?Q?lRQlP5odDUy5tPy2rtDPdj9ghyJnyo2WDlPKs+mQFERvzBk1vbb9Z5vouxmw?= =?us-ascii?Q?hyv1T9iCmackptHqInV0ncRyNV1KNNG2qs8I3l105T/9JCyU5EJRVg6u2PAZ?= =?us-ascii?Q?0bV5uDp4igqdHzUoq58NFSaRlc/Z2duB1OjJXIHJI5GC3eXiKWJFfwtbH/S1?= =?us-ascii?Q?XGrQCze9Onkco1NX6YcVu769cR+uuGG0rkQg9Qjl8OCMkxhd6cBQBp4IR/Z6?= =?us-ascii?Q?rOC08SZeHa7YMk16a7+6ORrQfKMcIMBRY+ZEaYiBQ2hYr4AbVYSPGsIYMoJV?= =?us-ascii?Q?9S0TP1hsEEAfzbgsleLpGfxiJPelToWRIZ2vlrAsV3laalGE9oddTnP+CwFt?= =?us-ascii?Q?LuUKLcQABLu0JHgeRRt2jIYcsQ0rhfAsP55Etozo7DFsoPMvNhMUN+iJU+fQ?= =?us-ascii?Q?p7Z1Q+t4dZYxSlkh/7wh4Ddb+4xm9/YevWuLSMRBoJRd9X3Ssq8bxtyBtKv6?= =?us-ascii?Q?7u6pHypZ0WolsIga/KHyLrQVDTcJyDAndwp2BxtCSJSh4hAon3ibuIP76B/B?= =?us-ascii?Q?8w+lItyFhszCSfY+7EBawW0SUeVW3/zzi204Y81ByKKK41/7b7F+rawWiSO/?= =?us-ascii?Q?TH1JtModmpVyD1FREnY1rS2awzP8KuQUikJxgcdUNk9gkZNVTRfm61vVBVVP?= =?us-ascii?Q?tcO5bW/FA4LAnDr7mn2cLwIda9ChuiCbs5gK3mOU?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9c3429bf-834a-4f6f-04e8-08db6e3bb78d X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 07:31:36.6027 (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: PibswDhej2RYLNd5CUq/x+XDtV0MgQ7ovgyP6uUf2tgOgUsJcs8sju9Tb+NT/mAdpmmAuOqnT+oneeEhwDyaGA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8226 Content-Type: text/plain; charset="utf-8" Set FAILING_LINKS as an env var with a limited scope only when calling run_tests(). Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 3811a6c3dc5d..5146c5268c44 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2183,9 +2183,9 @@ link_failure_tests() pm_nl_set_limits $ns1 0 2 pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal pm_nl_set_limits $ns2 1 2 - FAILING_LINKS=3D"1" pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup - run_tests $ns1 $ns2 10.0.1.1 1 + FAILING_LINKS=3D"1" \ + run_tests $ns1 $ns2 10.0.1.1 1 chk_join_nr 2 2 2 chk_add_nr 1 1 chk_link_usage $ns2 ns2eth3 $cinsent 0 @@ -2199,8 +2199,8 @@ link_failure_tests() pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal pm_nl_set_limits $ns2 1 2 pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup - FAILING_LINKS=3D"1 2" - run_tests $ns1 $ns2 10.0.1.1 1 + FAILING_LINKS=3D"1 2" \ + run_tests $ns1 $ns2 10.0.1.1 1 chk_join_nr 2 2 2 chk_add_nr 1 1 chk_stale_nr $ns2 2 4 2 @@ -2215,8 +2215,8 @@ link_failure_tests() pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup - FAILING_LINKS=3D"1 2" - run_tests $ns1 $ns2 10.0.1.1 2 + FAILING_LINKS=3D"1 2" \ + run_tests $ns1 $ns2 10.0.1.1 2 chk_join_nr 2 2 2 chk_add_nr 1 1 chk_stale_nr $ns2 1 -1 2 --=20 2.35.3 From nobody Tue May 14 04:36:08 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2049.outbound.protection.outlook.com [40.107.20.49]) (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 5931623C2 for ; Fri, 16 Jun 2023 07:31:48 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FLnF+d+QscmRMBrFfLOLUf5wPEkP2+3bfiLiOtBMUBkv//Mur8m9gKwj1M8A8gREWJWtSxa3Hs+k2KgPJ/qkGm5IY/qkfPHylCelq0n/jUuIqm/zRbXR4o9hayREv79wG3r07jsZLLmu9Umg9VbUxdXetIR7qpJMU+Ha1PCV2UO3yPhu3JDcq0RC3NVstBY31nPvJ4btNz4WHtIV/TY6AN2wp1XxLLyLBRbF56LdRUy0kdZKiRIn7aOjILWDq5t0z6YJpweMw6awntcuL8BumNus62NKj21B107DRwvS+u7kY6vsNaDsL3dL7rsb9SA3iso81B6XjNgVRRsB2gH5zg== 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=2+IcFPtLQyVs3A9VGbFsMGAlJ7fESJVWSKXHre48vps=; b=kgRAZiN3felfPC9935XmeeOQOLTaV9qUntiOyeu87KLdjiK16HPlrWDJsHmcw2bNVAvln3RvtqR7KVdZXSoN8j1Or9nr4rXjg+a7SkUgy9cWrNd1//7CjFYKFzhPh3mXMZT4iz/hHIFkmxk+rEKwZrI9x8xJIpgHDdtWIoz61cBPDACP+cNJCd+EzCYtdOZGjs7lKorIW15s0JYEzczjh/3dwVsghKRuYFsfNFZZ9ccvFsHSb1k9ojGD5f+po26gyp5O1oZnIPT5qMwegCPpRRSbapyLTZOF8cA3E68xe+v3BM71p7wBU1ykX4dqde8h64SLs8AnvgSnEwOpoZNJXg== 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=2+IcFPtLQyVs3A9VGbFsMGAlJ7fESJVWSKXHre48vps=; b=l7cDTYFYzeVIEIWcyAxEfxFNk8A7oOj3jye1rOsosI/L9h4/y+FwptTRvK6EZGjcgC1z/ODvqJZOLNlg6qNQGEdX88yA/kX4LRUEHGEAdE4vGjW1E8Pnv+pS1a3sTiKtyC8+3Jv/ma5h1DwTk/xAeuHxpnD/yqG3OzlH7+o+Sy7wuhfoCIZ5hLckViVE7FxVyERtVfsLcMn2BfE31vbrZx+vcGIDLdtzRRn6IBqn1T25Qq+5bIVz/DrvbqRXtTNWbm9lfOhEr0ZaQ8cTC2HsOyG7ghlFGxvy9v++cTMiKseH1Wfz5I3dbXA5MTM92TcC590opyr21mQG8OrtgJ1HGg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM9PR04MB8226.eurprd04.prod.outlook.com (2603:10a6:20b:3ea::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.29; Fri, 16 Jun 2023 07:31:44 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59%4]) with mapi id 15.20.6455.039; Fri, 16 Jun 2023 07:31:44 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 05/10] selftests: mptcp: drop test_linkfail parameter Date: Fri, 16 Jun 2023 15:30:57 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0009.apcprd01.prod.exchangelabs.com (2603:1096:4:191::18) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: VI1PR0402MB3503:EE_|AM9PR04MB8226:EE_ X-MS-Office365-Filtering-Correlation-Id: 970a0ea6-6df0-43cd-9042-08db6e3bbc5d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BOV10HoWRtFUYeD7E58y6g0gsjMJEidU+pIhQPGj92OakUzhWein1WNUp+viStGgQM7YD/epCEZTD7l4p3D+hn+YqmyfbB3u8qnZdW/fo50v0fYboNfc8ZW1c20nXNrh948CyKGI3fDPOxXoUtRj22JQBf4EOqod3C3oobfoyikp3ZZasFXnfXM2UW6q5XRptGMbs0RblnUMMBEjjNDJoIRAaPYDW5FbW4P3zhM4ZEKkVJwtqcpOVN8xqehhExM6ilFO7ab3Z1wBuDI4Sj6/EXN7Nsicel8hirnQoldh0PvEGtxcMIqkjgUnvaTmgD1teiEfe6rbv46yITuLPYJ1G85/rKEo3Zn5vF08zFLCSAx3FxuDZRj3vPQPXyN7QhbU+cncypQrKogYXzVZZzTtCmibpYpT/UCkBZM+nRqIlWRcOSYTKyd7BG4/z1z7Hf8oq8TBfYpPzVK1uP8fqFwFb+O60MkbEpd8EoCs33UHO95I0f0g1K3Zj2OUyvvICy+svmIbfZDBF/8WH8rv9p3QJwyS3ns5c83rbJ6Y01yl7tZ9+2qUJVOxOD1Dzn3keTBf X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(346002)(136003)(376002)(39860400002)(366004)(451199021)(478600001)(6666004)(4326008)(8936002)(5660300002)(8676002)(6486002)(41300700001)(6512007)(30864003)(6506007)(26005)(44832011)(107886003)(86362001)(66476007)(66946007)(6916009)(66556008)(316002)(186003)(83380400001)(2616005)(2906002)(36756003)(38100700002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?D74aut07Iy6qc76z/uEz+rFxQaKsLqtKgbqjmIv+QE5ojrQv2MgZPT+ndtmm?= =?us-ascii?Q?wravRgrreEUvW3Let0mVOhqsTCr3yoQFyUHIMfbFCrmqaeS1Tce6knZxlYMe?= =?us-ascii?Q?BvPlOumvdq0OpfXNtyRDBypqdU9UXzOeG5+4RN5twOqx4xpPJXDjUuGga0Ly?= =?us-ascii?Q?HXwU2N7Kvi0vvAmw0YN0P2Gqo4dahRrEOEuvQU4VnUZu+2WEbAokYvL3vUPs?= =?us-ascii?Q?AeMyLJA7eevp8BYVAB1wnxhUYjaSE8d1fT0FsKmVpAMFj0B3qugGAb0X8BDo?= =?us-ascii?Q?GF80APhnqOw+MfWCkipHvemIovRG4117+XVhkXxZv6Mw76TqziJLUnQBvOf3?= =?us-ascii?Q?rix1ia7eWjixw2TRD9dSjEzmxSvz/yqluVFZSvVNf2O0FiNa6lR7fs8xgMdv?= =?us-ascii?Q?5aANbhnK6z3zR51iE85aqwwu/9nf0cGHTJVUzQaZkpKn2ytkE2GkZuYH25V7?= =?us-ascii?Q?c7cHt5aUZ1hsOvE6EsXjXK/oBF50bZtN4e3OMf6pXuV0xHEQI7gQX8xWFlC0?= =?us-ascii?Q?b3HTWYKlx96H+RUhzL3Ysjz9MMrO/2VcitqfmLOIbdKv66uJy7Hvpfkdf7LL?= =?us-ascii?Q?3ZSv27eopPgLQuoFui+GsqocNkrwPmqAXEZWnqMS4r19fqe/PJ+TfEm8fLPi?= =?us-ascii?Q?BPNKxVM/xVkxO/yK0li+IZvHhBX/2EMWBy3YZZQV5+VfIqqHBF7I+y4VOnDo?= =?us-ascii?Q?yr1CgGO6pzcsf3ZH0YYQntPsSP2SCpL9YGlatp5z+u5iogeXSP4JkqW6KSN3?= =?us-ascii?Q?itavYx9ekjujP0ru7AsEvVJqhLgLFMpaWlnAqoqP9EJaG3ARevzhrD6aWs6J?= =?us-ascii?Q?Qs8m2mHwYCD63xhO64vZVh8ilHHos9Bccf4p6xBukmzvBWm7kr2nyA4QBIo6?= =?us-ascii?Q?m7ZGUe12tboZJJq/YxhCknF56KmD6u+2u1nyybgP+DY65VPpZIfMJOKJ+xYG?= =?us-ascii?Q?eZx/AWp69YTXMguPA/h7TJw0m48Ma+ZxiZw4yL6cVsFlQeGoJYJmw32ixVP4?= =?us-ascii?Q?TxEIw6H/X9yE9JchE1bwzdbVsp4pwS71YzxLLn3dBR47gfWiUlHCliwFxS/a?= =?us-ascii?Q?RqvjzQTT31QZ8kZLhdO1qVPEgENFlDSRDpK1Wek69oKYBpgztmOIfsisQyRf?= =?us-ascii?Q?VKZLN3zdXzoshTdurdIyAke/2qmfNNU+vSKvStJtzTDshbt0zbjgkl02hDg0?= =?us-ascii?Q?FF8FLDCBDHKLySkceloBjN3C/Ub/YuiFCqxJ/5pmfA0lBRKS2ROtKROEdPuz?= =?us-ascii?Q?yabeMtOBtVUSqkOh50vssSdAWms9KUrsYGItIbonjRDZ5DQ+pUxEfmJ9giSj?= =?us-ascii?Q?q2rAhK5bPSw78XPNYNy+hcSSM5pIdozwN85oULj2Xtkd1keLp/xnrG0vyOv1?= =?us-ascii?Q?FdJnQiUfUiXL1EidqaecHRz5PpmwjHNSIHPOhsejvq6QdBbTKAeET3Q7BR61?= =?us-ascii?Q?oH7rV1WNeXBPCeRGoPz6lhhrWhkjeIB33FJHeuWSseR85BI5Wm6mYxnYNlNa?= =?us-ascii?Q?KsVqS1d7yodCYAajMLGS/UzI5u90f9e/HijYoU/yajpMWdCV38oGHzdFgj2D?= =?us-ascii?Q?Vb+xncdABurQAFQ5Q5D6TRfWYZ3b6HiEeOC/O55U?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 970a0ea6-6df0-43cd-9042-08db6e3bbc5d X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 07:31:44.8719 (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: RpQQ259dVkR/sIfvhqzCSoMmGDYByabMaK9uRfOV4QAhAJh7PP1MZY4NhXq9mgfoIqss0aqV2Do/AlUx8tlw6g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8226 Content-Type: text/plain; charset="utf-8" run_tests() accepts too many optional parameters. Before this modification, it was required to set all of then when only the last one had to be changed. That's not clear to see all these 0 and it makes the maintenance harder: run_tests $ns1 $ns2 10.0.1.1 1 2 3 slow Instead, the parameter can be set as an env var with a limited scope: foo=3D1 bar=3D2 next=3D3 \ run_tests $ns1 $ns2 10.0.1.1 slow This patch switches to key/value "test_linkfail=3D*" instead of positional parameter test_linkfail of do_transfer() and run_tests(). Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts --- .../testing/selftests/net/mptcp/mptcp_join.sh | 192 +++++++++--------- 1 file changed, 99 insertions(+), 93 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 5146c5268c44..90cfd134bf7e 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -50,6 +50,7 @@ TEST_NAME=3D"" nr_blank=3D40 =20 export FAILING_LINKS=3D"" +export test_linkfail=3D0 =20 # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x30) || # (ip6 && (ip6[74] & 0xf0) =3D=3D 0x30)'" @@ -825,11 +826,10 @@ do_transfer() local cl_proto=3D"$3" local srv_proto=3D"$4" local connect_addr=3D"$5" - local test_link_fail=3D"$6" - local addr_nr_ns1=3D"$7" - local addr_nr_ns2=3D"$8" - local speed=3D"$9" - local sflags=3D"${10}" + local addr_nr_ns1=3D"$6" + local addr_nr_ns2=3D"$7" + local speed=3D"$8" + local sflags=3D"${9}" =20 local port=3D$((10000 + TEST_COUNT - 1)) local cappid @@ -874,21 +874,21 @@ do_transfer() local extra_srv_args=3D"" local trunc_size=3D"" if [[ "${addr_nr_ns2}" =3D "fastclose_"* ]]; then - if [ ${test_link_fail} -le 1 ]; then - echo "fastclose tests need test_link_fail argument" + if [ ${test_linkfail} -le 1 ]; then + echo "fastclose tests need test_linkfail argument" fail_test return 1 fi =20 # disconnect - trunc_size=3D${test_link_fail} + trunc_size=3D${test_linkfail} local side=3D${addr_nr_ns2:10} =20 if [ ${side} =3D "client" ]; then - extra_cl_args=3D"-f ${test_link_fail}" + extra_cl_args=3D"-f ${test_linkfail}" extra_srv_args=3D"-f -1" elif [ ${side} =3D "server" ]; then - extra_srv_args=3D"-f ${test_link_fail}" + extra_srv_args=3D"-f ${test_linkfail}" extra_cl_args=3D"-f -1" else echo "wrong/unknown fastclose spec ${side}" @@ -902,7 +902,7 @@ do_transfer() fi =20 extra_srv_args=3D"$extra_args $extra_srv_args" - if [ "$test_link_fail" -gt 1 ];then + if [ "$test_linkfail" -gt 1 ];then timeout ${timeout_test} \ ip netns exec ${listener_ns} \ ./mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ @@ -918,12 +918,12 @@ do_transfer() wait_local_port_listen "${listener_ns}" "${port}" =20 extra_cl_args=3D"$extra_args $extra_cl_args" - if [ "$test_link_fail" -eq 0 ];then + if [ "$test_linkfail" -eq 0 ];then timeout ${timeout_test} \ ip netns exec ${connector_ns} \ ./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ $extra_cl_args $connect_addr < "$cin" > "$cout" & - elif [ "$test_link_fail" -eq 1 ] || [ "$test_link_fail" -eq 2 ];then + elif [ "$test_linkfail" -eq 1 ] || [ "$test_linkfail" -eq 2 ];then ( cat "$cinfail" ; sleep 2; link_failure $listener_ns ; cat "$cinfail" )= | \ tee "$cinsent" | \ timeout ${timeout_test} \ @@ -1107,13 +1107,13 @@ do_transfer() return 1 fi =20 - if [ "$test_link_fail" -gt 1 ];then + if [ "$test_linkfail" -gt 1 ];then check_transfer $sinfail $cout "file received by client" $trunc_size else check_transfer $sin $cout "file received by client" $trunc_size fi retc=3D$? - if [ "$test_link_fail" -eq 0 ];then + if [ "$test_linkfail" -eq 0 ];then check_transfer $cin $sout "file received by server" $trunc_size else check_transfer $cinsent $sout "file received by server" $trunc_size @@ -1146,11 +1146,10 @@ run_tests() local listener_ns=3D"$1" local connector_ns=3D"$2" local connect_addr=3D"$3" - local test_linkfail=3D"${4:-0}" - local addr_nr_ns1=3D"${5:-0}" - local addr_nr_ns2=3D"${6:-0}" - local speed=3D"${7:-fast}" - local sflags=3D"${8:-""}" + local addr_nr_ns1=3D"${4:-0}" + local addr_nr_ns2=3D"${5:-0}" + local speed=3D"${6:-fast}" + local sflags=3D"${7:-""}" =20 local size =20 @@ -1195,7 +1194,7 @@ run_tests() fi =20 do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} \ - ${test_linkfail} ${addr_nr_ns1} ${addr_nr_ns2} ${speed} ${sflags} + ${addr_nr_ns1} ${addr_nr_ns2} ${speed} ${sflags} } =20 dump_stats() @@ -1990,7 +1989,7 @@ subflows_error_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 0 0 slow chk_join_nr 0 0 0 fi =20 @@ -2001,7 +2000,7 @@ subflows_error_tests() pm_nl_set_limits $ns2 0 2 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 0 0 slow chk_join_nr 1 1 1 fi =20 @@ -2012,7 +2011,7 @@ subflows_error_tests() pm_nl_set_limits $ns2 0 2 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 0 0 slow chk_join_nr 1 1 1 fi =20 @@ -2024,7 +2023,7 @@ subflows_error_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow & + run_tests $ns1 $ns2 10.0.1.1 0 0 slow & =20 # mpj subflow will be in TW after the reset wait_attempt_fail $ns2 @@ -2123,7 +2122,7 @@ signal_address_tests() =20 # the peer could possibly miss some addr notification, allow retransmiss= ion ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=3D1 - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 0 0 slow =20 # It is not directly linked to the commit introducing this # symbol but for the parent one which is linked anyway. @@ -2155,7 +2154,8 @@ link_failure_tests() pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 dev ns2eth4 flags subflow - run_tests $ns1 $ns2 10.0.1.1 1 + test_linkfail=3D1 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 chk_add_nr 1 1 chk_stale_nr $ns2 1 5 1 @@ -2170,7 +2170,8 @@ link_failure_tests() pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 dev ns2eth4 flags subflow - run_tests $ns1 $ns2 10.0.1.1 2 + test_linkfail=3D2 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 chk_add_nr 1 1 chk_stale_nr $ns2 1 -1 1 @@ -2184,8 +2185,8 @@ link_failure_tests() pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal pm_nl_set_limits $ns2 1 2 pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup - FAILING_LINKS=3D"1" \ - run_tests $ns1 $ns2 10.0.1.1 1 + FAILING_LINKS=3D"1" test_linkfail=3D1 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_add_nr 1 1 chk_link_usage $ns2 ns2eth3 $cinsent 0 @@ -2199,8 +2200,8 @@ link_failure_tests() pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal pm_nl_set_limits $ns2 1 2 pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup - FAILING_LINKS=3D"1 2" \ - run_tests $ns1 $ns2 10.0.1.1 1 + FAILING_LINKS=3D"1 2" test_linkfail=3D1 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_add_nr 1 1 chk_stale_nr $ns2 2 4 2 @@ -2215,8 +2216,8 @@ link_failure_tests() pm_nl_add_endpoint $ns1 10.0.2.1 dev ns1eth2 flags signal pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns2 10.0.3.2 dev ns2eth3 flags subflow,backup - FAILING_LINKS=3D"1 2" \ - run_tests $ns1 $ns2 10.0.1.1 2 + FAILING_LINKS=3D"1 2" test_linkfail=3D2 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_add_nr 1 1 chk_stale_nr $ns2 1 -1 2 @@ -2231,7 +2232,7 @@ add_addr_timeout_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 0 0 slow chk_join_nr 1 1 1 chk_add_tx_nr 4 4 chk_add_nr 4 0 @@ -2242,7 +2243,7 @@ add_addr_timeout_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal - run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow + run_tests $ns1 $ns2 dead:beef:1::1 0 0 slow chk_join_nr 1 1 1 chk_add_nr 4 0 fi @@ -2253,7 +2254,7 @@ add_addr_timeout_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_set_limits $ns2 2 2 - run_tests $ns1 $ns2 10.0.1.1 0 0 0 speed_10 + run_tests $ns1 $ns2 10.0.1.1 0 0 speed_10 chk_join_nr 2 2 2 chk_add_nr 8 0 fi @@ -2264,7 +2265,7 @@ add_addr_timeout_tests() pm_nl_add_endpoint $ns1 10.0.12.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_set_limits $ns2 2 2 - run_tests $ns1 $ns2 10.0.1.1 0 0 0 speed_10 + run_tests $ns1 $ns2 10.0.1.1 0 0 speed_10 chk_join_nr 1 1 1 chk_add_nr 8 0 fi @@ -2277,7 +2278,7 @@ remove_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow + run_tests $ns1 $ns2 10.0.1.1 0 -1 slow chk_join_nr 1 1 1 chk_rm_tx_nr 1 chk_rm_nr 1 1 @@ -2289,7 +2290,7 @@ remove_tests() pm_nl_set_limits $ns2 0 2 pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 -2 slow + run_tests $ns1 $ns2 10.0.1.1 0 -2 slow chk_join_nr 2 2 2 chk_rm_nr 2 2 fi @@ -2299,7 +2300,7 @@ remove_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow + run_tests $ns1 $ns2 10.0.1.1 -1 0 slow chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert @@ -2311,7 +2312,7 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 2 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow + run_tests $ns1 $ns2 10.0.1.1 -1 -1 slow chk_join_nr 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1 @@ -2324,7 +2325,7 @@ remove_tests() pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 -1 -2 speed_10 + run_tests $ns1 $ns2 10.0.1.1 -1 -2 speed_10 chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 2 2 @@ -2337,7 +2338,7 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.4.1 flags signal pm_nl_set_limits $ns2 3 3 - run_tests $ns1 $ns2 10.0.1.1 0 -3 0 speed_10 + run_tests $ns1 $ns2 10.0.1.1 -3 0 speed_10 chk_join_nr 3 3 3 chk_add_nr 3 3 chk_rm_nr 3 3 invert @@ -2350,7 +2351,7 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.14.1 flags signal pm_nl_set_limits $ns2 3 3 - run_tests $ns1 $ns2 10.0.1.1 0 -3 0 speed_10 + run_tests $ns1 $ns2 10.0.1.1 -3 0 speed_10 chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert @@ -2363,7 +2364,7 @@ remove_tests() pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow + run_tests $ns1 $ns2 10.0.1.1 -8 -8 slow chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 1 3 invert simult @@ -2376,7 +2377,7 @@ remove_tests() pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow id 150 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow + run_tests $ns1 $ns2 10.0.1.1 -8 -8 slow chk_join_nr 3 3 3 =20 if mptcp_lib_kversion_ge 5.18; then @@ -2394,7 +2395,7 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.4.1 flags signal pm_nl_set_limits $ns2 3 3 - run_tests $ns1 $ns2 10.0.1.1 0 -8 -8 slow + run_tests $ns1 $ns2 10.0.1.1 -8 -8 slow chk_join_nr 3 3 3 chk_add_nr 3 3 chk_rm_nr 3 3 invert simult @@ -2407,7 +2408,7 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.14.1 flags signal pm_nl_set_limits $ns2 3 3 - run_tests $ns1 $ns2 10.0.1.1 0 -8 0 slow + run_tests $ns1 $ns2 10.0.1.1 -8 0 slow chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert @@ -2418,7 +2419,7 @@ remove_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 -9 slow + run_tests $ns1 $ns2 10.0.1.1 0 -9 slow chk_join_nr 1 1 1 chk_rm_nr 1 1 fi @@ -2428,7 +2429,7 @@ remove_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 0 -9 0 slow + run_tests $ns1 $ns2 10.0.1.1 -9 0 slow chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert @@ -2441,7 +2442,7 @@ add_tests() if reset "add single subflow"; then pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow + run_tests $ns1 $ns2 10.0.1.1 0 1 slow chk_join_nr 1 1 1 fi =20 @@ -2449,7 +2450,7 @@ add_tests() if reset "add signal address"; then pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow + run_tests $ns1 $ns2 10.0.1.1 1 0 slow chk_join_nr 1 1 1 chk_add_nr 1 1 fi @@ -2458,7 +2459,7 @@ add_tests() if reset "add multiple subflows"; then pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 - run_tests $ns1 $ns2 10.0.1.1 0 0 2 slow + run_tests $ns1 $ns2 10.0.1.1 0 2 slow chk_join_nr 2 2 2 fi =20 @@ -2466,7 +2467,7 @@ add_tests() if reset "add multiple subflows IPv6"; then pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 - run_tests $ns1 $ns2 dead:beef:1::1 0 0 2 slow + run_tests $ns1 $ns2 dead:beef:1::1 0 2 slow chk_join_nr 2 2 2 fi =20 @@ -2474,7 +2475,7 @@ add_tests() if reset "add multiple addresses IPv6"; then pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 2 2 - run_tests $ns1 $ns2 dead:beef:1::1 0 2 0 slow + run_tests $ns1 $ns2 dead:beef:1::1 2 0 slow chk_join_nr 2 2 2 chk_add_nr 2 2 fi @@ -2487,14 +2488,14 @@ ipv6_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow - run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow + run_tests $ns1 $ns2 dead:beef:1::1 0 0 slow chk_join_nr 1 1 1 fi =20 # add_address, unused IPv6 if reset "unused signal address IPv6"; then pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal - run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow + run_tests $ns1 $ns2 dead:beef:1::1 0 0 slow chk_join_nr 0 0 0 chk_add_nr 1 1 fi @@ -2504,7 +2505,7 @@ ipv6_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 dead:beef:1::1 0 0 0 slow + run_tests $ns1 $ns2 dead:beef:1::1 0 0 slow chk_join_nr 1 1 1 chk_add_nr 1 1 fi @@ -2514,7 +2515,7 @@ ipv6_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 dead:beef:1::1 0 -1 0 slow + run_tests $ns1 $ns2 dead:beef:1::1 -1 0 slow chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert @@ -2526,7 +2527,7 @@ ipv6_tests() pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_set_limits $ns2 1 2 pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow - run_tests $ns1 $ns2 dead:beef:1::1 0 -1 -1 slow + run_tests $ns1 $ns2 dead:beef:1::1 -1 -1 slow chk_join_nr 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1 @@ -2627,7 +2628,7 @@ mixed_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 0 0 slow chk_join_nr 0 0 0 fi =20 @@ -2637,7 +2638,7 @@ mixed_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns1 10.0.1.1 flags signal - run_tests $ns1 $ns2 dead:beef:2::1 0 0 0 slow + run_tests $ns1 $ns2 dead:beef:2::1 0 0 slow chk_join_nr 1 1 1 fi =20 @@ -2648,7 +2649,7 @@ mixed_tests() pm_nl_set_limits $ns2 1 4 pm_nl_add_endpoint $ns2 dead:beef:2::2 flags subflow,fullmesh pm_nl_add_endpoint $ns1 10.0.1.1 flags signal - run_tests $ns1 $ns2 dead:beef:2::1 0 0 0 slow + run_tests $ns1 $ns2 dead:beef:2::1 0 0 slow chk_join_nr 1 1 1 fi =20 @@ -2660,7 +2661,7 @@ mixed_tests() pm_nl_set_limits $ns2 2 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal - run_tests $ns1 $ns2 dead:beef:1::1 0 0 fullmesh_1 slow + run_tests $ns1 $ns2 dead:beef:1::1 0 fullmesh_1 slow chk_join_nr 4 4 4 fi } @@ -2673,7 +2674,7 @@ backup_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow nobackup + run_tests $ns1 $ns2 10.0.1.1 0 0 slow nobackup chk_join_nr 1 1 1 chk_prio_nr 0 1 fi @@ -2684,7 +2685,7 @@ backup_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup + run_tests $ns1 $ns2 10.0.1.1 0 0 slow backup chk_join_nr 1 1 1 chk_add_nr 1 1 chk_prio_nr 1 1 @@ -2696,7 +2697,7 @@ backup_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup + run_tests $ns1 $ns2 10.0.1.1 0 0 slow backup chk_join_nr 1 1 1 chk_add_nr 1 1 chk_prio_nr 1 1 @@ -2705,7 +2706,7 @@ backup_tests() if reset "mpc backup" && continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; = then pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 0 0 slow chk_join_nr 0 0 0 chk_prio_nr 0 1 fi @@ -2714,7 +2715,7 @@ backup_tests() continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; = then pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow,backup pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 0 0 slow chk_join_nr 0 0 0 chk_prio_nr 1 1 fi @@ -2722,7 +2723,7 @@ backup_tests() if reset "mpc switch to backup" && continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; = then pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup + run_tests $ns1 $ns2 10.0.1.1 0 0 slow backup chk_join_nr 0 0 0 chk_prio_nr 0 1 fi @@ -2731,7 +2732,7 @@ backup_tests() continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; = then pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup + run_tests $ns1 $ns2 10.0.1.1 0 0 slow backup chk_join_nr 0 0 0 chk_prio_nr 1 1 fi @@ -2820,7 +2821,7 @@ add_addr_ports_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 0 -1 0 slow + run_tests $ns1 $ns2 10.0.1.1 -1 0 slow chk_join_nr 1 1 1 chk_add_nr 1 1 1 chk_rm_nr 1 1 invert @@ -2836,7 +2837,7 @@ add_addr_ports_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_set_limits $ns2 1 2 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 -1 -1 slow + run_tests $ns1 $ns2 10.0.1.1 -1 -1 slow chk_join_nr 2 2 2 chk_add_nr 1 1 1 chk_rm_nr 1 1 @@ -2849,7 +2850,7 @@ add_addr_ports_tests() pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 -8 -2 slow + run_tests $ns1 $ns2 10.0.1.1 -8 -2 slow chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 1 3 invert simult @@ -3051,7 +3052,7 @@ fullmesh_tests() pm_nl_set_limits $ns2 1 4 pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,fullmesh pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,fullmesh - run_tests $ns1 $ns2 10.0.1.1 0 1 0 slow + run_tests $ns1 $ns2 10.0.1.1 1 0 slow chk_join_nr 4 4 4 chk_add_nr 1 1 fi @@ -3063,7 +3064,7 @@ fullmesh_tests() pm_nl_set_limits $ns1 1 3 pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow + run_tests $ns1 $ns2 10.0.1.1 0 fullmesh_1 slow chk_join_nr 3 3 3 chk_add_nr 1 1 fi @@ -3075,7 +3076,7 @@ fullmesh_tests() pm_nl_set_limits $ns1 2 5 pm_nl_set_limits $ns2 1 5 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow + run_tests $ns1 $ns2 10.0.1.1 0 fullmesh_2 slow chk_join_nr 5 5 5 chk_add_nr 1 1 fi @@ -3088,7 +3089,7 @@ fullmesh_tests() pm_nl_set_limits $ns1 2 4 pm_nl_set_limits $ns2 1 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow + run_tests $ns1 $ns2 10.0.1.1 0 fullmesh_2 slow chk_join_nr 4 4 4 chk_add_nr 1 1 fi @@ -3099,7 +3100,7 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow pm_nl_set_limits $ns2 4 4 - run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow fullmesh + run_tests $ns1 $ns2 10.0.1.1 0 1 slow fullmesh chk_join_nr 2 2 2 chk_rm_nr 0 1 fi @@ -3110,7 +3111,7 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow,fullmesh pm_nl_set_limits $ns2 4 4 - run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow nofullmesh + run_tests $ns1 $ns2 10.0.1.1 0 fullmesh_1 slow nofullmesh chk_join_nr 2 2 2 chk_rm_nr 0 1 fi @@ -3121,7 +3122,7 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow pm_nl_set_limits $ns2 4 4 - run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow backup,fullmesh + run_tests $ns1 $ns2 10.0.1.1 0 1 slow backup,fullmesh chk_join_nr 2 2 2 chk_prio_nr 0 1 chk_rm_nr 0 1 @@ -3133,7 +3134,7 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_set_limits $ns2 4 4 pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup,fullmesh - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow nobackup,nofullmesh + run_tests $ns1 $ns2 10.0.1.1 0 0 slow nobackup,nofullmesh chk_join_nr 2 2 2 chk_prio_nr 0 1 chk_rm_nr 0 1 @@ -3143,14 +3144,16 @@ fullmesh_tests() fastclose_tests() { if reset_check_counter "fastclose test" "MPTcpExtMPFastcloseTx"; then - run_tests $ns1 $ns2 10.0.1.1 1024 0 fastclose_client + test_linkfail=3D1024 \ + run_tests $ns1 $ns2 10.0.1.1 0 fastclose_client chk_join_nr 0 0 0 chk_fclose_nr 1 1 chk_rst_nr 1 1 invert fi =20 if reset_check_counter "fastclose server test" "MPTcpExtMPFastcloseRx"; t= hen - run_tests $ns1 $ns2 10.0.1.1 1024 0 fastclose_server + test_linkfail=3D1024 \ + run_tests $ns1 $ns2 10.0.1.1 0 fastclose_server chk_join_nr 0 0 0 chk_fclose_nr 1 1 invert chk_rst_nr 1 1 @@ -3168,7 +3171,8 @@ fail_tests() { # single subflow if reset_with_fail "Infinite map" 1; then - run_tests $ns1 $ns2 10.0.1.1 128 + test_linkfail=3D128 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 +1 +0 1 0 1 "$(pedit_action_pkts)" chk_fail_nr 1 -1 invert fi @@ -3179,7 +3183,8 @@ fail_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.2.2 dev ns2eth2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 1024 + test_linkfail=3D1024 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 1 0 1 1 0 "$(pedit_action_pkts)" fi } @@ -3304,7 +3309,7 @@ userspace_tests() pm_nl_set_limits $ns1 1 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow backup + run_tests $ns1 $ns2 10.0.1.1 0 0 slow backup chk_join_nr 1 1 0 chk_prio_nr 0 0 fi @@ -3317,7 +3322,7 @@ userspace_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 -1 slow + run_tests $ns1 $ns2 10.0.1.1 0 -1 slow chk_join_nr 0 0 0 chk_rm_nr 0 0 fi @@ -3327,7 +3332,7 @@ userspace_tests() continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then set_userspace_pm $ns1 pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 0 0 0 speed_10 & + run_tests $ns1 $ns2 10.0.1.1 0 0 speed_10 & local tests_pid=3D$! wait_mpj $ns1 userspace_pm_add_addr 10.0.2.1 10 @@ -3347,7 +3352,7 @@ userspace_tests() continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then set_userspace_pm $ns2 pm_nl_set_limits $ns1 0 1 - run_tests $ns1 $ns2 10.0.1.1 0 0 0 speed_10 & + run_tests $ns1 $ns2 10.0.1.1 0 0 speed_10 & local tests_pid=3D$! wait_mpj $ns2 userspace_pm_add_sf 10.0.3.2 20 @@ -3370,7 +3375,7 @@ endpoint_tests() pm_nl_set_limits $ns1 2 2 pm_nl_set_limits $ns2 2 2 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - run_tests $ns1 $ns2 10.0.1.1 0 0 0 slow 2>/dev/null & + run_tests $ns1 $ns2 10.0.1.1 0 0 slow 2>/dev/null & =20 wait_mpj $ns1 pm_nl_check_endpoint 1 "creation" \ @@ -3393,7 +3398,8 @@ endpoint_tests() pm_nl_set_limits $ns1 1 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 4 0 0 speed_20 2>/dev/null & + test_linkfail=3D4 \ + run_tests $ns1 $ns2 10.0.1.1 0 0 speed_20 2>/dev/null & =20 wait_mpj $ns2 chk_subflow_nr needtitle "before delete" 2 --=20 2.35.3 From nobody Tue May 14 04:36:08 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2051.outbound.protection.outlook.com [40.107.8.51]) (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 AAE8023C2 for ; Fri, 16 Jun 2023 07:31:56 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GKMpsurNAXrUQeev3DxLPm6xFZjFI74r0r60QXhQv1H7kzvh+5fEyz2lVqoVgbqxw9qDRL4/dhVX7YgF9YLwpZ/sIYTlQycz0Lr+Z9GQbb/+JlAqnCoNMNPbIiMAb6UGhV+VDPOpMt9oZk/rCkDiJ+QqAH9K56hBXA5TpqfyrwyFwCQZuA4G5M1Yeld3hoqRRjLk2S7b0c/Qs88lMFvgDxBfWZ1F1BZZCKhukahiDkklMTEkaSsgn35TmIlIa5wpJcAZ8qmpkC8Ixi/yvIha50LRpPG8/xYzTsxvItvYG2HYthtAKbAVW2/YwvHBGpvCLrriePBqYq1klpTSQ8f94A== 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=4eN6PgFmsp2c7lbVqZNJObwjVmqueVPS8VX77hIyBY0=; b=bJ4sxSa05fwXwbHgX4nACzqNrB+T7UOVcytdd0KXgeVbzw2Omq1nEEd5XN8JYx114N0LURvdI5D1OA5J1ZDfRLCII0/RxRX1k0J2N/rX52nNymKapGhNqQXWuk4WxOT+/b/LoozXUR73LwXU8bVNEHw1HIxvHTJJVUCA9GxHFah1Xk7Igu9YdTWtZzn+MvsHd6q9K3x7Fhi8nRTdumbScy/WSkniKdMUQmfmIiDCh/E/tz1FNm07ZMtZWfR80FkSLf581HCA9MuwZpcyNm0LhCqPBCf3A6WPMrZPT4pjxSLtcWMymPnQrPEx0umYU6C2DOJY7mG2OhW2/FAmFz24LQ== 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=4eN6PgFmsp2c7lbVqZNJObwjVmqueVPS8VX77hIyBY0=; b=SP/Hk9EEKx2hC66aKD4FKoP/dwONAawxUxbYhouzTJeVr+gR/8yxj40Fi9qfA+c2FcdZ5DwrxVsSCUFFyPMT0VjWUt3g7NP1vs0tPvyWazO6MfYEQoEzd6UGXmTDKutDvHvvxk//Y0dh7uF31ZjuBE1d7iFUGI4PzNsz50+F+PLzGqpTu4VFTO3l9DXzNMOXf6iyo8mOqjsp9dLCaEmlWTVhpRY9GJ84+CQP9qhRqnz7ZRuipFSZ6IlvCFRRnYOA7We+1EkUaawzpqM8LQeIZ8tUn/w+ftbnFgBsjeZWNYrkHP6cDdty69w7cxotJDr07jELvC9sHuuGtf6QlE21zg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM7PR04MB7157.eurprd04.prod.outlook.com (2603:10a6:20b:118::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.29; Fri, 16 Jun 2023 07:31:52 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59%4]) with mapi id 15.20.6455.039; Fri, 16 Jun 2023 07:31:52 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 06/10] selftests: mptcp: drop addr_nr_ns1/2 parameters Date: Fri, 16 Jun 2023 15:30:58 +0800 Message-Id: <6cafd9fc77143d31508b81c17523b5a814b185d9.1686900596.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0015.apcprd01.prod.exchangelabs.com (2603:1096:4:191::15) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: VI1PR0402MB3503:EE_|AM7PR04MB7157:EE_ X-MS-Office365-Filtering-Correlation-Id: 96eaef19-bbc1-4760-fa70-08db6e3bc0c9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DPlGl/YteYSVmeosexGoSvnkspDLHEqvrehDdNNE2GGNG8x6aJd5EvZK/P25qSTQbaA9dfFL4X4C7HManYYxmqllCnock9LkdLS5HxvA22HFEm9DmdfEjvaoK0u7OJobpu42T7fuCE9nGYLq8BfWCT/OOi9HbvUawAWRNYjqy8sAW0Y3pxnK8qnlcMcMfQ5j61QUUgbCfZGDF1xJU26l/+zbSExU6Hc05wMmyxBcZyLTiV7gu2nefj7TGZ6r9Nqt+q9j2/GsFe0Mb0rWGURCG4mYfvwvi5vIU56KQ+A2p1gFQR/TjMfK7lI2AxvfEbxygK/DtdpKUq85Tzow4hA35LoW43WjRA88AT+vW7edFgmxHQWAEqDLv2s/3/FZRX+yjZhZGg6mqhcnQO+bG0w5H67qhQh41OZ+N6/xWEqK9NzycWU+RS4JXqT/NRoH4YJPjI4EGUxbwC9sK1cPDkUXurih2JtqpHq9DKoF7bF7njo6B6pyl+SnEsjZRd9OHMLlU3Zg8Sqg6uaeBtqBuugBhEa1/Wbuof8NK5R+BHED+CMfi3Uwp8qvnYjYwx+icOAf X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(366004)(39860400002)(376002)(346002)(136003)(451199021)(6512007)(6506007)(107886003)(26005)(6916009)(4326008)(66946007)(316002)(66476007)(66556008)(2616005)(186003)(83380400001)(6486002)(478600001)(38100700002)(8676002)(44832011)(8936002)(5660300002)(86362001)(41300700001)(2906002)(36756003)(30864003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HyIXcl5sLza34C64/yOZKvslIg9jt7x6kpw/K26Apzg6b0sj9zLBUxZI/e1y?= =?us-ascii?Q?DcUTnkcsRdXZ4LVw/hJkDxA1QLfYypPLnHrXIWtq98swhGrHR8Tt37lFsNJJ?= =?us-ascii?Q?O0vs3GOWQt51kCauY9Wk3/nboazfNBsIh6hDPvhbpOH0XMgHDLsNcTxwQCGr?= =?us-ascii?Q?/F5XNzzOGVSGqAdM2khZC/Fi/f5FZrjJRV3iXiK10c0jTmBRNYFz1nb75sAy?= =?us-ascii?Q?3poiQm10Z3kcNmshpbf8Od3DdKZjXxqDPx9PC+wRcjQKFU+G0yMHWA8iQ2JF?= =?us-ascii?Q?E2GsHMKDp6d6YRrrI7J9Hvl3x80iC1ssHa6KHkDBehKDYkcNctuBc6N3EANn?= =?us-ascii?Q?7AzAWDzY44OzSjr4f4zkxCKm46EnMV4gP9A3GwUPP9g+ki0kiz/ZXFn1StFy?= =?us-ascii?Q?GL4m8O34DDLNDO1lMw91zEZFkjGQdO0Ft0XH4toCzrkp7+lKaFnimJNtqKRF?= =?us-ascii?Q?91OpKLJmWHeYq6Pxv+4CPxYrusbAo9xnlw5b+/f26f0uJcHqn0MUPrvzpR+c?= =?us-ascii?Q?k6lIw9DgT/6qvbR5KJJVb2qynvE7FCfLyB2OgMxDjxBEZr7ZmlxAKJPOwTaF?= =?us-ascii?Q?WujCWxmc1sAtzt+J98uunvmSPe64FPjlSHwesLVUpJd2bcZ1pE8PAI8TKKYj?= =?us-ascii?Q?Dln7E7H+w/GlzYox3jW81C1k3xnqjPiEhu1cxW1ZlEMy+8WZnJWYikbf2CfJ?= =?us-ascii?Q?jYtx9+f9X6rU+6PWJY1zwg3IJeM4hG0Ecn67XdrutHCylGphUlDjNGXc3kog?= =?us-ascii?Q?q5PjgOjV8vvs/uoRbnH1Th0PcmvjKcQTVVVzTXZiPd2+ZOuUVNPSYIscOonj?= =?us-ascii?Q?4moA5Yz/UAvQ/TB9dPczLludV93km5MsWvf+ck6BTSPv900fCCimd1CGLzQD?= =?us-ascii?Q?n9/qbQXAfcWcl7hlCpX0tY3xTmDkbffCqSiiPJLdGuuxIrwDPL7j/oXOPlgC?= =?us-ascii?Q?46WaGmKQhI185Jx277NfX2c0/rwzdFH7GnD/DEoQk5q/t7BacQSiPyQGs6rq?= =?us-ascii?Q?E9ku8TnHGhSSeMYv5KSIKJOd5JQ8s7lB/eVmip/aEUYbyUy0od6O65ATgnpq?= =?us-ascii?Q?b1WCSB+02B25ZysbW+xU44YXbK9DQxOvO83cSciYhyw16WTqLwtuppex+q2n?= =?us-ascii?Q?LRxb2nZ5cw/funnBaB17QbD1IIs31QAoXPYr1OOXQfsn6dg47OjkECHnL4LN?= =?us-ascii?Q?uUf/csbupacAVy6zITWwdlxcR9f5QMPkNYIarRgzLnWN7oShzP2lSAuY/Fbv?= =?us-ascii?Q?0g4h2Rxme8SlsjuGRHlSe3YzeI8SIxVU7OTVxX96cjnwDbqHQrdLNer7qpa5?= =?us-ascii?Q?NiDZIK8eo4lNZWlXjUB4GInJR+yE7G8QQL8/QniH15iRy/LZBGckqkBQqpaX?= =?us-ascii?Q?lQley/RRqEWGdmLx483dPUDEA0bPs2uixkSdjh4vtFcEbAHKYs343xL7e5cW?= =?us-ascii?Q?SjVFGZFGv3evUsUK/BxRNa34RnAZlOM+JqxZFfa3au+DH1UYOYoJD+3rFpDV?= =?us-ascii?Q?WNd8b5F9ykhQuJ4BIry59YaSD43/Q6aUCGXuGNI/QczP6HdRU9TjW6meff20?= =?us-ascii?Q?lc0oQEQ3nHEGZVwHfQxe7zK4KLO44J3YvICZr/zE?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96eaef19-bbc1-4760-fa70-08db6e3bc0c9 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 07:31:52.2960 (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: cenO/H9ufBbEwayK12h9fQ3RyxjefDhn2ISrw2bwcOrVfcqOGEQD83OQQAQJIDr9FYF4eZVLImCPavOoHci3Dg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7157 Content-Type: text/plain; charset="utf-8" run_tests() accepts too many optional parameters. Before this modification, it was required to set all of then when only the last one had to be changed. That's not clear to see all these 0 and it makes the maintenance harder: run_tests $ns1 $ns2 10.0.1.1 1 2 3 slow Instead, the parameter can be set as an env var with a limited scope: foo=3D1 bar=3D2 next=3D3 \ run_tests $ns1 $ns2 10.0.1.1 slow This patch switches to key/value "addr_nr_ns1=3D*, addr_nr_ns2=3D*" instead of positional parameters addr_nr_ns1 and addr_nr_ns2 of do_transfer() and run_tests(). Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts --- .../testing/selftests/net/mptcp/mptcp_join.sh | 176 ++++++++++-------- 1 file changed, 103 insertions(+), 73 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 90cfd134bf7e..f9bf4733ca41 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -51,6 +51,8 @@ nr_blank=3D40 =20 export FAILING_LINKS=3D"" export test_linkfail=3D0 +export addr_nr_ns1=3D0 +export addr_nr_ns2=3D0 =20 # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x30) || # (ip6 && (ip6[74] & 0xf0) =3D=3D 0x30)'" @@ -826,10 +828,8 @@ do_transfer() local cl_proto=3D"$3" local srv_proto=3D"$4" local connect_addr=3D"$5" - local addr_nr_ns1=3D"$6" - local addr_nr_ns2=3D"$7" - local speed=3D"$8" - local sflags=3D"${9}" + local speed=3D"$6" + local sflags=3D"${7}" =20 local port=3D$((10000 + TEST_COUNT - 1)) local cappid @@ -1146,10 +1146,8 @@ run_tests() local listener_ns=3D"$1" local connector_ns=3D"$2" local connect_addr=3D"$3" - local addr_nr_ns1=3D"${4:-0}" - local addr_nr_ns2=3D"${5:-0}" - local speed=3D"${6:-fast}" - local sflags=3D"${7:-""}" + local speed=3D"${4:-fast}" + local sflags=3D"${5:-""}" =20 local size =20 @@ -1194,7 +1192,7 @@ run_tests() fi =20 do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} \ - ${addr_nr_ns1} ${addr_nr_ns2} ${speed} ${sflags} + ${speed} ${sflags} } =20 dump_stats() @@ -1989,7 +1987,7 @@ subflows_error_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 0 0 0 fi =20 @@ -2000,7 +1998,7 @@ subflows_error_tests() pm_nl_set_limits $ns2 0 2 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 fi =20 @@ -2011,7 +2009,7 @@ subflows_error_tests() pm_nl_set_limits $ns2 0 2 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 fi =20 @@ -2023,7 +2021,7 @@ subflows_error_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 slow & + run_tests $ns1 $ns2 10.0.1.1 slow & =20 # mpj subflow will be in TW after the reset wait_attempt_fail $ns2 @@ -2122,7 +2120,7 @@ signal_address_tests() =20 # the peer could possibly miss some addr notification, allow retransmiss= ion ip netns exec $ns1 sysctl -q net.mptcp.add_addr_timeout=3D1 - run_tests $ns1 $ns2 10.0.1.1 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 slow =20 # It is not directly linked to the commit introducing this # symbol but for the parent one which is linked anyway. @@ -2232,7 +2230,7 @@ add_addr_timeout_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - run_tests $ns1 $ns2 10.0.1.1 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 chk_add_tx_nr 4 4 chk_add_nr 4 0 @@ -2243,7 +2241,7 @@ add_addr_timeout_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal - run_tests $ns1 $ns2 dead:beef:1::1 0 0 slow + run_tests $ns1 $ns2 dead:beef:1::1 slow chk_join_nr 1 1 1 chk_add_nr 4 0 fi @@ -2254,7 +2252,7 @@ add_addr_timeout_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_set_limits $ns2 2 2 - run_tests $ns1 $ns2 10.0.1.1 0 0 speed_10 + run_tests $ns1 $ns2 10.0.1.1 speed_10 chk_join_nr 2 2 2 chk_add_nr 8 0 fi @@ -2265,7 +2263,7 @@ add_addr_timeout_tests() pm_nl_add_endpoint $ns1 10.0.12.1 flags signal pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_set_limits $ns2 2 2 - run_tests $ns1 $ns2 10.0.1.1 0 0 speed_10 + run_tests $ns1 $ns2 10.0.1.1 speed_10 chk_join_nr 1 1 1 chk_add_nr 8 0 fi @@ -2278,7 +2276,8 @@ remove_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 -1 slow + addr_nr_ns2=3D-1 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 chk_rm_tx_nr 1 chk_rm_nr 1 1 @@ -2290,7 +2289,8 @@ remove_tests() pm_nl_set_limits $ns2 0 2 pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 -2 slow + addr_nr_ns2=3D-2 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 2 2 2 chk_rm_nr 2 2 fi @@ -2300,7 +2300,8 @@ remove_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 -1 0 slow + addr_nr_ns1=3D-1 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert @@ -2312,7 +2313,8 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 2 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 -1 -1 slow + addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1 @@ -2325,7 +2327,8 @@ remove_tests() pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 -1 -2 speed_10 + addr_nr_ns1=3D-1 addr_nr_ns2=3D-2 \ + run_tests $ns1 $ns2 10.0.1.1 speed_10 chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 2 2 @@ -2338,7 +2341,8 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.4.1 flags signal pm_nl_set_limits $ns2 3 3 - run_tests $ns1 $ns2 10.0.1.1 -3 0 speed_10 + addr_nr_ns1=3D-3 \ + run_tests $ns1 $ns2 10.0.1.1 speed_10 chk_join_nr 3 3 3 chk_add_nr 3 3 chk_rm_nr 3 3 invert @@ -2351,7 +2355,8 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.14.1 flags signal pm_nl_set_limits $ns2 3 3 - run_tests $ns1 $ns2 10.0.1.1 -3 0 speed_10 + addr_nr_ns1=3D-3 \ + run_tests $ns1 $ns2 10.0.1.1 speed_10 chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert @@ -2364,7 +2369,8 @@ remove_tests() pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 -8 -8 slow + addr_nr_ns1=3D-8 addr_nr_ns2=3D-8 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 1 3 invert simult @@ -2377,7 +2383,8 @@ remove_tests() pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow id 150 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 -8 -8 slow + addr_nr_ns1=3D-8 addr_nr_ns2=3D-8 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 3 3 3 =20 if mptcp_lib_kversion_ge 5.18; then @@ -2395,7 +2402,8 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.4.1 flags signal pm_nl_set_limits $ns2 3 3 - run_tests $ns1 $ns2 10.0.1.1 -8 -8 slow + addr_nr_ns1=3D-8 addr_nr_ns2=3D-8 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 3 3 3 chk_add_nr 3 3 chk_rm_nr 3 3 invert simult @@ -2408,7 +2416,8 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.3.1 flags signal pm_nl_add_endpoint $ns1 10.0.14.1 flags signal pm_nl_set_limits $ns2 3 3 - run_tests $ns1 $ns2 10.0.1.1 -8 0 slow + addr_nr_ns1=3D-8 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert @@ -2419,7 +2428,8 @@ remove_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 -9 slow + addr_nr_ns2=3D-9 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 chk_rm_nr 1 1 fi @@ -2429,7 +2439,8 @@ remove_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 -9 0 slow + addr_nr_ns1=3D-9 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert @@ -2442,7 +2453,8 @@ add_tests() if reset "add single subflow"; then pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 - run_tests $ns1 $ns2 10.0.1.1 0 1 slow + addr_nr_ns2=3D1 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 fi =20 @@ -2450,7 +2462,8 @@ add_tests() if reset "add signal address"; then pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 1 0 slow + addr_nr_ns1=3D1 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 chk_add_nr 1 1 fi @@ -2459,7 +2472,8 @@ add_tests() if reset "add multiple subflows"; then pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 - run_tests $ns1 $ns2 10.0.1.1 0 2 slow + addr_nr_ns2=3D2 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 2 2 2 fi =20 @@ -2467,7 +2481,8 @@ add_tests() if reset "add multiple subflows IPv6"; then pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 - run_tests $ns1 $ns2 dead:beef:1::1 0 2 slow + addr_nr_ns2=3D2 \ + run_tests $ns1 $ns2 dead:beef:1::1 slow chk_join_nr 2 2 2 fi =20 @@ -2475,7 +2490,8 @@ add_tests() if reset "add multiple addresses IPv6"; then pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 2 2 - run_tests $ns1 $ns2 dead:beef:1::1 2 0 slow + addr_nr_ns1=3D2 \ + run_tests $ns1 $ns2 dead:beef:1::1 slow chk_join_nr 2 2 2 chk_add_nr 2 2 fi @@ -2488,14 +2504,14 @@ ipv6_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow - run_tests $ns1 $ns2 dead:beef:1::1 0 0 slow + run_tests $ns1 $ns2 dead:beef:1::1 slow chk_join_nr 1 1 1 fi =20 # add_address, unused IPv6 if reset "unused signal address IPv6"; then pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal - run_tests $ns1 $ns2 dead:beef:1::1 0 0 slow + run_tests $ns1 $ns2 dead:beef:1::1 slow chk_join_nr 0 0 0 chk_add_nr 1 1 fi @@ -2505,7 +2521,7 @@ ipv6_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 dead:beef:1::1 0 0 slow + run_tests $ns1 $ns2 dead:beef:1::1 slow chk_join_nr 1 1 1 chk_add_nr 1 1 fi @@ -2515,7 +2531,8 @@ ipv6_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 dead:beef:1::1 -1 0 slow + addr_nr_ns1=3D-1 \ + run_tests $ns1 $ns2 dead:beef:1::1 slow chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert @@ -2527,7 +2544,8 @@ ipv6_tests() pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal pm_nl_set_limits $ns2 1 2 pm_nl_add_endpoint $ns2 dead:beef:3::2 dev ns2eth3 flags subflow - run_tests $ns1 $ns2 dead:beef:1::1 -1 -1 slow + addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 \ + run_tests $ns1 $ns2 dead:beef:1::1 slow chk_join_nr 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1 @@ -2628,7 +2646,7 @@ mixed_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal - run_tests $ns1 $ns2 10.0.1.1 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 0 0 0 fi =20 @@ -2638,7 +2656,7 @@ mixed_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns1 10.0.1.1 flags signal - run_tests $ns1 $ns2 dead:beef:2::1 0 0 slow + run_tests $ns1 $ns2 dead:beef:2::1 slow chk_join_nr 1 1 1 fi =20 @@ -2649,7 +2667,7 @@ mixed_tests() pm_nl_set_limits $ns2 1 4 pm_nl_add_endpoint $ns2 dead:beef:2::2 flags subflow,fullmesh pm_nl_add_endpoint $ns1 10.0.1.1 flags signal - run_tests $ns1 $ns2 dead:beef:2::1 0 0 slow + run_tests $ns1 $ns2 dead:beef:2::1 slow chk_join_nr 1 1 1 fi =20 @@ -2661,7 +2679,8 @@ mixed_tests() pm_nl_set_limits $ns2 2 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_add_endpoint $ns1 dead:beef:2::1 flags signal - run_tests $ns1 $ns2 dead:beef:1::1 0 fullmesh_1 slow + addr_nr_ns2=3Dfullmesh_1 \ + run_tests $ns1 $ns2 dead:beef:1::1 slow chk_join_nr 4 4 4 fi } @@ -2674,7 +2693,7 @@ backup_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup - run_tests $ns1 $ns2 10.0.1.1 0 0 slow nobackup + run_tests $ns1 $ns2 10.0.1.1 slow nobackup chk_join_nr 1 1 1 chk_prio_nr 0 1 fi @@ -2685,7 +2704,7 @@ backup_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 0 0 slow backup + run_tests $ns1 $ns2 10.0.1.1 slow backup chk_join_nr 1 1 1 chk_add_nr 1 1 chk_prio_nr 1 1 @@ -2697,7 +2716,7 @@ backup_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 0 0 slow backup + run_tests $ns1 $ns2 10.0.1.1 slow backup chk_join_nr 1 1 1 chk_add_nr 1 1 chk_prio_nr 1 1 @@ -2706,7 +2725,7 @@ backup_tests() if reset "mpc backup" && continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; = then pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup - run_tests $ns1 $ns2 10.0.1.1 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 0 0 0 chk_prio_nr 0 1 fi @@ -2715,7 +2734,7 @@ backup_tests() continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; = then pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow,backup pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup - run_tests $ns1 $ns2 10.0.1.1 0 0 slow + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 0 0 0 chk_prio_nr 1 1 fi @@ -2723,7 +2742,7 @@ backup_tests() if reset "mpc switch to backup" && continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; = then pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 slow backup + run_tests $ns1 $ns2 10.0.1.1 slow backup chk_join_nr 0 0 0 chk_prio_nr 0 1 fi @@ -2732,7 +2751,7 @@ backup_tests() continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; = then pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 slow backup + run_tests $ns1 $ns2 10.0.1.1 slow backup chk_join_nr 0 0 0 chk_prio_nr 1 1 fi @@ -2821,7 +2840,8 @@ add_addr_ports_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 -1 0 slow + addr_nr_ns1=3D-1 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 chk_add_nr 1 1 1 chk_rm_nr 1 1 invert @@ -2837,7 +2857,8 @@ add_addr_ports_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_set_limits $ns2 1 2 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 -1 -1 slow + addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 2 2 2 chk_add_nr 1 1 1 chk_rm_nr 1 1 @@ -2850,7 +2871,8 @@ add_addr_ports_tests() pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 -8 -2 slow + addr_nr_ns1=3D-8 addr_nr_ns2=3D-2 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 1 3 invert simult @@ -3052,7 +3074,8 @@ fullmesh_tests() pm_nl_set_limits $ns2 1 4 pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,fullmesh pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,fullmesh - run_tests $ns1 $ns2 10.0.1.1 1 0 slow + addr_nr_ns1=3D1 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 4 4 4 chk_add_nr 1 1 fi @@ -3064,7 +3087,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 1 3 pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - run_tests $ns1 $ns2 10.0.1.1 0 fullmesh_1 slow + addr_nr_ns2=3Dfullmesh_1 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 3 3 3 chk_add_nr 1 1 fi @@ -3076,7 +3100,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 2 5 pm_nl_set_limits $ns2 1 5 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - run_tests $ns1 $ns2 10.0.1.1 0 fullmesh_2 slow + addr_nr_ns2=3Dfullmesh_2 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 5 5 5 chk_add_nr 1 1 fi @@ -3089,7 +3114,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 2 4 pm_nl_set_limits $ns2 1 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - run_tests $ns1 $ns2 10.0.1.1 0 fullmesh_2 slow + addr_nr_ns2=3Dfullmesh_2 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 4 4 4 chk_add_nr 1 1 fi @@ -3100,7 +3126,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow pm_nl_set_limits $ns2 4 4 - run_tests $ns1 $ns2 10.0.1.1 0 1 slow fullmesh + addr_nr_ns2=3D1 \ + run_tests $ns1 $ns2 10.0.1.1 slow fullmesh chk_join_nr 2 2 2 chk_rm_nr 0 1 fi @@ -3111,7 +3138,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow,fullmesh pm_nl_set_limits $ns2 4 4 - run_tests $ns1 $ns2 10.0.1.1 0 fullmesh_1 slow nofullmesh + addr_nr_ns2=3Dfullmesh_1 \ + run_tests $ns1 $ns2 10.0.1.1 slow nofullmesh chk_join_nr 2 2 2 chk_rm_nr 0 1 fi @@ -3122,7 +3150,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow pm_nl_set_limits $ns2 4 4 - run_tests $ns1 $ns2 10.0.1.1 0 1 slow backup,fullmesh + addr_nr_ns2=3D1 run_tests \ + $ns1 $ns2 10.0.1.1 slow backup,fullmesh chk_join_nr 2 2 2 chk_prio_nr 0 1 chk_rm_nr 0 1 @@ -3134,7 +3163,7 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_set_limits $ns2 4 4 pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup,fullmesh - run_tests $ns1 $ns2 10.0.1.1 0 0 slow nobackup,nofullmesh + run_tests $ns1 $ns2 10.0.1.1 slow nobackup,nofullmesh chk_join_nr 2 2 2 chk_prio_nr 0 1 chk_rm_nr 0 1 @@ -3144,16 +3173,16 @@ fullmesh_tests() fastclose_tests() { if reset_check_counter "fastclose test" "MPTcpExtMPFastcloseTx"; then - test_linkfail=3D1024 \ - run_tests $ns1 $ns2 10.0.1.1 0 fastclose_client + test_linkfail=3D1024 addr_nr_ns2=3Dfastclose_client \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_fclose_nr 1 1 chk_rst_nr 1 1 invert fi =20 if reset_check_counter "fastclose server test" "MPTcpExtMPFastcloseRx"; t= hen - test_linkfail=3D1024 \ - run_tests $ns1 $ns2 10.0.1.1 0 fastclose_server + test_linkfail=3D1024 addr_nr_ns2=3Dfastclose_server \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_fclose_nr 1 1 invert chk_rst_nr 1 1 @@ -3309,7 +3338,7 @@ userspace_tests() pm_nl_set_limits $ns1 1 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 0 slow backup + run_tests $ns1 $ns2 10.0.1.1 slow backup chk_join_nr 1 1 0 chk_prio_nr 0 0 fi @@ -3322,7 +3351,8 @@ userspace_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 0 -1 slow + addr_nr_ns2=3D-1 \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 0 0 0 chk_rm_nr 0 0 fi @@ -3332,7 +3362,7 @@ userspace_tests() continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then set_userspace_pm $ns1 pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 0 0 speed_10 & + run_tests $ns1 $ns2 10.0.1.1 speed_10 & local tests_pid=3D$! wait_mpj $ns1 userspace_pm_add_addr 10.0.2.1 10 @@ -3352,7 +3382,7 @@ userspace_tests() continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then set_userspace_pm $ns2 pm_nl_set_limits $ns1 0 1 - run_tests $ns1 $ns2 10.0.1.1 0 0 speed_10 & + run_tests $ns1 $ns2 10.0.1.1 speed_10 & local tests_pid=3D$! wait_mpj $ns2 userspace_pm_add_sf 10.0.3.2 20 @@ -3375,7 +3405,7 @@ endpoint_tests() pm_nl_set_limits $ns1 2 2 pm_nl_set_limits $ns2 2 2 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal - run_tests $ns1 $ns2 10.0.1.1 0 0 slow 2>/dev/null & + run_tests $ns1 $ns2 10.0.1.1 slow 2>/dev/null & =20 wait_mpj $ns1 pm_nl_check_endpoint 1 "creation" \ @@ -3399,7 +3429,7 @@ endpoint_tests() pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns2 10.0.2.2 id 2 dev ns2eth2 flags subflow test_linkfail=3D4 \ - run_tests $ns1 $ns2 10.0.1.1 0 0 speed_20 2>/dev/null & + run_tests $ns1 $ns2 10.0.1.1 speed_20 2>/dev/null & =20 wait_mpj $ns2 chk_subflow_nr needtitle "before delete" 2 --=20 2.35.3 From nobody Tue May 14 04:36:08 2024 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2078.outbound.protection.outlook.com [40.107.247.78]) (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 6368123C2 for ; Fri, 16 Jun 2023 07:32:03 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FhIkUkWY3vrhPDHVCXBYwVNQfFiQXRaj3rlW/Dv9km1o1Sqdp5q4bYojY7lm3im/Jo39gfoSyPuJgUltuan5xt6tSwddNq8Hu4xHvzvfHi81lfehEGrTiBobJIfZr7qo4+dNJGXxpQXfPw7I4ueYcwW0e+L+HKek9I9lCb7/kh50fb0XRUI3kxRMk/w63a22GSmluTt+ZRnjn8Zk+L/9eQc2xQC3c5g5Q8528vT1de1pzyEaEQEiK5Pjli6RWCazhiYiZSZQeR21d5j3AZBLaebLt+Eq+Mt94gf9cmytMhBnv14OAn2YFHDCjUkehqLnTge3t0j46PZAHcMK2S8hiw== 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=hVK9MSUaowTOYVMwXfv+9FmAL1n1AueRe46zxJZCN0M=; b=V77OM5D4E9gC9S7TlhyU5hc3xbqCQheq2EU+HQxBL+Jz9VjRwkPOicXBcS5IamaiB/Mrzu+IzlXHvUegZPKi030M3D+BtZ++2nn0kUMNmwN+mE6LUQmj8N7pY5EbezJJhAEomSAnbKW6uq5iy70SDiBu1EIPBKDUS1ylpezJY4SIbKlwPAGn1CTZKoklCi+hfH4oo5VF0By8gBx1t8tyfOle6YYi0RpizzpXaYcq58SAJmM8tPMQ/tizNFIYavEOXybYjj9QLIL3xYuOKGU1/1vPYmmvaOVR8twHKOxmYUvoeWs6EKoQakAGSEyJIeedkCjfYFSxUgxMnCcvltkKkQ== 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=hVK9MSUaowTOYVMwXfv+9FmAL1n1AueRe46zxJZCN0M=; b=as571SgiXoOTpB88SIxv4jrg6AxkBFEBWgtm0lpm/lLJjYd5j6GWDUCzt6fJiByQGOqBP4lHUOGP5fA76ufvQcSzcnkPsauQanXafDHUXb8KjLH25wjikJ/dPlzjrdYUzCIR5CV+PPFjz3w7N8sV9KA8z0A0aJjAjyeDAZZ1dpleuqrY80ln61SFsL929SVaHESezQCwUJqzl1yZ5i+yGRYv97AuZxQ1ByS1HxvnbJZL+Y0OC8pXQzEo2nfugKr/7eh7jtDOEieabaL4ceQJfzj8Jl6JGi7TA1Z7XCIst77JeTqB0iJGfVfnl6oylA7Y3K0otTqL/98hy2FNwvSGAg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM7PR04MB7157.eurprd04.prod.outlook.com (2603:10a6:20b:118::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.29; Fri, 16 Jun 2023 07:32:00 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59%4]) with mapi id 15.20.6455.039; Fri, 16 Jun 2023 07:32:00 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 07/10] selftests: mptcp: drop sflags parameter Date: Fri, 16 Jun 2023 15:30:59 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG3P274CA0002.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::14) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: VI1PR0402MB3503:EE_|AM7PR04MB7157:EE_ X-MS-Office365-Filtering-Correlation-Id: 38213ace-076e-4221-aac5-08db6e3bc5c0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: foSA7wx1HwQJEyyOJLsLQ3r1M/4pqemY5ijegHHQVGkxtgUnczjeHWkErRDQHJWP3JcHi4ooIaPVcx4q5z+UCFpp395V5QohQ7anyKFBg0QUBlbjRrTiPaCR1nLZr3pP5rpHUT7n7XmhcukvvT1sTXuyY0dkPLyHQDES/i+pdi69+VNVIHJwyV3Ai9PLp9pyUvvkZ+FPNCI/wWXDMEl/sRsLwf32N/fan/aJrvTmKSmM19rglFmluCu2n7eA0VaKQ9Ex5eYhlasUc6bZ88TRrYLsqMVztVoXOPW77M4YNjHNE8959PdBC2DWH4u2n68qhAfIfqIh+npoy6ITnkv/Xq6U7EoYpd9iNAS8cvifkBXzOZNeFrrVcT+VtAg+Yi7B4I1UwUsRaajjZY8mpCYe9O82ZmR0V7jA1EmpV5jvI3VkNNxP4X1RG6yADgqLloxuRUYq9ncm7pJAvGhVQkeeoBkIoJif6Kw6THDJZy6nUrKdI/OzTz+6zdGxgu/Z4McmZA5Ah0+UYXnhQ14AifHvUSZ2ZEt+gFP7ORr1H0hv0SZb/L3BRfrQHFMlh1koMmR1 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(366004)(39860400002)(376002)(346002)(136003)(451199021)(6512007)(6506007)(107886003)(26005)(6916009)(4326008)(66946007)(316002)(66476007)(66556008)(2616005)(186003)(83380400001)(6486002)(478600001)(38100700002)(8676002)(44832011)(8936002)(5660300002)(86362001)(41300700001)(2906002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?LyWu1T9IH/Fj7HnBKHGcdo4j7x5GhPI6DppHTw0EGeEEsko30P43XKCDplOb?= =?us-ascii?Q?2LFRsEgOIxBN8JrX4QVhzDX1eKuBWFQNmWedOWf+qvcFnYiB82ZAMRp+Al1u?= =?us-ascii?Q?dAhD3Mi02R3liljI8aFJJBkE2ZTMbg7hXLB1LP/vdzVU6cA/5t2X2tvsKsto?= =?us-ascii?Q?0JlzmeUhuInRMxBrErCODZ0Zveajp9xb+P5vF2f3hdkplblOjBQl7ng9GTiG?= =?us-ascii?Q?yonRghY3wb/gd/S15SpmxSxErRfJmH+zOvXMwFhMyWyp9QjAHun0+hK8S/bw?= =?us-ascii?Q?iS0zTI7VI2AKGV5AlqgjVUww0T/YtTh5xPliyff80hYoquf1Pynq2SmxejXR?= =?us-ascii?Q?FNzYQA0AAr3dB8O3yla0FxLgAEOJ561CRGoCqkH65ZmNaT0Mb60RZXwik24j?= =?us-ascii?Q?79ylMQp8CuV6uPvveH2pjGFQH2tMyTn/N2Y3vlV/9Y3BfT4lWks1duO/MhYT?= =?us-ascii?Q?zHyfdfnprQFzQ3GDaE/PjxZ9/jV2h9mSpqwNYUhE72SKlusvpRG6CG6fIHC3?= =?us-ascii?Q?yAOiEb9ozezJ43wCvlC+C4jhrgnRaQpnqqJZa4DFTV4A6q1Mty9+wShM2JiO?= =?us-ascii?Q?0pmpBGBCXze06W5X4iAUlnFUpj5RERaCUhj8UzDVZ97+LEkfSBI8Qsh+xOm8?= =?us-ascii?Q?v2fnyU1M9Qn6RbsFcKyRsAeYviTl9FNlWsFEswL95qcgYg6s9mNYj5wQYajW?= =?us-ascii?Q?L/YP8N0eicoESj6cY4lCCiTML8L+DuYBNwj3kWoR2g2F2zj5her8nIDe7nTP?= =?us-ascii?Q?SfVD2Vl1/eTI7R4J0l39na++t+ek6fe6HmvAOY2emCoQjgV91XhkjOXqkBHa?= =?us-ascii?Q?tmJuP8bM2HwIQkeyulrfogq884HxR1wOIJ/Rgdnx6bUZpIIzcqwElJ0vTi9r?= =?us-ascii?Q?oeWbk2R6MqiSi/X96U25VmW/6YolllzWFK4wRbD/jye/fPjA2Y65ehhjC6rx?= =?us-ascii?Q?yh1mtmcDOwGl3QQMSVoi+4XcQHvG2SM33c0Ty4rbZjfFdP/ZLvq5GRm5e26I?= =?us-ascii?Q?l0HQRenLr07BGyWYsrzh2K+KJeFr3TQfudZBXYTHkyW2cZGEZbk8MHs4GKT2?= =?us-ascii?Q?6m9JMY1WkxyWCsgSgQED0dTOqAS5w5Mo2cD17PQmEGyor86J+64Ir1k/wwiP?= =?us-ascii?Q?LL7cwoFfCLXP90KAzD7/sycS7MDJXeNiKRAaafxe92dC2eN3LRVUFbmLix66?= =?us-ascii?Q?eyVPzypiFmqOnUuZMxzPFv+WwY5Btf3EkMKTDGcc4/tdBtkuNy2E3BCsBdAY?= =?us-ascii?Q?RCoYunlhlXeiZs0AmhcJIETnSkov91DK2cmhgsHLqiHT5ZABd+wSx13yJKIi?= =?us-ascii?Q?7iaz4blyMAtg8JIrpkvN82SNNvlo42biSn2meMBsk76GeonbhhcvGw/ic0EW?= =?us-ascii?Q?FSoI7p/9jm7CiVztUgzPzrRi4PswzVj3PJFAYtDWSaV1hHhjwmF8U9alHgO2?= =?us-ascii?Q?XnQ4psKe7B37iaDGU7NWVGnQRva/hiI0MyFTHaDf1Y3g+kcV4xinipykEFDK?= =?us-ascii?Q?XbcNcuv42LOsBhccOl9Q1BG+c1YUM8VrBIz5Gknz2eut5pI6l/N2Yco+mn00?= =?us-ascii?Q?W+yOvnidMOc8kGE0uS2QHxlRmqbm21eOO1U+dYor?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 38213ace-076e-4221-aac5-08db6e3bc5c0 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 07:32:00.5525 (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: lOdqrA414wpKklh5G6GZkxAuoG7awDCibgkJX7DvwcTjhh0G7U2EmZSUAW/iwTZgVDdEXund7wFVYRQsJ8BDjQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7157 Content-Type: text/plain; charset="utf-8" run_tests() accepts too many optional parameters. Before this modification, it was required to set all of then when only the last one had to be changed. That's not clear to see all these 0 and it makes the maintenance harder: run_tests $ns1 $ns2 10.0.1.1 1 2 3 slow Instead, the parameter can be set as an env var with a limited scope: foo=3D1 bar=3D2 next=3D3 \ run_tests $ns1 $ns2 10.0.1.1 slow This patch switches to key/value "sflags=3D*" instead of positional paramet= er sflags of do_transfer() and run_tests(). Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts --- .../testing/selftests/net/mptcp/mptcp_join.sh | 39 +++++++++++-------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f9bf4733ca41..49d0fa5496a2 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -53,6 +53,7 @@ export FAILING_LINKS=3D"" export test_linkfail=3D0 export addr_nr_ns1=3D0 export addr_nr_ns2=3D0 +export sflags=3D"" =20 # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x30) || # (ip6 && (ip6[74] & 0xf0) =3D=3D 0x30)'" @@ -829,7 +830,6 @@ do_transfer() local srv_proto=3D"$4" local connect_addr=3D"$5" local speed=3D"$6" - local sflags=3D"${7}" =20 local port=3D$((10000 + TEST_COUNT - 1)) local cappid @@ -1147,7 +1147,6 @@ run_tests() local connector_ns=3D"$2" local connect_addr=3D"$3" local speed=3D"${4:-fast}" - local sflags=3D"${5:-""}" =20 local size =20 @@ -1191,8 +1190,7 @@ run_tests() make_file "$sinfail" "server" $size fi =20 - do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} \ - ${speed} ${sflags} + do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} ${= speed} } =20 dump_stats() @@ -2693,7 +2691,8 @@ backup_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,backup - run_tests $ns1 $ns2 10.0.1.1 slow nobackup + sflags=3Dnobackup \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 chk_prio_nr 0 1 fi @@ -2704,7 +2703,8 @@ backup_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 slow backup + sflags=3Dbackup \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 chk_add_nr 1 1 chk_prio_nr 1 1 @@ -2716,7 +2716,8 @@ backup_tests() pm_nl_set_limits $ns1 0 1 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_set_limits $ns2 1 1 - run_tests $ns1 $ns2 10.0.1.1 slow backup + sflags=3Dbackup \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 chk_add_nr 1 1 chk_prio_nr 1 1 @@ -2742,7 +2743,8 @@ backup_tests() if reset "mpc switch to backup" && continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; = then pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 slow backup + sflags=3Dbackup \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 0 0 0 chk_prio_nr 0 1 fi @@ -2751,7 +2753,8 @@ backup_tests() continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; = then pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 slow backup + sflags=3Dbackup \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 0 0 0 chk_prio_nr 1 1 fi @@ -3126,8 +3129,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow pm_nl_set_limits $ns2 4 4 - addr_nr_ns2=3D1 \ - run_tests $ns1 $ns2 10.0.1.1 slow fullmesh + addr_nr_ns2=3D1 sflags=3Dfullmesh \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 2 2 2 chk_rm_nr 0 1 fi @@ -3138,8 +3141,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow,fullmesh pm_nl_set_limits $ns2 4 4 - addr_nr_ns2=3Dfullmesh_1 \ - run_tests $ns1 $ns2 10.0.1.1 slow nofullmesh + addr_nr_ns2=3Dfullmesh_1 sflags=3Dnofullmesh \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 2 2 2 chk_rm_nr 0 1 fi @@ -3150,8 +3153,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow pm_nl_set_limits $ns2 4 4 - addr_nr_ns2=3D1 run_tests \ - $ns1 $ns2 10.0.1.1 slow backup,fullmesh + addr_nr_ns2=3D1 sflags=3Dbackup,fullmesh \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 2 2 2 chk_prio_nr 0 1 chk_rm_nr 0 1 @@ -3163,7 +3166,8 @@ fullmesh_tests() pm_nl_set_limits $ns1 4 4 pm_nl_set_limits $ns2 4 4 pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,backup,fullmesh - run_tests $ns1 $ns2 10.0.1.1 slow nobackup,nofullmesh + sflags=3Dnobackup,nofullmesh \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 2 2 2 chk_prio_nr 0 1 chk_rm_nr 0 1 @@ -3338,7 +3342,8 @@ userspace_tests() pm_nl_set_limits $ns1 1 1 pm_nl_set_limits $ns2 1 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow - run_tests $ns1 $ns2 10.0.1.1 slow backup + sflags=3Dbackup \ + run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 0 chk_prio_nr 0 0 fi --=20 2.35.3 From nobody Tue May 14 04:36:08 2024 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2059.outbound.protection.outlook.com [40.107.14.59]) (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 093E323C2 for ; Fri, 16 Jun 2023 07:32:11 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BeMHxGJL/JLnK+W9EmbXqo2JsKaer/XztZrFAeMje6im3OoyY+asnWthJtVbUWybp/wwTcC0BDnEeQVdATisVf8SP3IYk+j3UqUTLqeTJ7bImzS5qLF3G94H+UQSU/msu5EGBbtO0R7YAmHkduwoDeO5Pzl+d9ODsGp1+3x/RlmWrc1S++eZ1Q2oJhoDSqF1MDo/SscjXBvhISWiZ9q3xIEWq8MaWuSAr0unC6stVjmx4C8uKY/uO9eB/N8LRseZhdvs0Kzzv7w4mfEqTE8Ai99J1j4Z9ytB/vig2T514i6lZoJopru/o9cAMxLIu14uKjRFhuwL36Zd3fgpXPbdEQ== 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=t0MsODbHF4hJccdLIrllByj0rSIagnxB5b8D70tzx40=; b=k64g61iwICBWVmw6E05FiP+vbqE5Dom3/O/lM7BqHCSfzP+cp0Bk7byM8R+7Apr5817pMnWrRjZBpoGcIjIseSkCWW7IAy3gRvMaQxGsk6YxP9e0DWUAXnSonB81ield6jFDfR4mw7CuNmqQoiM4V6g0B6ox4zarTfvhSJDG2cpI1cIpsLv/3U4iDvtUnIHh1FZ0P/r7OeaLoBFrne3G2l4BlFsO9HTghY0f7z0K1HqaFQoZqmEWPrA1cHxVKpbBEZOfmXhYx4SS/6Zr3Jbt35NbXvxj4VM+BxRy+Z11IJS/DvplTXZulgxH9rgEjUDzajVa5YZBSTRj0niF6BK2ag== 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=t0MsODbHF4hJccdLIrllByj0rSIagnxB5b8D70tzx40=; b=25x75q3a/ifsaAiGseSCTZ1XUxTZvBFYkLFHmujedVsT+1AL5uIr9lCiEmM5xIqYueImejjIBH7hTTm6l/uKKpFsh4tO4/n1lLVibOJvmudVSHAaqu/hzq8IKgcr4Fdks8cHPoM/mA0GOXdBHzg4Cff016lLEHm8gT5tRHszHZa/+SVsvgr6uJS045zNFAXhASMYQAHOQnNt/JGbW2K+reGpn/CtIWoDlqWzGTtTphq/wxQfgSHP6iTc1sNLtsBsYuPzyKgplNyv4Vgg/0R99/FvJHf4eSlGpPqo3CCQCOHPIcE+4j5jp/52ci0+4nQ/hmIVrwlgFCQDqZIfEi2p2Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM7PR04MB7157.eurprd04.prod.outlook.com (2603:10a6:20b:118::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.29; Fri, 16 Jun 2023 07:32:09 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59%4]) with mapi id 15.20.6455.039; Fri, 16 Jun 2023 07:32:08 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 08/10] selftests: mptcp: add pm_nl_set_endpoint helper Date: Fri, 16 Jun 2023 15:31:00 +0800 Message-Id: <2efa6bc9b4f8b3817a64445f92f50bace87aeb20.1686900596.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG3P274CA0010.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::22) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: VI1PR0402MB3503:EE_|AM7PR04MB7157:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a21fdec-4bf6-4d45-23a6-08db6e3bca7e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iWtTSeT3BmpviI1FyKctC3XSjBSM9WF+Y5eMG1bL/5spRVMD0ScoBsnDWq4yNwzwYGi7yunIdE3myEvvO1gFktN17ljmWU6ZYKmUQ6n/i7GT+x8pTw8/DOZZkJT61Hey0ZZbFrOKA0xS/fmHfGC174QnGsBNH6mRZIASXi87szNIi9+H5EEtoOsgU52mN3ffbBAEPA2KzwveooJLLpKeE6QhIGrUjfrZZ4lp8cvDYagw32CJ2KLjzG/dAme/qI8V0e39zPlfKHKSK+deqI5z9EpjB28icc09UBybQlCGF7Jy5biodbmJaJ/e+ub+uVNCwJNFjOcIad3FK5NLgvjqAQqaE9aZfTH3DxfzjptuXCSrS3Jsj4GqxEEkk0j/03MjfYap9pWFje73UVUsJxsH4BzjLi3cwnRib1LbbT5wIFJxzy08pRxEbgf5KymanOtDQ0DdleWcWHLVdy8NTOk/sjmYQbq4ycTNMmg4/7RinXFtyd8mmudZobIwKjWVXnHO8bXAqZEfc7pSnwezUMsV/tE4Ih771T9wRiA7QyCzy9e08clL+d6cpyFBmDKINsBj X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(366004)(39860400002)(376002)(346002)(136003)(451199021)(6512007)(6506007)(107886003)(26005)(6916009)(4326008)(66946007)(316002)(66476007)(66556008)(2616005)(186003)(83380400001)(6666004)(6486002)(478600001)(38100700002)(8676002)(44832011)(8936002)(5660300002)(86362001)(41300700001)(2906002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ASytsSEKHb1MXWbl6XT7EVH4nXLSsVzL48C4erOc11FUdGm1AwInpSKOlB++?= =?us-ascii?Q?bh3AAhIV2kP+xFYnRVtPuyYLMeboULdRDA+RUGjQi9vbsibUB5IXBsqEJ2sF?= =?us-ascii?Q?6x1xQ98T1i6rqgL9UMfCWBXStA7EqBdltDN+9fS0WUHkuBkMgF9fKia9AnU+?= =?us-ascii?Q?uwk2Xte5rwKZhHkw3WZUjasO5HUvzjScnin8vwO7foiaLghsBiseV7hTuO19?= =?us-ascii?Q?glQjGSV8wGaZktxuEjzQJPekXYW87CcyXjqUFqZdye5Kg9fnLjRFRRTcfdqz?= =?us-ascii?Q?jdj29JDP2oOP0Z1//8hYZLvFS5ZcMLWP/h4WBCK7DsXlGEH3s4aKFI55XFyL?= =?us-ascii?Q?XtpDmr06pmwiPvZDLb4rCZyqMiuGsWA0js3qwg9sFPRFnFOOPT35F8LhBE9t?= =?us-ascii?Q?LTgwJuABB3YOobF4zfWMQOxD3oEWqGvdPgHcJuOWttiIbBMTSy3YXvbpfc54?= =?us-ascii?Q?ZfHL8w/VxhCyr6nyLB4+Lh7eNQ9TuWSMg1eugD4hhjJ9xuqWeADrbHi7jjoQ?= =?us-ascii?Q?x3zxz5S5O0Dt6LDopZAeHn05JLzJK5obxrtmsuEZRZRI9NsKW3BuyXlv76t1?= =?us-ascii?Q?6yFqil5eCFRQlS70yZYZFZ/lzA+PO8X6UbRDxyfiU3zdnc7QaHkuD7a73kWA?= =?us-ascii?Q?hzm/BYOjlQ3MpmNnV9USLHy+VJXTEgJ5jpjYSdoMPBdvx6sG+spfJM0DyJCb?= =?us-ascii?Q?71lagIwneJU4zGUkaXcjbAfwe1k1PKqFrDR8m5M9wybLzQh6Ge+7L4JZ9Lfu?= =?us-ascii?Q?vehWdSeo13tgAuCJ88L6QrnV1eRqluRTarHuXL9CUx2LkN10fwJdEwDMIIsi?= =?us-ascii?Q?sPArFUbLlBeUS9l3P4xmw+RrYsG2KbADI6mJBpzqmlXQ91gzi0Z8mOeRoo1b?= =?us-ascii?Q?tp3fFvrpCA/odv+NFzdCJzMLtELZszpJIC8BCsjFyDIP88uXIanh70dglHxC?= =?us-ascii?Q?jH8y+9urTCO7UC5puGPULpazqIOjB9eDTj1hJrxXEe6AcjBcio9m/tcKusk6?= =?us-ascii?Q?JnfMc84J66lzBGqYlHvuoMvrZlrSniD86yxP6az2awbt+CP4EXMjkQllbDII?= =?us-ascii?Q?k30f8u8XW+aFFom29Z73XENB9VHSDVP1YrKKznf6y3Ga52mRJdiZVYl5g8se?= =?us-ascii?Q?UXtDUxWWs8l3l8BsOi8UYykaGu6iL+2vjP5mYLfTP9QAorC8JGZTg69XgAfe?= =?us-ascii?Q?oaX5xY2K8bjBpRSzIYxSuFmKMWjuZF0neVAQwQAR0OW+6V+GDWgKMf+aZR5F?= =?us-ascii?Q?EgM3mxj6e3LGNGg+WyxnGe8i9y2GlH6JoIul+h0hRqVn+nzJinZS31i9vmsv?= =?us-ascii?Q?kqsphJtXbqWy8F29cySBGhEG3H6vI9n+JRhTUfZWMVsmBcyvVUr2XnDGbCXt?= =?us-ascii?Q?RrD5fYbOLAf+SDlLmWc5Tw0Tw+P/7+a9814V+Lo6U5/LLJ/ot/rFGkNQBE7r?= =?us-ascii?Q?EYoiDl5+X7MNRXFOUvLxRoTISTFBrAC1sMQSch/qf/TyGKQCS4ThEAOkh14B?= =?us-ascii?Q?5G3cRykGDjtgD1ez0/nNIoUxGBMS+GJPFb9iGiZ7TJL+tX2OQPCS4M8qFCvj?= =?us-ascii?Q?AECDMPEqhWfsOymbHnC1WEyLrSQlRgg/yLuK7hIQ?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a21fdec-4bf6-4d45-23a6-08db6e3bca7e X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 07:32:08.8556 (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: YrXgbXynuA8gmENeVK5Dl3lxpXyCXf3d4D1InGf5uckPQUvzq7HUiPwlCnrB5vr3ih7jEQQ0J837Q5ozpEV9LA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7157 Content-Type: text/plain; charset="utf-8" This patch moves endpoint settings out of do_transfer() into a new helper pm_nl_set_endpoint(). And invoke this helper in do_transfer(). This makes the code much more clearer. Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts --- .../testing/selftests/net/mptcp/mptcp_join.sh | 235 +++++++++--------- 1 file changed, 122 insertions(+), 113 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 49d0fa5496a2..c3c8471f9ad1 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -822,122 +822,11 @@ pm_nl_check_endpoint() fi } =20 -do_transfer() +pm_nl_set_endpoint() { local listener_ns=3D"$1" local connector_ns=3D"$2" - local cl_proto=3D"$3" - local srv_proto=3D"$4" - local connect_addr=3D"$5" - local speed=3D"$6" - - local port=3D$((10000 + TEST_COUNT - 1)) - local cappid - - :> "$cout" - :> "$sout" - :> "$capout" - - if [ $capture -eq 1 ]; then - local capuser - if [ -z $SUDO_USER ] ; then - capuser=3D"" - else - capuser=3D"-Z $SUDO_USER" - fi - - capfile=3D$(printf "mp_join-%02u-%s.pcap" "$TEST_COUNT" "${listener_ns}") - - echo "Capturing traffic for test $TEST_COUNT into $capfile" - ip netns exec ${listener_ns} tcpdump -i any -s 65535 -B 32768 $capuser -= w $capfile > "$capout" 2>&1 & - cappid=3D$! - - sleep 1 - fi - - NSTAT_HISTORY=3D/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \ - nstat -n - NSTAT_HISTORY=3D/tmp/${connector_ns}.nstat ip netns exec ${connector_ns} \ - nstat -n - - local extra_args - if [ $speed =3D "fast" ]; then - extra_args=3D"-j" - elif [ $speed =3D "slow" ]; then - extra_args=3D"-r 50" - elif [[ $speed =3D "speed_"* ]]; then - extra_args=3D"-r ${speed:6}" - fi - - local flags=3D"subflow" - local extra_cl_args=3D"" - local extra_srv_args=3D"" - local trunc_size=3D"" - if [[ "${addr_nr_ns2}" =3D "fastclose_"* ]]; then - if [ ${test_linkfail} -le 1 ]; then - echo "fastclose tests need test_linkfail argument" - fail_test - return 1 - fi - - # disconnect - trunc_size=3D${test_linkfail} - local side=3D${addr_nr_ns2:10} - - if [ ${side} =3D "client" ]; then - extra_cl_args=3D"-f ${test_linkfail}" - extra_srv_args=3D"-f -1" - elif [ ${side} =3D "server" ]; then - extra_srv_args=3D"-f ${test_linkfail}" - extra_cl_args=3D"-f -1" - else - echo "wrong/unknown fastclose spec ${side}" - fail_test - return 1 - fi - addr_nr_ns2=3D0 - elif [[ "${addr_nr_ns2}" =3D "fullmesh_"* ]]; then - flags=3D"${flags},fullmesh" - addr_nr_ns2=3D${addr_nr_ns2:9} - fi - - extra_srv_args=3D"$extra_args $extra_srv_args" - if [ "$test_linkfail" -gt 1 ];then - timeout ${timeout_test} \ - ip netns exec ${listener_ns} \ - ./mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ - $extra_srv_args "::" < "$sinfail" > "$sout" & - else - timeout ${timeout_test} \ - ip netns exec ${listener_ns} \ - ./mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ - $extra_srv_args "::" < "$sin" > "$sout" & - fi - local spid=3D$! - - wait_local_port_listen "${listener_ns}" "${port}" - - extra_cl_args=3D"$extra_args $extra_cl_args" - if [ "$test_linkfail" -eq 0 ];then - timeout ${timeout_test} \ - ip netns exec ${connector_ns} \ - ./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ - $extra_cl_args $connect_addr < "$cin" > "$cout" & - elif [ "$test_linkfail" -eq 1 ] || [ "$test_linkfail" -eq 2 ];then - ( cat "$cinfail" ; sleep 2; link_failure $listener_ns ; cat "$cinfail" )= | \ - tee "$cinsent" | \ - timeout ${timeout_test} \ - ip netns exec ${connector_ns} \ - ./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ - $extra_cl_args $connect_addr > "$cout" & - else - tee "$cinsent" < "$cinfail" | \ - timeout ${timeout_test} \ - ip netns exec ${connector_ns} \ - ./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ - $extra_cl_args $connect_addr > "$cout" & - fi - local cpid=3D$! + local connect_addr=3D"$3" =20 # let the mptcp subflow be established in background before # do endpoint manipulation @@ -1077,6 +966,126 @@ do_transfer() done done fi +} + +do_transfer() +{ + local listener_ns=3D"$1" + local connector_ns=3D"$2" + local cl_proto=3D"$3" + local srv_proto=3D"$4" + local connect_addr=3D"$5" + local speed=3D"$6" + + local port=3D$((10000 + TEST_COUNT - 1)) + local cappid + + :> "$cout" + :> "$sout" + :> "$capout" + + if [ $capture -eq 1 ]; then + local capuser + if [ -z $SUDO_USER ] ; then + capuser=3D"" + else + capuser=3D"-Z $SUDO_USER" + fi + + capfile=3D$(printf "mp_join-%02u-%s.pcap" "$TEST_COUNT" "${listener_ns}") + + echo "Capturing traffic for test $TEST_COUNT into $capfile" + ip netns exec ${listener_ns} tcpdump -i any -s 65535 -B 32768 $capuser -= w $capfile > "$capout" 2>&1 & + cappid=3D$! + + sleep 1 + fi + + NSTAT_HISTORY=3D/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \ + nstat -n + NSTAT_HISTORY=3D/tmp/${connector_ns}.nstat ip netns exec ${connector_ns} \ + nstat -n + + local extra_args + if [ $speed =3D "fast" ]; then + extra_args=3D"-j" + elif [ $speed =3D "slow" ]; then + extra_args=3D"-r 50" + elif [[ $speed =3D "speed_"* ]]; then + extra_args=3D"-r ${speed:6}" + fi + + local flags=3D"subflow" + local extra_cl_args=3D"" + local extra_srv_args=3D"" + local trunc_size=3D"" + if [[ "${addr_nr_ns2}" =3D "fastclose_"* ]]; then + if [ ${test_linkfail} -le 1 ]; then + echo "fastclose tests need test_linkfail argument" + fail_test + return 1 + fi + + # disconnect + trunc_size=3D${test_linkfail} + local side=3D${addr_nr_ns2:10} + + if [ ${side} =3D "client" ]; then + extra_cl_args=3D"-f ${test_linkfail}" + extra_srv_args=3D"-f -1" + elif [ ${side} =3D "server" ]; then + extra_srv_args=3D"-f ${test_linkfail}" + extra_cl_args=3D"-f -1" + else + echo "wrong/unknown fastclose spec ${side}" + fail_test + return 1 + fi + addr_nr_ns2=3D0 + elif [[ "${addr_nr_ns2}" =3D "fullmesh_"* ]]; then + flags=3D"${flags},fullmesh" + addr_nr_ns2=3D${addr_nr_ns2:9} + fi + + extra_srv_args=3D"$extra_args $extra_srv_args" + if [ "$test_linkfail" -gt 1 ];then + timeout ${timeout_test} \ + ip netns exec ${listener_ns} \ + ./mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ + $extra_srv_args "::" < "$sinfail" > "$sout" & + else + timeout ${timeout_test} \ + ip netns exec ${listener_ns} \ + ./mptcp_connect -t ${timeout_poll} -l -p $port -s ${srv_proto} \ + $extra_srv_args "::" < "$sin" > "$sout" & + fi + local spid=3D$! + + wait_local_port_listen "${listener_ns}" "${port}" + + extra_cl_args=3D"$extra_args $extra_cl_args" + if [ "$test_linkfail" -eq 0 ];then + timeout ${timeout_test} \ + ip netns exec ${connector_ns} \ + ./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ + $extra_cl_args $connect_addr < "$cin" > "$cout" & + elif [ "$test_linkfail" -eq 1 ] || [ "$test_linkfail" -eq 2 ];then + ( cat "$cinfail" ; sleep 2; link_failure $listener_ns ; cat "$cinfail" )= | \ + tee "$cinsent" | \ + timeout ${timeout_test} \ + ip netns exec ${connector_ns} \ + ./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ + $extra_cl_args $connect_addr > "$cout" & + else + tee "$cinsent" < "$cinfail" | \ + timeout ${timeout_test} \ + ip netns exec ${connector_ns} \ + ./mptcp_connect -t ${timeout_poll} -p $port -s ${cl_proto} \ + $extra_cl_args $connect_addr > "$cout" & + fi + local cpid=3D$! + + pm_nl_set_endpoint $listener_ns $connector_ns $connect_addr =20 wait $cpid local retc=3D$? --=20 2.35.3 From nobody Tue May 14 04:36:08 2024 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2075.outbound.protection.outlook.com [40.107.14.75]) (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 C304823C2 for ; Fri, 16 Jun 2023 07:32:20 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F11xVltNPBZOCa7mdmTcY4WZRgZVShu5QRUBu2yNH+JQXpSekuqEedHFhHnvLEOQSYLqNRctUs8F6CWtgPiPf548Um/ptizeJ+MrPMhVboMOxjws3/PNMMe740XwHKyG2kF3wDDDtZs+d3IaH0Z6Ch0Lcb23JnlsxQ70XkFP9gNyBICdamjTpa61yBxhcMMIEcS5GTXwcuG14oUgwBCYBwu2ctXBY6l+BdvvYaE6G08gqz+uMQ3LGmvnpCn/nzt2Oz3NZ83jhlTVnKWR3ccqugk1AkKZjIniIpn6SePozDimtydy839h4yFdgheugIpyDCTSfHm+uIY/IkEiJ94idg== 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=0EfCkrssy6+K6TWdQh8vo1wHv5UNkJXwm+eNA9B6Ylg=; b=X16zC3/rhszgleZ4Ekd4dwnTqIwzfvRlVpyWnMpAge6ezc5hlrr61QoKakWBMqVPbadbHShUcXV8qJHMqHPZVMZ0oOW025XitoqkdtfGNT3NXF0QY4QGxAlrTeg5PPQ3DSuQJ8HnjkGHOmg59QkPb7dRBC6J7Tg2vtZpiGzuo1JVJxM+ALsL/xTWU0zQiyHUNqU323ZKJyqZZjnK8HCNLvffKJbTwEF1aZwxD7FuJqoJRID0m5fEiOuVAbeVBdqNCKq6A/8NCanC/V1v7g9HmjMd65Q9nKT84gtbaS2QA04QX8UmBD73g25mwvPgunpG3bA1W5br7/fTmB0D7UldRw== 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=0EfCkrssy6+K6TWdQh8vo1wHv5UNkJXwm+eNA9B6Ylg=; b=J4na+1BMKw03hUdkFgIg7THA+9Uhtw1qD3ewcSvQlq83GjaPWgbKSrqx0cfJknzFcolGxF1nMSnr0xDnyh4qXh/5WIq3aH3srZU/1Y46iP2ywsialTEqnl3EF2ixBF5c2n5Dx34wqeeCsQ7559SxcJd6Aj2fZpC7wth8KLE6JpUHAX0G6XQgr+zBjmi2cYTDpNExzHc0PqXD291I7XswhxOkD62zIhDBPu1vBfYToi80iHwoU48Qr9JWarz+wrIYPJZO4b02WlceN1lqPPOjLMAnXqOzc4NsVbj+C0z62k4lKMyiKmsIPKEWIK7wFU8qI5Emb6HCxnuW2mvNMoL0+A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM7PR04MB7157.eurprd04.prod.outlook.com (2603:10a6:20b:118::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.29; Fri, 16 Jun 2023 07:32:17 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59%4]) with mapi id 15.20.6455.039; Fri, 16 Jun 2023 07:32:17 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 09/10] selftests: mptcp: pass fastclose to sflags Date: Fri, 16 Jun 2023 15:31:01 +0800 Message-Id: <70cf8f866f114c950f14febf9c41f0f09f4ea5c5.1686900596.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0045.apcprd02.prod.outlook.com (2603:1096:4:196::21) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: VI1PR0402MB3503:EE_|AM7PR04MB7157:EE_ X-MS-Office365-Filtering-Correlation-Id: e2d166f7-862d-4a85-b7c0-08db6e3bcffc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: a4l8eycCUqmzJfJBuZ5qMaDMOBHNBYB0xbYRMkcu/X63yvPkOGWLO7nNCkeNP1qpQL1oBQ+ERUdSlKY1XDOA2Gu4qFsRrBFeOWlP/cbMYsY6vDVrt1XyEiTPTkYVMmOvW53zRTQc2xpHiGgXtugz1pc08LJC7PcN2Gw8JhKq6hA+F/b2waV5+uSp3j8N30WPT/3Kn+k911R369ZTHi4efiMc6NapdDK2MYGXjrKE4s8pyDLhmeunTU/6AVRDFBxG+08AUhK4AQQg/PjYN28LumW9sZwrrS4AhPBkOII5GeGZhaSKi7a0bVyL9cgdqOwp8sFVgwTI9wyV3lBSny7XtAjUKdHcCQId4gF1LRq1WZxmJncbXxt1ufR8vZcCzZqcxeXpvLX3YBc35jF1tPgO5Htfnl6/+FCpf60qOO/vmgrr1DAZqOoIF4xqMXAKfVijtAUlZ6Gnj5OnslcEy7KdzI/qSR6BgDjI5JFC0freUc672IC4+aqlGoYEKLzZaLxHheKbHz5ZUQs4r52yQKT8zD8/+XB3HilWYwh5O19uZwMb9O9HRD/kvgqRnMQVgTEU X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(366004)(39860400002)(376002)(346002)(136003)(451199021)(6512007)(6506007)(107886003)(26005)(6916009)(4326008)(66946007)(316002)(66476007)(66556008)(2616005)(186003)(83380400001)(6666004)(6486002)(478600001)(38100700002)(8676002)(44832011)(8936002)(5660300002)(86362001)(41300700001)(2906002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wMZyKGPsYLFKMcYLZ6SWEuFUJUYkw0HJDIYq1GFpRuQDEb7cfeaHW/4WnKwb?= =?us-ascii?Q?hFHCfdYnzYWDCyugt+RPQDCa27CcWfdv3ymnD38vLQxCmi21l42Zk3kDi88z?= =?us-ascii?Q?lCShDP7PyMlEURgsBDSjLbfhEG0yKZIHN3ToXA/x4w7CF+vGkTlf1jr/ncNm?= =?us-ascii?Q?gYq3H5QCaWFnJYvBPTS5kNTjSOjsDtZ6mu6U8f3n9H5yVHsyxr2eER4pyvAx?= =?us-ascii?Q?JBmUqAlHhrcG4nDshzjTWHqrOwYhZQCeSbhB7Z1M4pnpejk9V6I9nTe3pawv?= =?us-ascii?Q?mgSrwL5o9vYxjOU6sB0dcKjXvO5DtxILqvHdLEUY7hPER6aEt7MGq/efjRfk?= =?us-ascii?Q?TeAN7CIXP3aR9DLoisigSuaw4L4jBVy23t+7p6vfboPOIJNDcfhBf4Rm9UG4?= =?us-ascii?Q?M8qDUlA+P6QuNstmD9MlV63lBEKlQkPH/Bf0k25m5nqhwsbT9Lc6qfWQpS+B?= =?us-ascii?Q?qbFNzs+6Ei2nNQPtp5I8h4wG4iFqNebgOxEop5Hm+itulQv9B3WyBM1Hx/6S?= =?us-ascii?Q?KFXxLfbx+Ixd03thvAcnOSEmT1j3qYW3iI+Ut0WR6x2dNvFN7A9xYL/lav9M?= =?us-ascii?Q?9y5NEzC+cS2qVMXp29gNQtGDkstLRIaATMmz5ept31bBZ1G7K0I2Euj+a5tZ?= =?us-ascii?Q?SqSoTYrSc2GvrEG0turLINtuv+JSVenl9sYdCJxuMamFYoXn3VFOXu7o/WEY?= =?us-ascii?Q?vOzTnuNSdk52v6mbSCERl7nCOtvN8r9k23h6E6gWeaH/x2etuwj6yDl1r6+J?= =?us-ascii?Q?xVOpLe+0871qrT60a7YNbSbN26K59eytDk+0D0XrJzZACOsYKXVj98GSp2pd?= =?us-ascii?Q?FUXVCXMZurZIrw7rmVAuc3oNkYIry6tUzgSlDZuYXMFEV+4NVu74w1W1iz6j?= =?us-ascii?Q?NjRGXP4OtuQ1nSvQzKxhj9w7EBimi82mpv5pSxezRoZmnx1GJj6QlFKJ7K+D?= =?us-ascii?Q?yZml+BhDze5n4lJRRcDw8fEK2xga8VQQFPsvHwWdT0u6uWwpBem3Nax0FRVE?= =?us-ascii?Q?D7S+9Lw3I1l0K0mMGs/GoRnF/dQlhDvP1zPkZnQOi7CwLWp4/nPjdIUggFE8?= =?us-ascii?Q?mdY1viFLuNT4ZWDPt6Fv2KLD26LpSUbqhFyeqyYtvRz2fzQExduRiEGmY2TT?= =?us-ascii?Q?IqxUsjtqmlDXqddqO36bD/g6mN8RsjJu8c+oIRGE9pOBamcl053DI1L38g9L?= =?us-ascii?Q?t0Y8vsrJbbQFZnSqMgKT9aSaHBr5dn2sEHOoof8LSiVvhavdOR1KhQsHGvP8?= =?us-ascii?Q?W0U45qRgJfFR11eBJV6QEIx0AV+4jZKDfZbpoq6KvAHyCyNUs4j0i0wyqmDz?= =?us-ascii?Q?kDqKWFlZuML7Og93Nh7AYS68ITWLgZm3zRIJcOP6X3REGhFESRC6VymcXgPK?= =?us-ascii?Q?pbxqKiCjFAKSi1TqrOwGiKW+6QYLys6lAOgXDz6UtkuPrryiClg4D1S2OGXr?= =?us-ascii?Q?OGirdjTyEystZgJfUlI0lIkJpeJ8J2Z+xpkp6SSPiQ+X+AHcD44v/YRxX/22?= =?us-ascii?Q?zsjxMtR+eutGtQy/Tg6TAFr15bmyG8jV6fkpE120j6V7zTfEgf7xXAgGVDYE?= =?us-ascii?Q?Eul6FrKyxPRp82TDioXrrlDuVA2sQNr/Rib4kzjm?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e2d166f7-862d-4a85-b7c0-08db6e3bcffc X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 07:32:17.8253 (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: SjhijTv1yHoB0zx1hPSs+NNsGqU+vzVffMXK0+ITEYXHb4lOS8W+Kj6156vTKfyoGZgotSJsP9inNQvYU9BDqg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7157 Content-Type: text/plain; charset="utf-8" Pass fastclose flag to the sflags argument instead of addr_nr_ns2. Then the fullmesh flag setting can be moved into pm_nl_set_endpoint() from do_transfer(). Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts --- .../testing/selftests/net/mptcp/mptcp_join.sh | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index c3c8471f9ad1..89379815b619 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -828,6 +828,12 @@ pm_nl_set_endpoint() local connector_ns=3D"$2" local connect_addr=3D"$3" =20 + local flags=3D"subflow" + if [[ "${addr_nr_ns2}" =3D "fullmesh_"* ]]; then + flags=3D"${flags},fullmesh" + addr_nr_ns2=3D${addr_nr_ns2:9} + fi + # let the mptcp subflow be established in background before # do endpoint manipulation if [ $addr_nr_ns1 !=3D "0" ] || [ $addr_nr_ns2 !=3D "0" ]; then @@ -1015,11 +1021,10 @@ do_transfer() extra_args=3D"-r ${speed:6}" fi =20 - local flags=3D"subflow" local extra_cl_args=3D"" local extra_srv_args=3D"" local trunc_size=3D"" - if [[ "${addr_nr_ns2}" =3D "fastclose_"* ]]; then + if [[ "${sflags}" =3D "fastclose_"* ]]; then if [ ${test_linkfail} -le 1 ]; then echo "fastclose tests need test_linkfail argument" fail_test @@ -1028,7 +1033,7 @@ do_transfer() =20 # disconnect trunc_size=3D${test_linkfail} - local side=3D${addr_nr_ns2:10} + local side=3D${sflags:10} =20 if [ ${side} =3D "client" ]; then extra_cl_args=3D"-f ${test_linkfail}" @@ -1041,10 +1046,6 @@ do_transfer() fail_test return 1 fi - addr_nr_ns2=3D0 - elif [[ "${addr_nr_ns2}" =3D "fullmesh_"* ]]; then - flags=3D"${flags},fullmesh" - addr_nr_ns2=3D${addr_nr_ns2:9} fi =20 extra_srv_args=3D"$extra_args $extra_srv_args" @@ -3186,7 +3187,7 @@ fullmesh_tests() fastclose_tests() { if reset_check_counter "fastclose test" "MPTcpExtMPFastcloseTx"; then - test_linkfail=3D1024 addr_nr_ns2=3Dfastclose_client \ + test_linkfail=3D1024 sflags=3Dfastclose_client \ run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_fclose_nr 1 1 @@ -3194,7 +3195,7 @@ fastclose_tests() fi =20 if reset_check_counter "fastclose server test" "MPTcpExtMPFastcloseRx"; t= hen - test_linkfail=3D1024 addr_nr_ns2=3Dfastclose_server \ + test_linkfail=3D1024 sflags=3Dfastclose_server \ run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_fclose_nr 1 1 invert --=20 2.35.3 From nobody Tue May 14 04:36:08 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2079.outbound.protection.outlook.com [40.107.8.79]) (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 2A2F223C2 for ; Fri, 16 Jun 2023 07:32:27 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dQrM14LeNefZtPhCwwZkV69xQ4srqs47IUTYNKX+rPvp7z9kCj5CBb7JtFzTXgF1YpQtoLQOpMN/pB4mFL8ebqjCOiE7NN1EqqPdsIMH0BsK/Hb/SJztz/VZY5kpgnPgVp/r+OtWBdlHEGdyMDnmceJVhQesxtKbKInjrimllu8THBpYkSrBOHefgoelw8D8eIx+2mi9gD+gNVE+i6u/YUDqv68aONOJwjIOq6zeWhWs7HHqUpMvYQ6tZakT+TAkIT+L3X+dk3zqZkv4OWGRQHKspBbt/qdpXg5AYkawOa0v4Gh7pKltnascDkJQbeXnSBMwTAqrQbaPsgHzSG9FeA== 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=ImpvogNTkrgBVMcijVoEh9Ju6mjCACaUXhVN0Rhx3/E=; b=l5GaLBBgJ9IP3YwyZuXkIuOGG5+TyXo+NB1UJ9vi/BgTXRKUNA/S3CxJMEafNiI41avJCbmOtHzAGITiHyRBLawFolSe7A2/6u2Eiyg+228btCBgHCkqmqpGt6iLj2pnjeHzw0SE9b7TBhMPmG4BljblRTZv1yqxcoUPG0eDhR3jvaRrAMjPNag4md5DloquA1St2qV/7J26ERpHm9KIYVjp/RQ4J7N5E/vI8ZbIKeXk0gfn+87Y5ZNAE6OBtItjCojOlUl8dVoDh65Q1Lvm3PuMkpk8zy0VSvWBwcx7Hdewh51bMkuFZoQzX6Mjp2e6wHA9ma0aQ+jZloWg0YLTWQ== 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=ImpvogNTkrgBVMcijVoEh9Ju6mjCACaUXhVN0Rhx3/E=; b=wIW3Tll4D1XlBUnT1tG33tq3WVGBTR8nWSVV1Sye6YjGgtYuZRWqY6QysoMrT0PUUiCTAyh1ntsLg5SDm/qeIQ3ExnG/LTw50QYQyfypGhbUrWwLZsq4YyizyY7OrRj38sO1ct1dt7LO/9mF+Vmv3UILMb87Q+VAAe7VZzq8OTaDwaRDAcJ2k94bkYHh9c0rihT7uysYETtmzRiT3uCkNISSlUOuIKK/0G+xe+nicMcXsz6sFM0swMdWA8NZ0XbhgPlJorDJKbZvUTaF0zLOK6IXBwUwQi/aIMWegE7KvhmpaBpMgq5qr5YHSA8nqA+uU01uYD5OmU+hDC87hHuCpw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by AM7PR04MB7157.eurprd04.prod.outlook.com (2603:10a6:20b:118::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.29; Fri, 16 Jun 2023 07:32:25 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::f3a7:5b84:b8d6:bc59%4]) with mapi id 15.20.6455.039; Fri, 16 Jun 2023 07:32:25 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v20 10/10] selftests: mptcp: set endpoint out of transfer Date: Fri, 16 Jun 2023 15:31:02 +0800 Message-Id: <0dd86c4b502f4d977add42b983c0aecccef8b289.1686900596.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG3P274CA0010.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::22) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) 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: VI1PR0402MB3503:EE_|AM7PR04MB7157:EE_ X-MS-Office365-Filtering-Correlation-Id: 897a2001-6299-406e-ad2f-08db6e3bd453 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zyyb0rm8Vfv5VlDit2kx0rntqUHYjFlA89CGcw+xRNOEshrfSuXlj//+vzgpXHmZTt9Oa3dFixSeLn5Z0qsx2rbzjcN4sBRmvwM+XYUTc4kggpKNPTzE3ZF9n0jMAvnJCY1swiunqpi6B8x4lanJqshM4NLEEamvgk6ucqO712rlS8D4mIjrOTLBgZHiTR4/CnOLU53tjTDNL8KSxVIvHGOru8NzB7IzVToWPJxc+NI0XLpMXFs9HxCdb6g94Hss6cwAlIP6nO2rhkj5aC1c4/vj1mioJZWPZl7Mo8jcBLbU+uPcaqZJQOh8ukwtwgNoLM/o9+pppG7jjp6hl9Pv4tLidD5J+BehwaDhZL8DO21Fh5m0nFdYlQ5y5083SRPBVAjkFEG3GPjK2RE/a3fhvI8NGb4kmYfqPUX/RWRMBtkc3kb5I16kWayTBdJVyb2bJ+jTgqFbujPGz5QdD1GrseaquFNwYS4nbG88+fA/CB/XNehH2OLSmSK7ljRYKR9RNWgqg8M5hvlh6PziJJj+67tWQgCOtU6Xvm7nMf0XDdMM44H1EUmJIh3mBoB0e0tG X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(396003)(366004)(39860400002)(376002)(346002)(136003)(451199021)(6512007)(6506007)(107886003)(26005)(6916009)(4326008)(66946007)(316002)(66476007)(66556008)(2616005)(186003)(83380400001)(6666004)(6486002)(478600001)(38100700002)(8676002)(44832011)(8936002)(5660300002)(86362001)(41300700001)(2906002)(36756003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dBrgx0L2sDggMBBdnKJxJvvPotKJVEmtspao5/tRijawy5A2E/lpAasNDLEs?= =?us-ascii?Q?N98OSpoefM8kNuDi4uzvSLRn4vd1WfKprgnK4Lm8lEtJ8T3nSEGp3SKEdJ9h?= =?us-ascii?Q?99cFlmGmufn2vj59IJnSUw4AhYjhX2NG6gMzjQL8qEYDPbn8mWV8VnP6qLPp?= =?us-ascii?Q?SAGrkim0iyQHit5c8HizQSxdlhFcX6EEc12LI0vuiJ/UVp7AFmEZV7zBfT0+?= =?us-ascii?Q?+SU7At/KaSmjvZs0aahTJ/iFVonugxH8jGIEqkpESVdCy4GNqbN6i/SQFOPc?= =?us-ascii?Q?f2JYgJH+IW7TNOPmPzuY4SBs6oMBmP56hg73DwmB4vMviNrOZeU2CZnnfjWe?= =?us-ascii?Q?aw5wFgpPQvdMqnGL0jY3UhtfCjbnUyxLklSzDBFISk5pOHVdZlVni8pojvFX?= =?us-ascii?Q?J/0vR5TuxOMiHlEkU+0hVDz967O59OeB3EY55f+HtDH54sUmPv9j55RYd6Nv?= =?us-ascii?Q?pBmJF5XgleYa7CbvXZoT+LZF9+xE41NqmaUMmCBYL03xnKTX1zOh0sLvhwNL?= =?us-ascii?Q?OyjtRV3kh5CH04Ak8CJOi5MRu5O+vH1mvNXshszYdA1b0oWxjFXdZtj5hvtw?= =?us-ascii?Q?/scjyhqzGoWzbIxhwenspe6B3EA3iThCuOwl04zZA/lcAlDG9McgbcCO7S1x?= =?us-ascii?Q?WLrSU3zggHAHw1KiLetVa8MXAVXuAsR5B8wB7a/2RJU+Lf6guioV/dkRtcux?= =?us-ascii?Q?hqlkD6Jtq1NW4x9JencmVmMVlQpp09OqBrKOtzpeVkjJCAJ0MSXe61dMDESM?= =?us-ascii?Q?YegtTHDy7Ce98FKmEu56/X/lUqpUG0xO38cj36cJbqrPG/yzXwJhWqBIObuT?= =?us-ascii?Q?E76/UC0IGr17svOzS0YrM5G5rM0zehP0iuXeqQkhz0bL10yJM+Q66gfMJlHv?= =?us-ascii?Q?Fo3JiOdj1CCW7yINNaUdLDHD0MUjICR6pUnbVB46uNjxRWU186Ge9Z4e2AY6?= =?us-ascii?Q?yDjxit1AqLSy17KPygP0wvQ7dyt2ydeJ/XVUaTqS/jMFIwOY+XUcoFwfPXG0?= =?us-ascii?Q?B6tU9erkQMIMa2EO7ySdbdrxMlCnQRLYPApejUUjFiLUrWUu20rYOAnK/T9Y?= =?us-ascii?Q?VScB0glOaA2uY8sy3Uj6lMa0LK5o3lVo5c4l4wIpoELuF3BWKNW14JsXnhrg?= =?us-ascii?Q?TJb62C9uQLfg3Cn10z4+b0cidvt0A0VGWUwPAgLDG0aJKO2A8bXNgIZOZYUF?= =?us-ascii?Q?86Y8BIor2psX6Hgl7NpcTYNMTrgzcs/JLufFMhS6aVijlOpjNfDKi1UTVer2?= =?us-ascii?Q?oqQwlZixjtCXm7GA8BsyLDDk21X+G0vObkHngrL9xrT5g2MX+NUnu/zYT2mh?= =?us-ascii?Q?LopWVDwhZA9QGajnjOAnNfPrBd6qiUnHYNGJALEXMT05rL0h80Sn6E94g/1n?= =?us-ascii?Q?copYKMsfAeRnAjix1hrpkvp9EdWb4xyMV2TfRtwrpDWjOsKerJhB+gt1UnHQ?= =?us-ascii?Q?ai8ULLZKdgEcL1T3vu+BE+E1BxfyA/XoASOr55ureO/eBXD9887lpOZzaagW?= =?us-ascii?Q?XOSLgMKFf0IPgHg21MN/pKS6Lhh1PdnqWxMIxfzkNMdBt+9iU8zv8haWv7Nx?= =?us-ascii?Q?KVziZVEn6KLWQiZafzFh0+3sMs3bz+hp4OuOIA0D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 897a2001-6299-406e-ad2f-08db6e3bd453 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2023 07:32:25.1380 (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: by2sU2317cC4V+PE+qQniQdm05QL6pvMFXO9sqAvQRqRCQs0jIPRv64DW5vX8+Bg8HEryrrRQvf2OLm/U/1l7w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR04MB7157 Content-Type: text/plain; charset="utf-8" This patch adds a new flag set_endpoint_outside to control whether endpoints are set in do_transfer(). Add a new function run_tests_bg(), in it run tests in the background and set endpoint outside do_transfer(). Many tests can use this run_tests_bg() instead of run_tests(). Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts --- .../testing/selftests/net/mptcp/mptcp_join.sh | 65 ++++++++++++------- 1 file changed, 42 insertions(+), 23 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 89379815b619..f5a79a88131e 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -54,6 +54,7 @@ export test_linkfail=3D0 export addr_nr_ns1=3D0 export addr_nr_ns2=3D0 export sflags=3D"" +export set_endpoint_outside=3D0 =20 # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x30) || # (ip6 && (ip6[74] & 0xf0) =3D=3D 0x30)'" @@ -1086,7 +1087,9 @@ do_transfer() fi local cpid=3D$! =20 - pm_nl_set_endpoint $listener_ns $connector_ns $connect_addr + if [ $set_endpoint_outside -eq 0 ]; then + pm_nl_set_endpoint $listener_ns $connector_ns $connect_addr + fi =20 wait $cpid local retc=3D$? @@ -1203,6 +1206,22 @@ run_tests() do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} ${= speed} } =20 +run_tests_bg() +{ + local listener_ns=3D"$1" + local connector_ns=3D"$2" + local connect_addr=3D"$3" + local speed=3D"${4:-fast}" + local wait_join=3D"${5:-0}" + + set_endpoint_outside=3D1 \ + run_tests $listener_ns $connector_ns $connect_addr $speed & + local tests_pid=3D$! + [ $wait_join -eq 1 ] && wait_mpj $connector_ns + pm_nl_set_endpoint $listener_ns $connector_ns $connect_addr + wait $tests_pid +} + dump_stats() { echo Server ns stats @@ -2285,7 +2304,7 @@ remove_tests() pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow addr_nr_ns2=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 chk_rm_tx_nr 1 chk_rm_nr 1 1 @@ -2309,7 +2328,7 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags signal pm_nl_set_limits $ns2 1 1 addr_nr_ns1=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert @@ -2322,7 +2341,7 @@ remove_tests() pm_nl_set_limits $ns2 1 2 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1 @@ -2336,7 +2355,7 @@ remove_tests() pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow pm_nl_add_endpoint $ns2 10.0.4.2 flags subflow addr_nr_ns1=3D-1 addr_nr_ns2=3D-2 \ - run_tests $ns1 $ns2 10.0.1.1 speed_10 + run_tests_bg $ns1 $ns2 10.0.1.1 speed_10 1 chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 2 2 @@ -2350,7 +2369,7 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.4.1 flags signal pm_nl_set_limits $ns2 3 3 addr_nr_ns1=3D-3 \ - run_tests $ns1 $ns2 10.0.1.1 speed_10 + run_tests_bg $ns1 $ns2 10.0.1.1 speed_10 1 chk_join_nr 3 3 3 chk_add_nr 3 3 chk_rm_nr 3 3 invert @@ -2364,7 +2383,7 @@ remove_tests() pm_nl_add_endpoint $ns1 10.0.14.1 flags signal pm_nl_set_limits $ns2 3 3 addr_nr_ns1=3D-3 \ - run_tests $ns1 $ns2 10.0.1.1 speed_10 + run_tests_bg $ns1 $ns2 10.0.1.1 speed_10 1 chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert @@ -2462,7 +2481,7 @@ add_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 0 1 addr_nr_ns2=3D1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 fi =20 @@ -2471,7 +2490,7 @@ add_tests() pm_nl_set_limits $ns1 0 1 pm_nl_set_limits $ns2 1 1 addr_nr_ns1=3D1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 chk_add_nr 1 1 fi @@ -2481,7 +2500,7 @@ add_tests() pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 addr_nr_ns2=3D2 \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 2 2 2 fi =20 @@ -2490,7 +2509,7 @@ add_tests() pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 0 2 addr_nr_ns2=3D2 \ - run_tests $ns1 $ns2 dead:beef:1::1 slow + run_tests_bg $ns1 $ns2 dead:beef:1::1 slow chk_join_nr 2 2 2 fi =20 @@ -2499,7 +2518,7 @@ add_tests() pm_nl_set_limits $ns1 0 2 pm_nl_set_limits $ns2 2 2 addr_nr_ns1=3D2 \ - run_tests $ns1 $ns2 dead:beef:1::1 slow + run_tests_bg $ns1 $ns2 dead:beef:1::1 slow chk_join_nr 2 2 2 chk_add_nr 2 2 fi @@ -2754,7 +2773,7 @@ backup_tests() continue_if mptcp_lib_kallsyms_doesnt_have "mptcp_subflow_send_ack$"; = then pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow sflags=3Dbackup \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 0 0 0 chk_prio_nr 0 1 fi @@ -2764,7 +2783,7 @@ backup_tests() pm_nl_add_endpoint $ns1 10.0.1.1 flags subflow pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow sflags=3Dbackup \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 0 0 0 chk_prio_nr 1 1 fi @@ -2854,7 +2873,7 @@ add_addr_ports_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags signal port 10100 pm_nl_set_limits $ns2 1 1 addr_nr_ns1=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 1 1 1 chk_add_nr 1 1 1 chk_rm_nr 1 1 invert @@ -3088,7 +3107,7 @@ fullmesh_tests() pm_nl_add_endpoint $ns2 10.0.2.2 flags subflow,fullmesh pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow,fullmesh addr_nr_ns1=3D1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 4 4 4 chk_add_nr 1 1 fi @@ -3101,7 +3120,7 @@ fullmesh_tests() pm_nl_set_limits $ns2 1 3 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal addr_nr_ns2=3Dfullmesh_1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 3 3 3 chk_add_nr 1 1 fi @@ -3114,7 +3133,7 @@ fullmesh_tests() pm_nl_set_limits $ns2 1 5 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal addr_nr_ns2=3Dfullmesh_2 \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 5 5 5 chk_add_nr 1 1 fi @@ -3128,7 +3147,7 @@ fullmesh_tests() pm_nl_set_limits $ns2 1 4 pm_nl_add_endpoint $ns1 10.0.2.1 flags signal addr_nr_ns2=3Dfullmesh_2 \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 4 4 4 chk_add_nr 1 1 fi @@ -3140,7 +3159,7 @@ fullmesh_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow pm_nl_set_limits $ns2 4 4 addr_nr_ns2=3D1 sflags=3Dfullmesh \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 2 2 2 chk_rm_nr 0 1 fi @@ -3152,7 +3171,7 @@ fullmesh_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow,fullmesh pm_nl_set_limits $ns2 4 4 addr_nr_ns2=3Dfullmesh_1 sflags=3Dnofullmesh \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 2 2 2 chk_rm_nr 0 1 fi @@ -3164,7 +3183,7 @@ fullmesh_tests() pm_nl_add_endpoint $ns1 10.0.2.1 flags subflow pm_nl_set_limits $ns2 4 4 addr_nr_ns2=3D1 sflags=3Dbackup,fullmesh \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 2 2 2 chk_prio_nr 0 1 chk_rm_nr 0 1 @@ -3367,7 +3386,7 @@ userspace_tests() pm_nl_set_limits $ns2 0 1 pm_nl_add_endpoint $ns2 10.0.3.2 flags subflow addr_nr_ns2=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + run_tests_bg $ns1 $ns2 10.0.1.1 slow chk_join_nr 0 0 0 chk_rm_nr 0 0 fi --=20 2.35.3