From nobody Thu Sep 18 06:42:59 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp204516uab; Sat, 11 Jun 2022 07:55:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzenJG+t+gQsrOCje7an6ivqekM74gldY2rXhAi1KvQSfi1Llk/Wumk14lrLFfslFLSIj5y X-Received: by 2002:a63:89c2:0:b0:3fc:8bd2:aa5a with SMTP id v185-20020a6389c2000000b003fc8bd2aa5amr43856751pgd.362.1654959305222; Sat, 11 Jun 2022 07:55:05 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654959305; cv=pass; d=google.com; s=arc-20160816; b=MfQhEJte0BfChrE+KRLQIZ+gZP7MH2TGaA5OvXFc+4IDxpFfuB3y3+23Bwk/t9RcVR 1tHZlqnQfAKZRjaxwdd29WNNSv6c4W981270ZxHVkc2fnQ1lZA/VfbWnr/z19mhnR6Xm yWwlz4TdwEwUQqcmCzOdeOyQKig6Zk+0FTFsxnO6soU4L9I4kJ5lEgbuI05TNEFCKQpa 5FrYwXFd3arDQcPccy1WjuczoWkuSJDndG6R5xdHG7+lz8PGtBQnObYfxWyN3HqfRnAv vHR2w1Utl59roxQryxh11+2fHTJSJY1dy4bgkPBKHJlCRiYy5kz+QlZIH4aDeNXRU8Fl wGuQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=/f8ltqDoaMw/d1Zjg64aLn4j15aIsfPIDgUz4zeLI7s=; b=pJTJ7RKI4pfKKD1C7jCYPDoOnzwy+OX7XQDsikqfa69FnY3MGsOpmaWc+4cV5CVaIh RhsqE/yXBjodHCOYET+tBA2obCKZgrpqMPZAWb03JVhffI6jhrG+P1HetvJbCuxTWOo7 jV65lcjErlXMwfCRgKx4KyEcRVld531QjzGR1zKJX1sGukyCXO3EBIDWUs+8At3vZGgm bzeonFxYhtvsssQV5H0QgKXxre8lAtAoy/MJtd4UFJYkWAT5lIOktjJaQ5vNPWURLZy3 wxE0DhBDQYM+QoP3ARWOrQJEYcmrwRCt70wkdZc2IxEAOkqmPUMMQOKL0L5cdGj9sLlD UAhQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=0VaKcFHw; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5638-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5638-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id t11-20020a17090340cb00b0015838c0eedbsi2656706pld.506.2022.06.11.07.55.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Jun 2022 07:55:05 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5638-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=0VaKcFHw; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5638-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5638-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 9051C280A7C for ; Sat, 11 Jun 2022 14:55:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9F59BA53; Sat, 11 Jun 2022 14:55:03 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev 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 2C982A21 for ; Sat, 11 Jun 2022 14:55:01 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W67ifl0jSdY9ah15w19T9qvk01FtcGa5sIAbfYn7cf9E/+n53g77Ji0ufl9dBu6/KhJKAooF5rluC52OZk50XUSWyDwq3b6D6Yq+Bl99wSyvyPu9AEa+JYYv9FaqKYXzCSTYwxe/IAX+kD39zfIhav6bfh/oM4TGrGpq+5Max3//yOyEwW7HohVQvM+iYGjImm2QRi1Yg66jSCXoOLojCE2SXI/n74npgFLyySCOqd6SYlbKHzBFlmz2RMEqGKd9OLJBadnJkGLmSHJFZelpII6uZBsPTVnnpEtqvTt4h8c3pMNLNJpjApX23D4nwrqGtAiGOTsc1ZLq8xNyeFn+oQ== 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=/f8ltqDoaMw/d1Zjg64aLn4j15aIsfPIDgUz4zeLI7s=; b=lCbRSo+N89+6lfy1tOS03mivcw/yfviaEtNn00V/7rSIfKdL8ezGJRbAuJ5UMSGClVEjV9TGTx0pXBI0r4A/Ye5Z+2kWOdDUJrjCmQS56uCXPlxScZFawqBgkqlPoRRpWWPjd5lEhtEzEQzTEERdPPLE4PStxHHQdi3K6t8FgAc7TOxV0e1G9cgM++XzU0G1k8pLk2lxUZugpb0/o3Fl5zrIauhkR18BVxTtYuLUEK82sCrtx3GSTZbl4aqmZ70/WI2NA4GQMihk5cCDa98cDNXr6pxnifo+Re9ZMss2HCXXcWnEGvGBdrasUmrnum0gFoW/Mb0c9xTo6kak9rkOqA== 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=/f8ltqDoaMw/d1Zjg64aLn4j15aIsfPIDgUz4zeLI7s=; b=0VaKcFHwdRLjx/C3qXsVWZwIcNN3U/FGR4lc0m+gbPaiu30+RHnUF7T+N8FrtQuPNj9ocDa9PNBBHwYBv7sGpEc2XevgiQMzSxXdN1BPdNctsryHpKcK3vCCEKm+aWdAUJaSExV+5sRPWN4F10VFs9N/SslIRuj7fj746sDSv2Auwx26aTXgEaFw5shlduRZRASy6eAau821l8dBy1KxjTJ287arfUyDnw363WCzER9UFk70OcQN3NVeDKEiwcS5/ZM6Ie71iO2exNRjZT3zKwWpGcQtC1A1r+i1nxi+F1BwCXvkUTCXZ4AhoW6FXFNm2QmQSYMUGSZ80JnArJYHIA== 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 VI1PR04MB4944.eurprd04.prod.outlook.com (2603:10a6:803:60::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.15; Sat, 11 Jun 2022 14:54:58 +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; Sat, 11 Jun 2022 14:54:58 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 1/5] mptcp: update MIB_RMSUBFLOW in cmd_sf_destroy Date: Sat, 11 Jun 2022 22:54:35 +0800 Message-Id: <4ed5348a34b4de9b482fe192fc271a59ee334e37.1654958401.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0025.apcprd02.prod.outlook.com (2603:1096:3:18::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: 113ad8b7-937b-4034-0dd5-08da4bba5a85 X-MS-TrafficTypeDiagnostic: VI1PR04MB4944: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: Z1fsy68a/AN1wL0DUiuh2FKi2D5ijsraD2kEqyaOZerTXJcg1g9p+0xMSyvSD8rRnRQLev7yDzkAEDEVCmSAqTC1UP3y2BV7kYFUWgQ8an9FXOldxJG/7jw7Dzn62oItN5s1ECzYvdvSfp1v6sVCzKaW389hURnGxfwAU/RUJW7PNgJzUu3T0XTIEupuCMLGjYaFi1Z57ptOk4edxyFpxBns4AYnyIBypBHd8X9MJ0+tfwSSbVeR0ILvrnVVNs6llg4fF3Wo5MWl9cf58q8g49/mjvdgleYTJHT8o4j6teArJnN0DlctEQ8jkkZ1J0SRqB9wWI4C4rx9U2YDfJnktYdN+YBi4RpRRzw9UmEuWnE47mVRhV/guFYcHCKmgxgRzCt2HQZfyzSoelD7HQm+uvwWStzkMwR6CbC4Iflh8IREwSYN7AxoHJ9+uQnvD8fkiLnCQBZWnVrSIL6vjbaOT66U8Vaj7wpDawjBpc7EgTsx0VCwswmUumJlRNKAia4cvkbc+94S3y2HLkOJYw3thBHSCN0xhz6cp8uzCAH8VOy0g+wCwwTv0phYok6fPcwiOJLxAXLimTyOvMuxOBkcKVw9q93Bw1qjfPIR37UWbTqEzU/t3hhvsOHfwvOGU0c/rbjGii127rgsUOIavRf5VstWid9e56Rvy/BRDrQmNq87eHpfuQuX8VcLG8WNxtnPJ5YhvToG6DpXdXsAZbBzDw== 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)(6916009)(107886003)(38100700002)(316002)(36756003)(2616005)(508600001)(6506007)(66476007)(66556008)(66946007)(8676002)(83380400001)(86362001)(186003)(6666004)(44832011)(5660300002)(4744005)(2906002)(26005)(6512007)(6486002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?FvjUDILKnzB9QnsgTx7QL72nJbLX7IJyqc2GE9APY+knfwR6FXC1CkXYOJl9?= =?us-ascii?Q?kBX3+nPqpmEBfaWfMIZRt1pvW+/k30idEOMmOcQ7bq4yX8UiBQmrLswQfLHj?= =?us-ascii?Q?bdFlgjR77tQuKcvsd0/hlgmhnr9tFtMzW3cuy/yxzZcXSsKCn+jNBWXqZ1Zu?= =?us-ascii?Q?KfL1AJcvHAgO+2e4Up1I9REO0ylI3G1U5mklxrZuoyREO3yubCxIkZMzaspf?= =?us-ascii?Q?526vWIKOzO1rKlx6w3sVJezSxeeyDB8EvXsUmrsaKL/KcMS822TqvJzafXmr?= =?us-ascii?Q?ooi5tIANn0Ar6mEOZ8fLdMWnrvpaMDKfre27EfQ9iEHH/vdDpQVy/1+4qjPP?= =?us-ascii?Q?vuVMHl/fFSdaF2UKAWryIIF3FERr9VwbCYPp6JjKNWEjjHH58F9KaCkPbSav?= =?us-ascii?Q?1xflpW+NXwdEJB+Ntx8m1PJWZoBvNWkbhn1VPbwzhIuQm1CvNYekIR+3XE4n?= =?us-ascii?Q?Mx1X+qBrqIdaEGbfhTQpUKuMOF/KLy1hDaFjf2aFJo84qjS3LucRhTlFPpUo?= =?us-ascii?Q?qWNW6CEyt8ld9XGRd87s8leFttBG4kMWmvHU379Y5HpeUMLZ5Lg7a7L4MWy6?= =?us-ascii?Q?6f/H4mJ0WCOEB7EY6kzfzRWiWNEF0z3fWX/51v3Bo+ehQd798qwJD8TVn/XT?= =?us-ascii?Q?BE7uBhJ6iFsJExgDdrkLotZlSG3JvDrKUCTnnZC8lNlwGBiVvrkwPLZPSjGn?= =?us-ascii?Q?dsl1DUV0XSJfpvXgqlxoRPkStNKhHJ9nceO9wLvLvBjCM1TPAvqLK17uVw3f?= =?us-ascii?Q?kCUMPeqKVEYPsX4ofSBvKJA7VL8zKgoV7K3hj40e2E0eiYlk4OJ4DkRQiz+q?= =?us-ascii?Q?va12CU6kGTuNoheqN+67rR4qYIJQwDX4k30MDewyV6toqf8F30pIB22hnrmf?= =?us-ascii?Q?eaM9GXcN9d10Z30wlzhtzjfAOxOSN5zroXGWGhUo10lmxShXsCIbgcBvhwuK?= =?us-ascii?Q?/Zm4V1HfCqF5ExOx2A69kZXPpbCVkvapWBebnkloOTjrcHwhsJQ59UowZ+EA?= =?us-ascii?Q?FPjJwRskZQV5KQPYtK7hTNzm+eNmW2TWhJaYHCLPphiNBoiHExFccnSpVh3T?= =?us-ascii?Q?AxdQOc/uGDLNhx2jhdRDVykLkv1ZYUani9zQ2azBoh/q2W+9M2B6BmL8bsFK?= =?us-ascii?Q?h1K2vRRwO5z/r+8+T04CqvYuXCeKVH8XZ9TzBCYdHQdBZjA+0o1pMtUxfTWY?= =?us-ascii?Q?oehNcZfY8Ly0TIXfK4igPIr8hvb1xyih+HP7kttQ1Wvb6FDq7PTn4RXoFeWn?= =?us-ascii?Q?of87IynMEcJXkaM2pNp83WFESFMQ4t06DVh8wW/OZpl4fEXSQ3c8SIjwZWTx?= =?us-ascii?Q?a4wRgYQ8Ii5eVuHP6r3h9s4IsoKE6LdigxqvhFOMcaqhDnhKC/CDVJcd29Vs?= =?us-ascii?Q?gTD+c3vjBkcv0FL+wyhjTSMSq2AiPaOWxdZpRXXfeeuId8uqCUVu3trz8zvJ?= =?us-ascii?Q?XlbNnhujPgkOLwoE2TWwxJmZDvtfWS5wf0TomRUX/o3SIDKts+SDHGLnfP71?= =?us-ascii?Q?xCg6NNjXfiEDtrvtBKoH/MnzNIE9gEpe92pVwgYyB+Rt6JZ4qmKjafyvySQe?= =?us-ascii?Q?SWFjniE0nhR6W7b36vNMPM/ynFcr8NoJXcEU05tl8DIx85mZZ3NEPNNxYJ5T?= =?us-ascii?Q?VyVAsi5Av5R1nn76RjvTK/gmqIsOQD9Ib5QE47QYthExSPtD4otJcNnrDpeC?= =?us-ascii?Q?gfMZpyTwqcBOOCgGGeNh9cAG7dMaOkN36HwQRRJfFFAx8Rmi5p5QTcz01AD6?= =?us-ascii?Q?KgVefNuMtMtPWYWbuYNcS8luZ6cdgKc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 113ad8b7-937b-4034-0dd5-08da4bba5a85 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2022 14:54:58.2109 (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: AVwnuCTfHGDp4KPBqH4rZmofXmUbZU2zXIpBPkqFcPENxdcKwOUtPibaTfnzcdbwVRllCwxoL+CoyHF1M0QEPg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4944 Content-Type: text/plain; charset="utf-8" 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..ebbab5200290 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -5,6 +5,7 @@ */ =20 #include "protocol.h" +#include "mib.h" =20 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) =20 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 =3D 0; } else { err =3D -ESRCH; --=20 2.35.3 From nobody Thu Sep 18 06:42:59 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp204551uab; Sat, 11 Jun 2022 07:55:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNeOcl5NhexJ2xeXvo5sbgdbjOG+hGp0byW0X7cpvNGXi0I1olnx4r4HwQHpcst+IqaoQJ X-Received: by 2002:a17:902:ed89:b0:168:a7d0:ddf1 with SMTP id e9-20020a170902ed8900b00168a7d0ddf1mr13798735plj.38.1654959311648; Sat, 11 Jun 2022 07:55:11 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654959311; cv=pass; d=google.com; s=arc-20160816; b=vfol/iWci96BDSBff2542o0xvXIk3UpjJ0f0P0wpro8YDwKcj+DXNcDZJE0MXCDN+T tPchGhCaQiGzAevlLwBQVWDQ6MdpXnICcMoenSNugF+NFzOVDcguNRLibzr1CFxqisM/ tzkYue2l7XloLnkrYVIwK1UqF9T5w/q8ou8ehXsrQ3YtlVJafNnRhGMW9PcgQDZB22rH wFUjk6Uw1B0I8v2QDF59LgxDWh3W4covr4/Hk08IndeZ1maZiC4emAU/A527STWrfpKf ALES6ciuVppXbxFPgmi+HVolb7OIW4p6Fkmg5NWjopk15Wb16tKDy1KyWMS00xt9GTb4 yPHQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=PR97hGReSYttj0BBCshqRSBCSyacnElylEjPrrWhCT8=; b=ibxxEcYHci++hR32/Xj+wRZulKOmsiWKFq/w84m/F77Hv8gu7hj3VjljrvSxkI6hst FsDN7e5ylypoqAW/crTGz+4PGrAOi2+vjwZeGxP+/PTRBkzU6h7snv8u3pF8CNM7A9zp G2mhgywCag+sprtRm6HiKNjKNUUAYp7UXVp5LRbUyO/IcsNg4nYsr+cNYX7cFPEO8UuE 2P6cvUoESvt1SNZKfARAjA52j0NkGND57VCF6tcAUa6+x22AHTp29yYGQQMy6ixyg3c9 wQa4cnx+OM75WZssJpaOmaGyfTzvnQ7+0khusaG662WQcVxNVABNKCR/9snUNYZv0lIl 4Isw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=SGUI2ZEU; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5639-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5639-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id jj6-20020a170903048600b0016213dc7805si2613577plb.324.2022.06.11.07.55.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Jun 2022 07:55:11 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5639-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=SGUI2ZEU; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5639-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="mptcp+bounces-5639-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 40EA6280A85 for ; Sat, 11 Jun 2022 14:55:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 59151A53; Sat, 11 Jun 2022 14:55:10 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70042.outbound.protection.outlook.com [40.107.7.42]) (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 9A358A21 for ; Sat, 11 Jun 2022 14:55:08 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m3LKoQv+n3ohEa1xp5+YIlsVo63RcZb0NrQ1VqUa6sCuZHMefQaI1DYdJjECcbv3WLDo/MHdCbl+yfvziLd7uWGp7Y+yCgl2JADs1ORPTOwXYivyppYlAvEiDMEYDiber5nKx0kBx8kpMtqLBHhAq6nvZNIi7Dm9rFs6Z9+5T+EciVBgD11uuLSyODcYtClYDf+6AvLtw/nTYAGJhxO6zOojLY+sDskMkr4oXtQF1wrhAsfhvnX9/zqPeyMDvYbqIevXmjWdLGwA1UcYltJtweFu1hM2ROtSBgv9vTfE4AyZF1hi9KjUil+Da5AByjR2TJ2tczftPD4h3kRnIa699w== 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=PR97hGReSYttj0BBCshqRSBCSyacnElylEjPrrWhCT8=; b=Meb1YhAV61kkZnrt91K2mYADp8IZWa89X9Zn4dDrjeAebTJ6j6wOtwjSmvWbLmgZ4UYJY3hVrzmOhkGRPPKppcFqOCxBuCQpw9gnAZKpRY+bC7eI2o8mWkxYviVrk5c0Bd3WqGcu070aUJuWchBt7Ur5x7BddM3PBtw5fGT770nF8cBWnbnRnMkM+9p0K7fke5CByFxv4/ViRqFcRHKc+UK/N2lsEZGMf1iw0RB8AUMAk8uHpm3d76FK6J8SBf0uAaZ/rgYmiva1C96gFJMaQVkyHxfxGGefMEKXZKnBBCsx1eNjhgwTfOBLluua7YrMd6aAbimUbolqQVQlHuvWYg== 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=PR97hGReSYttj0BBCshqRSBCSyacnElylEjPrrWhCT8=; b=SGUI2ZEU25RVIWjBgFA5Moa97MedIQGzVkvTxZDi44OgQIsonOI663H+HsPen0++X7p2dizioHZxdClIP2z+1Q9sEmcz0CDsjvIT/6YKvf3ocCw0xYhNEiWgOC+iOSLn1a+yAJ1yHuTPIlrhzYoiuilizBO/Z4v9A/p+oCG8UJ5zy+uHm7atFlxOudqerlrtXl5r4bSbBqGg+we7RwqaTgv9+5j276pJO7jCVKv/Tx1FrQuv5NcNQTs8F9nVcHjw7ob2+w6A8CIjFjUyK697rh1TmIrj/r0081XJFl+IH27AOKMoGQgZrwAXg0sEJvRGsMQ5lJ71mAQpErb2arHO6Q== 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 VI1PR04MB4944.eurprd04.prod.outlook.com (2603:10a6:803:60::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.15; Sat, 11 Jun 2022 14:55:05 +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; Sat, 11 Jun 2022 14:55:05 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 2/5] selftests: mptcp: userspace pm address tests Date: Sat, 11 Jun 2022 22:54:36 +0800 Message-Id: <11ccaad770f4e51f211665639d4fa2daac975ee1.1654958401.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0026.apcprd02.prod.outlook.com (2603:1096:3:18::14) 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: f85d5aef-770f-44fa-9ab5-08da4bba5ef8 X-MS-TrafficTypeDiagnostic: VI1PR04MB4944: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: 6q/r9ZRfgUklCi7Bzd74bM0P23jDcCyajOVBcyExBnsauwpalRDzPCur+vqSWcNTImqX0UZ7xBJ6C3E4zO8xAv8/+voSTi9YOlV7ZwvfPB5KByvzEKXdVEigIhesLj7r3+KRxewzU9nqqidbemLgMHCOPq++7uNfqrGEpJ5lWdeJEb61ub3ovDqOy19UWTC6sj39LEvyDn2M7A/iDeT7lN0WanAT9xOmGp+dRpp0X+CxcJnFVU006jjPlEje529cAsrf0SyGyQEr98DEZeUFkjQYCuOrz6vPkC22OjqZb6p3+OB9ePG9/51UE49/S3UIZ2NsAWuzqpoukDEedTzVvSvYaMGa3XiKp7ATR9piWh8gfeZ//NC1FgyxYCbJ+7XvI4RQPYiBnTb/1fk88TMsbcyG6+4kTS56of7TgQrcwB4R4hgoXo3FwzY/A8ITWk+wDOYsGk4mMrlQm/2x/bka2qvUFD6ZP/o2B29wH0hxn6VtF0nq0Zp7Ivuy/OocehaDif0JyAdyZToq4/TmbKz8APXN79JtdcP4GPmdfLRKiQyHYod4ubHAal3A6xtdvXTSe7359CE50RmnM/zAGbeHeQSlrGPk6BpZW3ZFzJOjf7MWWQJmJVRpb1LoRlYUqx4klictSKapNUa62teGWlxyOK9W6tKWKsaHLSkLi1VuSqyWtm06mj1HFqxgLdKw34Rj 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)(6916009)(107886003)(38100700002)(316002)(36756003)(2616005)(508600001)(6506007)(66476007)(66556008)(66946007)(8676002)(83380400001)(86362001)(186003)(6666004)(44832011)(5660300002)(2906002)(26005)(6512007)(6486002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9Y4BgqVmQbr9N6G2udAhWk68+sHkyicbQ3BDtT06EcZSSvOknLUeRkQjMYmK?= =?us-ascii?Q?HR502A1R3Z1kkIukizVDkrkaMpV5CJr0IG+K7nKiBa+ViXf9/8j2mCfbQe50?= =?us-ascii?Q?xwbf28Ym7l6PK1a6Y/b68WMdGFO89h+aCV6nQVotESKM31Sv6Qsu/rh5cuN8?= =?us-ascii?Q?R4o40KtHHgxSyknYhlCTsyeREytSM9u0U5t+cDGpJ/PC5qIaeZFPTVEJ8awg?= =?us-ascii?Q?jKTtHjbknCu9nnr978b5JT3tC2AACKzZL1LTSPyRcHZ2iExgByp8W92e0vlf?= =?us-ascii?Q?AKpmU2NxUW5ZSx57yQ9QsbjyNDX3ENtRAzSWigxCN9mBUdLOv7G76pGLCrrL?= =?us-ascii?Q?qf3Glug+DOzhCqcKMJ5qo5MVAPdQxw9VoquQtpBo9/fzCPLHksSlPRGfIpz5?= =?us-ascii?Q?N1nR9gKtCQlrOepY9sGa8wIb6ZWiPJwuWLRUkP3vvwANEuT6smCM1NOSLWrv?= =?us-ascii?Q?sUJIQpXgiCeSA1fIZvw81q+NyaiKiVihLk9vH33V82U6+TtsbE06zNcMTqAK?= =?us-ascii?Q?vqX7Fa3IFjlPxkNirQLW6pBKMhe8KZN6ddq7XF3R98Lj9muTPar0AyjxW1D0?= =?us-ascii?Q?2xvDR42xoiGqJvDRVCzBhvuWVzHsMFFiD4Ttrd4y2VRkM144ZiohJr6VuQhi?= =?us-ascii?Q?wTyCFxMA78DkLUWd5VBQNobsAYu+MWTAHR6ktQfkpRfB5/tACRpwJN+x23fE?= =?us-ascii?Q?TT7wu+75QII//kUYVgM8uruTzRd4YA8+hfV1KDqSy2o6ERf1t+s1/Wad85nm?= =?us-ascii?Q?JlgU2bDkG9I6kMMzRdYWcL+vFh+IFq/O6pZ/l5Dr3Lc6R8lw7fNK0dncQyZr?= =?us-ascii?Q?ogrukE2lZw4O04v1TbzeXjgFHFleYC5B5dclaZ9q94/1EN0KuxMZXHKW6KeZ?= =?us-ascii?Q?IgcvtS/FdEzrjZPTMwbPxPpcx4yGBzlVR7fHSC1dq5KI/wvd7fRC/u1r5ikN?= =?us-ascii?Q?GTxaNiFd0m5Jmmguu7H6a75KkYrvbFcWaZw3txUdJ7x39WiSY2LOHVFeWZ67?= =?us-ascii?Q?gf+t33bK49DFKBvp52a6vreGH5JFLYMSG3EWjTtJV8tM1PL3eZoSyr3Uyazx?= =?us-ascii?Q?Ljc9NmHTtYgcAnKDtBwhhYmopbwjKdJLzuSmZrXX9+6yjDoVqi6Fz55VPcqQ?= =?us-ascii?Q?0DeY2l3GcwNZLwMpILEVqNy0TSfMoZqrdbjyDg9VgYONkEbyDzspZIyVGSKb?= =?us-ascii?Q?XRNTgIMzRUJgp8fFkNiIkp9FwNnRquDEqddG5Ukojpn/75Qz/0I+742hj0xc?= =?us-ascii?Q?YiI3a6ZC7UtHOEDtNN5JOWb7B3WNHqdlnOHJWfVl4OXU/TWbDcgcqh7PAI1s?= =?us-ascii?Q?On/dN1ROm2Ipd7rA7BO2oB3tbkjpdVYSKMkHt+iM/zf0BDfoIM/z4TGb2HPy?= =?us-ascii?Q?Vmk2rUtFneYNXPlGu5BuBpQuZY7ctgT4x6O+LwrafBAwFikCFxyRknaEQXLF?= =?us-ascii?Q?GTlb+3dfPpFUpq/5BT0mcDvZ+xPv7uSfEaSM/EszPbwe6FBoWRhSe9D8PWN3?= =?us-ascii?Q?jB3HPi2cf/CllNXCcnYDjGYEsyPiD2az3b1JKkaaZuMtmaMDOUdQ6y3xF1md?= =?us-ascii?Q?aO55dedxfmSEDAIGS/FcviwzLFP9ufASJ6J4t76MUDsYnEkHvXv1NwyIQb8m?= =?us-ascii?Q?WAd/gc0NE3q8Q8dfmabNUwy6lNGK2RbDHEzeaDc1V8ziMvGvl67VHV8vE8dV?= =?us-ascii?Q?ZlwJcNw8eTqsOa7HtV/rK9q6YFnyWzYYHUWJ5/N54Cz6hV61u9Fg6Dxy2dp7?= =?us-ascii?Q?9ojtVBcbOOE+XH9wbnFDycTO524qK8Q=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f85d5aef-770f-44fa-9ab5-08da4bba5ef8 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2022 14:55:05.7728 (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: QUuZfuHQ/Z/JmCRWwdV4pkbCCIbJvlJCqwSChc2c7Q7MV4u8TEHuTtejZOUrMOno6lfDoFoz74sZwGCVYuwqLQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4944 Content-Type: text/plain; charset="utf-8" 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 | 45 ++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index a4406b7a8064..c3cea1d0d245 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() =20 local port=3D$((10000 + TEST_COUNT - 1)) local cappid + local userspace_pm=3D0 + local evts_ns1 + local evts_ns1_pid =20 :> "$cout" :> "$sout" @@ -690,12 +693,24 @@ do_transfer() extra_args=3D"-r ${speed:6}" fi =20 + if [[ "${addr_nr_ns1}" =3D "userspace_"* ]]; then + userspace_pm=3D1 + addr_nr_ns1=3D${addr_nr_ns1:10} + fi + if [[ "${addr_nr_ns2}" =3D "fastclose_"* ]]; then # disconnect extra_args=3D"$extra_args -I ${addr_nr_ns2:10}" addr_nr_ns2=3D0 fi =20 + if [ $userspace_pm -eq 1 ]; then + evts_ns1=3D$(mktemp) + :> "$evts_ns1" + ip netns exec ${listener_ns} ./pm_nl_ctl events >> "$evts_ns1" 2>&1 & + evts_ns1_pid=3D$! + fi + local local_addr if is_v6 "${connect_addr}"; then local_addr=3D"::" @@ -748,6 +763,8 @@ do_transfer() if [ $addr_nr_ns1 -gt 0 ]; then local counter=3D2 local add_nr_ns1=3D${addr_nr_ns1} + local id=3D10 + local tk while [ $add_nr_ns1 -gt 0 ]; do local addr if is_v6 "${connect_addr}"; then @@ -755,9 +772,18 @@ do_transfer() else addr=3D"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=3D$(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=3D$((counter + 1)) add_nr_ns1=3D$((add_nr_ns1 - 1)) + id=3D$((id + 1)) done elif [ $addr_nr_ns1 -lt 0 ]; then local rm_nr_ns1=3D$((-addr_nr_ns1)) @@ -890,6 +916,12 @@ do_transfer() kill $cappid fi =20 + if [ $userspace_pm -eq 1 ]; then + kill $evts_ns1_pid + wait $evts_ns1_pid 2>/dev/null + rm -rf $evts_ns1 + fi + NSTAT_HISTORY=3D/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \ nstat | grep Tcp > /tmp/${listener_ns}.out NSTAT_HISTORY=3D/tmp/${connector_ns}.nstat ip netns exec ${connector_ns} \ @@ -2810,6 +2842,17 @@ 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 $ns1 2 2 + pm_nl_set_limits $ns2 2 2 + 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 } =20 endpoint_tests() --=20 2.35.3 From nobody Thu Sep 18 06:42:59 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp204823uab; Sat, 11 Jun 2022 07:55:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzcW+nZFIZLQDH2+iGw0NduNsRn1lpIx0B4uHZCKzllSbLCSboj5i93nOP4S8fLOFBVUUfh X-Received: by 2002:a05:6870:40c7:b0:fb:13a9:d731 with SMTP id l7-20020a05687040c700b000fb13a9d731mr2718205oal.27.1654959359333; Sat, 11 Jun 2022 07:55:59 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654959359; cv=pass; d=google.com; s=arc-20160816; b=QUWhu4w/Juv4nsdFmo4Ii0Y/7+g9x8n4hLqKa6Ftxdnpl+OyeHO2eoeAcQI8lGS9oG VKDUqwv0ZtLNAAe/05LmUMYsreUdJdVshdlYJlDC2+7/UtQXt5EavyxvwO8/0ldJpw8q sqjYYHLDXujTIhfziHccb66SYjHy4+ArwlwEhYpPOiog+AV2bj2mTTwfGO1YaE1EZKl7 jgUDAZh4G2fb2inAWFjzXL7OVgpC2jihEFRi5H/UtjAqzoK6hTk4bJE74G+MLPD0CK/9 4dGJ4BGyVp7iWESTFxi9VhKJvlwQGl6KVzW+Dyqe+ZV/1QrYbdUmmllw/vrC44bZ7QvA gfsQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=IZjRFhTo5gEhj19yBmzPdZ6NMbomkAcr2xQHop5jQMk=; b=yeD+v4AiKKkwvnyTPvCDm829X8SXIKY/+tGl3EneLWXh9nWhMa1NtngPMQvLDdTP90 M2k0bZrl3ZQGTw8VK7z4in4P0slvMmqtP+AdioiHC05+ba2rd+XCehmRCD3L+mrI1UMn WBAn7gcQlV3Wd9o5FC9waNk8z/47BpCJCQdx2dcD16/288y6q8xNMd5+UrMdxEW5nwqr oiQq+/PoR3zg358Q6sf9mFjyXVzkdkqnosoD4hWGaZMvH4hw+eigPzVat9jBPDO2dyPX 3frP4Yu353RBfmHFtKrHaGSkWakf+SIj6RhJ/VQC0Tth8QlamJcHGOGwV1GB+fzp9QeV 2COw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=p1tN1db4; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5640-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5640-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id u10-20020a056871008a00b000f5f801dc22si2412390oaa.182.2022.06.11.07.55.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Jun 2022 07:55:59 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5640-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=p1tN1db4; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5640-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5640-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id 1BE612E09E8 for ; Sat, 11 Jun 2022 14:55:29 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C9C91A53; Sat, 11 Jun 2022 14:55:27 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2048.outbound.protection.outlook.com [40.107.20.48]) (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 18DA6A21 for ; Sat, 11 Jun 2022 14:55:25 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e1Xv1fwEe50RCT/7saCS3LilhEkGc9vR2FZrUSSkistGK6C11lh/o5AZDJFawC2b/CCFj6pJBoL8aFt9FNjU1rvmDGWw2tmXBF7XYSmCJGRNlXhxayCrj9T5Bg6qfJBif8Fcp6iZkh864gFeuZHmY3hEunh0q2JYkDi4zdMScaMbMBHKHHZBkbG4Gn5Rts6W0hrQOmDM1t4zqu2iHKnRAMSE15tFFV/6UthOo0hOq8H0iA+ZwhIhbz24uR7SSfbD83ZlLor2s0AbIsHoLj9XWfPdife/s0JXgODpch8Bjn3ttLKFnwDsmYXaFYxYIBFjC79SOQM9tU2Zqt2dXasKPQ== 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=IZjRFhTo5gEhj19yBmzPdZ6NMbomkAcr2xQHop5jQMk=; b=OOCzQfVe4P3YF3dpNDnRTUdQvygGnZqgrLWkD7Sfbn1JWffjVlDSTKZsOn/WAzfCHQ3NQmGifOnsOyxDrU4BDP+zJBXXxxKQGbRYJ/gnNdZ8oK3zJu9wPhscK48+Fpkw/jn82pn2G2Xxc5AvsTyeac4+ll+n19pIURopBJHi4wlw5gMmwA4kUnNnQJ60f17ibRSvT2Ov1lrsgFkyQQMeS7dgZSjyaRI2pMXkFCq6+2mM7VZjEEMhF+z5qcFpLi/haRThQnP8FNegG3ZeHhewdjdp4K3qJ7swLQ+HVRvL3D/rEO1AXDviZuGtHnsCA9Nxi4ujjgA+VRYBS/fmiMKfVg== 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=IZjRFhTo5gEhj19yBmzPdZ6NMbomkAcr2xQHop5jQMk=; b=p1tN1db46hQrUeyQ5I3jnO1Zgu3il9BpaPyp3VerF7+OZeqr6QLOkXd5Y3aethEjCOML9j8hIZIC4Ict8UAg0wWA/OAmQhbQxGmaUnhGxq/eX1JRPNeDs9oibgVf5l+gX0AQHy9rXeWBGD1BOVdgj19Vh8RZhxklaTLvPPSUH2QshCGuq7psnNxC9Racu3p10HJ0DW3zdOUO4cb2WBPo5sx/kdi6Yv+rwEn8K5CJtnn7p3KC75kdJGz+Vtc8Bdw+4QbFPU4J+TxCLQ7N9IY3aF/E2yeRedIBzhb+rMaQlIX3Q5pgCgBxDvlbecdGcO0mosUBGhfwpr9Y7uU4+reA3w== 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 VI1PR04MB4944.eurprd04.prod.outlook.com (2603:10a6:803:60::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.15; Sat, 11 Jun 2022 14:55:13 +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; Sat, 11 Jun 2022 14:55:13 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 3/5] selftests: mptcp: userspace pm subflow tests Date: Sat, 11 Jun 2022 22:54:37 +0800 Message-Id: <0f4fbcb36ff483b7fde2529c7512e90f2398b380.1654958401.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0096.apcprd03.prod.outlook.com (2603:1096:4:7c::24) 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: 39c3dfd3-e1a7-481f-fe9d-08da4bba6383 X-MS-TrafficTypeDiagnostic: VI1PR04MB4944: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: u/yaRfe/+meE2ZMOBxm2uXFmtrGtDlJ9eSTHowX2YTCbpRYpQbddWTWPd+2wQzp9lH7N2PFq0Cav8mn7SZ43TOwWqwExgnTqEafPEGBN8AgvE91BkQ9bqnJ+HXnihTwJxKEAD/CBF1mkekxIe8imChIMdGy7BaBR5YFCnuyttBK3q8IKfl/s3CtoY0JcL151WAw7QY6OVk532xpJTp2631omtOvCgxQre8xYKUrPf8WVhJlrAMm3CfT79FMDKsqVNAxAta9YhGEKXU/PEcyo/qYe7qJzMlTI3HDSOG39NIv9OXWlTcycoA4XJJFK1FDTxNq0rFEr7aQf0xe2Yw7Ft9oqZNIfWTb6DpvEkdD+WoYFAbOnjmtI4JX5Ew0seGGlpdVUzYUZzncNiQ/CvrK/ZV9rRDgoHseWTYk3o0L6f6xgmmhC29CPzvgqFZWbaVc9yH5SNI8IG+6UbgFpCHNM7DbYdWLFiooC0aT28g8kazcstDSzyD1AnTs53yynIyfiIFlFok5vWbQy7UwvC2/nEID5WCl2aLg68uL21WjMPjfwRj05M/BF/y8DsKQq5ZpMldTV5elQGs8wy16BGSdfaLIw5yD7YdtJyCDt/b07YQ5+HVm8aIYKyFmXBTSljv9BDRWJX5VAz3Za9B6cgS/rOw3tSzO+apZSsJVIWF+tDyd9rQYhpJ0UMPhyPnH3UTFwxLLVtVyRaStbswKuaU1sxw== 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)(6916009)(107886003)(38100700002)(316002)(36756003)(2616005)(508600001)(6506007)(66476007)(66556008)(66946007)(8676002)(83380400001)(86362001)(186003)(6666004)(44832011)(5660300002)(2906002)(26005)(6512007)(6486002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?R10MzKNsciR3COBY0HmxPEwIgjFHTlelqNr8oUb3m0RupXIjyOM/RrH9xCAe?= =?us-ascii?Q?CHL1rnaBzNjPwpgWZD8dNZ9S09Ngx5d0QV+RpDJ2yV3/RNdI7ZKxe1Oq458d?= =?us-ascii?Q?8hViZDtAAKfxEdboC3RtBKlenxl1/TkHKyKuzeIA6U20qLv8juukSxI8Ulai?= =?us-ascii?Q?m/Inv2fktt55kfzpJ5qgvRRyyQM89YgNiWROFBciGZhJag5AoDN1+gbjQRBw?= =?us-ascii?Q?wmFNAIZprA+RzpqHQrl75wU2VN+ofFiVsFIUN5fBwHejcDWLAhaklMI9caBb?= =?us-ascii?Q?9ljtobAAqihqtoJBeOn9r9fB6ZkvhstuwXaYnJDoK87AvwfjJ1mLg7fP9jki?= =?us-ascii?Q?R7a+S6KLl1O2rTq0cd85y0MqmJSPV3D+VH6TqmyDUw3dxLxCvh4Obf7+fYaB?= =?us-ascii?Q?MhDFcrgb9QG4S0CqBGCKcssnpUIGQrhY9o9jMeAr3BYlOXzOfjugxu4qqcOH?= =?us-ascii?Q?RJDlbgRr7D1RWF90un6/KTsHzjNWXMjd2AUngdn1TbhpmDyG2H4ZrBYD2fTK?= =?us-ascii?Q?BndeHNNJOGq+LyJC8NU3FnwNuEEb64L9pgJyGdZPw6F9daz0r6JzgfQlpwiz?= =?us-ascii?Q?xmkVbsZkceoJ9SaPZO5GHCdEjNMrUWruimKkbgWcJ2aoNl10vcO1t4UH2hTb?= =?us-ascii?Q?lG5Yx8H1OZ1hIQ9b5YNe4OlcNeQjTMOIU7QoEZ1fIzNT47Bxv3855XtvZAiy?= =?us-ascii?Q?sTXrnWbm38NS2G5ukRaykykVobvC3L4gVOeC0HRWomwas1/p8Yl2y9fi0WOJ?= =?us-ascii?Q?O9yMCwd+vI6EpUqdfYeynyjtGteK8egD4x9iQb6IBASul189kxb9F6aIPfJq?= =?us-ascii?Q?SWRd6kK+vuCr+xxo59wWM3aQujOAALI0LAHR2wVYsnvLb7N/Hdz0E5PUD2eG?= =?us-ascii?Q?HQR4ZND8JoOm9VpAcUqBxkbyi7bd5IQduMM6ralUGH+wZnQ3UBDasxXvjkKD?= =?us-ascii?Q?m3iJTVJxc0M1LTTrZvsiJe/iBsYKM2kHDaAM/LAsf+GLfkcpgGZCv1AU7oxD?= =?us-ascii?Q?Ko+C34QIoKWcGT+DwcPvfCrAK9Ab0Kw4kitzmc8agGjwkcxd+nNz2BoydHV7?= =?us-ascii?Q?3JWKK4+dnevcnPesHWjaPrAUrFDloyAwgjXttPH0W2Zgwu3DryWQGG3QrKg8?= =?us-ascii?Q?MEIsEztPOADpnHUqr9pb4g8lKbCYiS2/fxKa/IATcRMkKuxLftoId+N1Iakt?= =?us-ascii?Q?94U3k0thfHwoSFlXmBmkm/a1sZb3QP2Tvh5j13zuiFFzRb6pGmSPCkwhmHwe?= =?us-ascii?Q?VsT2iuqu0sf9uZUOXjhzraSREwRWIcCXzVE0L2/g3Qr3+ybwwQ897AVEvGLh?= =?us-ascii?Q?RRHRjFUpleDRwUFKc8kieJDFFfZcHYHL+I8pmNNSnMhtWOJZCNBbLgOniq4U?= =?us-ascii?Q?vRxXA4PEpxlcfZpO9DDnh95KR+V0Pa6g4OAoBKeVuAn5E1n6CkKgl5TxJubX?= =?us-ascii?Q?BSd50CZ+6FJN8LHZBms6sNeWXm2Cqn1cIAFfNIP5IIIlJNZ2jJVCYfxIJTJg?= =?us-ascii?Q?OA6a4ZC6dzLzDkoc8O/i0Co3e8S0zNujSAeorA43/RUSEAsbF4OCn13zpVir?= =?us-ascii?Q?DHVdhCFRXxQSuH9MEVWqZiKxYiAnClAr7DLnKAA15zAEtbFLGWmqp0uxEj7D?= =?us-ascii?Q?3q/dFlIuipWXBUgPmlIYaKWID+8dYeCQdyb+lGEPxL//CXReAGYa7qJPJ0u6?= =?us-ascii?Q?Zk76HBMpIaHsyZ50/OnnVgC+pwbrer8Q2iA3pobhfx2ql7JAYT4G7DjLRtbi?= =?us-ascii?Q?dj5R4E8fd7KknZrfAuPYQZKg7nc4nLs=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39c3dfd3-e1a7-481f-fe9d-08da4bba6383 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2022 14:55:13.4910 (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: k4QQUX1lJDmR4kH8YVLAS19DyFHWWsAMefXsFqbn+Ef14kju/nquXsakkG4MzDuahADznU6Foyx9ehk1p3+XJQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4944 Content-Type: text/plain; charset="utf-8" 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 | 41 ++++++++++++++++++- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index c3cea1d0d245..6bbe6e8ef51a 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=3D0 local evts_ns1 local evts_ns1_pid + local evts_ns2 + local evts_ns2_pid =20 :> "$cout" :> "$sout" @@ -702,13 +704,20 @@ do_transfer() # disconnect extra_args=3D"$extra_args -I ${addr_nr_ns2:10}" addr_nr_ns2=3D0 + elif [[ "${addr_nr_ns2}" =3D "userspace_"* ]]; then + userspace_pm=3D1 + addr_nr_ns2=3D${addr_nr_ns2:10} fi =20 if [ $userspace_pm -eq 1 ]; then evts_ns1=3D$(mktemp) + evts_ns2=3D$(mktemp) :> "$evts_ns1" + :> "$evts_ns2" ip netns exec ${listener_ns} ./pm_nl_ctl events >> "$evts_ns1" 2>&1 & evts_ns1_pid=3D$! + ip netns exec ${connector_ns} ./pm_nl_ctl events >> "$evts_ns2" 2>&1 & + evts_ns2_pid=3D$! fi =20 local local_addr @@ -830,6 +839,8 @@ do_transfer() if [ $addr_nr_ns2 -gt 0 ]; then local add_nr_ns2=3D${addr_nr_ns2} local counter=3D3 + local id=3D20 + local tk da dp sp while [ $add_nr_ns2 -gt 0 ]; do local addr if is_v6 "${connect_addr}"; then @@ -837,9 +848,23 @@ do_transfer() else addr=3D"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=3D$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") + da=3D$(sed -n 's/.*\(daddr4:\)\([0-9.]*\).*$/\2/p;q' "$evts_ns2") + dp=3D$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") + ip netns exec ${connector_ns} ./pm_nl_ctl csf lip $addr lid $id \ + rip $da rport $dp token $tk + sleep 1 + sp=3D$(grep "type:10" "$evts_ns2" | + sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + ip netns exec ${connector_ns} ./pm_nl_ctl dsf lip $addr lport $sp \ + rip $da rport $dp token $tk + fi counter=3D$((counter + 1)) add_nr_ns2=3D$((add_nr_ns2 - 1)) + id=3D$((id + 1)) done elif [ $addr_nr_ns2 -lt 0 ]; then local rm_nr_ns2=3D$((-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 =20 NSTAT_HISTORY=3D/tmp/${listener_ns}.nstat ip netns exec ${listener_ns} \ @@ -2853,6 +2880,16 @@ 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 2 2 + pm_nl_set_limits $ns2 2 2 + 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 } =20 endpoint_tests() --=20 2.35.3 From nobody Thu Sep 18 06:42:59 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp204673uab; Sat, 11 Jun 2022 07:55:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJytQgqtyjfC1fHkWHL50gE30osvknqZhgpc/BPdEi27atYYasU2KuZB7f9niSXIB3upCwUN X-Received: by 2002:a05:6830:1c2f:b0:60c:15a3:f7cc with SMTP id f15-20020a0568301c2f00b0060c15a3f7ccmr8205747ote.240.1654959330693; Sat, 11 Jun 2022 07:55:30 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654959330; cv=pass; d=google.com; s=arc-20160816; b=nfuyw36WrOOLKiFUItNzoPkZoQ01BsJUusQx5m+Idywp+Np9QuoNO2PsiZJfDHRpDu aslYE5UKz7EDXslUPQhX/xQ/hzDlkH0nNhH13TS8cH2jvcwt6Y4H5zFWBhyyE2iJvkvV YjG11zybItoQ1vbOKUFgaHDKnbwonTsvyD4iJI53D9JIuj8RhMqLC8Pq6UPX78v++F7f vRR53leL0Yl87mtTHrmlPniXjMOBEHf0XhueIP1stPscf6kA24YI1qSd7aDnrzB1w/O+ jm+BC3Z+BzH2yX04Dm1w0U7J6UBgg0M3QuX6cdYLXMKJgLclnsMuAsuay/eA9UbrCUnh 1fOg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=+1I6QnDt8s11zkZnJSGk8llIMgOtQcZXVvtTA2qWy0M=; b=Mql+r3leX8MXKK6480+eoqGC6k6u6qMCwmTtIG/aKIDhxn1BOq4tZuvjPGQxalv6pl 5huKU9O92vFBG1u5atrPWLm8Ng4or+QCQLDcU3+eE5o48qFt8biDm+WFWcjI7NT/1mfK akERgVce2p9dUnRnL9qsE5ndKpM+Em0fgts8g9VrAF16syXNjyIbe4vb2bRWLbxqEToL eB4m5n6GDcEFmaocIQB8cwEcfVvxudz8khaDN/ViBOqgvB07xZKmMcnf2+lM6rvjPwAH NdjMtqCopWKE5Kxm3fJoG5iIWoXeQCmWxCTL6OSR1zrMT0iXUBdc5tecA88uoTFMJBT7 ZoDA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=32FVBhA6; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5641-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5641-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id s42-20020a05680820aa00b0032e9d95bfeesi1862329oiw.77.2022.06.11.07.55.30 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Jun 2022 07:55:30 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5641-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=32FVBhA6; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5641-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5641-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id 701082E0A02 for ; Sat, 11 Jun 2022 14:55:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9BD58A57; Sat, 11 Jun 2022 14:55:29 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2048.outbound.protection.outlook.com [40.107.20.48]) (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 03F8EA21 for ; Sat, 11 Jun 2022 14:55:27 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IBMHhCxM4u3vUxPf2ncL7/wPbKXgezFt+/kWyWh5BOLOiAVlI78ZYICjX72A/2PYL7u5lJwctC5kr7czdBc5wXdsCq/qbk95UHOuz+LyOUTecN9fj3qrk/3pSBcF54YQYbjEBIXujxQLXdgGIkojfBvyF2DTychJ4FMpT2CZxbpiPiBPrgqvY3108tPCO0P/vz+/p451cG6DtWYUoy+FYKrIGpgBQjjf3DIhzkwvgWUEJ1UvwLA2a45Aoe27LcgkCL+sYqMIAZDxjYbGth2tTRnqClpfT8xPf3upgmC6gcZ6KQerXT86hz7shtdOARnmaLF6rzF3FLftOwymYZLvQQ== 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=b/kLZuxtk9NY9YlSF1nB3tjHdmhDk5KSVBHDeUvU9aqcE2WC592Aj9DtKRolKv6T/paSZ4wbZ10lTyK+3GqP1a/7GkBAIeFCWKeRvONUuSzaM9VTkMaU4xVbEoIi5Qy2Le1Nsx8nhkFYvM0voqx6yfv23oMbOFXRqyWGjSif9NaIZ7vY6fW2O+xKIs7C4/6NHBNAoaOIrvi55KSjEsd23g+BpMbasi61iDGsQ42b95yp5I+msWrd1/mHpwvbyEkU9Qw2F5QMJy20akXIBH0HTgVCd/xcuke5hVcrHE5ZGJcXCJ/ocYAgYTLOhZEmu3SSbaN7b/ii9cNlK05sh5SUUw== 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=32FVBhA6e9s+Flk5crUUY/J97dbFsZ5GyB57tk5MIkxpN6FpFYBXH4W5WHGUCadmUYxq7wsjHy/psTkmzSJ860kUQ8ougH9n4EED9opfXUVd4U8g/V2aQbgdXXHmgMYkbZ8ta1i3Tf1+u40EWJf+TgjP1JAGO0CTOnB4e5MCtWe5lrYlVB+RYzHO6DPJmfzIDuNvZTrMas+EWz5WAm16gvxt6YW4IS/czmK8xlMTY5hHBdjR+/18QdTkGbxLCHgEerrVeFsC1rVduHs3u72VqtQz3RiSGOmNLAA5uw6mSklVaFJMnWNWac1CX5dlzeIq8w2NG2w5iq5C8AjLnVpAuA== 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 VI1PR04MB4944.eurprd04.prod.outlook.com (2603:10a6:803:60::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.15; Sat, 11 Jun 2022 14:55:23 +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; Sat, 11 Jun 2022 14:55:23 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v2 4/5] selftests: mptcp: avoid Terminated messages in userspace_pm Date: Sat, 11 Jun 2022 22:54:38 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0098.apcprd03.prod.outlook.com (2603:1096:4:7c::26) 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: 1b517195-71f4-46f9-f1f8-08da4bba67bb X-MS-TrafficTypeDiagnostic: VI1PR04MB4944: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: rs4prdTQqP+BBfNz263R0OA1zmQjgnz6NCxujX8kbarVMEo0CgpvE7lFcKhqHLh5SBvvIkCd2CbTQgMxGsZEhRn9VQ/AN5EGxYCXMmHLqqljxY++JaWjg6XZ6S9svUvl23kUjZy6s7ZsC0pqCNWnxlnxTIsmhMu8hE9bV0WLj/MdQN3I5rhwo6YhtSX4RRcV7TQMRI1LmLE+hxW48dj14EyPxcbvbeIuUX8G4znneC+nfF7i4gv1ktxQPFlMHsQ1U2wb+7AMhdoDGzj20Y+/Mpr1agLbMrCcF8zycvAN81z55BsY/WBmu6uCE+1VqLMCGFz3w+mHmWjH+aaPanM+RZLTXJ5x0W+ELHujcfLU9ounuGyLAZoSgc726pkfWJ7IR7AwV8ER2M5mj6ErM9847HhNMEqMvvk+Xm0dvzfkXZUqvMJWKAtBFABhg3b7GdHmFuoRMU40TAdufx+8QJOHHJbWUL+N8zcn9CAJz8qSy698XTW3GE1VzHs8XkA9V1jlHzFsYW11z4ktPwM4KrQSffoE/59W5ZrpTUWfk0+oNrIdXrnSMGaO+/yyPeu/F66OP5wTNzt3KW0N0IGI2bqE9ZxSVRsN/we92MwhpjMeOlX80/bNFAEBtnFIZat7ZTjUbNJN2DVXG6HtSlvGVCLNBFAN5sA33lKJxFZa2hAOdg3meQziP21fL65np/dyJI0MA8T3czGuwmLq2LUFyOK62A== 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)(6916009)(107886003)(15650500001)(38100700002)(316002)(36756003)(2616005)(508600001)(6506007)(66476007)(66556008)(66946007)(8676002)(83380400001)(86362001)(186003)(6666004)(44832011)(5660300002)(2906002)(26005)(6512007)(6486002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?88KYggm5VAIMS6Uhmj8Zcvo8AWI5gBzBGyMXXNPtokqpykeUKzHxYWI8gsLX?= =?us-ascii?Q?0X4aSq98SXhr4E22i2pwhP6Oo27zx5Z7VtZjzKFiMzZ6WTFgcackGWfP/Gxl?= =?us-ascii?Q?omX01+yYiZOi3GHVW/rILq0IheutIx27wxYPRH5aSPqySQXonCosSq/JoKpO?= =?us-ascii?Q?vEIh5i9N1xPC7f9eCGaTLcKy49JSRS7uCra/m9h+RXYXfysV5iwxM6X4eWuR?= =?us-ascii?Q?w9bINhwc0nRZRWcbarL/OP1RxS4+sTekHx70c9MJvve6v/gynL9v+Akcvfu0?= =?us-ascii?Q?YYz5JUZPlwauVwANx/pPVIVDS2kTHA5aHY8uFQnNAQq4Cjd4igSfKjm6XJV5?= =?us-ascii?Q?SFMcam2FIxcYq83avgCXkAWwnTbkK4QxWBFto6X9RZf7BKcZ7MUMgphSGRnw?= =?us-ascii?Q?gDXPVqjREsoFfn+g1xJW5B06YYqPUBREp18GNRH+wQiZp6+Mcos6uA6pBYV7?= =?us-ascii?Q?D5rEEXnAwwtX1UQMb1ZJvvhXRq3gmOum0QBVL3zlfhFUMkjytEqMdztw+qLf?= =?us-ascii?Q?E8eGNbaJJQJOMX2DUgS6HkUoXB+REVlRxq7tnfuOkh4Rd0vTJTYosFpxhX4y?= =?us-ascii?Q?o/ePngbqNG02R5sy94P84mddLgcRAeU4Wzo7V/yfgxWfYe95MWTJ5gvP7SsA?= =?us-ascii?Q?C/wneMO1LpEv349NZ7ha7yy4S1/d+YXeH/chACUdLv01X39sd8aspoVr5u2n?= =?us-ascii?Q?c3IjZnLjmFdpphlpYFqVw3BW8ShKl/EDJnPoMNHCdbKeERgmURfpzI5MAZ60?= =?us-ascii?Q?h6Bh7aMwg9JCHHLZYByykIScBTdUc1Edv4ebW1TJgQo3954nAgQIxRyFD/Ti?= =?us-ascii?Q?XRSDiUNuTZPjEo+hxhmX+297OO6F38m2IZ8w/hCEWWCwJREn69EK4Rotrk7J?= =?us-ascii?Q?jlHdS578Zb97ktzdkD9Jj4HOqDWKnzbONS79CsSCuH2STZ+C/ZmQi79irOuC?= =?us-ascii?Q?ZUvf+J1Zd12v6t5Aqz/G55delN+2AynlHPEzt4AJXlne4O4fIEcj9EX3oDa3?= =?us-ascii?Q?3hQk/8ByIIT984E1UlGBYz+3MdEGov8VTyJo7WxWfaZX0QJO8hFHKAdG9p4b?= =?us-ascii?Q?6GWKEhPhQZoywiaNWcijTq77hTMNCOiewYOcLrIQy2QZbGGVVky3dUpwYm6y?= =?us-ascii?Q?ESumTl/3Z03UDeG4FazN8hBXERiihJisSLTqKSLB7PaIq6YrzAUfNAWo7fWd?= =?us-ascii?Q?5GO5Ab89FnL4jrrEGD4Fnjytrf3x5yDScz70CHUh7ifx7OusjepFPSK9hBDl?= =?us-ascii?Q?mCNZjdS1V7e4VYJyAoR8ssdkc6tgmRMi7Vo6BNSr3UEhBxjZVYywrbyEG5Q/?= =?us-ascii?Q?5U20uJBE51EhHCaId9a5pRJiNvl302Y1SxagHijUs1F8JpS7774HShru3IC6?= =?us-ascii?Q?9N+kaSHgx5sd/n2Gjer4gnnx9VvknJJ02Tocm+8zfjNGKSlG7Wwh7s9/MW6t?= =?us-ascii?Q?91L+MPvPp7RCfB/n4tDOtyckNL7XKxDaS/g7RIsvR6dmS7S4o5/7vPBcETz+?= =?us-ascii?Q?XllcnMwRxhF6iluU1fpbIWtkyZtOQRPTQUZxLXokV2Hu2G1REe+1zgtelZFH?= =?us-ascii?Q?GT50kbPY3T2gtCrWiO6eC1+i5jahYAEqLg8HLzUIgyw9ZSXJFD/8LRuneQE3?= =?us-ascii?Q?lGCwYqT1RvnUq+sO8CfilpK7ZoVkjpBdRfUDKUMN3HprAyFBp/psCyLQl1Cw?= =?us-ascii?Q?yJn4J1xNjNas/YiN3Ti33pFoeK/BzC4jaEX48/SdNbqeLPM0oUoNLwNAaOXv?= =?us-ascii?Q?dpjocRELK9izGU48MbQFUGdVSWp4w5s=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b517195-71f4-46f9-f1f8-08da4bba67bb X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2022 14:55:20.5841 (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: 4CtYfPJS/goUSiBwPEp/2RuwmHr63DgkphM7dBE+M8saMZ/hXNEwV8FgDBespcqEI8ZyIfQdQFDcBhiZcnUt7Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4944 Content-Type: text/plain; charset="utf-8" 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 =3D> 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 =3D> ns1 [OK] ADD_ADDR 10.0.2.2 (ns2) =3D> 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/test= ing/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=3D$(stdbuf -o0 -e0 printf %x "$sec")-$(mktemp -u XX= XXXX) ns1=3D"ns1-$rndh" ns2=3D"ns2-$rndh" =20 +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 =20 # Capture client/server attributes from MPTCP connection netlink events - kill $client_evts_pid + kill_wait $client_evts_pid =20 local client_token local client_port @@ -165,7 +171,7 @@ make_connection() client_port=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2= /p;q' "$client_evts") client_serverside=3D$(sed --unbuffered -n 's/.*\(server_side:\)\([[:digit= :]]*\).*$/\2/p;q'\ "$client_evts") - kill $server_evts_pid + kill_wait $server_evts_pid server_token=3D$(sed --unbuffered -n 's/.*\(token:\)\([[:digit:]]*\).*$/\= 2/p;q' "$server_evts") server_serverside=3D$(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" =20 - kill $evts_pid + kill_wait $evts_pid =20 # 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" =20 - kill $evts_pid + kill_wait $evts_pid rm -f "$evts" } =20 @@ -416,7 +422,7 @@ test_remove() sleep 0.5 verify_remove_event "$evts" "$REMOVED" "$server6_token" "$client_addr_id" =20 - kill $evts_pid + kill_wait $evts_pid =20 # 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" =20 - kill $evts_pid + kill_wait $evts_pid rm -f "$evts" } =20 @@ -553,7 +559,7 @@ test_subflows() "10.0.2.2" "$client4_port" "23" "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created - kill $listener_pid > /dev/null 2>&1 + kill_wait $listener_pid =20 local sport sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evts") @@ -592,7 +598,7 @@ test_subflows() "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created - kill $listener_pid > /dev/null 2>&1 + kill_wait $listener_pid =20 sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evts") =20 @@ -631,7 +637,7 @@ test_subflows() "$client_addr_id" "ns1" "ns2" =20 # Delete the listener from the client ns, if one was created - kill $listener_pid > /dev/null 2>&1 + kill_wait $listener_pid =20 sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evts") =20 @@ -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 =20 - kill $evts_pid + kill_wait $evts_pid =20 # 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" =20 # Delete the listener from the server ns, if one was created - kill $listener_pid> /dev/null 2>&1 + kill_wait $listener_pid =20 sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evts") =20 @@ -713,7 +719,7 @@ test_subflows() "$server_addr_id" "ns2" "ns1" =20 # Delete the listener from the server ns, if one was created - kill $listener_pid > /dev/null 2>&1 + kill_wait $listener_pid =20 sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evts") =20 @@ -750,7 +756,7 @@ test_subflows() "10.0.2.2" "10.0.2.1" "$new4_port" "23" "$server_addr_id" "ns2" "= ns1" =20 # Delete the listener from the server ns, if one was created - kill $listener_pid > /dev/null 2>&1 + kill_wait $listener_pid =20 sport=3D$(sed --unbuffered -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q' = "$evts") =20 @@ -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 =20 - kill $evts_pid + kill_wait $evts_pid rm -f "$evts" } =20 --=20 2.35.3 From nobody Thu Sep 18 06:42:59 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a9f:3042:0:0:0:0:0 with SMTP id i2csp204680uab; Sat, 11 Jun 2022 07:55:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqcahPjfnH2WSUhmgg33VI4Aq7MCTJ8iGyUmJEz/kdFCQIKwnxjJKWOGLarxqMF4rK+siy X-Received: by 2002:a05:6870:5829:b0:f1:6937:2789 with SMTP id r41-20020a056870582900b000f169372789mr2823001oap.245.1654959332121; Sat, 11 Jun 2022 07:55:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1654959332; cv=pass; d=google.com; s=arc-20160816; b=edSjeck4/LRA/P07EbJNz+7gZGJH+E34Q7uiPi/5aszraPtYwNKlwIn/wOOndghYLU QYjYzQt1q7qY0jKGRFfVO04ergXXntUbhyoOu0/TFZpNFFskQL5Ri5vO+TVO6G+KJKEw z2f08jWVCQzRZ0cAalKpAz79YFYaGRWDtslq8FyQqWWqtFjgymJaLUhQPNPLLbRwOUUF EOCFfc7ymuDi/46kedf/6cXIpqFE7LvDL076pFNl2Mckm6miKyGoLBkVCS8dsJ6vshgY 9ckIUORdK+eAgZDu+wRh6e1ITYuxVxpXAKJoqnJAr+A0xGYQmq/SVl2OvxaYzqK4/H9B IqBA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :content-transfer-encoding:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=rdUQ61vXLUrRenZnksFO3mIPsYnrpxYO/+WT4Li6shk=; b=garNNNlvfYCK9cxamw2UhJf4tj2ZYQVBh1rrElPahCmmXxbaaYtYRfzf8gV4WeTecY sfB+pZcnIrJo20AHcQTnila2PoX/AcTfQXu4f3JofdFlNE9oho2+OWCKCodyk22iJo7R FV1U/oDG+cOk0uXCTAQpgx2RB/yQyZ0NGFJOvYJ0iEZ7U2s0aaqEMmizVpRsGNz/lIiV hY4IHi9v/ZrDC/xHDDp11R6WLecpsLXueSSxTiCofXCfeiw3oeuie7PYcNo036iNQc4c JVGjt2hzymwvsKB9h9jsSO3uWh2QWuchJAJh3B9QmD9xE3oAGgLmlTkB2vrXYIuBXTol gSzA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=lQMNJZPi; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5642-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5642-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id i30-20020a9d171e000000b006067275bd35si1889940ota.69.2022.06.11.07.55.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 11 Jun 2022 07:55:32 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5642-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=selector1 header.b=lQMNJZPi; arc=pass (i=1 spf=pass spfdomain=suse.com dkim=pass dkdomain=suse.com dmarc=pass fromdomain=suse.com); spf=pass (google.com: domain of mptcp+bounces-5642-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5642-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by da.mirrors.kernel.org (Postfix) with ESMTPS id E467E2E0A0F for ; Sat, 11 Jun 2022 14:55:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 2ACD1A53; Sat, 11 Jun 2022 14:55:31 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2048.outbound.protection.outlook.com [40.107.20.48]) (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 C85BFA21 for ; Sat, 11 Jun 2022 14:55:29 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=az3f7E9mhAJycff1B/RBhp1GmslAfbgwuAEaIg5Wm+MBL+nwGAngJZVUuwgW0hixywD8E5MfpG9yqWZ+XrwC3E7l9awLlkWqoVKE3TxukihS5QNuuupsxSGMUtsa9g2HI7+I8/oK3PkUqjgfi3jYj9dT0V2Ehg8/iVqBuc9n0Cg211+++Qz7dfjPsFyFKBKqWSn0ea6CH/l8TttvuFcVL7Fq4u3xSHwqiew2ZUwHEl+vRqhMaYhxdeGVqNwsVvfGaP2A/ZhY8q9PFOZQEddwtG4glFW9BxUVKNWxccjF8mvD6kmPMkOnIoC5tbLClIg51uEIvn0UNTcUGktF8Ypvqg== 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=n7ELcElB2lA555CbAqfJihWjB/6OH9f/m/W8wsliM1SbwrnOShwOhSZ/DwGxo+LgA1odh9KRnhlhIKsAzyTy5hD16MyMEFYA+cJ6e/L802IddIY1h6g+/dPlh+9lM5Yseyn0DiDwXCvKDwbhv8fsdtWRtZ5nhwUkVKtGCTHQMEJeM+Odn3achF3hRsgi2YT0/5v7XtsxjYzCTzn8/5x6nKB9gbueskXqA47M06rXNBsslUiRqShDe7osB8fYU2CH9QhzPXBA+DuHX46Sa5iXzJjkqyf+e6iHCfafZw4b9KkZY3QSm4KPwHeV8do+5QyebFr/38Ex50hVRolrYLwL+A== 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=lQMNJZPiwa8x2itWLzFlDUimFp7DW2dASCxhubi1+6shCkKZtXucHhekd8ekbb6c7M8OLjVSPocfpZOaeU4DlErsfKKGL73ujI//h50EO/RD/witgQ5oKhSgtooNCpWUJFwNHPbtKjbkzjh6/6P3YBa0n4hlBe3PZTmVTpVbCsBHQPKJeY7D+E7HCtUA5z8gPDDjlzM05NrR73HSjkVkbdogbvrnhWicx6dtiW6zu7eAhKZQL/zCHzd+RPl7jD9VkqCjuchwvbMNhABEbF9b9H2LK/lGESOAmO9f4MYff4nH70rru3/6jCBxf/lcO1Ekf0ZAN0qqhjF/7xuKCdZKWw== 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 VI1PR04MB4944.eurprd04.prod.outlook.com (2603:10a6:803:60::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.15; Sat, 11 Jun 2022 14:55:27 +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; Sat, 11 Jun 2022 14:55:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Mat Martineau Subject: [PATCH mptcp-next v2 5/5] selftests: mptcp: update pm_nl_ctl usage header Date: Sat, 11 Jun 2022 22:54:39 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0120.apcprd03.prod.outlook.com (2603:1096:4:91::24) 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: b4e92956-20e9-4ac6-f9bb-08da4bba6be7 X-MS-TrafficTypeDiagnostic: VI1PR04MB4944: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: 7Z2I21jMc1A79J2mZiWSsBjy+EL972UjW3q4mCd+SSElbEvigxnUSYpNF8ZlhLFdhTmVjt3ZQZD7322w00LlR7emWj5CuF4aw0Cszjxj4fyvlOzYSsIJ3LnBoCtQHPFu2mescQQqXyPYZkq01EldTRj6tqz6xei04UEMlCDZklc+4Y24YS/i32LageLqTOpKFsSq+KZMvP5D0Xw1M2bhFaddlYmcAeySq3o3g+yCWy0i+qIMQd81KRipsvMHLZhqrpodcwzh+P0IcwSsrhG8ut/BQ8aNGL6vZrOit9I5vS30fxRiqrfY3OA+On3tlyFx9U8PeaTQntZMkDpANH9sNWu5UACXwExaUe9fQJoiMCKEcwaGuzU2jZbAef7kLCXjitoDLh4crKzN9INZAlWDJ/qYv6ivK1Xio6ywD2phZpYGR8X4cgewgQevU9pQ8kBcVLROsLrXueLSChJu3AiJT3FM/3UCW3AbvVOtHtRFveYlRxk0keHk99uiGFmNv0LEsWKbJxQT5jTh/L/++wqPcJOCnDY/gfiIHa/I4wS9+27jf6iG/iclz01Rs1dkUA/rSFkEhcQMFT7uNPuRNTroJfNPx1YdLHirUqMp760NLOtAHZUsE/BY9zQTGWb5hr+yKNisuTYvhIIRx517gnWEeaNPN8cKcUQE4n3XFkYVtWv4QWCZPMJvwVN38iIRiRvhZSF0qTi827xOp8DCKCKSuQ== 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)(6916009)(54906003)(38100700002)(316002)(36756003)(2616005)(508600001)(6506007)(66476007)(66556008)(66946007)(8676002)(83380400001)(86362001)(186003)(6666004)(44832011)(5660300002)(2906002)(26005)(6512007)(6486002)(8936002)(4326008)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jKdxIWJlX2Tj6baVX4IDFuHqbeqwaDtZpAvli7Czu8TU7/5yj1YIGE1U/5r9?= =?us-ascii?Q?Eztr9s3u4muF3OcS8Nr/EWX7PPp+DPeu4TlhHesYL3jJD4ynAfLw7v9JNMiQ?= =?us-ascii?Q?cdPVJDRBVwu8eOePXgUmMrmBF1F3oulczrUwZdgaRbCl3I6VpRLNzoR879Rs?= =?us-ascii?Q?RXTBcP2XCVrJFOXG6AqOPLvrIrw0yPMdsK85WA65FAoa3VIheaZCFcuFwjSf?= =?us-ascii?Q?9HRhTKo9uQDFCC4MgUo4dW86QiUgA1ICtj62LqARImR868BWl34b/PX+AkQd?= =?us-ascii?Q?GrJHLznxtybcfECrXKpA6gJf5ebClPphFPUblNioFC/WEJvUcazd3p3G5CLj?= =?us-ascii?Q?egr2tsBpjbfuw2Up5cYCCBFpuai4xHZ+JtNu0LKO/zUZNJbXHyqN9IInCNFe?= =?us-ascii?Q?7Q95rAmcZNudjkuWCQ5In0Z5Wh5JhLhbYmqvc01QudpO2PRxdr0ZHjQiLIio?= =?us-ascii?Q?A67kzwF/mQImmM+yRRkdMsQrc9wanI1WGisQ96uf/1OiEZMpZUmn7OO+ILhc?= =?us-ascii?Q?yxZENy2RgYsLwx63IL5NXKv3Viqj/E/KyUGuQjFxxSEi/3NJgB5H35camAJt?= =?us-ascii?Q?57z/eTuw3+AvV9UuAmHx7ffaLbO6SMnqq2OLzv2wjfsdEZz2/i+ya6DN7ZHQ?= =?us-ascii?Q?fjFWY5iatYoH8t7vDmkFUu90tBdppSSQDPS+dyCbXzi7qq+JL5QW+VsTnoXN?= =?us-ascii?Q?tDZXnO3l22X9oXNqk+dmD4xvRdetvqSgnuvlLsu4XgTP3xIK1+ojLIxgur/B?= =?us-ascii?Q?OB6puHwMTCxCX0oirQAmLsk/LVicVpJ+0mDRn9pnfD6Htmd5lQ7w4vKLAdzB?= =?us-ascii?Q?UVJM53n4yNVNAJKaAtwWAzbg3gPdTktJydh5Drkqn/o3gIG0qLGHjDgzgz9X?= =?us-ascii?Q?FPzQOpcirYKwdopM8ODhj4vMoZTtBuzW9/dEIjQENA5F0oa8r/o5/EUPrmnU?= =?us-ascii?Q?9A1gyYW2dgCKn5b6UE2KKIz9fNkY3d3uzXHD+Obq66IqWMgEH+kVr97eL4fM?= =?us-ascii?Q?tGqQ8QM4sML5kttCHI4i6dPS8VFNclfMdMuJJiJjQ1XLWCDO/purHB20R6Gp?= =?us-ascii?Q?hgU7uSTjGh/P/6B442NtQkG9UI+zWSpRRG7agTzU8Ko02zOQQ6uUu/e/c/Xd?= =?us-ascii?Q?H+Aonls84Y2+hfOi+3Mz9NT8GmcbT0nICCFHcS/rMYjHDUgIN2kTFvHrckbO?= =?us-ascii?Q?7qcmsAKp9hyPkRXhDoDo6bNoxsTsxPYyEclFnGfbPhoGzgABSfrDKc+om6zt?= =?us-ascii?Q?Mk2d4eor0hdQjz5Dzgazr75E0uD2M13sJLOg6mj+mZSObjGmlEI035stCSJD?= =?us-ascii?Q?YNpuTEKjxnvSM9quD9tkwPgTg4bNJ/2xMkHbDI0QwBwVFNsJxRnfI7dcTzY7?= =?us-ascii?Q?v3yeIXdC7CPCwU6ci9LGzHeZN6JQwwW+Z9IkYwk/xXyP8MPUAsQh+YI4Af0t?= =?us-ascii?Q?IPr+6m98MBOlr2qWY6f5pAZwVisQBRxbxbmEQSyXy78rDtJZIfPHsQht4YxM?= =?us-ascii?Q?2nbnVDDPXln20xD02D1eE5ml6Z6Mqm8x7fAMOj0s7G2H4qFTRrKATc/i28i1?= =?us-ascii?Q?nkbMi/KMMktJdBxNS2LPoPF+flTKU5O+RPk1bH5gUoGmHNDjFWo/U8jvuADt?= =?us-ascii?Q?2BNhdR4WEdkg6aUY2p3+7FjoocPElJHM/LdZ/ci0bBTeq6xfJasYS3SZYUMl?= =?us-ascii?Q?WETmFidSAdU94u67FTt1bvg04ziWSC5U0mRcDgWcWxZhCq1x+MhE7NE1dJlm?= =?us-ascii?Q?3v2nwc14PbbOLAvYqC7l+GxUhwtQp8U=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b4e92956-20e9-4ac6-f9bb-08da4bba6be7 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2022 14:55:27.3805 (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: 74Ow+Ih7EKuXItaNDEIMZRah1k6JAg0fzZRdzv16DSjREvrABXVdagleiYJ/Gofsk66TXRjZnSpVcsUla7fq+A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB4944 Content-Type: text/plain; charset="utf-8" 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 @@ =20 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|lis= ten|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"); --=20 2.35.3