From nobody Tue May 21 16:39:15 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2069.outbound.protection.outlook.com [40.107.22.69]) (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 C5DF711192 for ; Thu, 29 Jun 2023 13:34:46 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PcVqwN7w4MJBoW3QHZqapVHtozqhM94haNmbJG5EDm6iziAT1cXqi6uPfBGUnlh0fqz7a3VguZpaKaipziFT8BfSFlszcCWOekPAqUaoGQNa6fAe2x+jFH7/1J86kCSl5BL1MlbdvJgujXOxEAsDXZ5NUjycgmiPu08iJKR7hOYYBXqXGcVRKlLY9KzuHcb1Jp5f9OFUMaiDq48nlEmQSUd327Zd2tEagGMDG4vbOZPjxrvM4b8/Y4wEIYTo/Orfhp6OQEmQBz5Fj6XtXEK7BHFnKDg+aws9+sTf+C4rIK4TXvbcUcG0kTpNG2yqdgi18hjEbra0ZGuB5+bIvVqhUg== 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=hOR6gKi/8AVW66L5aBMNqlWuV2URJauNlovyRjmhTZA=; b=MSyq+UU6UGmHjeH9em8WyK4iM9ESz8hxWUitJozvDw3ulRC6t6vDqkdog/d+uz/ryvocu1s0oyOWCLOMeS1G6a2vqvp8aTg48DZdsMgqXxa692hgmmpP1DVSeDxXAffKP0HeS9/QnRtSUg67MMyU+LpwQ4Z6HTSvGE6eT3R+cIypIb9Haj9i4Ev/KvI0cEXns8H9zQG98lvzf3yNK29iB1t5Kx1AGNiWK9Mqnk8fPvfDJVtdeboJlcHc9buoGLWQPywn2ZaKrVRa06tJQ9XHl9uTRwxkyOItKmZYDTtbkWJliZIr8QLQjqjREeMrszfQqFATL5Qe9CY1gA4mYstBSQ== 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=hOR6gKi/8AVW66L5aBMNqlWuV2URJauNlovyRjmhTZA=; b=dH96SUFIcA1uB5b3VEFEsrg1r91clwEi5CpAebQz/LoWiy1DVRyaEQ1QmdpRX6kV+LBWjvUNI7LC2fYOOaESY2ip7l/xryNmpqBpdQVov7jUxS6VAnJFbe4MNKy8n/ubBMfjIh/csb735DuB4/iCTp4iZNuwUs2HMKPbIGoSNM7GIXDV4WlqVUUXi1S/XZ/CSRdUeaVO940mx41QCFDU+8dGHhk9mlr6jvZX+rqLKL1SNdHLeO3581ieF1+T3k59aoHfGTw9SB0ZrKh7zSJ9UaEZF9vGc2ltpgKdCjNV0wXvbgwql+gb6Jhl5Do1mZCsp/mepXmP0jKhPQrvQsjqVQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by PAXPR04MB8286.eurprd04.prod.outlook.com (2603:10a6:102:1cd::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.37; Thu, 29 Jun 2023 13:34:44 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Thu, 29 Jun 2023 13:34:44 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 1/4] selftests: mptcp: reset all the env vars Date: Thu, 29 Jun 2023 21:34:29 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR04CA0011.apcprd04.prod.outlook.com (2603:1096:4:197::10) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB8286:EE_ X-MS-Office365-Filtering-Correlation-Id: 1acca38d-e436-46e3-5f81-08db78a5995b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: foa9Zrx021/EixohfG9Li+WSyygCQJWx51O955vQqeOXjP5CkWBO9X10pyIe1RY3UIxwjBAx4xPlO/Yd3BJctk2eEglLyDmZ/mIqUa7L90RQNdiL9pk3UeQl4gaSWSI9nchm02m1T+J5ZtFZglE4CuayBfM2BF16V8kt+CsuTR3H/MXpSgBqi718r38GaTxuo497LFEFwdBXED8z/BtbwcjZDnHBd3PIwvGL5jYyQyAFtxCCbpzjkFAvVj8QAMpGCTjJVjGk0J4R8nLY4D/6cZ7gTFLUPj+fNMXWmvACXmWN+jUPrgbt+mVOgJ+r/PmqfEa9OByP1s+Jb+Gv/HWYIPcuvnakP4XxkOOoJ0odhjSzFyqsh7ygJZnvMomAKlCxbatzZnX3Bd020rpgNZjs8r0r1EjU2UnwO2Ve2DnSf0wV+pPmnGkVx27JlPCbCQSp2PV69x03SI1xuMwrrNTFotDjy0HkZbm6so7vj4L/RhEly9VwjFEZYvZ+ITcSHFvEZG659CKVDoM2AuFN4If+Wh8GFRzDiEXt3u6SDBiBdqerEpqi7LiTrH7efWkvzgey X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(136003)(396003)(366004)(376002)(346002)(451199021)(478600001)(6486002)(6666004)(6506007)(26005)(186003)(6512007)(107886003)(4744005)(2906002)(66946007)(41300700001)(316002)(4326008)(66476007)(6916009)(66556008)(5660300002)(44832011)(8936002)(8676002)(38100700002)(36756003)(86362001)(2616005)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wK1qldGGfnUHIF1+BHPPCpf83DfiJPuT6OUfnCQfX0vrAflS6e/YmPsBYwuf?= =?us-ascii?Q?8ftJBLUwh6a670g1E7ewbxXA6ST3vf37YYQzinqBZW0WhTA426Pt8So9Fo4n?= =?us-ascii?Q?3uOJEvQOgTSwYUISdh48QuFlRoB1jyZKYui4wG80P7pCuabUgoJtrIzXWCqA?= =?us-ascii?Q?aVP6xlPI5m/iwU9wrf8iyt01HPuigHEWUGCwVCCs6hXmuTMUplQQZX9UP2kY?= =?us-ascii?Q?cZidZspj3H6qxUWejudbWHW2iJskX9/xeYAesY8bG3eYfpry9HFbM61XcqMQ?= =?us-ascii?Q?a2odyaFS+QytQPBFBBBViJecm7jNZti1GnUwf4JVEuPnDdNlstQIhKzpfyqO?= =?us-ascii?Q?jySbkUR3hzPaEN25nQzZ+0qt5fMwKZPpIyle56H+7hGLJDvAeLYRIiBEblP9?= =?us-ascii?Q?l47pbsLWEEwyNhsNvdER7WRCkhsB5FN0gV4RsWckWuTIs2H1FWK33GszHZp8?= =?us-ascii?Q?A7nOcYUIKzopFnAijC4xamxNOcWBduCuBvG/JDyuU2R8SLM9vc8Vqo1h6ZtT?= =?us-ascii?Q?UPepwY+Z5hR5Hogevd9AS4dFrqepLVvZrxGyGMqrKJKFPXR/dNvRPTyEoJPr?= =?us-ascii?Q?AwXu+tA5ApNNIXcDHzFmQkIGwNop77WPMnNDgDs8OVto8eJebK5U6SxAQ4EF?= =?us-ascii?Q?SxJvtaF2DoeXwCH1DuA5jPmegVcBB/aW/DFO5NFlbjwcdFNoV4mCwHEIKK8y?= =?us-ascii?Q?xq51kci+mnpejh4Eu1BfSaE7eFT79YP9w7jT0RKPlLMgSuVhpIvaOICTx0jo?= =?us-ascii?Q?I65/Zd979uevDJenvibGdnjEykbxt3FHL+TPd7KBtaLK2SvK8Myb/Zs1rpZu?= =?us-ascii?Q?pG4B6b8q5rewjmvBGAY516Y7G8HudOFKfhxlru08ninPPb/bof8k6oEKZYyL?= =?us-ascii?Q?UJD0r5F9BPTvWU3NNEOlYox/oBOPMOFRw7xq61xWbK98j3zzIAPtdJOaFBs/?= =?us-ascii?Q?eUBZE92srpktbFhfvS+10VEU9PoguFU6c1DcDLMW0cxFenS4RFf701O8InbM?= =?us-ascii?Q?xTW+xf6FLvAaA+2Lt5r13najnb6p++1oBO1Hegp4cH5+fBnsJXaw1E683lGi?= =?us-ascii?Q?RDfj/08vIIXikQS/hjGvt74zt/rzfalr2Cgm8lkDDjEM8DqvEZuVrjRK3fc9?= =?us-ascii?Q?Cuw2+KAIFCGUSq1j2zrAlvLYB1f5A37NsTsKfcTuv3vbt43GWREa5jauSDi9?= =?us-ascii?Q?6urLIvUDLL/lKVqycaeciW8q8vYn7XtR5/dnszocEnp9gpmUlbVKzrnkand/?= =?us-ascii?Q?9A3IekGgrMMHcpOqATC1B0oTSq8R/VUMxowLzVCiI7CAnomJ3Bo3V46wpVtz?= =?us-ascii?Q?/KgTedQzGsy5pd4rI7AYWWEcoeHiWaf9j5BppMWYRqY4XGIy0YL3I3iSfTsD?= =?us-ascii?Q?C7NRy9LZ2ZTpeQ/kZf2uu0sjEs17feZfhIY41dGUpWp+4IbAC2ZLvScjN57r?= =?us-ascii?Q?H5d4Ta7w3vQoUvwuNeZedxZvaqAhoywsfq1/26xAsi4qbvm+y84Lo2iN7J0n?= =?us-ascii?Q?k0/oSaf4M1bfg0gVB8J3T2+UIQYys6ZoX+/rx8ojsJ3e+7HFvbtc0zqJjHF3?= =?us-ascii?Q?SMkD3Lip3QB7yroUeqKMsDyxjbL1a6qgQ/G6bQBm?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1acca38d-e436-46e3-5f81-08db78a5995b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2023 13:34:44.2089 (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: bA6FiMFALuj+LSIERJHK2c3wqhC0MoT+C1J1Y3qhFE0amk2pOgcle+CU6pfE2HjchWFwQZ2HB3iYLOobuPRPKw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8286 Content-Type: text/plain; charset="utf-8" It's better to clear all the env vars in init_partial(), to let them be reset before runing the next test. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index e6c9d5451c5b..b80c5e7b5a7b 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -101,6 +101,10 @@ init_partial() check_invert=3D0 validate_checksum=3D$checksum FAILING_LINKS=3D"" + test_linkfail=3D0 + addr_nr_ns1=3D0 + addr_nr_ns2=3D0 + sflags=3D"" =20 # ns1 ns2 # ns1eth1 ns2eth1 --=20 2.35.3 From nobody Tue May 21 16:39:15 2024 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2083.outbound.protection.outlook.com [40.107.247.83]) (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 9147511192 for ; Thu, 29 Jun 2023 13:34:58 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DwRqh6L6ILqW+It+j5upQAlL2G7MJRdwk022b42h27T1KML5w3HMC7Dku5Ip/VQwmWkADjLGDx78a+pJ9YC0pXJh0WdAFfK5nldyJwcHqxqcEgzdO0n6tUT1Aisqk2pjqN0MBU7NHz0rhNTmq5j/gAsuZqQCGz8/BQPtjBkE5q5ooTz6wxIFjdjy/JQPFnQpnDFKbzIQVg9j3posnrBDOCAAULNWXEMp9c2Zq4Bv44goj3yroca/0nxW+ojMMhEVFGtp39dRf5QO5E3PjWueXn91RVEMFj8DyVuw19HKbaNgbcj8N+CUUMt3vjY/WODurDx4iQT/gKZdIOQVN8CtAw== 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=XkcZZ5KA+8CLOCI4NkUJ4+GkRN0DYaS8WJd6KbJaAfE=; b=OsGqbwE9O8WHpUtqLp+/ezbzacjwud/Fr4/19WbCo08MciyH2I8+Cbx+Uo1OmshmcCzHz8CTyxf+uD4UYwqj086+y1YaeA1GK/K7E3TQjccq75jZJAu/PtFtwYVWG0/OMJRK9/OzgsKaN+FvNuZpxrHZlG0mLFPuvwbekbuP6AwSfjLckYetR6DSOoXBHj+DFha3aIhoRbwmnuDy7B6SlrFUuwvyvQYfv8++Vv1mWfcuT+p1sxaVdq8sRrNCIs7YIisZl3gPFN6hYY4yHzVf7tttLOlWQBIbVi80BrXoWCNf0FyYlKC1Pv96rMehaYvKM/0pIqi6W/O9HKuxf8mqPw== 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=XkcZZ5KA+8CLOCI4NkUJ4+GkRN0DYaS8WJd6KbJaAfE=; b=11I4Ifoc5oEzh8qYv6eC8fi4GXCaiXVtGbHtO1wjWof4DdPkrzo0czutoY8grRrhrJZI1hEFeyHwulfFhPdaCegnZXw9UB3ux0pCxpgC5NNm7XSrfgS45w8w4lToAAxknhPxTRg3Qlmx7etg8WAvTZPkak6PVu7U5hd59Usz0gGWB1cZR1WW6p5Tru7B9ky19C82Xdd4YugfCVcn8dF4+z0wT3Acdi1FkisAFV3C1LZD9ldcS3jlVIW3Ut+f02CIgcjswVNv4NYo8FhBq6jMYmUrkB0F7ihXG3W/9cfDtnr5S87+lQTY2bNsy91xAQR9j9CdzbguG68ocg60nwCZ5Q== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by PAXPR04MB8286.eurprd04.prod.outlook.com (2603:10a6:102:1cd::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.37; Thu, 29 Jun 2023 13:34:56 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Thu, 29 Jun 2023 13:34:55 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 2/4] selftests: mptcp: add fastclose env var Date: Thu, 29 Jun 2023 21:34:30 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0093.jpnprd01.prod.outlook.com (2603:1096:404:2c::33) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB8286:EE_ X-MS-Office365-Filtering-Correlation-Id: fc3efcdd-b827-412b-12e9-08db78a5a02a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: HvtO4k5YZasAwGLwfAWLkLqD0i9KEpWU5EvAAXXGIs6pZHj6DwgrFlvIRL5yge4Wb4nsmlVCF3Bzt+HwLHB0HGLwwW5ieLPs9NC5CtfzhzRsyUusqH9S2y76ZPsrd6TZ2pBfvvon+pV8fRQLVwKIiYqO6SGvYayingO77E326uZ1BPCvGg//WiVQXmTWkn1khAlEZd1ZHEBFRnG2u8Vut7HB6fOoPPTC7vsjpaEiew7O5IziJL/Dj2IKsTznALzMR9n3E7m7VyjMW0niKWd9Ki+GjHaby0yF8NIJOxg8LFr7sHWGFejs0rNAYOWyX1ZW9WJwWBaFFxe29BfnEeuqHTnvcyOgHx9dP1pZP+U9raAzfUuYEwrvlXZZwn8gjw0BPlcxkVvj780cHal91NlFCU83K6pzszuhg16wlCNjGHHfq8gSBiGE7yqbWfl2ZBa6Ck5/5P2wYGScW68gX3j/sflWKXPONW4vKGYnSVrMPW3OcC3+3gJOkfVEq61bZNShroyYHxwqX14jtU7RBXta3E13MJXmXiDCEsMVzgUSdeuzeoxVQja3ZDfy50pvGRxE X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(136003)(396003)(366004)(376002)(346002)(451199021)(478600001)(6486002)(6666004)(6506007)(26005)(186003)(6512007)(107886003)(2906002)(66946007)(41300700001)(316002)(4326008)(66476007)(6916009)(66556008)(5660300002)(44832011)(8936002)(8676002)(38100700002)(36756003)(86362001)(2616005)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?axcb+UKJol3Y+WqdhoWpz23QUYhclT4Hhs/X9Il5CopRpMkQSatFIJsIij6W?= =?us-ascii?Q?vMmxJBKKSWbwRpKAG2XiPVb1tAm8rY3DLorIsWUV4OsrUJ2TF3hDjSr8+NHm?= =?us-ascii?Q?ga+yhXgpqWdFf44Ht/RWolod9OxEmsIUaph0XtqFUQk71rbt6NcTQimQ3GPZ?= =?us-ascii?Q?8S0pm7xSE+GtoMQuTH0w59R20LCRmEt1TH75WcUAtd+Xn00ChSyi3BOP+gDB?= =?us-ascii?Q?vcM+B+CQQ/8irbpCUW7E32XhGiD0kDa934Qvral2OWMnRLPiG8qWXAkC5uoa?= =?us-ascii?Q?fqtWGccX1Aqrw6JrjCAGWo2M1zXX8moMJZzb6UmlTs5dNVvv/Pa2xfP3d7zn?= =?us-ascii?Q?s2wCtiIuqPI/26DgsneGUo1tPaveXxl6rhP4zsItvB8d0uL36urfFfbGkANd?= =?us-ascii?Q?dpzAu1yLxYJrHhTcyr8DEaJu7ruuL3820asaqv2V5uAVn/ZryfOyNzvo4tzm?= =?us-ascii?Q?oZQShUbda6Wd4fOMfwvKbvMD3Vmc2ruUbtQCI8H4k31YSuZUwEqvdICB+mj+?= =?us-ascii?Q?bh3vS3/1sTBCSwZt4Iz/1Syf9NDE7hrPVs3IAAwKgpHHW0iwlTCZGVxwDHML?= =?us-ascii?Q?rGECWKgSSfVCSkuoLHY8VFYuFmKHLlzRvknXm6AWz063Ve69sfkoVv3uuVwi?= =?us-ascii?Q?y/M4cPdXxd9dG+lRzwndqascGX3qK8ziLB8n0EgthpjTKjy+0YPilBcvZNmi?= =?us-ascii?Q?Y7YiIWiTzOLLjxSbtiZUJI2fKyi6TSjo7J2ThFPmFWDp4KxpMUoP4xmny6XB?= =?us-ascii?Q?ri2qhjdk9UVnAxnrlYjWUp3hlpIb40Mx4QhbfoBSTlroCCeNfKSbE0vptqCM?= =?us-ascii?Q?K6w/JKjtkXQgBvYtOH92pVeU5NlE83izadEwfPXErcngZt3DnIz80k8kjsMX?= =?us-ascii?Q?zfFc5PXAwIAocZ9sFc06fjZetEMJWZgTrt9Soq9koBBgXMIAoLfbRWWXWvYc?= =?us-ascii?Q?4pC+oA4CxmdnDPrUTOpuoouvMLMmKKM87SvgD5JH9Ty9dwnMFgq6LD1U/UIf?= =?us-ascii?Q?k5BvRqNBMvAFG6ckKqAU2tz1fo+pnF3F9CyRPRziEIOpqlH3tUbnQImZqdyQ?= =?us-ascii?Q?C9G14DjW22D2PmkwHYKfHve0kaa0XlxR3dPX4FST8xLePJq4seHt2iRJqJNq?= =?us-ascii?Q?hJJu3WtSromoXtvh7S2fLRGdMeRSr8T2RF1ow56WgpWO4dZihRPzvKXG2rQz?= =?us-ascii?Q?XBBopWBXV+W/mRo2UIioDp6D1z85Yv746HIBQfTXl3csvGBXnY7JebUdRnvh?= =?us-ascii?Q?PXJ9q0I+yf7yFTqEBFjjyPwEH1HJKXOXrNa9HnTzkI5Lph+jt4VRjLlFl+C4?= =?us-ascii?Q?9Z9p+qyren8wI1Evi+0DJB4Tim2ogGES/6/vnIgS8WpTaIZCFEO0BtZ3AU2u?= =?us-ascii?Q?jD0v3YRjuiuSbXXearmQwzGG4BbadNIqiGLHrb9pIsc694gBq56AN6RxBXVB?= =?us-ascii?Q?zqlQvfBEN1KiU+XIs1PWzmvO253IR2SeQ4f1T+WnaUiy+qbar9bqOjkJrrGG?= =?us-ascii?Q?4zqjt/8CL/yj2cppQcSZXsDl7pI3kPfJCLIOFajy1Isfu68gEgvDRqgr14hB?= =?us-ascii?Q?UfDl/FBohzpGgmt0sK0CaVvy2UOmD8T0vlQtAJGU?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc3efcdd-b827-412b-12e9-08db78a5a02a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2023 13:34:55.8559 (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: J03riQ4aMGo32tgEP5xtjME2DbF9bajipNck8naFx809k+C4llnYFZbf4f/1Ru3nD08NIbKzW7IUw8bO9aMk0w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8286 Content-Type: text/plain; charset="utf-8" Use a new env var fastclose instead of passing fastclose to addr_nr_ns2. It can be set with 'server' or 'client'. Then the fullmesh flag setting code can be moved into pm_nl_set_endpoint() from do_transfer(). Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 21 +++++++++++-------- 1 file changed, 12 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 b80c5e7b5a7b..e1e7ee46e980 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 fastclose=3D"" =20 # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x30) || # (ip6 && (ip6[74] & 0xf0) =3D=3D 0x30)'" @@ -105,6 +106,7 @@ init_partial() addr_nr_ns1=3D0 addr_nr_ns2=3D0 sflags=3D"" + fastclose=3D"" =20 # ns1 ns2 # ns1eth1 ns2eth1 @@ -832,6 +834,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 @@ -1019,11 +1027,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 [ -n "${fastclose}" ]; then if [ ${test_linkfail} -le 1 ]; then echo "fastclose tests need test_linkfail argument" fail_test @@ -1032,7 +1039,7 @@ do_transfer() =20 # disconnect trunc_size=3D${test_linkfail} - local side=3D${addr_nr_ns2:10} + local side=3D${fastclose} =20 if [ ${side} =3D "client" ]; then extra_cl_args=3D"-f ${test_linkfail}" @@ -1045,10 +1052,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" @@ -3184,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 fastclose=3Dclient \ run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_fclose_nr 1 1 @@ -3192,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 fastclose=3Dserver \ 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 21 16:39:15 2024 Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02on2054.outbound.protection.outlook.com [40.107.247.54]) (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 554FC11192 for ; Thu, 29 Jun 2023 13:35:10 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=koufAdm2/OfR0lVs1a9I1AePZGNEcGNRZKZIQBz6zzxBY5PBxf33hhXcTmGnULSRLggGZ+hP+ki/Xz48Uv90o3nQTa0tpSST48XR5SfZVcvlKn3WHTyZp3luiAwAel9+S6l/Ce364KXTJPF78aNmdCeEtPE5OyNmwzuVnitFlCC1ZHKJDbMjusYefsDhqUSRF4I+zGsSEGHFFCMVeNU3/KmGhSMfFEiE5DrFwo0DlqMJbBG0xwaFixHaO9dL8yvovZ6l9aXkQNx4UR0QjZUTP208HPXazp0VDG6VSDsw06OYZfSFynmrXszx8DVejNhgj4Doo0mu8d7k/QNMmk5F5w== 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=j3YUl256b+5CtRAQxgSoySGn2pvEoM7H6HHgVvvs63s=; b=UX6d1yyf9an8k/W9HNsiMi2ybo5p0PRf3xUnDRHseEIw2ZlpOmx55lh6jBP+MLxXuu29aOHoa4nkYFLXcY2m75m3yuAA7sh0b//c2YAHBVwpbwELcR7nWnKwDaVLhxVlwRh/9VUCQ+wuWlBLIG5iVQqKAYhtBPKnfAJ6aYbY3Yh2csvwR456CjUedVLbUIXIn+hofdn2D+kf//t5Hbwmv2ALxxp6Pu9QvxGGeFUSzwmkr4N3/Dze2HbWyVrg8idjcjK1YVYLKxkevzuizVKXEXbK81JHlf/ZtNI8o2/c7+M51iWODvSWv4sqHaXFNFHQlvbE72nvfcR4gMepYZT5gA== 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=j3YUl256b+5CtRAQxgSoySGn2pvEoM7H6HHgVvvs63s=; b=QUT49q3ZgFeJmqnH93zbVZck29QzQwAYvDTsQDRf9oG9cVTgrSCGgrKbJ38t6k0WMsWiY3na/7EubAa9S9pzHnoB0RpqF8aTAnVdlB4JPYHNJ9Vyzva+CQCMGwtzr2wQ5BU9Rx25xB/3yokDopHEPNvzuX911mIsNFO9dg22VEqiWueRKdLSBbfftMghMyLbKLhxJumMpFCPtq5kdRycW2PINKHc2NN6xlxoEmH/Rf2FAb1z/wgJITWp13YoLyE6v7sm96na5l1N/TW6Ssfr03GZLrBqwxyTYE5KGYisG6svq2GlyfreQhPLdQXEniIcMEzJIJuiquY5RwT+hLW/Ug== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by PAXPR04MB8286.eurprd04.prod.outlook.com (2603:10a6:102:1cd::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.37; Thu, 29 Jun 2023 13:35:08 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Thu, 29 Jun 2023 13:35:08 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 3/4] selftests: mptcp: add fullmesh env var Date: Thu, 29 Jun 2023 21:34:31 +0800 Message-Id: <1279f658dd6aa12561713bc985d548a1a7fac0fd.1688045383.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0094.jpnprd01.prod.outlook.com (2603:1096:404:2c::34) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB8286:EE_ X-MS-Office365-Filtering-Correlation-Id: 016454f2-b616-40f2-473d-08db78a5a77e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KAllUWEnXj9dhgFp5i8rmsJWiFSXRPYocps9py0A+mHl4PQPXd9Gh2VCNefY8nDG7bY3a6cwd8Ba5Me24WNPNrhStFsTSvG9DFHEarzWq4TImYQHeiA68e6pWgcj5+MN2SibZ9d2N9Nzj/WtWg8AjLZG+fQ9TPsoSrABlM/v4LDn3WogoAiaC2D9D5Z3f8k+8OzLJDthQ4VD0GuLFstQ5bvHuNPYt5qPED9fcuYeaaOMDDlcWQ1Er8YJxbWSo8dh7QMs4MurqEmHnbFL4wCAB2TixHBqxnkMC0fKmt+ZlG/30jo2DlDKfQkMvqnNVqIiW/GECmFckipIQep1dM/ISUw6Ptv1jSwtrBV63u3k59HWdNkcR3voTIr2Amf/mgXpY3276N20M12yX6RKP0aoPh7hBhWp+zf3F6i7r1vhdiJbymhP0sjs+ayeEYh0zfCuYb41MF8yj6t9oXOFulzTgDL26SepaBRm1Y8jbzK/RK/HY/aaYFAzzorksMQiuZyZL0uryl6ktsfwU457fbjXMr7+ufUOVmbYX7+WMYzgXAzkPNuEFHyGmmK83PmnTNil X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(136003)(396003)(366004)(376002)(346002)(451199021)(478600001)(6486002)(6666004)(6506007)(26005)(186003)(6512007)(107886003)(2906002)(66946007)(41300700001)(316002)(4326008)(66476007)(6916009)(66556008)(5660300002)(44832011)(8936002)(8676002)(38100700002)(36756003)(86362001)(2616005)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?36EXJgRxtQRtgLkBs48NCktSwRHQGcYUicTqk0M/F1aH2pI01nRg6Ad9/uNj?= =?us-ascii?Q?+JXqvolRoqvHZPsuU4s5FCn/OdwM/5Q5uJf45sZBFYr1rbqgwz/QVYz5+0NK?= =?us-ascii?Q?Y7QOvSE1hA1oRrKI3oGLz8AyMOjReKxUlW5JVpstwzQYB7rxRehCiaZ3SrgV?= =?us-ascii?Q?NKCCh7sbAEfidfh4DnLyAILDVUxkjfGIWPn0uE2bUx6NUp8lzEZHSt0IeF7t?= =?us-ascii?Q?Eb3j0t+JNy1kr6UXj3mZaKNBpzlohu7V+Wshe0Ccydqaj4f3KGaOF5pvjblz?= =?us-ascii?Q?Uak0SGE8jmg4o9tupSCKr4EMJe0N8qSlF5N5OfvgtQug7y0HzvkUIPjJO4nQ?= =?us-ascii?Q?ZcD1zsdzDukucPmrVYt4ocbBQLy4yWXuhSo90T7VFla0G0/Rgvt+NWN4+FdW?= =?us-ascii?Q?BrlH+mIQxr3oeEn5O5VVpqcO4XVoGzpUA1KwUb93F0Bk6xaNTlC0xdHSbuT9?= =?us-ascii?Q?9OXtbLLApWPI6RweHmccaibuqnODEozeU5OdssrIp6ZuJlKsYc8G9l+uak9Q?= =?us-ascii?Q?T5Eu9+Kjp2YArD+UQx3GKI+9q3uaxSmViCwCKCt76ZzqETfRo3lO/0VDl7q/?= =?us-ascii?Q?981Favfil2xbK0rOA3Wj5zd/HKOw9BmQC9W5HLYDHnlvjTr178iqntGNkavo?= =?us-ascii?Q?Fy4loFUr/QWHAQR4HtNIvI9d+wLmqJ0Rd2S2rxe969rN6AJg28ER4rOsdznY?= =?us-ascii?Q?yZxyAGvjI/hwgJNmaPCyEL17hdeeNHOMIHpCk2N4CBtRR5Ue4f4EldYj33tT?= =?us-ascii?Q?EcejxcIRKSwIeVsTubglFIj+0Me5mL3OwIFoDLfmQYcVyhcdXZLr7YJOv1IO?= =?us-ascii?Q?iGeDOyl6y7Vp9+CiKN/XNtKFU+jkggL+QkE2g84v21lbcikYZIY2SeNCxt9s?= =?us-ascii?Q?5wu8UlLdcMS0UiYmAz9MO7x+iWuuDeG8mMle/C/66arEoTs95YjnCGhC2cWx?= =?us-ascii?Q?e88SmIT8WFZFGuGS63GGYF3LV7hXG7ouieYDcPJ1l40ykVaK0WBHWKby+IBL?= =?us-ascii?Q?YugWRxWlVwzktrwatk0WeSfvX/+1VPWtzD7OadjWleiZvrSd8lXETNI+0BSD?= =?us-ascii?Q?Y9WzB3kGOVtA/I97ovArhR3mlNEzUkzDKQ4Ig5ZMDWzvjqYD++jr3mkL9Fzk?= =?us-ascii?Q?RILjUORx+4rMUtVxhi+Ri+UdpTKjZNQTPgnNsGXTdiPLAJnMU8kVi1s5DZh7?= =?us-ascii?Q?luV7iAc9MuaHQ8LkcdeV2KW2CMkKsPmQWq2BdC9mrF/M8k1QcDa+dlW3qoB6?= =?us-ascii?Q?kskdbTuFTUb5b9Ieqp8Smj2ygQ+96titNwTmq2wIrehQi3tDHftkrE0zYtr+?= =?us-ascii?Q?Q5EK0QwYGl4T58MUFJvqjtaOixnSniYC2cMJJbf6kWdrLsiZsbVi9mUJ4yAL?= =?us-ascii?Q?O3StTIJe3/jSfj9eiFkUpEQOtYZzwGvxDMcYRKn4ToHH6OuYPNkx8rcsMmCe?= =?us-ascii?Q?TUmntTIwx/0PRJLMxEQU46Lp8P1QxbQONKRg4BYIHvA1n3lVyzDAALPJobDc?= =?us-ascii?Q?Iz5ybJJdNigdm/gHyJwasr6DCMhUz/JAF9/UGKurpYS7/uzjFQrRM3RR+fX4?= =?us-ascii?Q?AMjsAzMeBNDWcx1ahC/yxv3mXll07rIQ9zUTOgbv?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 016454f2-b616-40f2-473d-08db78a5a77e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2023 13:35:07.9458 (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: cRJdwMc+pFRQTvOUDzCLvWH50egqYYPnPAoyG/dEmvVf2ZGYr6o5ulV9DH+9FsCxHmzQzix5QHaQALmMzRgP7w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8286 Content-Type: text/plain; charset="utf-8" Use a new env var fullmesh instead of passing 'fullmesh_*' to addr_nr_ns2. It can be set with the actual value of addr_nr_ns2 now. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index e1e7ee46e980..f829fb39ff8c 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -55,6 +55,7 @@ export addr_nr_ns1=3D0 export addr_nr_ns2=3D0 export sflags=3D"" export fastclose=3D"" +export fullmesh=3D"" =20 # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x30) || # (ip6 && (ip6[74] & 0xf0) =3D=3D 0x30)'" @@ -107,6 +108,7 @@ init_partial() addr_nr_ns2=3D0 sflags=3D"" fastclose=3D"" + fullmesh=3D"" =20 # ns1 ns2 # ns1eth1 ns2eth1 @@ -835,9 +837,9 @@ pm_nl_set_endpoint() local connect_addr=3D"$3" =20 local flags=3D"subflow" - if [[ "${addr_nr_ns2}" =3D "fullmesh_"* ]]; then + if [ -n "${fullmesh}" ]; then flags=3D"${flags},fullmesh" - addr_nr_ns2=3D${addr_nr_ns2:9} + addr_nr_ns2=3D${fullmesh} fi =20 # let the mptcp subflow be established in background before @@ -2687,7 +2689,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 - addr_nr_ns2=3Dfullmesh_1 \ + fullmesh=3D1 \ run_tests $ns1 $ns2 dead:beef:1::1 slow chk_join_nr 4 4 4 fi @@ -3100,7 +3102,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 - addr_nr_ns2=3Dfullmesh_1 \ + fullmesh=3D1 \ run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 3 3 3 chk_add_nr 1 1 @@ -3113,7 +3115,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 - addr_nr_ns2=3Dfullmesh_2 \ + fullmesh=3D2 \ run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 5 5 5 chk_add_nr 1 1 @@ -3127,7 +3129,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 - addr_nr_ns2=3Dfullmesh_2 \ + fullmesh=3D2 \ run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 4 4 4 chk_add_nr 1 1 @@ -3151,7 +3153,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 - addr_nr_ns2=3Dfullmesh_1 sflags=3Dnofullmesh \ + fullmesh=3D1 sflags=3Dnofullmesh \ run_tests $ns1 $ns2 10.0.1.1 slow chk_join_nr 2 2 2 chk_rm_nr 0 1 --=20 2.35.3 From nobody Tue May 21 16:39:15 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2072.outbound.protection.outlook.com [40.107.22.72]) (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 761FA11192 for ; Thu, 29 Jun 2023 13:35:23 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nY0SGgwpR/H8Qsh8OdRwhwNawS1XFVZHrV9vriwxiiM4GHfFipOftuDBU6P7yfLNKRXM7C+rvALLp5nd6LavftibVa6cu3yQuhmbbE5EKFXY+T108whxYd/yrxDAWScii+iRyrXw0hmdQrFs6830P/llWtKR3Pdaz0coLAeSWWVHtlNtUfI9q1l1wG5u/rd6pjzESQFPEAaN+AUhsbZJ9R4hXnd++jgm7HfZlQ5B4QMWNqpBrtKjBQKaCeKNC039LMTi/+MLegjFPnk7Pd+6ohwXu1hZigITc+PinQL3ZzYrrQaVlBCYWo2HGYCRodUY5WmIzK9fcpEsXFFlj+CdYQ== 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=EByRJp45pKCPFb4MUOC7zzwDQRJeP+cLywVdi5RnU/s=; b=ePKk1nPUs22BLC97Mu0HhivANRo7UDZrt2vSKLlXp39bHYlvVv3gGgYCJneTS4YMooHrqPxIvaU1BaP9v9OapknrnnQX0+B+dlKBQ007DRKyLg5SQLQTsQSZ69ExdevrWEu/hhKO0ZVBcUR/689YglPDBq5CRZOgRJyvgc9cfn1oGHUViuBWanwXkwBSzO0cIMHYxII9oSJxjEojHNBoxOAwvpMM5SCNdqEXWFp2Eu+wh2Mdb7H4mcJ6pE1VvdP859MuFM2PSkxomWW3btE8b8HFXSSy6AMCvx6cJmKvS4bqvR+MApTIbm9L4V/0uygyaqcOvgcO3UsxYfk0YulNcw== 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=EByRJp45pKCPFb4MUOC7zzwDQRJeP+cLywVdi5RnU/s=; b=PRVnt+xEFyziWc5py+KhSv4XpvjFj7x3EpRY2kEJQIG8p5JKYKR0Zh+hI3t34ZqLAr8NSOX+4TOEW24A33qF4I3dKDn1GaoJ/552eI0HVo9dcBfvPd+0w6o7M1+eZUu/8aAxwZMgTD4SbSCjD9CiFx/zCbO3b5mcfXzpPkV4WmW/8zONTQC8mZqIC35LLXT5zkiQ/yRSvGNipo8dlz+WGhtuN02zta/NkQoSrh9SVJfa/tH9jdlNPjK5XeoeEO7t6NTMCkMCnrrKD92kRxJViYS4NN+vQdjHGj6YkkdAKEWqIy8bFsp1XOyhws40AXcpo3QWkZNhifOI3Z46jPQUZQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) by PAXPR04MB8286.eurprd04.prod.outlook.com (2603:10a6:102:1cd::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.37; Thu, 29 Jun 2023 13:35:20 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::423a:a30f:5342:9d35%6]) with mapi id 15.20.6521.026; Thu, 29 Jun 2023 13:35:19 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 4/4] selftests: mptcp: add speed env var Date: Thu, 29 Jun 2023 21:34:32 +0800 Message-Id: <05fb1934b9654b965f62f54be06579cdc97c864a.1688045383.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYAPR01CA0045.jpnprd01.prod.outlook.com (2603:1096:404:28::33) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|PAXPR04MB8286:EE_ X-MS-Office365-Filtering-Correlation-Id: 4fcad70d-e914-4598-bd44-08db78a5ae70 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ts2+f3n7WtLFhryoyiF2ALpdbKvtdFhq4fKK1AihAzw9hkJgwn1Cc8S6Fp/RWflb8+J+JGdFumw2fmi+7pnccq+mFXBgPc+B481JTz0P5lCHJrC+EZC721r+UPprexNk0uUldEOJ0PbkUEwtlMLpWQD9IQp5XrjujFH9NBFky5obq49SCceZcMcS8kULvc/uywuVabx8Roz5xHYrj/eYtY7rmyDP2LlBkQtAj7CBlGyVVquESfhV+RKp3dcrwFc/2mY5sDjMK8F7pgjpzIUPx4dRe/iIjRxu40O/3bqhDdai7W0FJOwb4MW3rRJqadcHkmSN2dZEs8aw9XplVwH1ARnmWTQ4kZEXpx5af7jA5ADekx/5SphKJo3tKyk9c6bJpQ4Cjf5/VjFkkEZbscvWRi/a75efbjonMz9J6aAUvpp/Fvn06wgSiqAcagcZoJ6L/6BKp83SsafeFyVF8gAz+gWxwvZqu9MKkSXsrKH2LJ0yesaP8VLn1DzHR+t41S9bPQst/jSO+WBE9DJSwVPf+ccEw1Kf0qXB6iDMzIbf1sG4HQmB4M2Aeb2ElyUfUc7C X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(136003)(396003)(366004)(376002)(346002)(451199021)(478600001)(6486002)(6666004)(6506007)(26005)(186003)(6512007)(107886003)(30864003)(2906002)(66946007)(41300700001)(316002)(4326008)(66476007)(6916009)(66556008)(5660300002)(44832011)(8936002)(8676002)(38100700002)(36756003)(86362001)(2616005)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xdcdxZX3vz5A1pJvYaBc4sl4czkA9HeS0hDgQ4b7Ak3siwl8iXRM6PEgMvDU?= =?us-ascii?Q?WU5Cc3yc2mA8GZMn8jO8euw9eWTp2IN9cGab/2G77fswEUgPwMrGZ9hj9kic?= =?us-ascii?Q?oks7KPGmr+t37h8pjCAc2kgzeyI4TplJgSK0Wu6UA13Vj6dIBb9q9wdhqbcm?= =?us-ascii?Q?sYAwfi0cv56jIzXe96s4WS1SzPoS23M/M8T/WEohUdIdXCe2ugBw3amVCebJ?= =?us-ascii?Q?TRVBJX1LhBRjclZ5LRmMlb+M2EzcSiM11+QDlvOP1p37g5GyXrN7VXu47Ro1?= =?us-ascii?Q?q6huC0tye9fKp0Q4dq0oxTfGfTiqeIEUaEqjPeMUamM0XlJQvbUddAjR50MG?= =?us-ascii?Q?TiS06/AGWlDTbIGWfx8OWvxsC3ZMKBkOKHarwfV+t9CHbz+I3n+Sj08tldEN?= =?us-ascii?Q?ocrfQmfs5i0xB3xy/B2CiGZZ4RSvpSWre+CQ/MeuXlorMW9ZKmXtVl+VE3RQ?= =?us-ascii?Q?H6huuY0tb2co3OjibKXQ3qqWQwP76aHhIMQ5xobSISlyAE10709fYRkRGjE4?= =?us-ascii?Q?a+oc2G3DBE3h+euyyQFybatCnzdR/SLz/hGVa6XGBiBA6fTntuTsP2vfyQ9t?= =?us-ascii?Q?qhpwEUmeftS/lHC0S6i1MBQD+snFEvpuhW1fZa/Xt2atMWJ3ldjMwuxnRoCC?= =?us-ascii?Q?9PtF4wpKk4P97bfvsmYD/ysbrimMzNYGbKwcpnG9GR+g5ioJ1YeTardOk07s?= =?us-ascii?Q?gOlFpUbKmDDxl3q2oYQDmswIuTaVoetkaikXxmcrjnUeiCy1U7EtP8FeG3/k?= =?us-ascii?Q?VVj2k1Uqi3z+zYOjQn52OHpb+I3gUT9XKa4gxFK0vaN4a5W0pH3GVY3rZql3?= =?us-ascii?Q?vApxYR1HAdJRug1HutT53yPe5bCGvlx4cQJ2wMY8mFzp9rRvV+wk6XbmhjPG?= =?us-ascii?Q?FlmfhbZ9pyGAAozjG8jC0wdYJzc45DviaxFlzGiHMe9qXlktWnr5shWwfsAZ?= =?us-ascii?Q?3zbfqwVAu+2gcLetZ5SahbqYMRlzu6uopBthrNWXUatNCWkAqLlQLVIrCqM5?= =?us-ascii?Q?ccWChqbCqB/dXBZcqjAtYanLSTm4v7MD1QB+atF8Hq8QyaOtOL7B3wy7pq2L?= =?us-ascii?Q?v+bLRRQtNn8s3MSaaUQ9vnwpNV1/UTftcRt3NZKc2XRIxdvWiXqsn0GHFr+9?= =?us-ascii?Q?yWPqVyKYxmoIEBTb3u/FX178oMJRCb7PcNYoTKfg2M4UBrlwj0IqDcebXvI9?= =?us-ascii?Q?YTDgOva4avZqYpRfERQtvFGe8A2wJjImrMx4JzRNdH3UurM/mCDq88SR9mRv?= =?us-ascii?Q?ysemkI+NO/TLEWe1Q2Z4nUCccRWtzQqQ4jNnq/45W7bAoPyH7vQWno0x3sn8?= =?us-ascii?Q?kVWaX2NO/gNbGjaIrcWsH8ZfILUdWe0AqYjL/rqaUY7Yw5mRQauv3G0OIfz0?= =?us-ascii?Q?Xi/QWNbgIi3czATO6Qq1wiGvHvW9kv06iTsKuOMiovN3Wr6Fy1ozOUNJiLCM?= =?us-ascii?Q?kufYhtd6R0+3ncUOLPsvCIKI+QYVWYLWTL7DbF2wmJEeEPCXE5PpEPFNDtxV?= =?us-ascii?Q?NxFVkaJkuVbzaAOeYAmTE3M8Ovxps2iXO18p8pjl3Mo4/0j1hW/R+s9hEo2g?= =?us-ascii?Q?crsZZ5YEQle/la4IzsLCOa962b4SSqXD7uJWKoWP?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4fcad70d-e914-4598-bd44-08db78a5ae70 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2023 13:35:19.9252 (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: If5MuoTCqVq9qhcJmtPqIVj222Fb3CFfQ2hrLLTriooi0+5M0gT67vAdKWB7ZdsKAoZpTWI5QlBjVW+qfnkLWQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8286 Content-Type: text/plain; charset="utf-8" Use a new env var speed instead of using 'speed' argument of run_tests() and do_transfer(). It can be set with 'fast', 'slow', or the actual speed number. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 230 ++++++++++-------- 1 file changed, 125 insertions(+), 105 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index f829fb39ff8c..a80b3bd5430c 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -56,6 +56,7 @@ export addr_nr_ns2=3D0 export sflags=3D"" export fastclose=3D"" export fullmesh=3D"" +export speed=3D"fast" =20 # generated using "nfbpf_compile '(ip && (ip[54] & 0xf0) =3D=3D 0x30) || # (ip6 && (ip6[74] & 0xf0) =3D=3D 0x30)'" @@ -109,6 +110,7 @@ init_partial() sflags=3D"" fastclose=3D"" fullmesh=3D"" + speed=3D"fast" =20 # ns1 ns2 # ns1eth1 ns2eth1 @@ -989,7 +991,6 @@ do_transfer() local cl_proto=3D"$3" local srv_proto=3D"$4" local connect_addr=3D"$5" - local speed=3D"$6" =20 local port=3D$((10000 + TEST_COUNT - 1)) local cappid @@ -1025,8 +1026,8 @@ do_transfer() 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}" + elif [ $speed -gt 0 ]; then + extra_args=3D"-r ${speed}" fi =20 local extra_cl_args=3D"" @@ -1164,7 +1165,6 @@ run_tests() local listener_ns=3D"$1" local connector_ns=3D"$2" local connect_addr=3D"$3" - local speed=3D"${4:-fast}" =20 local size =20 @@ -1208,7 +1208,7 @@ run_tests() make_file "$sinfail" "server" $size fi =20 - do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} ${= speed} + do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} } =20 dump_stats() @@ -1997,7 +1997,8 @@ 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 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 fi =20 @@ -2008,7 +2009,8 @@ 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 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 fi =20 @@ -2019,7 +2021,8 @@ 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 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 fi =20 @@ -2031,7 +2034,8 @@ 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 slow & + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 & =20 # mpj subflow will be in TW after the reset wait_attempt_fail $ns2 @@ -2130,7 +2134,8 @@ 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 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 =20 # It is not directly linked to the commit introducing this # symbol but for the parent one which is linked anyway. @@ -2240,7 +2245,8 @@ 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 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_tx_nr 4 4 chk_add_nr 4 0 @@ -2251,7 +2257,8 @@ 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 slow + speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 1 1 1 chk_add_nr 4 0 fi @@ -2262,7 +2269,8 @@ 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 speed_10 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_add_nr 8 0 fi @@ -2273,7 +2281,8 @@ 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 speed_10 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 8 0 fi @@ -2286,8 +2295,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 - addr_nr_ns2=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns2=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_rm_tx_nr 1 chk_rm_nr 1 1 @@ -2299,8 +2308,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 - addr_nr_ns2=3D-2 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns2=3D-2 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_rm_nr 2 2 fi @@ -2310,8 +2319,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 - addr_nr_ns1=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert @@ -2323,8 +2332,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 - addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1 @@ -2337,8 +2346,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 - addr_nr_ns1=3D-1 addr_nr_ns2=3D-2 \ - run_tests $ns1 $ns2 10.0.1.1 speed_10 + addr_nr_ns1=3D-1 addr_nr_ns2=3D-2 speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 2 2 @@ -2351,8 +2360,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 - addr_nr_ns1=3D-3 \ - run_tests $ns1 $ns2 10.0.1.1 speed_10 + addr_nr_ns1=3D-3 speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 chk_add_nr 3 3 chk_rm_nr 3 3 invert @@ -2365,8 +2374,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 - addr_nr_ns1=3D-3 \ - run_tests $ns1 $ns2 10.0.1.1 speed_10 + addr_nr_ns1=3D-3 speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert @@ -2379,8 +2388,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 - addr_nr_ns1=3D-8 addr_nr_ns2=3D-8 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-8 addr_nr_ns2=3D-8 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 1 3 invert simult @@ -2393,8 +2402,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 - addr_nr_ns1=3D-8 addr_nr_ns2=3D-8 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-8 addr_nr_ns2=3D-8 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 =20 if mptcp_lib_kversion_ge 5.18; then @@ -2412,8 +2421,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 - addr_nr_ns1=3D-8 addr_nr_ns2=3D-8 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-8 addr_nr_ns2=3D-8 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 chk_add_nr 3 3 chk_rm_nr 3 3 invert simult @@ -2426,8 +2435,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 - addr_nr_ns1=3D-8 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-8 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert @@ -2438,8 +2447,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 - addr_nr_ns2=3D-9 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns2=3D-9 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_rm_nr 1 1 fi @@ -2449,8 +2458,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 - addr_nr_ns1=3D-9 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-9 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert @@ -2463,8 +2472,8 @@ add_tests() if reset "add single subflow"; then 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 + addr_nr_ns2=3D1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 fi =20 @@ -2472,8 +2481,8 @@ add_tests() if reset "add signal address"; then 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 + addr_nr_ns1=3D1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 1 1 fi @@ -2482,8 +2491,8 @@ add_tests() if reset "add multiple subflows"; then 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 + addr_nr_ns2=3D2 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 fi =20 @@ -2491,8 +2500,8 @@ add_tests() if reset "add multiple subflows IPv6"; then 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 + addr_nr_ns2=3D2 speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 2 2 2 fi =20 @@ -2500,8 +2509,8 @@ add_tests() if reset "add multiple addresses IPv6"; then 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 + addr_nr_ns1=3D2 speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 2 2 2 chk_add_nr 2 2 fi @@ -2514,14 +2523,16 @@ 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 slow + speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 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 slow + speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 0 0 0 chk_add_nr 1 1 fi @@ -2531,7 +2542,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 slow + speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 1 1 1 chk_add_nr 1 1 fi @@ -2541,8 +2553,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 - addr_nr_ns1=3D-1 \ - run_tests $ns1 $ns2 dead:beef:1::1 slow + addr_nr_ns1=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert @@ -2554,8 +2566,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 - addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 \ - run_tests $ns1 $ns2 dead:beef:1::1 slow + addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1 @@ -2656,7 +2668,8 @@ 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 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 fi =20 @@ -2666,7 +2679,8 @@ 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 slow + speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:2::1 chk_join_nr 1 1 1 fi =20 @@ -2677,7 +2691,8 @@ 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 slow + speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:2::1 chk_join_nr 1 1 1 fi =20 @@ -2689,8 +2704,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 - fullmesh=3D1 \ - run_tests $ns1 $ns2 dead:beef:1::1 slow + fullmesh=3D1 speed=3Dslow \ + run_tests $ns1 $ns2 dead:beef:1::1 chk_join_nr 4 4 4 fi } @@ -2703,8 +2718,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 - sflags=3Dnobackup \ - run_tests $ns1 $ns2 10.0.1.1 slow + sflags=3Dnobackup speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_prio_nr 0 1 fi @@ -2715,8 +2730,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 - sflags=3Dbackup \ - run_tests $ns1 $ns2 10.0.1.1 slow + sflags=3Dbackup speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 1 1 chk_prio_nr 1 1 @@ -2728,8 +2743,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 - sflags=3Dbackup \ - run_tests $ns1 $ns2 10.0.1.1 slow + sflags=3Dbackup speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 1 1 chk_prio_nr 1 1 @@ -2738,7 +2753,8 @@ 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 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_prio_nr 0 1 fi @@ -2747,7 +2763,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,backup pm_nl_add_endpoint $ns2 10.0.1.2 flags subflow,backup - run_tests $ns1 $ns2 10.0.1.1 slow + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_prio_nr 1 1 fi @@ -2755,8 +2772,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 - sflags=3Dbackup \ - run_tests $ns1 $ns2 10.0.1.1 slow + sflags=3Dbackup speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_prio_nr 0 1 fi @@ -2765,8 +2782,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 - sflags=3Dbackup \ - run_tests $ns1 $ns2 10.0.1.1 slow + sflags=3Dbackup speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_prio_nr 1 1 fi @@ -2855,8 +2872,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 - addr_nr_ns1=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_add_nr 1 1 1 chk_rm_nr 1 1 invert @@ -2872,8 +2889,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 - addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-1 addr_nr_ns2=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_add_nr 1 1 1 chk_rm_nr 1 1 @@ -2886,8 +2903,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 - addr_nr_ns1=3D-8 addr_nr_ns2=3D-2 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D-8 addr_nr_ns2=3D-2 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 1 3 invert simult @@ -3089,8 +3106,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 - addr_nr_ns1=3D1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns1=3D1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 4 4 4 chk_add_nr 1 1 fi @@ -3102,8 +3119,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 - fullmesh=3D1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + fullmesh=3D1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 3 3 3 chk_add_nr 1 1 fi @@ -3115,8 +3132,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 - fullmesh=3D2 \ - run_tests $ns1 $ns2 10.0.1.1 slow + fullmesh=3D2 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 5 5 5 chk_add_nr 1 1 fi @@ -3129,8 +3146,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 - fullmesh=3D2 \ - run_tests $ns1 $ns2 10.0.1.1 slow + fullmesh=3D2 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 4 4 4 chk_add_nr 1 1 fi @@ -3141,8 +3158,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 sflags=3Dfullmesh \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns2=3D1 sflags=3Dfullmesh speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_rm_nr 0 1 fi @@ -3153,8 +3170,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 - fullmesh=3D1 sflags=3Dnofullmesh \ - run_tests $ns1 $ns2 10.0.1.1 slow + fullmesh=3D1 sflags=3Dnofullmesh speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_rm_nr 0 1 fi @@ -3165,8 +3182,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 sflags=3Dbackup,fullmesh \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns2=3D1 sflags=3Dbackup,fullmesh speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_prio_nr 0 1 chk_rm_nr 0 1 @@ -3178,8 +3195,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 - sflags=3Dnobackup,nofullmesh \ - run_tests $ns1 $ns2 10.0.1.1 slow + sflags=3Dnobackup,nofullmesh speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_prio_nr 0 1 chk_rm_nr 0 1 @@ -3354,8 +3371,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 - sflags=3Dbackup \ - run_tests $ns1 $ns2 10.0.1.1 slow + sflags=3Dbackup speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 0 chk_prio_nr 0 0 fi @@ -3368,8 +3385,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 - addr_nr_ns2=3D-1 \ - run_tests $ns1 $ns2 10.0.1.1 slow + addr_nr_ns2=3D-1 speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 0 0 0 chk_rm_nr 0 0 fi @@ -3379,7 +3396,8 @@ 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 speed_10 & + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & local tests_pid=3D$! wait_mpj $ns1 userspace_pm_add_addr 10.0.2.1 10 @@ -3399,7 +3417,8 @@ 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 speed_10 & + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & local tests_pid=3D$! wait_mpj $ns2 userspace_pm_add_sf 10.0.3.2 20 @@ -3422,7 +3441,8 @@ 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 slow 2>/dev/null & + speed=3Dslow \ + run_tests $ns1 $ns2 10.0.1.1 2>/dev/null & =20 wait_mpj $ns1 pm_nl_check_endpoint 1 "creation" \ @@ -3445,8 +3465,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 - test_linkfail=3D4 \ - run_tests $ns1 $ns2 10.0.1.1 speed_20 2>/dev/null & + test_linkfail=3D4 speed=3D20 \ + run_tests $ns1 $ns2 10.0.1.1 2>/dev/null & =20 wait_mpj $ns2 chk_subflow_nr needtitle "before delete" 2 --=20 2.35.3