From patchwork Thu Jun 16 05:02:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12883319 X-Patchwork-Delegate: matthieu.baerts@tessares.net Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70059.outbound.protection.outlook.com [40.107.7.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 8F6137A for ; Thu, 16 Jun 2022 05:02:43 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F7y44FdALjkUMR6WwGCfpr2eJCPa9G4k8A9YOL6vMnJqZFtZrRuI6PpANw0PFzVvDT6FWIpvUEDYTlwhikjBXXfVdxAstFGWlockdyL8tfmnDQC0T4nFk71LYhqpre9RTdT5dMseNydTixgo1lzWFpMqlzSXizYemfqiCDt/6INzgvvrAy1tQVzlruijam9rn6/uDxoL35ocu0swSwoam5hQD40fba/W8r+GzfktcBu4B0O1q8V6ZbQTpHfFjJG3+IlmESWx08zEB62236yd3qoyPXBK2xbYY5GEj8llXnHFxlb9rUQkbe7AtVnZx3gccjwFNz+DsmbTtvN2UabUzg== 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=XXgX2HBq50glYCcQ33RefzHFwER9Pmf1gD/1RYA8rio=; b=TOeN3pDcPnj2bwxh5HQd2H/NJpxI6mD9gPNmxppRd6r66dORUN4EtHdI6BP2M0dB/oT2Z3G5dV0JgJDdlYnNdAI9gnF3OUrk4In+IcWvzlNmob1rEoW1e3UT1QGN6P9q+0JtcZwGwkoBsmUEl3hAsFVQm9s4kgf8as4jo84f2qgHC2TnV+0FX/iRPMeqIXNDkVy2FFqAB2FkMHt7asdYyDltkxtqGJqCcoVWz73VMDkdem+Id0B9S12j8REO3k5RediEqoxsvgO8WWVcXJefEuz11QUGfozLO9XUSmA6YFUVvzr1XFtgRTdmIuyIW5osLmQ4E+JCBsa3Yc8MUVUNvA== 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=XXgX2HBq50glYCcQ33RefzHFwER9Pmf1gD/1RYA8rio=; b=Zz8QCa/44X4j2JxunxbLqRlx/Tx2w4m1/NLMcR8PRwjuFgzPDOwdkpbOti+hFUDBnhKShC3i1qZGAsi0ZIKGvj59EDXs2Q93XXQv7EoDDF4QW4w1WJMM2nx+63aOBqSanpvf8JRMhxSJl8vBT1NUhiKuS2HpN/oWOCFJc3LQFbQX62bSZBhpdCkBevJK88caPydF13py+KCrgjBZY6ZCXNz7H04uh6SevvzKC+ZpounixffwcHWc2i6GDEE9jmdtzkjB2anL07CZ1A5SexGIZqB6wjBEsio6ZsolnrEk/hQ9AsYXf2Hf6Ibw0uTnRJc3bcL8SY/UYh3KbgmhNYvh7Q== 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 AS8PR04MB7880.eurprd04.prod.outlook.com (2603:10a6:20b:2a5::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.21; Thu, 16 Jun 2022 05:02:41 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5332.013; Thu, 16 Jun 2022 05:02:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 1/5] mptcp: update MIB_RMSUBFLOW in cmd_sf_destroy Date: Thu, 16 Jun 2022 13:02:22 +0800 Message-Id: <723d61d82730b996132925686b43f9c3c79bc747.1655355422.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: X-ClientProxiedBy: SG2P153CA0031.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::18) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 092b0ee7-41a7-4f5d-ac45-08da4f5570d8 X-MS-TrafficTypeDiagnostic: AS8PR04MB7880:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S8yl0Fmruar3LIKsMQzQ+kKbPgqEgeX6prKpYiGr1Nu5rmre2ukszotBsDBmuOKpfWWz0M2BzISJ4UkL5dGgyz08lRxpKEa5NjUGGOSGBFurLvm4dlu61YRy0TBf41Ty2bsc0Z4C7HELe7sgMalsXn/0y3rJdIDCzijZxGYJqoJO4nPdDtTkQyUuqBUFR2NWAeur0Il2oOC4oCGyZZtre0wBPxjSU9AvktNayCmc4iDnWpPVBhUaTEKp4au1KPkqTyhzaVW3XDVrU8ku4B+sdUlui3S21hBSfulMTqoVojncZlAq95XkMDcXoTd1KHMXs/e+2iiH4fBSxpMu20TxdfYalQJ4dozIgylmAPKBbHSGy7G7vUMM9Y4+e3W1QEnWgq5Ge16lYEZiymLuJRblN3YWv36jVGUbvyjz94JFQmiXSIM1DqvsmQtaaxx703Ud2fI6bTQBliBNcsHhlknN+kumVZhH0fB/qkOtKP1TE+HjQa4UveNWGyDOGjXXgk2fYcfi5mOvAG+tg6hkN1ASMVakMZztDHQ85Xacu6UyOGHYV42yS+4gFVWZHXUwkWK47+Em/bmq3Tt8n+nre1BoYPkPVXZYZvzQSzkgj7chzEwyAO0psw3o/ygWz/O9K3y/a/pxBvugmpoSM9epmG/d7XGraJE38PJO0mWtKwyow/hmk5PgwJLtbOaGH5gt3seXpRX8MfzgC2vMWNfZagk/2g== 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:(13230016)(366004)(83380400001)(2906002)(5660300002)(8936002)(38100700002)(4744005)(508600001)(6486002)(186003)(44832011)(36756003)(66946007)(66556008)(6916009)(4326008)(6666004)(2616005)(6506007)(6512007)(316002)(66476007)(107886003)(8676002)(86362001)(26005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: e8eKI8dDTC7+rVGtGUnlJW612HcYbgj7IcMSPhXK+lbOynAEplkddLqg75LGDCYjgBRlMIz2GqiUsvXuVocGMPlHqJXC/eo3+Khlg5W+whyUHpWz/Q5WkNFpceMo2j3goRyCthgMCsbn2Xz71F6tdkVv34ehV7vlDJHDWQV54hYfq7aHlwuLAfFEZFFscbgmQ4gSkA0rHPMFVe6YE1He3lP7npNaNGmUJrOtERc43yp1TcHrjq6G5MhK+hDiOdR1ZQScsVpIHZQfK45HnR5DltN4TSomv4iPcr9wmioTeooD+jf/FvWoj0DzZtM80WdovhWIsJQ3cSJNo73q9KoS9iOHe4IR23P3mrqRrGR1zrcak7A+G0D159ActVlRFfDfgBQuqRMuJn9z1Fcusy6OTRkckbYX01Thk9VQJc/fxI+qA5yWtvEq/Z1Ln5Tio4pdncLWFZhl/MHXIu3lyu9F8w55w0rhvq02ruy+HdsS0IsH8l5l5naroI3vtDj+p4vQ1iPI0amnqhk5h5LhhP/oxwKPQDBi29U4gaBgYK3aBS+Ag/4Es1Or/eEGOctWXdMgIZCN3IRWp607rhyvTF5wfFrnH/omNU2yumTzrUb8SBYJT5wpZyK3yGqTVG9BOuKN0HO1m1ReeOKuwxNC0pGjYgJYxJXlO+0hzhzPkU2xpxfLZoSzwZqVyslXJW5LedLPwWBJgKKR1bmDAeII+EOu+18dL2hiHxgdvatwKWXZtYIncyYL+roiwHe++Gg7xUr5Bd2UTCTYAC/GMBD64kzQeBKNm9hRYhW0JLWxOyRp87r+n/flWK+qSb4N8FGP/FGy9uZhRmZBhhysZ9ArYG+cBQY7/712x9EdRPfxxdp5+dcACwgyUgTXcxxB9f4uW7GK/NL1FeBArFQ+/VG4otUq2wghii646wPMcbpgV5UZC/R8h8IiEJYi6lpZbBYVjgI51uJ4ql5xntmu+KJdCl6q26eC/HVkl3n9sFj/AgzLuyYB0r0fgm9Gc4ThEoLHH76QkLb7ntNXA44xq6wpCKvuXcOBxRZZ8zs3VZjVUdlNDrbcGXNhPfEFXt9j991paC36jeidb4IOxv/OUZ83IlbUFl1cZSPBzf+pFS4w2ZIJiTroe0iN55MJMUipb1qs1nMui7aXPUfNAZ103iyay+5WHU1od1q/4RdZrl7GqXNX5NuvfWVtB2hFToa3lx5OlbzaFVLC2iEYnnfvNvDxJXwIONJyFmk70heWaacsmfctVvhmKly6BsTC7nk/wIrvAhKsHr7eq9XZtb+2+hKLosnHkZGLGpDgY9CY9p9aftOJn6U/UR96HXt6mO8OuOYnEUZ5RlAutlRyvm3Azf2xvBLN59oR/vzWh96W//jvNg2E5Yy6+5QuHNS33O+f8hrD1TksRw7g+tqfWgXUT273foUXXX18gdxlnl0rqK3Lnuo+4XCljqjeNv9MqCZXqhk0ZJmOz8Kjaq390AFgTk+jG754eBZqbhgXJtb/PTkOONGulrW5cgzwiy3JS64I3sfhWBHUwN/WnJmK508Br+dKUtIcD8hZ5i3bs+vQykzUVfbUPTx5PsVom3NIy2Ki07oN6grsiLIXktH5nLnH4ziiDCW5p0hzoxBoSZbQRfIXsEbMAW1kdVEWwLsh1OeCxU91PdnrcmTcbr2QOjIg/kzU9UdX0B08lLJMdXtA8X2UhiG3VhgrcCXdRSjILjfESos2XfV28ge+yTkerleRPidfPBwacs7rnOakKgmmAsPyRy4UmfI= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 092b0ee7-41a7-4f5d-ac45-08da4f5570d8 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2022 05:02:41.1346 (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: JtN5x6Piq3czlNQhbvg7eG4N1d0/rwS4hoXFfw6J6B4Z/S0HoKOgaFM+UPYhlXXzWMcBSiryKB38WQ78LQPmqA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7880 This patch increases MPTCP_MIB_RMSUBFLOW mib counter in userspace pm destroy subflow function mptcp_nl_cmd_sf_destroy() when removing subflow. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index f56378e4f597..3d1d365e9c6f 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -5,6 +5,7 @@ */ #include "protocol.h" +#include "mib.h" void mptcp_free_local_addr_list(struct mptcp_sock *msk) { @@ -418,6 +419,7 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct genl_info *info) mptcp_subflow_shutdown(sk, ssk, RCV_SHUTDOWN | SEND_SHUTDOWN); mptcp_close_ssk(sk, ssk, subflow); + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RMSUBFLOW); err = 0; } else { err = -ESRCH; From patchwork Thu Jun 16 05:02:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12883324 X-Patchwork-Delegate: matthieu.baerts@tessares.net Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70047.outbound.protection.outlook.com [40.107.7.47]) (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 C52F37A for ; Thu, 16 Jun 2022 05:02:49 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Cs9Tw2YQ3VsNEDSjDtpAVDXZ6krN3sRTnZfdplpFhLq3eojoe/nHAPMx0dRrWD/5qrTh+EGEuj50il2G0V7iYrNiV0xQIPR2Dffht2+hOlnnkmQFsvXEJxs8hjeTK+5Uv45jNdSdQ08mRxsMtHGvcWRbhQnnibtAnXlj5F4zWfvUz3Klt94gGr/GRAzKq4VYwt8GM0cd4d1OWLms8Y7ElT7pTt/AflmyJqbcnH/nzHecv1Asma6i+UbVLjZ/nX7cYlmIuabr+WdKYLEcJIRW2ntDiVyAxV9uzSQJNjYhKypU9x1zxdiwBr31iIM1oG47Argp3FAP5itJaCnERDzOng== 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=xCTX0cU4iJ6q1N/p4iGGoZypY3bAPqJjkStTyQ5qU/w=; b=OWZ2Z8e2GTq/z7YqWgnfhOEW144ysf9V19Xn/u1cmve4a7E964R87NLa1gGBk+gIvuUvEHwVhQBtokyA9F2wFvRfwpbLpiYQYPrSJQsukOcTyLXiPrFxURLo+i4O2UDiPyhQqLiMFlHSoKJyyh2fCJVobaFdB8dEDTime8LN0b+gWH0VXanWPs3a5Op5G4NNWtPT5AmerOkmke5MJGxKqPiOfSIS1X029u5jRj2wSb92p8CMUMqeteOszcMlQkh3qqusmqavPtrni0kj5iMoYbVd1FU70iOHenNjlnsXAL0yFvTAGflr17/Rn/Pumn7BDcF0Tvz8xH0dBIy1yiVgUw== 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=xCTX0cU4iJ6q1N/p4iGGoZypY3bAPqJjkStTyQ5qU/w=; b=1n2sJslzxaREV0JssfUSgP6t2DulDmFvx2rTQG7myl2oaHHdS6J1Djc4FVTDuSXEm9317kbJ5CZ19WMmuPie9YQQp8NtAdmvv5UrILi9wgvwcTACWgVyCWLhFwUlYjLCtvZ6mcHfJmd7B3cBV0qyuADp4vIjEB8eHWiqBKMjQTr7R7e3RaQJBZt/6VsQAW/VRRRtCgJ9RLomV0E0nQOcKAadGGrMkgf7IW2zqkxQmZDv6rIBDPTvcjh/wLVnkSvWTzT7kvq+N20GHU3qaarY6M+cg2HMNdjOowP0N41+HLmUQrnzrWhUbCgWmG0LEdwJr6QFHgAKQwqUKdENPhM3rw== 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 AS8PR04MB7880.eurprd04.prod.outlook.com (2603:10a6:20b:2a5::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.21; Thu, 16 Jun 2022 05:02:47 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5332.013; Thu, 16 Jun 2022 05:02:47 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 2/5] selftests: mptcp: userspace pm address tests Date: Thu, 16 Jun 2022 13:02:23 +0800 Message-Id: <85bc880f1c3d5aa28d74b09247d6d6f5ebb27c31.1655355422.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: X-ClientProxiedBy: SG2P153CA0033.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e2ad700f-bd04-4609-82e7-08da4f55746e X-MS-TrafficTypeDiagnostic: AS8PR04MB7880:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +ASLaSmbVPYRTpX6chmX5R88nOWYQXBNzBlug/otht63S9ZyporVyZ96SK/wBHjfbn8t8GE40REh6FqpAHVt34zj2jQwtUSrUE0FTgsf+toV0ToKENrGJdaqLFu/YO9sJctpJ29cOFSdXtUAw9RrKiM2qlmvT8ClJNtjGLlCwGb9NJjnMgWDnCIoNmMS8iVDpWwtvyosbyjPch4jUfNl2tViY6yg2aKcoC7+vpRmTrrU9T+VQtTp5JH4n4/XIYTbvwPu/m/+FjCPlpIFRrF7P7flGAWIXVMlgrA6dZ5hpKAlJNqdUhraIgZ+TuBvYj+2dTheRogxWlK9g8/SZbkT1ukZdK7ccWdacgUt7Onw1GKXvg+aw4LjkaHxKPnIHd9SBRq8YwLWJARBdLgHO7cpWS66yAZBGsA2CzK8UtjYYEzWyfJ1h0aJrTJq9FpfPhGT1k2r0Mlkx4JUgqJxRkxiYYte0cHeyo52GRqx+KZDT2dFrXfYxOfL5z1vDXCXV3znIxsWkkoWjUyCDtAHuVYBhiqwgB3MJxv3YNW+vPN4lzCI0b2Yl8L7I/xvNdVumdahxPxCq3M69qBZSjKU+eKGdkwRNa9zBdLN2I0SPzpV61Rl6qFl8OSe6247JCWjj7eY889UR4zQiBMmB4cbNPXP63KlWFAMiF8Ckmmp9II+f5MH7bKRuY8GdB3FmlHENP7Y 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:(13230016)(366004)(83380400001)(2906002)(5660300002)(8936002)(38100700002)(508600001)(6486002)(186003)(44832011)(36756003)(66946007)(66556008)(6916009)(4326008)(6666004)(2616005)(6506007)(6512007)(316002)(66476007)(107886003)(8676002)(86362001)(26005)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nrnAdgIhWTB/JOYU7M2yl1M/1+dUokJI1sm4YpHR+imK/hJfHQDc5wur14dDCoOtQK32Ue2LujrGyTDDvyjFfRVTPclZcbJzgm06Y838USjKZn7MsO/rEMOzBOGdxACG10kM3/tFjUcB546gElt0G847DczzNyH8ffvik2VglqCQ9SAq7c4yffyuzDlEfdIay9KOxmHQ7A3WjFGoqZ0y6YW7m/dAhe+cTZ37iJqzdVa+96PmPG6eaa9MUBlSD/uC6l2CRkRla0Qs/WVxb1pq8YDbLK6w4py1YPDHsQH7oaSGEW2QypHfyaUNYpSDGhMupLTRISx1Ak93RTprkSWbf4Q5bRa3FfrOykcxvCYegn5S3GoyUO/KVWVsY8+e/YAyeAkIGMj6Z/eWNv5uPeiwsLAL1DSd1xHHcwOP6uE0r0sDIQogYTHL3EWpbbI6lYQInu0Pud2OxZawLwmCzATnDzjwYNEzbDwvoykhn+tYAEVNZGKhAMe2yDAOMkC/bL1HjqVbDfOC8ATN4jiKpgCwIDJjZedcPYnaJGUnEC7FBRm/IUJY4Lr+hGzLsC83vxWSvzgmNgPFh2tDBGiPFcx+3qx+pn9bh1QJkXfbC8caIn1OQLNvg19gX30RT1u0FESIF44gAL9gQv3awlB9ig13mwEtn9lnQCjkqc6hckOHMzPaAdegHlbG+XWgxKra1EZ6izOkCuj4puWQl+27gPVNhB1a3961JgGNNNe0oFAhBjRV/bPt1JtV1DJJTSo8WmuFRI1Ja10ZgAUT+plm1Tr+hFg0OOcKrQzuiK8Cp487DMirnTwR9g98JzNagW0W+MkZ7vzP8x4cyWS690o+fX9hQPHQaxmBwYv4V+i4GWT4Hnqz04iENqaBv63f/ay28j9jnxjiDxITSsh21nzREHOqTyiUuX5+NZRxIP1AeSaXFGrVKHihXRXxO+AEpCcCRla8dHihx2NhFP/OJceTCb7H2iuMgR+H7dVCHHLMq2YfLrBLp4pVophFOxJHJpNEOp9n/ub2OcuifUsOkPBO9pcfNEePiBE+5ddiA6F+TDiPaPMoWLWHYxFgfJM+lhVhmu/8S43RJviSSEqLsg/naHbOppW+j80w2EzBPJPRFawVT11K7wGQqBcHAazg87rK/lwCbxFcCn2h1/VVLWxIg/N82WHSc+6B1wUVk2ZiWcGP4Dy7Su705kc3PsFrhnhQcqcvQXNdmXwcXeTl4U8uCRrKgFI1kyYo8UMD3+0ip8P9OtiROlRtkff6nuH1oDAuBhBm6Es8eOWJdt6xJf66Jn395J/mvrnfXp17MnlR49jNAXqIt32LOLGmORadIMX4eR/gdZAeNDE1tzHGwBLxMEriTDStIA3x6fiQ3EBJ2F617m9+jS2LiAKPvcASucK6ZuI3yaUZKXDvj0tzxNZkMYruiYtJouJtCVWS6C5dOy8aPi1PsuhDh4UioH4Cd8MWeA1Cv0TJZoz9Rnmh24pvb/I3/Q9qtbvqd6QFnmluhJOFInnhUakpw5buQs/E5pw34Jd8aiTNDykfz3qNV9r9dMy9BOwrgco5Zeq9K49VUuHR+YYB1e+TfnKo5WppvTAvQg9lCLokccEhqhz2W7Qx/JI3jPMrcKR6tgx/lIasuKkqduRK0MQDDoJAIBBOZe4l07+BtAENvqPkoW17PscQjFaSF5jlHprkLxDc1onsqSWui/8owdXAlTJXkl9l7YCDCzAsADeFixqF2V8Ib61Jj6PlsjjJvbq/nzdykyZFCLqkltI= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e2ad700f-bd04-4609-82e7-08da4f55746e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2022 05:02:47.3529 (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: 1yLD/wmXQw7dVIVFin/9gGRyuC0DQ4hVLPbfiOXzM9dlOKkz28S9h/Yt0xnWWU2cSnmRm2cV/bHmQrkiv9odzQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR04MB7880 This patch adds userspace pm tests support for mptcp_join.sh script. Add userpace pm add_addr and rm_addr test cases in userspace_tests(). Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 44 ++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index a4406b7a8064..977c59c540b2 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -654,6 +654,9 @@ do_transfer() local port=$((10000 + TEST_COUNT - 1)) local cappid + local userspace_pm=0 + local evts_ns1 + local evts_ns1_pid :> "$cout" :> "$sout" @@ -690,12 +693,24 @@ do_transfer() extra_args="-r ${speed:6}" fi + if [[ "${addr_nr_ns1}" = "userspace_"* ]]; then + userspace_pm=1 + addr_nr_ns1=${addr_nr_ns1:10} + fi + if [[ "${addr_nr_ns2}" = "fastclose_"* ]]; then # disconnect extra_args="$extra_args -I ${addr_nr_ns2:10}" addr_nr_ns2=0 fi + if [ $userspace_pm -eq 1 ]; then + evts_ns1=$(mktemp) + :> "$evts_ns1" + ip netns exec ${listener_ns} ./pm_nl_ctl events >> "$evts_ns1" 2>&1 & + evts_ns1_pid=$! + fi + local local_addr if is_v6 "${connect_addr}"; then local_addr="::" @@ -748,6 +763,8 @@ do_transfer() if [ $addr_nr_ns1 -gt 0 ]; then local counter=2 local add_nr_ns1=${addr_nr_ns1} + local id=10 + local tk while [ $add_nr_ns1 -gt 0 ]; do local addr if is_v6 "${connect_addr}"; then @@ -755,9 +772,18 @@ do_transfer() else addr="10.0.$counter.1" fi - pm_nl_add_endpoint $ns1 $addr flags signal + if [ $userspace_pm -eq 0 ]; then + pm_nl_add_endpoint $ns1 $addr flags signal + else + tk=$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns1") + ip netns exec ${listener_ns} ./pm_nl_ctl ann $addr token $tk id $id + sleep 1 + ip netns exec ${listener_ns} ./pm_nl_ctl rem token $tk id $id + fi + counter=$((counter + 1)) add_nr_ns1=$((add_nr_ns1 - 1)) + id=$((id + 1)) done elif [ $addr_nr_ns1 -lt 0 ]; then local rm_nr_ns1=$((-addr_nr_ns1)) @@ -890,6 +916,12 @@ do_transfer() kill $cappid fi + if [ $userspace_pm -eq 1 ]; then + kill $evts_ns1_pid + wait $evts_ns1_pid 2>/dev/null + rm -rf $evts_ns1 + fi + NSTAT_HISTORY=/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \ nstat | grep Tcp > /tmp/${listener_ns}.out NSTAT_HISTORY=/tmp/${connector_ns}.nstat ip netns exec ${connector_ns} \ @@ -2810,6 +2842,16 @@ userspace_tests() chk_join_nr 0 0 0 chk_rm_nr 0 0 fi + + # userspace pm add & remove address + if reset "userspace pm add & remove address"; 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 + chk_join_nr 1 1 1 + chk_add_nr 1 1 + chk_rm_nr 1 1 invert + fi } endpoint_tests() From patchwork Thu Jun 16 05:02:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12883325 X-Patchwork-Delegate: matthieu.baerts@tessares.net Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150083.outbound.protection.outlook.com [40.107.15.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 399AD7A for ; Thu, 16 Jun 2022 05:02:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QQPNyLHlLBikWwcFY9hM6SDGHahKidEIK+zmjKiwsC2wXZUVGutsh3jFqW2QNeJHQ47xWcDgkrdvrGpswpDBZg7niTZ+pIEMSSYkMU1bmAde5n5Yj6/Tvzs/Irrg52905RxryLcTc4hkkpeuFjBdk9TVLpB7kYqD9bs6SVmyXbqL0YJPFfgzdPOSCncxS6Zwsdfs6LLtZhhmdwbPe19UHrm6TbwluhoGePEPUHUjBivPl6JNC9QOSRt6cO65RA6B7eckqEZlpnqlDCk+qlUyuBAJhZxIT3jU2T3ZXF1ARYwNPAQYYNDXXgpyrVPQ6Xm2xqA0kQTdDkJ3fFGlueTabQ== 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=CCPk8Hc5W8xmackIsis3ojLe6sFPfb8X93AIiJr/vH8=; b=CZwNq6OIfkSyF/i5d7+6CYW8ct7JwGmjfkMWnqpRvm0LKcdhlKUFiFxVGAcK0nqUb/Ouq39SfgE1J6sWaTfz3ZO8WjFm5dCzty54vOJMh7KOaMd7aUGPU5vOuR+mVh62YizOGW0hNN5dmmABdChSjKc4HAK0UJObClHdN5+U878prCZPqfKvHBNnJP9/MCczQRM/TAjwaCVjIk1Zsa5pmu1Zfxuuz8UVaBveC41VKF/8Oizng6katY+i4TAeXci0R/4rkx1Jzqwe6omf49JR5Nwqdh6HQSviR5++9ud4I+0OjV08yCr3vGH7xVWf+Kq42UNQst2khmOmdLHVLIj0eQ== 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=CCPk8Hc5W8xmackIsis3ojLe6sFPfb8X93AIiJr/vH8=; b=mZGMDsIRts+SGo2ABpEk3jx7ZhuYQR0ArDAfsh8VgHBlzxAWgU1h5ykD2qdsqW3IuFS+nM5XlYbJi3kuesQlv+oT7A2djCji4osldMIi8JH64vY5AARUY1HtkV7rvreoqpTajJQEWwose8qaH+L5s8v6chFeQXu4ZSTCjg0HQCDLst8/ffLPNOnBvP7TwmCyfP3yg4n7tHUr8u4S1q3nIthYxmthJarvEjI2wVfqP9r6JcUt4pBbOymMB7ojU9wENLDXlC449YvE962XO54TPMKmUo6sBw+AUOZKxAPmrZ3B/b+r1xHBjuYEhwP/E7w7eFkXj7jqDvwhXhLpGs3gOg== 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 VI1PR04MB4720.eurprd04.prod.outlook.com (2603:10a6:803:52::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14; Thu, 16 Jun 2022 05:02:54 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5332.013; Thu, 16 Jun 2022 05:02:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 3/5] selftests: mptcp: userspace pm subflow tests Date: Thu, 16 Jun 2022 13:02:24 +0800 Message-Id: <3fe28e031020b282b23e906b1095f1cce16af111.1655355422.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: X-ClientProxiedBy: SG2P153CA0026.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::13) 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-Office365-Filtering-Correlation-Id: 4c9df6df-e613-4747-17f9-08da4f557866 X-MS-TrafficTypeDiagnostic: VI1PR04MB4720:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rMzU9nbwYjgIytA5ZrqSxhLYgyp8aM3wBwDTa7dDaoAQ40DnRW37IgrSbX+UWMS0FkXtZiyMsNETGCDMuYtr2kUBPc0B+JufZHSB9wZd8lOEcaTqtBZaTBDNBNvoE+aB7NLPd2cG5tLSFZRv5QLY5Qd0WJjk3tqjG9u+Mp/jB+Qj9sH9L1omO3ZVzAgY+nGct+0jxITTrEPsDgcJx2jrRaD23hdKZgsiD2QkCScJRftbImYu8/b4568vsWlR6FOo7b1T4ZAmBwmalTV3RQD1Bd/BwZKI1mZosLLZHN0do0Cj0RQpLdDTp0sFsjh5nhe68L4JFS1CnWX2WWrFhoRFYaMarsPNv5DRrskTv3mmVAfU2pDFWpFo9nElqq9TQSzaWwLEQRcNwxZWWOIJYHRinrP0RduDqRX7Gknhq18p6G2ksLWQ5ZjeXROaD5qqtsY5NEoKbX1rpMiajEzh3nLqT29w78nTiufP4hkhsZ+AvOFtzDX1prqijae+EDC80NnReqHt4vawaoLNIZ4aoI47D/b5tXiar3490pm/rM1wiJZm/EFTJ9r8kq35YnT/YTYMFWKuiUiJZyQnkPmP8v0sWszB5np7zvBs7y/bX4I0+bVAVOwbHgTiDqqovZhCuznsuDp8SFk2LTcNyUGHjK/lBauNGvG+rCCFCYcVZSAG82zMuqhK6F5pzm39cSst+CrljBiiunb2NlFVoKc59gh3dw== 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:(13230016)(366004)(26005)(6506007)(4326008)(66946007)(66556008)(66476007)(2616005)(6512007)(86362001)(2906002)(6666004)(38100700002)(316002)(8676002)(36756003)(6916009)(8936002)(44832011)(83380400001)(508600001)(186003)(107886003)(5660300002)(6486002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RxLqGseR1j0jXKTAntw5yAU6AX1vYEsgsjuY1UZw8Ft4etsIFtNG08PxB4eVacTkk/sxw+LDPMYwXkrq+/Q0BKKESXdgiOdpWBa3EOxZUXG/147Pxggy+aMfwc+GJwGIhw24czgF+rDx7nlVVzDjPTFFF9f/zR84KNptKKNA7uPi8BjUL5BAKLQLSquwZAagxy2bYzcyVoByjA5AjrwjiWIqXaMq90EkL+hUJvC+AdEQr2hVHgpPJyV+PKfcB2odiMsEpwWYJ2FW3apn/vBRdGLI+Ihzrl2DbB5UOUcL8RJfd9z6lNCIBg0aoFd2deLfXSerYRSw4gZWr08bEo0cIGZ/l6EFsNmOhELEP1YgXt967blLXXMpQy6x26qIJ0csZdNGCrIYLMjTdHGXg7L4xX3A9j2Uu9Clll/Tp8QIEJKc6g67KHaDCjPHJKuD5AWTpBRqvkniSynTM5vUcht2rH0xyIjGtGfDMqoKmxBxw+xml2AAfLoXtDbT90v1ym00Rze7hl0h01hMv0mgCBuXPV5qjgvXQ1rDQ2ULdNRyawwbrPkvvp7ADM3yQawv6aP77HdEJ1LRE2AoFLtB14p2DV+DWGa+7qwxbL82BGM8Vzt51UUR3RJxVzO70PKC3fxFu4BV8A29SBzqKC9zidN3y6K1aiGNZk3lwZQ/bSPjR6jYWtusBihK7wGn2Gi+Bh/kZJMGDLMtw+Y4/HqyKO/pzU7cEPiOIaWQ/n8wHacL10M2G18qZU6rB3qnVe45FT8CN2YwiXK4i2f9+5+88fdeAzuz+IbEahNp9crRtCTt6KoXD/IQGiNW9nF5MQJjnPKxrZxT9icqSpOwRY1g+bmx917vzDQj4g9iYS1NPHBEMOnRtXHhZ658GiDKAm+Cm5ZmGErrEgKnB5jXdOo9OSpTRtRsPmLVshEl0vBxBQrUqU571ks1xSGy2te6OXk/8SFyzo6CrQrvvCAyFv1EUglBLx/UIbQspqSduqO5vCsEXtE0lvcUJGgokr/ER5yadXK2+6aIiwz5VLuTfC30rq2Oqeyfurcpq+Yza3aVJDqfdHkUsEII7nAXJMY+u3HOSIoijv9PkHdMrRu6vMJInas8xIXhAP2LuHghaSquiqfJIvoPuvVtdUgRJ3R8G9UVv6XPFBd4Tx3k5WuNOkYWHkCh57jkywfJq7PLhLzNzqZ3OihUYEz/wjgjHQ0VXTI0PfZ1tFh7vjDIwvEpgbrNWX52cGRuoAWmWS26Uj8ZyIajcpiGHh7KdpBPQTI7jNeJVXgNzGqZ6Ahse1vBFJ0SXmG5KzbFG08eK/dM62MGKAWIUQ3U4WtaauLXQg4XymIqqRbEtwRoFUgQ6/gfyMt8mtVK2lr4/2GZty9VHos7s4Q6b7yXnpmAxHAelFASglpZzkEzrOtCu2rMRGrUBSIViw1DcchiFGQ5b3iUQjs3iP2oEJeHP1bRmjHEpj7cmWwk9xYDT7WTWHTwQ0fl4LImj4eS/vk9lbhVk3FECzNmvP/peD0/8WVB+gKTb2kJDrpGih2c1xogUaQML+GelYhp1HwCVdJx29oIRT/6QH1YgDBA/z+i8yzsQywC53QOzY9Y7nijYt9G15LQ+3JU78sBfkmDTyxpT+Ocm6njGxLLfqr4buTEO2D04NFi2Sl4rxTtt3FNUpkCUd5fDgEw2lt4hlEOqFVJrQ0+MwtQ7PHu1CLo8LAbLOz0No5k2OuoINwAOSu6HCbxGKadq/CxK9EqN33TtyaEEy96YzDgcfeI+YORFF0= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4c9df6df-e613-4747-17f9-08da4f557866 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2022 05:02:54.0554 (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: JvMEEgAq8iGaggvN1g/Pruo6sw/afiXMqAeCn9LFlz5mDepGbtfeWqwt657fDqJT4WgejNQJLCF6Do4LzcUbpg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4720 This patch adds userspace pm subflow tests support for mptcp_join.sh script. Add userpace pm create subflow and destroy test cases in userspace_tests(). Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 40 ++++++++++++++++++- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testing/selftests/net/mptcp/mptcp_join.sh index 977c59c540b2..bec22fa38415 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -657,6 +657,8 @@ do_transfer() local userspace_pm=0 local evts_ns1 local evts_ns1_pid + local evts_ns2 + local evts_ns2_pid :> "$cout" :> "$sout" @@ -702,13 +704,20 @@ do_transfer() # disconnect extra_args="$extra_args -I ${addr_nr_ns2:10}" addr_nr_ns2=0 + elif [[ "${addr_nr_ns2}" = "userspace_"* ]]; then + userspace_pm=1 + addr_nr_ns2=${addr_nr_ns2:10} fi if [ $userspace_pm -eq 1 ]; then evts_ns1=$(mktemp) + evts_ns2=$(mktemp) :> "$evts_ns1" + :> "$evts_ns2" ip netns exec ${listener_ns} ./pm_nl_ctl events >> "$evts_ns1" 2>&1 & evts_ns1_pid=$! + ip netns exec ${connector_ns} ./pm_nl_ctl events >> "$evts_ns2" 2>&1 & + evts_ns2_pid=$! fi local local_addr @@ -830,6 +839,8 @@ do_transfer() if [ $addr_nr_ns2 -gt 0 ]; then local add_nr_ns2=${addr_nr_ns2} local counter=3 + local id=20 + local tk da dp sp while [ $add_nr_ns2 -gt 0 ]; do local addr if is_v6 "${connect_addr}"; then @@ -837,9 +848,23 @@ do_transfer() else addr="10.0.$counter.2" fi - pm_nl_add_endpoint $ns2 $addr flags $flags + if [ $userspace_pm -eq 0 ]; then + pm_nl_add_endpoint $ns2 $addr flags $flags + else + tk=$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") + da=$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evts_ns2") + dp=$(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=$(grep "type:10" "$evts_ns2" | + sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + ip netns exec ${connector_ns} ./pm_nl_ctl dsf lip $addr lport $sp \ + rip $da rport $dp token $tk + fi counter=$((counter + 1)) add_nr_ns2=$((add_nr_ns2 - 1)) + id=$((id + 1)) done elif [ $addr_nr_ns2 -lt 0 ]; then local rm_nr_ns2=$((-addr_nr_ns2)) @@ -919,7 +944,9 @@ do_transfer() if [ $userspace_pm -eq 1 ]; then kill $evts_ns1_pid wait $evts_ns1_pid 2>/dev/null - rm -rf $evts_ns1 + kill $evts_ns2_pid + wait $evts_ns2_pid 2>/dev/null + rm -rf $evts_ns1 $evts_ns2 fi NSTAT_HISTORY=/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \ @@ -2852,6 +2879,15 @@ userspace_tests() chk_add_nr 1 1 chk_rm_nr 1 1 invert fi + + # userspace pm create destroy subflow + if reset "userspace pm create destroy subflow"; 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 + chk_join_nr 1 1 1 + chk_rm_nr 0 1 + fi } endpoint_tests() From patchwork Thu Jun 16 05:02:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12883326 X-Patchwork-Delegate: matthieu.baerts@tessares.net Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150071.outbound.protection.outlook.com [40.107.15.71]) (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 54C6F7A for ; Thu, 16 Jun 2022 05:03:03 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rfx+DSaLYZdPVZUKWpay7GKguY5oPnUqcotyBshoNF6F8u9EjbAHruZphmPMrqxuR1K6PszZJamJ7Yzbi8+ZRBHdMCzpfDbguXo6yN3rFvwYcCAaGV6pazNX+G762mJyhWILujVA8xd3C76RVrY6YotTWOOcQKV89U30Id9ulbL3/LSHi68dh+d91rXJTX9LSlup2JxnFUpbhtc/cvZZM7Fy4o0y8TOtc5dXVQZ6w03NuLdg4I4HOJGzHpVF0UG4NpUSpwYwbZ+O3osno7RFiZjPSaH4A3GSn2tgdH66q3kbcBl5mQQjwBJjvrOP+o+gXrCjVxtaDXYK06uXoFuKbw== 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=+1I6QnDt8s11zkZnJSGk8llIMgOtQcZXVvtTA2qWy0M=; b=hzXDEQ6Zp4ek4/bvZMAHkn2zL7VQiNMjK/VUvld8GjhFqktIa2bZcaVGzDYAMzGQngmHERmcffGnQ3ywGcRJcy+7tWS/wGw7q/+DBGfKSE/4ukAyqys/PdVpA6O16j2s3ylUNL5tFdraDX86nfcfSk6fj/woNqYJgkUnlTJdIUP8eXoDweccx9TDv10ImyeKEAOrJxx9BQsYnmoUMnH6cFZwindjpxN0KjN5xVgv5GLCMlGQQq3j6uqd85yDaGX08AatLaKhjatwQekdYZ3Tjuzxds3cYQTgwGz02EFhK0susV/wMv1DuYe0B/nf/gglWQERt/Y6OJO30zl/cFfqBg== 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=+1I6QnDt8s11zkZnJSGk8llIMgOtQcZXVvtTA2qWy0M=; b=peCgRIZw3vwcJv5quJrIFf8gi3pWeYH+FLd8VhkW91RLeHE0KtAlpHdQSO0pE6HRd9VXCq/dinLwSbkoQqaMaUCVatRKlKLraVVQJeUXeGQhVtnRIdmhGcLqrD107NMd4+8uJZNKjNIk32peKg02EKayW8ikE0ThzCYtZjGqtlUmnjWdebvwQ+ZJJqPnx4NsJUTGRpznvbxVX73Oio+2U/GAdUN5rRSJs5cIbn/qQANYlI3ZxtrNw7AVF2sEC3AYRLE+GA4F0RNs7LIvHvFSbpg8VpBGZwBaA1dIdLIUEOHYtgS/m47Vb24WCBixEAtB8rV6DThhIJvt2c6ZHuo5Pg== 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 VI1PR04MB4720.eurprd04.prod.outlook.com (2603:10a6:803:52::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14; Thu, 16 Jun 2022 05:03:00 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5332.013; Thu, 16 Jun 2022 05:03:00 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v3 4/5] selftests: mptcp: avoid Terminated messages in userspace_pm Date: Thu, 16 Jun 2022 13:02:25 +0800 Message-Id: <0bf0ae4baaa7bd9be22ccfc12330dfa7a1919f49.1655355422.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: X-ClientProxiedBy: SG2PR06CA0246.apcprd06.prod.outlook.com (2603:1096:4:ac::30) 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-Office365-Filtering-Correlation-Id: f8a2b0db-2720-4b8d-fad1-08da4f557c6b X-MS-TrafficTypeDiagnostic: VI1PR04MB4720:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ujPRpgZiJgHTM0FuUs1kK1eG+tAKjBUFMdg7cDeGHdacJ49iQIi15XAXHEm9e1dfvTRAdmDDgMiVkWQJelvDnmZ739sE8lgP4rgsRDCLrKZ+8tfx3MJTvZR5MRmqhQ5vUHxEqEGBV4FAhaBj7IGVuuZykzMrttAcDaDdmj0Zyfkfq2vJ0MLHPRUCwPz5/MZVE692/awcWPZj395B7nuunTjF56gMSZIn0+Qz91ctc+quIGlO3RIISuGCLKD3QuMEJWbXDnmAg2xdSEaknzYAtepPvb7JwpQwbZZMS8LJ61uFJqkdzKCZxUB+1mS78Rh2NfaVPcQ8+I2G7fBU5u/33ldX2jJRAWPCpkruPp1BD7PKjPhMGboxGr//fcTvr9xs2Ka9MFfREl1tW4T52SiMf84QZq/qE7PuxIRy6vXSePV1eKpMAs8KbVL1suXK2o0Yanu1CuvdUM4FMrfW0ls97oAOMRkUZqqCGazUB1bVM19wYUF0GHRnSYrLGRNxOARxDjM+mBFALMZ1eKYQm969VvYa3H8jddfjwe2Ob+1/H6XGwvG3NQcwZjO3A10hhFiSwJghrAc9CJKCQFuIfZbJ6LijqNttMH9o7h3hwig4g/Vr/nKLvwoBHrckxaYiMy9y480ckzYLGuBR9pot8BS7Q7RbeY/ULX2JHK/FiMhGbn5NPkBMiziGZ/cBzIf6ftGizTSRKQkt74eouD5GQ94n1A== 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:(13230016)(366004)(26005)(6506007)(4326008)(66946007)(66556008)(66476007)(2616005)(6512007)(86362001)(15650500001)(2906002)(6666004)(38100700002)(316002)(8676002)(36756003)(6916009)(8936002)(44832011)(83380400001)(508600001)(186003)(107886003)(5660300002)(6486002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hT//BNsEgsOV88fUevZ5edgzv2ys37PAzIclc5SWAIAy1nsw0cHZp+H3h05k9K4kE5MPof7LFjW7hcZwticVUnlSqMDalfsA6agH3jpzdVozaxBPBjEv+HldS57WpSLO/gBuXuwapN5bTYhkGsjfwLmAA4avudQcihIhRrGgqretYnEDZc2NAlc/MZNvb99PijFiYg/xVytmkCnkPysYmTsTLg08w66K7Cq/AUFFXIlPoEc8V0ZtyIyg+SKMJQWCOsVsg+4obtmb1deOw5BXdYodT2dxbTDGI83CEhjZzx4UWm0mWP+Vn4i0NszwXpUgBShltSJyARRMCoSCa93EbPSyRESIhTDHo5iwafRJie5dfHYU0lbaUPEmf56xNl8ZRb4QArTA1UFdJVUuFP4wDZ6Mb4YdXWCzsRPzVDTejDI7yDYqDTyhy3T8CLEq0c/+IlvZFgBwi2bMpezMVLC61tko3HXUzRFBFcxYP/Mh6Flk7UeIeNpVRNag4idL8FpD1k6foNq/pPjNOdbwGsEleIb1Eg7X0QoMc06XjpNKUgVy/8rftACwrxWwgTWnk5kzNJE1987ZgRwN7DHi0WrEWQVYr2t+Y67Hgobiltcg7E+Tj3hyQaWTREa3YxFJTMKOJLMT+rAVjiKm2+SINh89X1DJnVsYKToyrGJiCAlb3EpGROURgaUCkWsJ5otG2/KF4QNSO0LMGK/oDXf5TykuHcXFfJqXgdljDWjFznlH1P6AcSJdL0Bg7VTLrt160HwLDDHOpTUhqIXIgPiiFciNg6Yn6LoiIXtrB2H/NfcWgbM7A17zNATzlTFEcYsXgqnGO2fWixAH44ccWOkintNOE0aXES1D398NDhUytefI8dh8fyYg6xPA2XYwmBlLJhb7sQek705IxKo0Rd7b1KVMdaQnojgZ73r1AFc06Ayk252epWqhYOzvI/sJs+uOu0pf4yUpABNIlpq5ldvZKI6zh0BsmKHkBOIBCjvQY7FuTa+QtK+DG3WyKFrGfaB4lrxze4wLzH9Gu0BqiBFOrZ/EE663d2HaKWINmVMwLuvaoFQFxitwbzVY0RCDzdC2aJup3GiAsJxIsjHbWrXYmra6FtLoNBFF9vHDs5yyjZPEQUAep8daSF02dLd+R3Lpo/ywAY9zX7496QIGqqTfEUQrafSwwGOf7KK5ZLNvlmYqwBQgUMWuQb/ZexEgiLOqGu0OU1UHUzoConFvjeVwarZSozElyccMAgl7IiWKigXC0JmzvbjWWMLSrT7uIM7fr/bPUxQQHUmicrqDN7By6Bqtn8UG9WUOJEAE6GupJ7R46Q+C3zVSz+YkWcMrBJ03e5qgQvZxkCyt6aBNFBWf3wrtApR2RnAW658gxz48fXEQXQAV8rdaMxVXW5RMk/23YcE8feOsW1GX/veTwLoMRleMCSQqOphbsQVeJdRS2Ff8v5Kp08xy8gwiqX4loNrhvBzolFSm1vxjEyJAW2qTaBlF3EGhmcGqch5p+GIX6BYm2arZRJ48y79IX1UxkouoVk1QlcBP76g86wW09Og0OIDcqXiJo+Yp+tIta9mIZSg+blrjRMLrUt7GYWPVyR2yudmSfmQ+BALoXFs6DEl3INpYsLszZy1mzmGkBdj/ajNIwAsZObkFjqmIgtZdpzeqaYuKypnMeJnSMoSLotCtF8CgWCj1kVh20xtM+NHVO4KWWnfQOyjPD0hZglz02GpPItkJSZIRAi4tZwdbUkyvcW3pyQdwBV+wYcTT5KPiVfHaFTs= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f8a2b0db-2720-4b8d-fad1-08da4f557c6b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2022 05:03:00.7737 (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: uOKndXZqKRHUXxoW6zVln1HU0VLPK+lKRHO184GAu33JYMr+6jVQWwJLQ65S6mDIl0cIO6bZw7eTzjJUf+7oow== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4720 There're some 'Terminated' messages in the output of userspace pm tests script after killing './pm_nl_ctl events' processes: Created network namespaces ns1, ns2 [OK] ./userspace_pm.sh: line 166: 13735 Terminated ip netns exec "$ns2" ./pm_nl_ctl events >> "$client_evts" 2>&1 ./userspace_pm.sh: line 172: 13737 Terminated ip netns exec "$ns1" ./pm_nl_ctl events >> "$server_evts" 2>&1 Established IPv4 MPTCP Connection ns2 => ns1 [OK] ./userspace_pm.sh: line 166: 13753 Terminated ip netns exec "$ns2" ./pm_nl_ctl events >> "$client_evts" 2>&1 ./userspace_pm.sh: line 172: 13755 Terminated ip netns exec "$ns1" ./pm_nl_ctl events >> "$server_evts" 2>&1 Established IPv6 MPTCP Connection ns2 => ns1 [OK] ADD_ADDR 10.0.2.2 (ns2) => ns1, invalid token [OK] This patch adds a helper kill_wait(), in it using 'wait $pid 2>/dev/null' commands after 'kill $pid' to avoid printing out these Terminated messages. Use this helper instead of using 'kill $pid'. Signed-off-by: Geliang Tang --- .../selftests/net/mptcp/userspace_pm.sh | 40 +++++++++++-------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/userspace_pm.sh b/tools/testing/selftests/net/mptcp/userspace_pm.sh index 78d0bb640b11..d586bc5ffe01 100755 --- a/tools/testing/selftests/net/mptcp/userspace_pm.sh +++ b/tools/testing/selftests/net/mptcp/userspace_pm.sh @@ -37,6 +37,12 @@ rndh=$(stdbuf -o0 -e0 printf %x "$sec")-$(mktemp -u XXXXXX) ns1="ns1-$rndh" ns2="ns2-$rndh" +kill_wait() +{ + kill $1 > /dev/null 2>&1 + wait $1 2>/dev/null +} + cleanup() { echo "cleanup" @@ -48,16 +54,16 @@ cleanup() kill -SIGUSR1 $client4_pid > /dev/null 2>&1 fi if [ $server4_pid -ne 0 ]; then - kill $server4_pid > /dev/null 2>&1 + kill_wait $server4_pid fi if [ $client6_pid -ne 0 ]; then kill -SIGUSR1 $client6_pid > /dev/null 2>&1 fi if [ $server6_pid -ne 0 ]; then - kill $server6_pid > /dev/null 2>&1 + kill_wait $server6_pid fi if [ $evts_pid -ne 0 ]; then - kill $evts_pid > /dev/null 2>&1 + kill_wait $evts_pid fi local netns for netns in "$ns1" "$ns2" ;do @@ -153,7 +159,7 @@ make_connection() sleep 1 # Capture client/server attributes from MPTCP connection netlink events - kill $client_evts_pid + kill_wait $client_evts_pid local client_token local client_port @@ -165,7 +171,7 @@ make_connection() client_port=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$client_evts") client_serverside=$(sed --unbuffered -n 's/.*\(server_side:\)\([[:digit:]]*\).*$/\2/p;q'\ "$client_evts") - kill $server_evts_pid + kill_wait $server_evts_pid server_token=$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$server_evts") server_serverside=$(sed --unbuffered -n 's/.*\(server_side:\)\([[:digit:]]*\).*$/\2/p;q'\ "$server_evts") @@ -286,7 +292,7 @@ test_announce() verify_announce_event "$evts" "$ANNOUNCED" "$server4_token" "10.0.2.2"\ "$client_addr_id" "$new4_port" - kill $evts_pid + kill_wait $evts_pid # Capture events on the network namespace running the client :>"$evts" @@ -321,7 +327,7 @@ test_announce() verify_announce_event "$evts" "$ANNOUNCED" "$client4_token" "10.0.2.1"\ "$server_addr_id" "$new4_port" - kill $evts_pid + kill_wait $evts_pid rm -f "$evts" } @@ -416,7 +422,7 @@ test_remove() sleep 0.5 verify_remove_event "$evts" "$REMOVED" "$server6_token" "$client_addr_id" - kill $evts_pid + kill_wait $evts_pid # Capture events on the network namespace running the client :>"$evts" @@ -449,7 +455,7 @@ test_remove() sleep 0.5 verify_remove_event "$evts" "$REMOVED" "$client6_token" "$server_addr_id" - kill $evts_pid + kill_wait $evts_pid rm -f "$evts" } @@ -553,7 +559,7 @@ test_subflows() "10.0.2.2" "$client4_port" "23" "$client_addr_id" "ns1" "ns2" # Delete the listener from the client ns, if one was created - kill $listener_pid > /dev/null 2>&1 + kill_wait $listener_pid local sport sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts") @@ -592,7 +598,7 @@ test_subflows() "$client_addr_id" "ns1" "ns2" # Delete the listener from the client ns, if one was created - kill $listener_pid > /dev/null 2>&1 + kill_wait $listener_pid sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts") @@ -631,7 +637,7 @@ test_subflows() "$client_addr_id" "ns1" "ns2" # Delete the listener from the client ns, if one was created - kill $listener_pid > /dev/null 2>&1 + kill_wait $listener_pid sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts") @@ -647,7 +653,7 @@ test_subflows() ip netns exec "$ns2" ./pm_nl_ctl rem id $client_addr_id token\ "$client4_token" > /dev/null 2>&1 - kill $evts_pid + kill_wait $evts_pid # Capture events on the network namespace running the client :>"$evts" @@ -674,7 +680,7 @@ test_subflows() "10.0.2.1" "$app4_port" "23" "$server_addr_id" "ns2" "ns1" # Delete the listener from the server ns, if one was created - kill $listener_pid> /dev/null 2>&1 + kill_wait $listener_pid sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts") @@ -713,7 +719,7 @@ test_subflows() "$server_addr_id" "ns2" "ns1" # Delete the listener from the server ns, if one was created - kill $listener_pid > /dev/null 2>&1 + kill_wait $listener_pid sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts") @@ -750,7 +756,7 @@ test_subflows() "10.0.2.2" "10.0.2.1" "$new4_port" "23" "$server_addr_id" "ns2" "ns1" # Delete the listener from the server ns, if one was created - kill $listener_pid > /dev/null 2>&1 + kill_wait $listener_pid sport=$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts") @@ -766,7 +772,7 @@ test_subflows() ip netns exec "$ns1" ./pm_nl_ctl rem id $server_addr_id token\ "$server4_token" > /dev/null 2>&1 - kill $evts_pid + kill_wait $evts_pid rm -f "$evts" } From patchwork Thu Jun 16 05:02:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geliang Tang X-Patchwork-Id: 12883327 X-Patchwork-Delegate: matthieu.baerts@tessares.net Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2060.outbound.protection.outlook.com [40.107.20.60]) (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 26ED67A for ; Thu, 16 Jun 2022 05:03:08 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=h4/0x/ll+Pc3x0rPR8P6cLSx4dK9sVHhHMLxVDq79oq33EW5spz8O/CUjOHVlP5KZdC9G/Y82dusJbHmBwDzATKyQWDfKCpfk1chb9Qk3KORSGaR45RyGesVaBor2D9Bx7SqcCxlgewBV2l8enIJZIKyHepbhGTz7g3SaVVigHk6Ipsd78W0TM2yYB45cmVui3jXwSk/h5Li1NIbnngB0fRCnRoSCoYpEOyGUG6VyKLQsQyFVcfbVZ1ERJUQL9rrb39ntDgDEdDKJt1B96A/6uQe8RRwwT6Vw3ngGCd+gmvWQkVKOZSFY2kFoi0EBQLdXMc/mlnB8C4VTM9205Cc5Q== 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=rdUQ61vXLUrRenZnksFO3mIPsYnrpxYO/+WT4Li6shk=; b=Jtb2CtR0nJqWpfUU5jUPNIuBhBKv6+nPwMt4ewKSxBe2to0J+x1dvQYhZB+yOeIIed+WF4D//6eMXTvm1+7abZ+str5zJkkV3Hz6xfX7UPCCfjC9cGuY6EcZ2Rq02nA8HV18ZxZa5DCugejvGnAUIgNnrx4GapI85lr/9mXdAHOIqGNiCFp3YQdPrI1pmwEJu1+Fr12qgkyh2WZeoI9bvOke+zqIC5tpiBZadRePWQzwZKmFt90eRiZjexnAjRxcndpbkK9yCCTAxywEa3JQO/51Q4xwJvJL1j/9IdZFoDMl1fmeBVgG6qlw8T70pL/gXfSG2XL1l2g9JebLyGkQAg== 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=rdUQ61vXLUrRenZnksFO3mIPsYnrpxYO/+WT4Li6shk=; b=4VdKlQsaxy/RfHGUT4YSUWk1KvVwSRJYbuZyKdht8uZXx/8IKpkNMtoaqu3Lgj2lBWK2+feZUERuEyUtkL81L9k1MI/gF1Ztyv/Xw9FBgWKK5mDliVlWbWwxxClCn9A7IfwBEHgOOCHQiiEWqBThLH6pTml4sf3PjoOYOvOEtl+3zHIHR/ndO8QTp/Qdg3hGaYjq5nN7ypqdapHzMAxnx5g3av+rKsA7lWg+vCvoXUBo9526vbdeJigkUblZNmjGM1kgMDJROY2IVxNd7SgujGN8faT72Yshhh55YOn+nZ5wr4zI7vJ90L7+Crfn/OofY9B/Fq08TUVUrIEJehZoow== 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 VI1PR04MB4720.eurprd04.prod.outlook.com (2603:10a6:803:52::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14; Thu, 16 Jun 2022 05:03:06 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::8002:50a5:a57a:d8fe%5]) with mapi id 15.20.5332.013; Thu, 16 Jun 2022 05:03:06 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Mat Martineau Subject: [PATCH mptcp-next v3 5/5] selftests: mptcp: update pm_nl_ctl usage header Date: Thu, 16 Jun 2022 13:02:26 +0800 Message-Id: <11468cbfc4fc4ca766094b81c544f9108e04daf2.1655355422.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: X-ClientProxiedBy: SG2PR06CA0236.apcprd06.prod.outlook.com (2603:1096:4:ac::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ba5d3a58-6a8d-445a-33c5-08da4f558004 X-MS-TrafficTypeDiagnostic: VI1PR04MB4720:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1N+pjp0voWiestKoVWRrFdvxzBWFgYNMBuXB3ZPTkTG9HfyLl/yeIeTAomXjbRS3ZGzQiCJiVOLTcO+rbnJ/NXulmX3d0yEMdOCRXso6ur3P52Ncpxb3rD4RoK45BK5Jyz5AVZKl1AIA8BeYtTKz7Y+pf/frUU1OcjmqZfQU2P51HL4JxiLQmj/tfK4O6PeBwKSTMDt+3IuOBbnO6m+nLpozEhqFz/oqa/Fdt8j5ag6xYaxCidgr/ZyJLuXwi/HWCcjBAe8+1AbJfKwHfYLMctXhUx3QV1wyBtkbZ1lszHJMvOi0BPJRTzeplt36YCOcBBYY/1e6fZ82WzFiM9cmk+4cSpWCKsEW8DxDx9tvUuLJ+t0q4KuxseVB9nZxXfn/eSosxtxHlB5M6EChlNRVWWpWwnWTHThPMi4QGJttB9bYM1csXnuklLqbpS9gltwuENtqU2TF7BVB/Hh/ETGN9IH9Ra5AMzmUD58Es7BauTeNDrHgGaBeo3bC7T59jv1R1TcAbWA1UT3yfj/lJEXATLq5bvTiva9Co/9LlCJZg26Lf8rYKFEw0l8YMMEQZ/h2cw0nmyGEnmJtdXGbALJwUzdidMSmzDktAb6dzvo2ZzeSnDnoHFFIonDQXjIx6ssLO1Qgb0FDzmPrK4xEMI4lSqh7T+6p3ULFtlqhe3t+WArpEXGsZhcf02BpmlhmjDjoIhz9jqmFdIFUZlq+OkU0uw== 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:(13230016)(366004)(26005)(6506007)(4326008)(66946007)(66556008)(66476007)(2616005)(6512007)(86362001)(2906002)(6666004)(38100700002)(316002)(8676002)(36756003)(6916009)(54906003)(8936002)(44832011)(83380400001)(508600001)(186003)(5660300002)(6486002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4oEKZ1h/x8PTW2+jXIwD+Uyb2LAwOnE5uXl3InZ3kERWWwdSWHQNVqcZZNl2dJE3dHkUidimHxDTPlgFE7GfwpRoxPqS7z4gVwrBnPD8gxUc8ijtyKUtdr/WNylU2HQpXzdtGp/4muLMwTgpPssHRJFl/WVZ+0iuLbsVgW7rwISzbjo7RB2QW1R0hgKHqgCKUdEaOkmEoynhnoQqTjK0KFsT4HUwSuAVDPsDJBNmcu7vQkb6PtnGzuhcc7rWxsWU+xAOKQdMN8pE6DZDawZyWunLJRWvTZDzrkA6RoLk5TAm8AQnPleQL32sHBtIrWvpz+oKbiu0BITYGXHo4m461M/tL0x6B0gKUTyCaMQ5eLfFldhr8dkckKGSTmOV4Y843MmaODFOIExbRmycWYWcEEcto/OKgxX9MknGvWRHXAQMHdFywstGDRVqo7sZeW6kNg/vqyMlaEL21IB1I/N6+55r43Fxs5BOz7utpxA82O51uqjC39dVg8N/3cDv3h30OUWYsoNIGni/vSI/qMuGFvbC3KXMX6x5wS46qlJrLt9SHj3TJM18wOVmgR8nHiNU4MRN5RvxVZhcww1t1ch0apICaAUdlrkTL1YsASCkQvi9Y8tK3s3ZuwMSntwHg5O2gNi7JrANwMj6BXl0sJkgYPowVFD8QsOZgJSS4fBDwc+pQxmf0A+pi1Ua3f8i0cfA9Z0N7eNBDb6vMbP+7BrlfiD5bsSPl1yfGL1ISL3UXtbrTreUipc3pvPKGLS/TDvNuNQyGPMtT2yBJOzjmQ+zl0kqDejAx9AU5ViinVgiY+F/kkeDjjqlsRzmll49Nyi5PdTiMiRShf2z7SASFHyCMsvdq3l6ZX0V4RHhHPwCLPt2Zi1PZaPStmREfBmXNUVV0r8zTo4vZiCTd1VUooNlvLRR2Nvu9xmzMZN/wLP2ZePeqUj2qUMNR5TVSm6k33MAyS1CwKA61pWL6DavlXkhcwh9IxGLejcNoz7FE9JtUyhWjD5lXYkg4yBNf+pPFMhGvkaSh2c4zd2LVxeawN4+k+aCBChvq+nvZ9ZVVA7MJbQGaaUvn3gEfjCakKBU9LdaGYWC/zHivtWVZvsEGx8Rlh5ohe9AYEByi9R3LCEas8MOVIFvKTFEnHfJM59s4dj1r46jIUlX9qnijL65Vhwba7kqj3lyQmR+oBbNN3Rz+owFLxOx3AO3aCg0Vqm1XhyTQjYGKs86/4lynE52HDRGL9x0yG0qQA+2lwFFvTFovh2GQ/pIlYmH5OR2Sv2v55u7pBRXi7Ql+F1frKvfYXrpMQJYFJQdyF6jpuGxLzZ52xg788PS3TWADgC6lXKsNGJPNcZ4oo/BRN8pjWfmiIpJbEk9AmnpCtQditN+n18ZJWoh9QXQ6lsVA5xXWaQbWvN161RxeN0FOZh8Bz4y2aguyhUmSCqDyzARIxV3k++57nV+m9aym7NB+TbPXTgnMM1qqVTWK91t9mvIhzWRU+rb7lylh8LZ4UP/U6tRsYmLWDCbZC1uGCc5tA4c5/fhOFDKAJysAS6tEI9xbcCmsBqENicWyQ5+oX9tSQH5H6kWXGVwJmoxYBqK0QUtHfH3CTlEOdVnzOYerBq08WhX7oLOc600Lk+/bilmVzPCQvWJghVqGkyI0EnXwbyHhJB1fh/PrjAiuo1E7B1TPM2z+kzEzWaYaAZt7w5ib9aF8qcQe4vx8cFyqJ+cQK9+ak3uCxpV8hj9Jbk3mZZlpCJJA+I/WDhn7Ordc3TxRJtNfY7gV40= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ba5d3a58-6a8d-445a-33c5-08da4f558004 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2022 05:03:06.6326 (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: LHHKIxPa7z3vNI2Jx54EcfecYJ9iz0f5sSRJeMMaz0xADYKWuX7Rt3tXKBgJVeNPVccQES3BAxU1Ui+ea1Vy+g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4720 The usage header of pm_nl_ctl command doesn't match with the context. So this patch adds the missing userspace PM keywords 'ann', 'rem', 'csf', 'dsf', 'events' and 'listen' in it. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c index 6a2f4b981e1d..4dd87bb9ee91 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -31,7 +31,7 @@ static void syntax(char *argv[]) { - fprintf(stderr, "%s add|get|set|del|flush|dump|accept []\n", argv[0]); + fprintf(stderr, "%s add|ann|rem|csf|dsf|get|set|del|flush|dump|events|listen|accept []\n", argv[0]); fprintf(stderr, "\tadd [flags signal|subflow|backup|fullmesh] [id ] [dev ] \n"); fprintf(stderr, "\tann id token [port ] [dev ]\n"); fprintf(stderr, "\trem id token \n");