From nobody Thu Apr 25 01:49:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2280976jap; Sun, 9 Jan 2022 19:30:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJy6NsKew+CoNI9U9lgXtqoT10+g0VMJAbCLG4ldzp00Ey7kLOEtsUXtlZCQhNP3OaV/DFbM X-Received: by 2002:ac8:5dd0:: with SMTP id e16mr63464037qtx.563.1641785427182; Sun, 09 Jan 2022 19:30:27 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id gu7si2777645qvb.521.2022.01.09.19.30.27 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Jan 2022 19:30:27 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2997-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=cNQUCQw7; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2997-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2997-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE 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 ewr.edge.kernel.org (Postfix) with ESMTPS id C17061C0B19 for ; Mon, 10 Jan 2022 03:30:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9039B2CA3; Mon, 10 Jan 2022 03:30:25 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 2C33F2CA2 for ; Mon, 10 Jan 2022 03:30:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641785422; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=021S5zVs9QtfjMXcLvOravNDC6Jh/UfOkNzsERCl/hQ=; b=cNQUCQw74Gn+AVHQS9Vlv95rHBiD6CyJnMWyKdmyk30vkUYFKWGpnMqnVihC+RO0mTJgUx Isg1yx4azy6SHXDZ+r8wEqTxCTNqAH2p5DQXa3MmwNfOAvywxBWMClCmw3B1JutPCHzXpR ydsJCqUyH8nEP4WzpyF1f821GQv7Azc= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2105.outbound.protection.outlook.com [104.47.18.105]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-36-HJWMwfTCM_e5-JU7hSDOAw-1; Mon, 10 Jan 2022 04:30:21 +0100 X-MC-Unique: HJWMwfTCM_e5-JU7hSDOAw-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=W77WVU9fFLi6x8+gd3yhcJfxIBMVc/aUTKq1HU8swLdvl8F1ve0Cifv3Y5aiQKW8lkIjj9mkVDYr2+EW1wyCffXFG7M7bfvNlJ416FeQCKZ5h1pSskc0lrU7idFCVh1pSb/NAXYvR1miC+7SnMeWD0xN/roy1hj8MCWE4QrBB/qDVHIaovlKHO5MDn+xGhlTATGQRO9KEkOgTP05zG1MW7Xu3jUSg0cGAilU5WvVajpjjwgsz7/ERmFXAnZOjbRN1fRG9L8+/AyG+yawHAoPHBYWNibTI8NT0lrxlwlHXQtVxl5wiAN0Y/XkmZv+80CO8XtgJwa+ksD7L5auZfThJQ== 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=tpXD8aYEaam0GGsM0LY4Yvbv+lLByoXxdIwAZ4j6LYM=; b=Rf5qnWqXu+mOeLkACtzivejfqWwdpHZvjgXRoylO99xM4Mf6XzVyG5wvJOjEul0GCExN6WXSEDvkFSswDy6IdxSmGBZDPOzvbTrpncLHy0rtIzreTCr77tPEzutmbK6MSOhUyei2klUo/Ybfl3mXUzZ/I3lwps7d1GxMaWQFjgm7JMCp5+6v9LpRlFpczF92E6D65FQXF7EBkPtUgmwuvsj5OqYNFqTZd1/CU3tqqP5qeRtaVkqX3tLwYkb4pMdJRif432ImAKikqR4TOOi7sxUpGTXj6bQSBhDr6/4jn2PtMlJax61zG3oRXXaabKp/x9y/FJSwhCnMJA3lTnsE3g== 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 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 HE1PR0401MB2569.eurprd04.prod.outlook.com (2603:10a6:3:7c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 03:30:20 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4867.011; Mon, 10 Jan 2022 03:30:20 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 1/7] mptcp: fix removing ids bitmap Date: Mon, 10 Jan 2022 11:29:59 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HKAPR04CA0012.apcprd04.prod.outlook.com (2603:1096:203:d0::22) 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: b12b68ae-ae05-4d4d-934c-08d9d3e9878f X-MS-TrafficTypeDiagnostic: HE1PR0401MB2569:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4303; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4BEkP8xBmg3iW3gCr5bWzhLAHU8CUgwZF2ljrUmOpHFWE16K9HMnkgqUhM+XXWTBlmTG3lv9LaZngiXZxntL60ql8ERb4c8Zk5WGlEYW1idMzSHVjFQo8ZDsaGf4fQfhiRVxihxBRl1sKfDMjCk4ej7ubOQulqlYK6bgHswfKSVcupWZwT9nrKhWe6M5MbEmb0q36GDZQPcr4tF8Rrl8lNgiAYjtj3YuYj/9udvk0JoPMVJha3/BF7LZDkkCRKHgpoX2kwDX8xYYwZ/8FVq9MQuTHrjv+A6Y50N9gW4/ldm+t2eYcm6s1qOEQhJPHlakOlYaoYCZTNDPegoLhIC/CevCUgeKyTGC10s2rusgvrgfg4mTS7VoPBRe286913+UTJV0R/nn6XVEeQt8hh4VJ4sG8/kUg0NWbQQ3dZMvKSZnd4iAaAugYHpENemSiAZaG50JY+ziaaExLXnRZifPXSR6laqGvjZHFK3fSQaFfqhSg+sEKXGa6HD/vACHpZnYiLQ/DnAUspVQgCnTqDgDxd3RWc5ktJlWCPoDsR/meejQCjiICHufqo8eDg1ZhhmAHTPR6isWYoYJ64W+Nf6JAxBiVV0mnFH0ZJcxrXDjAG83nJ2a8ZBuhgrJ7cG707Oyf9VKQxrRNnO96GYeJ09/5w== 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:(366004)(5660300002)(6506007)(66476007)(83380400001)(66556008)(6486002)(66946007)(8676002)(107886003)(44832011)(38100700002)(6512007)(2616005)(2906002)(508600001)(8936002)(316002)(26005)(4744005)(55236004)(86362001)(186003)(6666004)(36756003)(6916009)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Mj4X0bCWIwcyGeRHv3lR3iVsbp49M4QO1LIMbfh6SJ56u1zo9/Pd/mc3qWAD?= =?us-ascii?Q?Vl/snROvwbANGg2ViamVIcv8FOvldfA8ZnkfCN1yC/8Gg8TBaXQuP0bgTb2h?= =?us-ascii?Q?MmTUJahgZPvC74GUa0ikQKMulmsGi0vv/yOH99+Pi6XelJ1lS8YUc57/Oxvu?= =?us-ascii?Q?RENMHTsNlPWasOeyZeMMX1Jqa0H2uhMzXIVVkQXEllB1JB9vY03D6+c+gMfc?= =?us-ascii?Q?Af3lc4X/QhztzHlALDEyOAOdv9qc79ApKH9PaDdIyVFJcCHKb3HfZnw9UANQ?= =?us-ascii?Q?8HrE/yYLj/eRNbsqif7eQcUF2MgnWDlzSjzxLoD/rmY3/QKxs5XWa0Rzaeq3?= =?us-ascii?Q?P52g/4FGp0AzZiyUjcCcwesTsl/b6Un+Gcr+76HZ5TttsZ2o5McyX7KhF5Gv?= =?us-ascii?Q?UA7oXcRptIv93oTZCO2Y7jpuOrdhfQBViYBJC9DX+EJJx6nX0fGygWjkr0ft?= =?us-ascii?Q?nTD77LbOx7Ol6GHr4sQnyByInhIPCL5xKN7tIl2cNATLq54v2BUcsEokxrTj?= =?us-ascii?Q?Vup0P+0TQFtwfObPwVpHSBROZd8qJ810IBXuHG5H734DAN+CS2as68d7MDME?= =?us-ascii?Q?DP2372mQ4pTAfWPswOgWoMf+5IDrIRF1DxNiUsyoOmFClyrNfJztWdeM3bO8?= =?us-ascii?Q?oJI/WRjtkB100kI7ythCBgPIluSlyC1WNvrBSm9ry6BT8Aurrgjg6Ss5DY4T?= =?us-ascii?Q?kn3RalAOA/SPCFRZOc2UXxLzAY8NNn/4oqVd3afNTRMRMVIpWD4NSb35a6UT?= =?us-ascii?Q?EyyZXCmhHICi0ALiL3RulGz6vmvAtbVIjOBSJyt9iCzqRLdNcwxPLKUCkd5o?= =?us-ascii?Q?f8dbXaOYFYS1BGhuYexW+Voy0hF3s0jCOWckMkpq4AUCRFiSfJs7Ln8N+UcT?= =?us-ascii?Q?6EgUFbeHWtO5m9phRMtkb5h+3YbW9F+fRGjgnB8rrgKOvhoW16Q8HXQmr6yp?= =?us-ascii?Q?YKWr97bGObbnnmGvm9VRHnI9ZFA0sbyV2N2brvhvnrcchhc6iESk1vcoOiuD?= =?us-ascii?Q?evCtuwGotPC9BQqnXCrMzFkZCmcg9f4+QZ27rArtMJLmuw5U/EkXKkZtecgo?= =?us-ascii?Q?YK2Q5eQTh8ZkOTLcVCQxLhYFNG/DxZmpdG3xL4LAwrRCH2ip3g7Ohs0h6VlZ?= =?us-ascii?Q?vGnW25Fuj30FvQ36PY5kx6zfYQIK8yI9NNmEj/Yt/tzOd3Sn1pYZ/C5RpxaM?= =?us-ascii?Q?XhHnxiWchgEJ8NT73znA6hbJWbGOheKmIIGIsG13Km4cCQTmcNh7SCLL+1bR?= =?us-ascii?Q?jCFVC6Yeqiy+UP3MzEPVhNZIanZhCjN5dW/bP3BeB6DSsi6504nyhBfxDR3n?= =?us-ascii?Q?alJboUpqd1C/34kyiSy8IHAEZo8ikv7Kl4AnBIv/p/KFFKGGU6sFPl9yK7WZ?= =?us-ascii?Q?NxPbLoK5HJYe3aKIZd3SQ1Ht2j1R4vsv1IdHLL+ZU7gM3k39rrTo6F/8WkwV?= =?us-ascii?Q?MoZCCpLMPl4oW0ADcpcxWu6i2j+Q7S7QvbMlBNhzVhGZEW6IZEJZpJcUVCF1?= =?us-ascii?Q?l7RnP+zQBvtnhXGroSe36aUpXY1goIbyqhSk7ybYEszPF61Bn6hbcUgoFeJB?= =?us-ascii?Q?anH3D68lBjWnD9gUQbW2Vy+JkuSngZ/fmdMtQt3/Djz4a6BVKYh/XFFBdpuM?= =?us-ascii?Q?mrPAqNRJ20vYYJmUwPboUNg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b12b68ae-ae05-4d4d-934c-08d9d3e9878f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 03:30:20.5903 (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: BVzV5aMxyXidAH6QFhSWVnST3r3Iv3rwVx1CCqp/y1/8h/iMeAj3RZnY9oTh9DUcBRW0A4aczXfLT+vithIPTA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2569 Content-Type: text/plain; charset="utf-8" In mptcp_pm_nl_rm_addr_or_subflow(), the bit of rm_list->ids[i] in the id_avail_bitmap should be set, not rm_list->ids[1]. This patch fixed it. Fixes: 86e39e04482b ("mptcp: keep track of local endpoint still available f= or each msk") Signed-off-by: Geliang Tang Acked-by: Paolo Abeni --- net/mptcp/pm_netlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index f12effa71942..47ad00d01cf2 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -777,7 +777,7 @@ static void mptcp_pm_nl_rm_addr_or_subflow(struct mptcp= _sock *msk, removed =3D true; __MPTCP_INC_STATS(sock_net(sk), rm_type); } - __set_bit(rm_list->ids[1], msk->pm.id_avail_bitmap); + __set_bit(rm_list->ids[i], msk->pm.id_avail_bitmap); if (!removed) continue; =20 --=20 2.31.1 From nobody Thu Apr 25 01:49:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2281033jap; Sun, 9 Jan 2022 19:30:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJya3hgGX7CIa04x318Rt6UgPlHKVJ4YTJdXiFK5sup+fRPFRSrZc/QCNBY9gH3rqU2tgicS X-Received: by 2002:a17:902:76c1:b0:149:989d:c6e3 with SMTP id j1-20020a17090276c100b00149989dc6e3mr52143275plt.127.1641785434386; Sun, 09 Jan 2022 19:30:34 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id p7si5864493pls.578.2022.01.09.19.30.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Jan 2022 19:30:34 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2998-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=B1pIKjju; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2998-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-2998-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE 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 sjc.edge.kernel.org (Postfix) with ESMTPS id 909FC3E0F65 for ; Mon, 10 Jan 2022 03:30:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E35462CA3; Mon, 10 Jan 2022 03:30:32 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 8EA552CA2 for ; Mon, 10 Jan 2022 03:30:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641785430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=R3RRegy7nMT/nxNxsWZUWKpas7o5csWkyR2w0tQW7C0=; b=B1pIKjjuwhuJq5nsiKuNI9NwPw6oYVIuLCwdrocdPJ3VZoFl3oXgLidAjQnPd5qENeIu8R Qi8hnaJDuAdwkaDPfpQgwGnzC86H9LfwZUlqgOTDm6Yl7Z2mepmhaqwkbGfQ9ddeIWIHsY CbqGuXS5LGtT4vQUaJja5Uatt8hQdak= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2108.outbound.protection.outlook.com [104.47.18.108]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-2-qe19zaXGMayqBm5uGywQ3Q-1; Mon, 10 Jan 2022 04:30:28 +0100 X-MC-Unique: qe19zaXGMayqBm5uGywQ3Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eua7b2eOeJOUx4qVI8e0BfhMqW/5XaFQl6+TaD+aSXG2vY87uslguXRDKqV77isb1r1abDrjO0d10WQwaEeVVkZN3uUypAvR3Kt458ezH3cPRxjKbSKjGDLyw6mQoD8/v4B9uaqEuCGRLs7nd7BZ892cM7p/h1Omjt8d26uTcNfJkrm1dI8GCDE7S2B9/uqGL8antU3OXhoX4FZIYxsey4WcWbNy+EZBZ2ffPDi86ea1fmci5nh24O0ilSY4i27J2n5uwajLovHroKzBDP8kuUldn78NIO8thJ/wLmPAKpEipo7CHddgMksp4tlDH4Oeju0720qeSk4iQLonk+QvZg== 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=tf//gfUGWFOBY3xUbfvtIov3BbZEJF1GsUoCrrsHSbs=; b=hxyaSkpYgSEcXLF1EGs9KvPxZUza22cyRBxLOIoaUkVsQbDVQEBD68Cqn7edeJwoYPPwCByFA2ZEi9884i0G9n8Ga0C07AgXmuX4dIMYT1AHxQ0nYn2+VRaLTyWxrntSUaH5WbTLAyOKrL6COYU4BfEfpqbyEAZdPj3N8EqhEGyB5rsNsj9kpJfTC1kPfFIU4/39kCToRQkz54Pmr24H6BwdN0tQymC7ebSdq1yursr3P9x0PBfOMd+VxWWCqtB/a+NNkFUXzKwumuU3Q4EHEUu49+zPKQ35esbMW+ebnbD6Niycf/7gNkm8xWze3eamxpEu5pjinebfUaL21HwNaQ== 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 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 HE1PR0401MB2569.eurprd04.prod.outlook.com (2603:10a6:3:7c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 03:30:27 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4867.011; Mon, 10 Jan 2022 03:30:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 2/7] mptcp: add clear_flags in pm_netlink Date: Mon, 10 Jan 2022 11:30:00 +0800 Message-ID: <0132f80c0aa9f62deb00c816dab5d51d4032afb1.1641785106.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0139.apcprd02.prod.outlook.com (2603:1096:202:16::23) 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: 2f1bcef7-7cc2-4cc7-6184-08d9d3e98ba1 X-MS-TrafficTypeDiagnostic: HE1PR0401MB2569:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1824; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pKZWm3BaaERDDUfPVHUVqakbHa13D8l20QXwAedIEh5FdUvIXFvhWSRFJrF5DgliDIGqf46j/Wcmf2XDtA6+f2Um4HfY69fojMUGz7ccKVIUig6W8YHO1Yi6kx5j82OPpRXQU+Cuc17efDYHB9hVTrRM4tLhtzt0tRlRvrUM7CvtLtBeEsN3LpeyQsmvDgPuozTSW+BncHrMlkO0UtSiZ2zwvjdiFJieVMgrgQr1/8wQ5C0lml8imavSpf9AoKcx2yRw1FpcvYcg6TYRfGuqCq224S7YwFhXl8pu39JktR47RbI/nylG/xkzZ5UFnh2f/F+oXjZxYyBJyTvOcoIrmN5OHZ2MiCoP4kF1PTnlpxrR5bdnf39xvxZN/Az8PKzuBAJVmc0HupDQaev5fIjdAPV/hehZGZEgmo/xtQe6OSuse6M6LoTZTCRWkgR9lwj1aFaKOhhomdUM18xfs3wy6PwT1OO6bMgjy/bN8dbpasl0JNkI1sxgGOAIYLFnLceO6wLrkHff7T+pNVH4UmWLF5C/kWkVJ1vEoDN3zhZHbN2adyXAJYMX5JrD+AM5Ab+yc2Pc+uc1APkquX6Qw92D3SdJBD5uDprG/a9BD09LM7exzo0OSt5BlqvDQkBvFEj3EPzEDYX4+Ly9EjonvSMFHA== 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:(366004)(5660300002)(6506007)(66476007)(83380400001)(66556008)(6486002)(66946007)(8676002)(107886003)(44832011)(38100700002)(6512007)(2616005)(2906002)(508600001)(8936002)(316002)(26005)(55236004)(86362001)(186003)(6666004)(36756003)(6916009)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4ryLXJjJ6B6hgju/6jnvSvfz17e9zIpp03BEQNDvQOCeKE/p4C7ESbeBE3kN?= =?us-ascii?Q?0i7lvG5u+ToqmFyAErq3x8Sz2T6lpLlpGq15jsCzxz3tVeXpw1VeLNt9LE8p?= =?us-ascii?Q?b6Es614hnJGrZVf/GsR6pfSyM6esVDlwKP+GjaacW/NwZASbGgAsR+T6/KQJ?= =?us-ascii?Q?TUQ9KViG9T/Kb0fMGN5JTseu3CnsWS08AKqlMhW5OpYMwXT48eCDTYz84UVh?= =?us-ascii?Q?OssQ2UYYKB/w1I0WiOvImQ2wDz6htjb6I5I+oj6TOhePxlVd+6qWAaHQrU1U?= =?us-ascii?Q?P77jdhIjE7tv+f/TIhxTQL6pNQ7fROhiSJ1y454F2cXVUyJgG9/6yIRl0AB9?= =?us-ascii?Q?XS64iqbOo865boFdT2JDPuK0JJi/PxTEFtN+jMsr+6Pe1dj1ngZpklN0ibfu?= =?us-ascii?Q?q8rQsPaSbTA5ubWhgIPwHd1X6VCilP6pEGMyFBIrIqk1w9pvlLGnhXD5fvAp?= =?us-ascii?Q?2iPJqpp3HX4VNe6lkwENkIpkgtupBigzJGpW4t+I3qr7AtmBB2ZFMboB3nBS?= =?us-ascii?Q?lDa6nbZbqUD2xWHJrKMCylfd6RrOPATFQfpiAnPY3R+923Stt2jOws9670OY?= =?us-ascii?Q?imwtSxFTu3K2SLKW+Lii9Yb+0WwiIg/24tWaECBe9zkSJDjYf3nx3JxuvrBB?= =?us-ascii?Q?71HT8yBhNJ1TYhL8yYQ+acumB/rPziH25Jr5H/C3Rh5a8Q37fVYkWLvFl+Zx?= =?us-ascii?Q?eN3jUAQAQFuV/40vqgHIGRrKCEGL18CofbqeSVe3vWV1VZ7ugg3RwIVqDMgq?= =?us-ascii?Q?fXemC0Mr7N3dERSWyf2hGyImf/pW44BoeZl29RtqkjiFMcDqttIO+/uvCWBO?= =?us-ascii?Q?l2r75HRhE0Tnz+6clxkKxqRQEpcv6Pzg8s45yNBLy0HGF3U17AXO2OgG4S4q?= =?us-ascii?Q?E9rGuIaG4P3/erIhNFG8E/8p57Hwy0Mgaavn/IrIkBE1uHgc65EhGfL4oCaQ?= =?us-ascii?Q?NVCbVorNAMTVNT85kySqvYRDUW/YeaxSGx8gG4MzAyAQy1tsBvCcbEufebIl?= =?us-ascii?Q?4KSCE6BMOrJn9054GQmXm+cBnoLsUoFEBAwQ2kaSBxK4/SU3fGkTpgBdAVrw?= =?us-ascii?Q?XZlVS0X7AC+MFSTSNDK3KsJpDZtV5TdRD2E7E1G9nFsHrFpmRkkUsvMc49GQ?= =?us-ascii?Q?TDLdZu0NVho0hPTolHKf0bwHD5LQ3bMb6rMSQG/ew0RbEEBMm4Euk4UNkhA0?= =?us-ascii?Q?9b2J5wROnhmNvnKBBjs6QKvIdWFKAKYKe14dwe0Um1kdbWaeN5jpKpxXZ0NN?= =?us-ascii?Q?vY2CN9rMu/qSQOZADO4YTpkP0UMyJxN0/4X3kdTDedVY3//jotdudq+t9ZhU?= =?us-ascii?Q?oDWiGJ6KuokmGXVGI7cebsEM3TJgtrbY4r5ICz8ZRR9YNmlUtn6CVtZ3FfwI?= =?us-ascii?Q?slf3E4ilGi9mVGfKGrLsGYCQX0sD3iUgEQPNSvL6DloCShdc2DkYuB+es8nG?= =?us-ascii?Q?ekem6uQZ4IfLhO4FNAbMm5/+UgLoIqTqq56iAg+3KRgOZ2+XX/ZrCDnsuzjM?= =?us-ascii?Q?CAvdShDyzs22iTHgI3A3HSejxlFt3qsAI04pTeDI/2gnIzC3qerlHgS5E8Pq?= =?us-ascii?Q?ECDySKw5E0A0dFtEdvMhwzWIhZKvW2/Qr+XWwxLnJ4tLUwR3aICaB3rFi3/f?= =?us-ascii?Q?3W9FDYVH6uER7wGquEjpWDc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2f1bcef7-7cc2-4cc7-6184-08d9d3e98ba1 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 03:30:27.5898 (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: aeYw6MldQaG9+egep+WQKofZglllZ4Ebtu57uIigDjipd7UP528CdpKqQOtBitxjpuwJopIBRU0rE0WvSlG4nw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2569 Content-Type: text/plain; charset="utf-8" Splite set_flags() into two parts, set_flags() and clear_flags(), make it easy to add new flags to set or clear. This patch added a new PM command MPTCP_PM_CMD_CLEAR_FLAGS, and a new function mptcp_nl_cmd_clear_flags(). Signed-off-by: Geliang Tang --- include/uapi/linux/mptcp.h | 1 + net/mptcp/pm_netlink.c | 36 ++++++++++++++++++++++++++---------- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index f106a3941cdf..1ca9b13c2ed0 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -92,6 +92,7 @@ enum { MPTCP_PM_CMD_SET_LIMITS, MPTCP_PM_CMD_GET_LIMITS, MPTCP_PM_CMD_SET_FLAGS, + MPTCP_PM_CMD_CLEAR_FLAGS, =20 __MPTCP_PM_CMD_AFTER_LAST }; diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 47ad00d01cf2..da1bef34e8e6 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1736,21 +1736,21 @@ static int mptcp_nl_addr_backup(struct net *net, return ret; } =20 -static int mptcp_nl_cmd_set_flags(struct sk_buff *skb, struct genl_info *i= nfo) +static int __mptcp_nl_cmd_set_flags(struct sk_buff *skb, + struct genl_info *info, + int clear_flags) { struct mptcp_pm_addr_entry addr =3D { .addr =3D { .family =3D AF_UNSPEC }= , }, *entry; struct nlattr *attr =3D info->attrs[MPTCP_PM_ATTR_ADDR]; struct pm_nl_pernet *pernet =3D genl_info_pm_nl(info); struct net *net =3D sock_net(skb->sk); - u8 bkup =3D 0, lookup_by_id =3D 0; + u8 lookup_by_id =3D 0; int ret; =20 ret =3D mptcp_pm_parse_addr(attr, info, false, &addr); if (ret < 0) return ret; =20 - if (addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP) - bkup =3D 1; if (addr.addr.family =3D=3D AF_UNSPEC) { lookup_by_id =3D 1; if (!addr.addr.id) @@ -1760,18 +1760,29 @@ static int mptcp_nl_cmd_set_flags(struct sk_buff *s= kb, struct genl_info *info) list_for_each_entry(entry, &pernet->local_addr_list, list) { if ((!lookup_by_id && addresses_equal(&entry->addr, &addr.addr, true)) || (lookup_by_id && entry->addr.id =3D=3D addr.addr.id)) { - mptcp_nl_addr_backup(net, &entry->addr, bkup); - - if (bkup) - entry->flags |=3D MPTCP_PM_ADDR_FLAG_BACKUP; - else - entry->flags &=3D ~MPTCP_PM_ADDR_FLAG_BACKUP; + if (addr.flags & MPTCP_PM_ADDR_FLAG_BACKUP) { + mptcp_nl_addr_backup(net, &entry->addr, !clear_flags); + if (clear_flags) + entry->flags &=3D ~MPTCP_PM_ADDR_FLAG_BACKUP; + else + entry->flags |=3D MPTCP_PM_ADDR_FLAG_BACKUP; + } } } =20 return 0; } =20 +static int mptcp_nl_cmd_set_flags(struct sk_buff *skb, struct genl_info *i= nfo) +{ + return __mptcp_nl_cmd_set_flags(skb, info, 0); +} + +static int mptcp_nl_cmd_clear_flags(struct sk_buff *skb, struct genl_info = *info) +{ + return __mptcp_nl_cmd_set_flags(skb, info, 1); +} + static void mptcp_nl_mcast_send(struct net *net, struct sk_buff *nlskb, gf= p_t gfp) { genlmsg_multicast_netns(&mptcp_genl_family, net, @@ -2074,6 +2085,11 @@ static const struct genl_small_ops mptcp_pm_ops[] = =3D { .doit =3D mptcp_nl_cmd_set_flags, .flags =3D GENL_ADMIN_PERM, }, + { + .cmd =3D MPTCP_PM_CMD_CLEAR_FLAGS, + .doit =3D mptcp_nl_cmd_clear_flags, + .flags =3D GENL_ADMIN_PERM, + }, }; =20 static struct genl_family mptcp_genl_family __ro_after_init =3D { --=20 2.31.1 From nobody Thu Apr 25 01:49:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2281096jap; Sun, 9 Jan 2022 19:30:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJwZJq/mduYyxsFfcgImisTtd+d4Zxq4zak1vhraBmzWFmAFdSIFHj0BrdmnBtAEGDFrJ2za X-Received: by 2002:a05:622a:352:: with SMTP id r18mr6720657qtw.78.1641785441644; Sun, 09 Jan 2022 19:30:41 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id c19si2201633qtc.153.2022.01.09.19.30.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Jan 2022 19:30:41 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2999-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=EQEqn8E7; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-2999-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2999-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE 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 ewr.edge.kernel.org (Postfix) with ESMTPS id 654DF1C0BDE for ; Mon, 10 Jan 2022 03:30:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E44072CA3; Mon, 10 Jan 2022 03:30:39 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 B9C552CA2 for ; Mon, 10 Jan 2022 03:30:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641785437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=i2tc+66KT33GCVYP8G+PwNx6zoVgWOK1ifukrcVW/7Q=; b=EQEqn8E735s+bcvTEL+nPasRbTzGAvQdFjiyaxS2rJ3iYEHTqCGbArIh2MGv4oVx9Hf45w t6pPnl6gwN4waJ6zLUtx2t9vITS6eg6ogRMDMHgWBwtv9cxbv7uqkiESfu5AqqkhSP5X73 Y4FWraxSojwWKMDb75Z4jgXBeq8Pelc= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2109.outbound.protection.outlook.com [104.47.18.109]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-25-CJPq7SPTPDa50GnZZVmUtA-1; Mon, 10 Jan 2022 04:30:36 +0100 X-MC-Unique: CJPq7SPTPDa50GnZZVmUtA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LzWB4s24bB9cytfYh6LLigr4prWGULcRQ84VAKoRzN3TFMhD3PMIkTTLxSXXnTtuB87k1yLbMudNCmZ/rH5WlM7teVsgwT/3Xd2cVixHCX7prv5DP19Oq8AatyK1NeaepeUQC0nA2saGtlUzfuRSLJh6TBQ7IWCXC4+qdfj7fZR34NEiG1P3z44L2BNg4ROQfGbM6PgqjvL9WxA5LGpEJ19wQQg9xOBT5RyCfQOEcIjUmEs5ol0NEsQpJ4M6WSeSqhcrvTohKItj3LRGuSe0ldhqfzjb1+cXJ1puNjA8+e03EwvoQ1eKpDycA5Ozvycea4sX87+eZBV16VOuzmyNWQ== 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=4axp9dHSMGDB6fPMaLETwbyUfpUE40ILeaW5EKXROBQ=; b=X73F1BPvRF2hY0RsZcYB0YzKkd5+RbzsOw8EEPlotIZa4rM7x6LqITHE/tWavXI40QFiyddj12Jx/PAPggshQI23LOmy6eCyThhLB6ITSGRmcIydQh8WW1PktymxeymnyqQxGrBQ5gIA/dO36/o3fD8e8paivFf8bgVDs478s8IEW/ojTJMAPg2TpnCcNQsf1VwkF3vmuVGpkHtj/Lue3I6uKxsYGJke6QapzWAW+6RH5HFA6uJt0vw9Esr5lGr/+EIgzcHUAzWTj4NFbHiWNvfHTABGRWT+y+wQAOgUAupa4q3Cnr3koK4hkZv1QFejyTPoPxuyCT5cI9oowWvs9w== 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 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 HE1PR0401MB2569.eurprd04.prod.outlook.com (2603:10a6:3:7c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 03:30:35 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4867.011; Mon, 10 Jan 2022 03:30:35 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 3/7] selftests: mptcp: add clear_flags in pm_nl_ctl Date: Mon, 10 Jan 2022 11:30:01 +0800 Message-ID: <13ad22762471ff0b8e10fb4c2eca39c106f80a0f.1641785106.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR02CA0135.apcprd02.prod.outlook.com (2603:1096:202:16::19) 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: ebfc104a-03dc-425c-9c37-08d9d3e99044 X-MS-TrafficTypeDiagnostic: HE1PR0401MB2569:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CL9fs4YjBIP7sslOX0d5PZ1wuwnMclBapDrrvuNHaLVdmOZf1pbyh5zQgRy5a44Sk13BwEmY7RvRpnIkMiyOfz8qFSN4RbAowlPojLi2HTuKWlA5wlJABnYpiW7t7cWgBkCc6Hqen3hINmYlxamQEj83WBp4tEpodTqpbUM0BlzJp28JlSYuQBSneenc92ykSXv7F0YPGT/lxnRD0FooECQFWc7gmrLu5SPgEgWi6eaAbLrx2bZyIcvc+hDVhYRM50+uSnA0Vk3otesiGAE9C/KLf9LiAWKg3XCUQzIGQ6H0PQRWqmhiMpduDzXGIi7kcUUnC37XWlm6v1KHMbddOZzrNIoMkEKn3Ic42O/pPYK329BXSXijXaBSzhdGunQkmm4hjRnDYgkk4gw2VeWhKWNGiOY/RfgRQWfEzEK0NrUa6A3iFVvwZO6xCLl83qGybaDiSvW3DY2t3q5J7TjzlMou+27ZFEq3n/eofNfjtmWfTOTV96+zsdg/D17FIRILCmW+GvOfrrUHOhlODCf5UHXH4fD1G4KDGlo2zPwXxNz1JBmcPIJbH+02AZuTBc73TJOfSFhYZFIZ+Nbh564xJsxxQ5xXyy3spLk+vOUAgzF6jfglOFOmyo/9SUcphik31833LMnaLGgPtUBirAkHcw== 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:(366004)(5660300002)(6506007)(66476007)(83380400001)(66556008)(6486002)(66946007)(8676002)(107886003)(44832011)(38100700002)(6512007)(2616005)(2906002)(508600001)(8936002)(316002)(26005)(55236004)(86362001)(186003)(6666004)(36756003)(6916009)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?wtNDTLwLTcTRClvlriDAQ1pae0fI40NvXN24v6uQFe6tzvodfr+JWOF1vz8G?= =?us-ascii?Q?lO8Ga1g/7epetZWuxVHH+o+aWk6ePr5bd3Jmgo/jIgRSL9xNPvTDh0BCytvd?= =?us-ascii?Q?tYCN55ro/W1siTtCjmXh0aZS0pPM+RGSch5cvNVnHeN9fs81dGm/Ro19akLF?= =?us-ascii?Q?bzztPOF9GapAeYMwoiFt6o7UOQBWY79qMUiQFy+dYgYiX1hGhIhkHEEGuyrm?= =?us-ascii?Q?VwOgtuavRJkNaVZ8eFXcVcdcQT4FLh6achEZYZ/Wggly//ozntDi9okKpxQS?= =?us-ascii?Q?HOMSVa5kgcozah7anw6fugq4+h1dRaZJTOTopWHfcSUsyvSoVvfhucuVh2D9?= =?us-ascii?Q?dgILpQiywcQkOv6oZSuChGurimYxDIUJFf4B/J99ZogqPEZq4mtmaNxGSC40?= =?us-ascii?Q?UNQGjke6gl73eflZ9c/Sx+JdcABaegMqQ5L5NfB/WdevoGQom0124Tgw4W6C?= =?us-ascii?Q?wlByXF1l+EavIghYTKbH2SRwhJhmQ1v9XqBO1SFEg0lB+Fq1NAukwFP+6fjg?= =?us-ascii?Q?MIw1I1pYAwHeU2NQuobDZLaucOLzbh1JtNTNX87pWGNr/k4+vFtPcSTCWbVg?= =?us-ascii?Q?m6oOSXK8zimoif7RdI8C+GRPRuhbqBY1LX3qL9k/e5ryzVKjlciH8L0W0KSK?= =?us-ascii?Q?J17/mT6iCYY72gmKENtBq9JwGwLEU1rFEf3awdCFeuq+Zq9Mq4LZFgtc3zOG?= =?us-ascii?Q?sSbGRvttn0QqguUjNM4YahEYWDad60YVHzAe/9uKfGJAcSMFdt84vv4psqbs?= =?us-ascii?Q?xy14L+3KbBNs18/6mob0NvFu9bS6IfMKMqWowX19e1e+d6LC7wMFcGuUQ7Ch?= =?us-ascii?Q?dc7sbZbNHLDj57A42CaqhFmPBik89nVMbqPWW16XVtu7u4LKgubb5j1fhBao?= =?us-ascii?Q?nWM8Av1LTLrLoYdX5vqFoCAeWHvUhzoNCMjXFqc/7ILnB7vsAE6wc0/7YCkX?= =?us-ascii?Q?rCQzUOu6WPzrFgfFuHWWcbIVCcHR9KEEVwYExCjHT54dhUtf9nPqZORr90IH?= =?us-ascii?Q?drcCwcops0uhvfzU4ps2f+8002I1Mq8xNpB2hwo+QY4wHtRowZb2lGrtHmvw?= =?us-ascii?Q?eAr7IqAYGWzBHR0cB/jyQ4YSOJ1beX1nQiR+Uf2o50JGe/5c/6PmYq6ZAU75?= =?us-ascii?Q?NpEGY7WLWsf1X0JDV98Ro2YIuBdkT55uHGZNdNw3it0cqr988JzshillmuwM?= =?us-ascii?Q?ehTb9NuxcXecn7aw2L0uaCphOQQ8sf9Ob99bRXiwSRnn/UG0rPvQRVg8gbIH?= =?us-ascii?Q?cjLUVgOcmU/tyjhYFEZ+MM9hktTzHvQMANQKnbtnUYug/5rjEZ7pLu95o/G9?= =?us-ascii?Q?P0y/5+DiGcvCD08wpE5wKCXSermXhqIWxs2W1k+ML0aRuKrsNNHnumWsyT+3?= =?us-ascii?Q?I5unDL/3RCgYWVF38Cap9Gkmk3gi27Cjce8sbhCQxXWTaGYs17RkzAYrp+u/?= =?us-ascii?Q?cSYL3/pvcQW5dHUisFdwTWREqh+pZDVyXvtuCdLTlusjMnsz/EPnMGTEXyaq?= =?us-ascii?Q?yYxVZ+7yc62BxhqMfISxKLPFb13HXNQUMzb5NOmgTohpnNRBp/+ClwHj0sNz?= =?us-ascii?Q?Raau+p7MoqQtYINvePPhLHupsTYPmOZB0MsvMWv/09mw43e83ZlXk4b2/5YO?= =?us-ascii?Q?zxBjDT/ajxqVAQFXkFmPhpc=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ebfc104a-03dc-425c-9c37-08d9d3e99044 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 03:30:35.1673 (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: pHdhfo/uSkkvnCnVHGvBx0liLwUVzvzBvi1JbsT6m0/JbEL+gu6BwJYsijxz87A+ElN3VOgsen7Y2mLZwR0Lfg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2569 Content-Type: text/plain; charset="utf-8" This patch added 'clear' command for pm_nl_ctl, to replace the command 'pm_nl_ctl set ip flags nobackup' with 'pm_nl_ctl clear ip flags backup'. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index 354784512748..85ca37e4b34c 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -28,7 +28,8 @@ static void syntax(char *argv[]) fprintf(stderr, "\tadd [flags signal|subflow|backup|fullmesh] [id ] [= dev ] \n"); fprintf(stderr, "\tdel []\n"); fprintf(stderr, "\tget \n"); - fprintf(stderr, "\tset [flags backup|nobackup]\n"); + fprintf(stderr, "\tset [flags backup]\n"); + fprintf(stderr, "\tclear [flags backup]\n"); fprintf(stderr, "\tflush\n"); fprintf(stderr, "\tdump\n"); fprintf(stderr, "\tlimits [ ]\n"); @@ -647,7 +648,7 @@ int get_set_limits(int fd, int pm_family, int argc, cha= r *argv[]) return 0; } =20 -int set_flags(int fd, int pm_family, int argc, char *argv[]) +int set_flags(int fd, int pm_family, int clear_flags, int argc, char *argv= []) { char data[NLMSG_ALIGN(sizeof(struct nlmsghdr)) + NLMSG_ALIGN(sizeof(struct genlmsghdr)) + @@ -662,7 +663,8 @@ int set_flags(int fd, int pm_family, int argc, char *ar= gv[]) =20 memset(data, 0, sizeof(data)); nh =3D (void *)data; - off =3D init_genl_req(data, pm_family, MPTCP_PM_CMD_SET_FLAGS, + off =3D init_genl_req(data, pm_family, + clear_flags ? MPTCP_PM_CMD_CLEAR_FLAGS : MPTCP_PM_CMD_SET_FLAGS, MPTCP_PM_VER); =20 if (argc < 3) @@ -755,7 +757,9 @@ int main(int argc, char *argv[]) else if (!strcmp(argv[1], "limits")) return get_set_limits(fd, pm_family, argc, argv); else if (!strcmp(argv[1], "set")) - return set_flags(fd, pm_family, argc, argv); + return set_flags(fd, pm_family, 0, argc, argv); + else if (!strcmp(argv[1], "clear")) + return set_flags(fd, pm_family, 1, argc, argv); =20 fprintf(stderr, "unknown sub-command: %s", argv[1]); syntax(argv); --=20 2.31.1 From nobody Thu Apr 25 01:49:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2281169jap; Sun, 9 Jan 2022 19:30:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJxcIt94TA1BE0jjD7XDEHo/g/1SD4zbJKwPiIzJZPHLGxx1TYt2zJenr7AfUtCpjP+YowPQ X-Received: by 2002:a05:6214:dcf:: with SMTP id 15mr66700172qvt.47.1641785449585; Sun, 09 Jan 2022 19:30:49 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id g6si1919791qvt.119.2022.01.09.19.30.49 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Jan 2022 19:30:49 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3000-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=CBHOrT3S; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3000-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3000-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE 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 ewr.edge.kernel.org (Postfix) with ESMTPS id 3419E1C0DD5 for ; Mon, 10 Jan 2022 03:30:49 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B8D2B2CA2; Mon, 10 Jan 2022 03:30:47 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 4F983173 for ; Mon, 10 Jan 2022 03:30:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641785444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hdUxTxTriFY0q9foxoKdNLMxFVzuwMMxraHJPFPVAl4=; b=CBHOrT3SuWlafkbSYO7+YeAL83KDvKYZgjXwbEGQ8mx+UZWH/9ehJy0ZiRIcLchBLS8NYu OJyOkMcp+6Kqnr4a9N0pkfaQwIZnB5mDwqvxAa3274XPMhGcxHpYp/syRXHHd2Rb/pDook 9424+9cMKYl6XAB/ilpDXR0UNfocj3A= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2105.outbound.protection.outlook.com [104.47.18.105]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-29-VBKabdjzO4WGkxW_x_yUeQ-1; Mon, 10 Jan 2022 04:30:43 +0100 X-MC-Unique: VBKabdjzO4WGkxW_x_yUeQ-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GT+r2EcK3sI44Jeb1DKcxc0WCqisNknUCSPU9fl5r65Y7YVA4NKVyrHDp83AlP1IGwcdTQiZLxalajfedIDU1R9kIy2kSZaHMHeVCmyCK1gEOBQGoVL4guCNVKlBS4QGQacKmNtqHDCYGkn7cvkcwcgl+EQW2B/RxrYXeaxV6iVDp87O93tOk/Tf7yjcw4GzV0QqB7wcjli+ThXqYKqycMd0lvUOGzA1dR97TgxkrBQwb+0lhWJ+qm1cpg20mKecDb+Z/Mxn55AtPwFWuly0pGCn//ew58OXdRT9vL1uSIvcXduI7Vxa8SvAnlwJd2X6qdncD9PLIel/giJbaJqDhQ== 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=nyQ6WyScsbCpxUtMvIl3UMi7fwCGOX+QsfqVwdJAeLI=; b=fWX9SlgGtxXgADYtVjD8keecusO7c4Jhp4z0hHB9Uudt1+OiMNDbn6yE/YwJwOzJRDQIfgqqW8ppVrGwghnrfl0a6v80gwo454PUkY8tmg5/wX95zOdG/DfvFInDcXGuTzOGf/J+Yu6SaPuvw7Hc88J+N4vtoqeJFOSh3FyNGno6mFk3Mpy2OxhPBHqOJckSKTDWyEreBm7I1d4VnHCOSwKFbr9CGuYj2zWUCRVaC6ynbXaZnefs8qq2x3+BiuWyVcuZCKm1zh44EoiTOPRSHtNZK4V5NzLPr+ntkeuMua2gjSEu+osWiy46rNSPUaiLiUjl9jQ01H2B8qiv6eiyWQ== 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 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 HE1PR0401MB2569.eurprd04.prod.outlook.com (2603:10a6:3:7c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 03:30:42 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4867.011; Mon, 10 Jan 2022 03:30:42 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 4/7] selftests: mptcp: add clear_flags in mptcp_join.sh Date: Mon, 10 Jan 2022 11:30:02 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR0401CA0001.apcprd04.prod.outlook.com (2603:1096:3:1::11) 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: 1d3b99ef-f008-47f5-53e2-08d9d3e99481 X-MS-TrafficTypeDiagnostic: HE1PR0401MB2569:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bYtZd2ix90O6t5y0Qha0l2BLv2q9LqT/8JTZy+iAA+IOg/fjZG/vVmfDMC0dJkt79wHvgttLezBJEfKBgwjElk3JlyecgvTITfRpI9BEwHjZbOi3DOujk7p6xOaOZ++KK5Kp7kgUhgrO1n49R6Eww6FQFPX+l2TeZrWO4TMOReBshiKQ0epshLTalyr09XU3PrCutO1W4fx/H0TmFFSVgpQ5ni4Jh+MKOgucuPOzzbGXI50ffRzJLpWo9GTrOfn64U5h3HgEw9gbC//TJAOKgujziVTRZ7PTm8WEe6+F0pqvp+kG/ay3YdZSND+7lxLGV+xbvskuGdc9BN+cMTaIxuYFFr+HGoR6uQZre682Q/Mpe2TDz4oqYaQDcWXS+QWkTAAkJEuHwO5bNgIyN10/XrNafwStsjuf83297lZmNAXYceZEVyMKOjJL0AebsVD2xLwPlH6oQusB0IMtxZ7REmprfjaWqWeABJ9h6IQI1O0B0Ua5OGJ9IRcq8jVYxjsNdspZsB6akJbk8a7U9jqskkrYFhi0wZfoQQJtDSrpVJntGyoBecdLmOOJeSJx7y0qtOrtlfEd01yRhATa88ik8/ilyOml/X2nxMd7EWCr1ZY0qdG03x16GX0ioppm33rg75o/Yp/3kbvHmU0g1qjQIQ== 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:(366004)(5660300002)(6506007)(66476007)(83380400001)(66556008)(6486002)(66946007)(8676002)(107886003)(44832011)(38100700002)(6512007)(2616005)(2906002)(508600001)(8936002)(316002)(26005)(55236004)(86362001)(186003)(6666004)(36756003)(6916009)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gOihoShVg330NtHkHxds67NKSwiOErcqTB6SMdzLiNicoJsqKbPT8nOlEX25?= =?us-ascii?Q?3i9oUu48Iyr1tzWUoiSzXv6dhzANLHSIVerGFIM8fjAEBJZI4Y/I4tZvhJ/s?= =?us-ascii?Q?/tsoofJ0S1jsNc1oyxJ+I8XO3exhN83oGzLTWbLZcvybuTQ1i/T16JdD9wiV?= =?us-ascii?Q?0d7ijrGexlxZ8mjq/AA7UarVS7p8uJIiyQbfp0sALYwhAewzuo0BhOhFRZya?= =?us-ascii?Q?iHZM9lgDscnG/eT4Cl5hx8ErLoMel65+DCezu/9AiFYHLkjXLcXNv8WhKyl4?= =?us-ascii?Q?ODS8B3j9waytX61EbhRWQCDm7pc8+3ILOsGHOnhi/0UbIf6y1EW2U9IhX0kD?= =?us-ascii?Q?y2xFm8QR7VT2GwfhFWPddP5MIEiEfEmhtGRs8aFWfEAEK5/36YIJJLzCWqQt?= =?us-ascii?Q?6xF/vzaHxvwB/kLgW8KnJdjnf3jrZHVZAEw3AItq3pOsV6ydIavISoJ2ALvW?= =?us-ascii?Q?LgiBH/+v73F3aJ6h3DtIeyAqvCb32NW6tMLcakGlj9mgeWgXancaMsuG4IG7?= =?us-ascii?Q?NecbFa3437I/4MtQ0nWS8sRbKpynxuIk4MaoLw2QvdbuHZSx+ixpYuMwYfRu?= =?us-ascii?Q?aT7NNgXOzWATBLbEq/LQTS2sj/INsX4fu6AXxyZjqLFU9OMRN317BNEq219f?= =?us-ascii?Q?H+tsNF+AMpODR2wgKNs6bmz1W2v2B6jLapLYnsY2aalbcGA0NJTSPfOXyemf?= =?us-ascii?Q?eQa5qhHRtxxcdbbRonZNW6aUNLmcE2dEaoIP3vKl2soPVZBqRi0kQOHnqjj9?= =?us-ascii?Q?am4HcOTDb5105XI1hI3JjseWzWrJMTypgJ87jdYEvhD7fCF2j9fb9QzbIxS8?= =?us-ascii?Q?/GcNFQtW/3OWolMTKHsti55m7ZAgxjem3q3iIi+8WuviAFq6L8j729kYS1sc?= =?us-ascii?Q?ec0345TFp7SJL4KOLCjCTMto76XO2VZQzK4JdRwsHO7O1I/gyij5HEytCvs9?= =?us-ascii?Q?UA3YErM59mT1XOqR3bczCDnliHNn7n9C+rdZmirHbk9dIV7mEpvWnFg47zj1?= =?us-ascii?Q?AfgKjrm4YExeo6zPzs49a6PPT+snZ/wUcvM0jBqstcthFS1frV5Wd9jU1o2j?= =?us-ascii?Q?Jfo/L9u6KYTbmILSsoqc/K4hJvhTYFOphj1ZGNNVXU1Xq+WHT6irSMyGJIc+?= =?us-ascii?Q?D/J9UkmDo/dB+ptvghxwLwHuBPo+DslClG0ao/eHjvnJoV4wPTiHPjxOWeTQ?= =?us-ascii?Q?moYgb4+lTEh7Xi1XsWBFffTdVVW3797j2nIBcN6Zu4ERS64WgAGltVu2f1N6?= =?us-ascii?Q?T2IHEM94KF6PVr5fqeAuZQQemVjPlvDw2esIRVQpWudvnu+sPaWLVZOTrNZY?= =?us-ascii?Q?8OB4NG5g4lYRVR4zGxA/VzNDZTOjVHx0NRhFZxGAEv6Xn9YUiH9Yz5SfovY9?= =?us-ascii?Q?gM+MPsD9bF6piH5QJ6001/KQWyVZ6c5LeZ8WMTpwj961apeI3lf0Iq5q07Lh?= =?us-ascii?Q?+0ERk2jBKWet4efG+bLpjIp4chR3UOnWWMJKd8gGy7oKfdHgLpSpLnmApv8e?= =?us-ascii?Q?fCB/5PbLDbvp0DDu+7mTPPxB+97FxEc1Hw2SFNEURKBUd5tAtfsOYsRB6TYs?= =?us-ascii?Q?h1eMjUnT2m66LtpoGfIvD1E+N0b8EsysdKqu4yH7tAatQuPKXnJpTAxsmcsk?= =?us-ascii?Q?sL+0kPBTGlI3RTH9sH8Rj4Y=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1d3b99ef-f008-47f5-53e2-08d9d3e99481 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 03:30:42.3386 (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: zhSdGLbkdmwIoi2dLFlMhJrWG5OO8zWBk6ffPDAOyrBjlheJrpysEJKYJx9oMKrvCd5uwDb9802CnpCWep/yTQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2569 Content-Type: text/plain; charset="utf-8" This patch changed the command 'pm_nl_ctl set $addr flags nobackup' to 'pm_nl_ctl clear $addr flags backup', and renamed bkup to setflags. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index e48ce23d2386..7dbd36c558cd 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -289,7 +289,7 @@ do_transfer() addr_nr_ns1=3D"$7" addr_nr_ns2=3D"$8" speed=3D"$9" - bkup=3D"${10}" + setflags=3D"${10}" =20 port=3D$((10000+$TEST_COUNT)) TEST_COUNT=3D$((TEST_COUNT+1)) @@ -461,14 +461,20 @@ do_transfer() fi fi =20 - if [ ! -z $bkup ]; then + if [ ! -z $setflags ]; then sleep 1 for netns in "$ns1" "$ns2"; do dump=3D(`ip netns exec $netns ./pm_nl_ctl dump`) if [ ${#dump[@]} -gt 0 ]; then addr=3D${dump[${#dump[@]} - 1]} - backup=3D"ip netns exec $netns ./pm_nl_ctl set $addr flags $bkup" - $backup + if [ $setflags =3D "backup" ]; then + cmd=3Dset + flags=3Dbackup + elif [ $setflags =3D "nobackup" ]; then + cmd=3Dclear + flags=3Dbackup + fi + ip netns exec $netns ./pm_nl_ctl $cmd $addr flags $flags fi done fi @@ -545,7 +551,7 @@ run_tests() addr_nr_ns1=3D"${5:-0}" addr_nr_ns2=3D"${6:-0}" speed=3D"${7:-fast}" - bkup=3D"${8:-""}" + setflags=3D"${8:-""}" lret=3D0 oldin=3D"" =20 @@ -574,7 +580,7 @@ run_tests() fi =20 do_transfer ${listener_ns} ${connector_ns} MPTCP MPTCP ${connect_addr} \ - ${test_linkfail} ${addr_nr_ns1} ${addr_nr_ns2} ${speed} ${bkup} + ${test_linkfail} ${addr_nr_ns1} ${addr_nr_ns2} ${speed} ${setflags} lret=3D$? } =20 --=20 2.31.1 From nobody Thu Apr 25 01:49:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2281219jap; Sun, 9 Jan 2022 19:30:57 -0800 (PST) X-Google-Smtp-Source: ABdhPJz7/Hi2OhzgRr09fMJsXRErwOvHbXRk52XogaNGCfYUXLEn8KP1YgqhDIbQNJt43+Er3g0G X-Received: by 2002:ad4:5e88:: with SMTP id jl8mr28484946qvb.90.1641785457024; Sun, 09 Jan 2022 19:30:57 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id i5si2417213qkn.490.2022.01.09.19.30.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Jan 2022 19:30:57 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3001-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=aRUHam4c; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3001-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3001-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE 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 ewr.edge.kernel.org (Postfix) with ESMTPS id B90EA1C0C61 for ; Mon, 10 Jan 2022 03:30:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 82D6B2CA3; Mon, 10 Jan 2022 03:30:55 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 43AFC2CA2 for ; Mon, 10 Jan 2022 03:30:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641785452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hlwJexNV2YJMEp6552AM85uhwEAt5maTJVSSKuDRERY=; b=aRUHam4csYGNRXegIMPmtVsAgdpRoa3qBNLx2+MHDxj+mEWxBRP553w4XUmJ2KZC+o6Eu/ dkEMNBaQCJ/IBVYcxAbvZ1qs0qpJIWrIkRBYexKZUzYwo9wMaqR9bI99/FaqD9H6vxtgMu OOjIWO4++E3DUfedNBNxoE5bHEQkRzM= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2106.outbound.protection.outlook.com [104.47.18.106]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-35-IvSnB6g0O0iGXIvqdS0QhA-1; Mon, 10 Jan 2022 04:30:51 +0100 X-MC-Unique: IvSnB6g0O0iGXIvqdS0QhA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=REiaWWyTXMdw8KpAcgjcuhQe0YaQypTuLQJOsOdXrbeia+mpfOuVXOU/O/yEGOusmggtlhxMfbhtCpdcNvcB8D6R1CCI2mAKyxLtupsk5ZH3r2aqR/Qzwphqs3xXKfT6dRuDzSQC5niwZR297s+SlRRfzxIoIfOM6bSQgZUrpy3cu0qwOB0NFg0uKiFjCvGpj8offQj9EXoeCtMAfpINSN8aKq9TH/FXkSd9dAhxefoxN/Asf12h3HQPav1xlkPyCQqiX+WfZjAM1ksT4FlV2Fjq/P9TjoKpBhREEn1TFyUKZrSPzgNGUH+Wf7MivfjDe7QU+qJVsBBRTrnbux1Bmg== 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=DWXooMOVCedFSl4If7n1Q8Ua7hTopj2zu8IHtBQZiSQ=; b=iKdC+fM2zCkW8ScUBzv3bKR797l72hVgiAdhKQJZCOR/BrFSPI6xPJalKV4F9H0194roowsGMueAyvrzwqe5tkQtWyygO5W4kPBRGU7qFLQKgEsjXOKeyvXNnNfMmsoc0HePusZ+D8YmTYFktEXRIQ1hUxG85pDAm4kWRTW0HTd9gvgl+gwEb7HyrlK6aM/Ed/8LkCAcU7AUecWGj7S2H9mRlubsA6IYQwk4FuUBw78BlukJHL8lbGX3aZs1fwECBDhwSzH3KmHrRsPbqUsjjUIiaGgsF3/OKyKtu91b9rIl2CYjFV8OxD9XExEqYRc1bI6rAGXvGHNql5L8jXmruw== 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 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 HE1PR0401MB2569.eurprd04.prod.outlook.com (2603:10a6:3:7c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 03:30:51 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4867.011; Mon, 10 Jan 2022 03:30:51 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 5/7] mptcp: set fullmesh flag in pm_netlink Date: Mon, 10 Jan 2022 11:30:03 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR0401CA0019.apcprd04.prod.outlook.com (2603:1096:3:1::29) 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: 8f24ece0-6777-4c35-4ae3-08d9d3e999a5 X-MS-TrafficTypeDiagnostic: HE1PR0401MB2569:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Fbymi/ZR6/0pBgF6amyMo0jxhkZRXUzLEUHWHsX5LjBh4zxrV7uOXCJAUc8p18uUGYbWz7W/sIhGO/8FEdtmb2+SVophgs/qKgLJyNry9ud7OjfRhV1pTrgu5xfVrsVwOxJHbu36doFOYUNX7ySb85v/z23bQcg84qNEVZRR3/BKDGRELIqNvQEzg6ddkpx0jtoYf0YVCnhrE87wp+IOo4tQB+ns1Ik+f5ah5zJ9ipXB5d0iHG6NWoEP5cH/VlVqPsvOXsEJOdnYfTnZsF9e/wM08/ehejtEsX9U2vWu7XVGUuZBOy6qV+nTsRFu5X+w5b88RWAiW9ymgGn39nd6upaGEV1VwKPiGnpq/TUv51QElnj4m4h9ER9X4tgNkixngnTC8HhFcydCfhEARKc/UFsLm8XXu1isMtEW0pvR/VKPHR6v5bMNXOB4LXjxEp4kQ4vOYtkueMkELq+eRPKi00w5k3tmBEohGW3gyokeGw4fyQySuEsZajPMdK6Eb0pP4/NwYjwgi+s22GXQRS4di0UheDiTEf0agfTkBePJfdA/yAldpyzAVtUc+FtfEKHPNig5/HfqbfXIBKlN+QJ+grFbmR7saeTzLkDPK7bSsIjNC3lD1WzWhwecFoeQh4u4kjEwnwGErF98VQAYCI84+g== 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:(366004)(5660300002)(6506007)(66476007)(66556008)(6486002)(66946007)(8676002)(107886003)(44832011)(38100700002)(6512007)(2616005)(2906002)(508600001)(8936002)(316002)(26005)(4744005)(55236004)(86362001)(186003)(6666004)(36756003)(6916009)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3qsne1nKZP7tFwC3YCRYS4FjeYvLn1aOGTiOG4lzqLDiTf8HjNe2VDOsLgJ3?= =?us-ascii?Q?wE1tWcbCLgptCMEtpDGOPFpto2rQppyIpmOi7ykOlQLVNGVC4T64HymWy6QI?= =?us-ascii?Q?YvLKNPECsihW2gbIpZ63hHQ90NOgKBLLvovcpCsLFw6VvLmFkXREgPN2pBRC?= =?us-ascii?Q?NYCB7hnZMODTMtNRJeZxkwvgUCxLHsIA6IxugAG7IwKawt69t01iS98I1lKk?= =?us-ascii?Q?UrlvYTnEdix6+Mu9qRQwog3t/Gy6UA9FgYdudpwn2AoAp98sUZkATkKc7T9F?= =?us-ascii?Q?DLzNoOU0zhAXfxdZ8bycLddVuChSCQRpSRafHeDp9EnVlIkf5m9beZFetS8/?= =?us-ascii?Q?QQvhXv/7OB3OePH2Nfg1motdHx5aeXzWMu6/Ca1ciP90OJshJt5Q8acWoBQt?= =?us-ascii?Q?67cj9+h+myVMusXJVhhBW5gZS+Wc+DpJXIf4oaJP2Va1vhWzYd+bgmJUrGdC?= =?us-ascii?Q?SzZs6vzNmffBIIz+wS/KRXZwSMRafBCwEvZOuw4RfnOig5do9HJfvBs3THQs?= =?us-ascii?Q?nFx7zACpMx6CtOETyejmlAgDxtmAo9FGV5qKff7rswkOPT2s31VaPzIY9FK/?= =?us-ascii?Q?o3UrJJnx4EAZsx8TmO1Z1LMeQK7LdKffMfVcyWHAh7L3e+ZMos5mi6vyTApi?= =?us-ascii?Q?d9BmJdjsIUtasIrk+2vXCFOVqcWnSer21tDgEsNlA8RSmCp7kVlio1v105o9?= =?us-ascii?Q?+KoOMoVKZ0J4hdmUzw7cC0RpXcv2nPd6aeCEHcrdpW/cxRphYFdoqsCXbotq?= =?us-ascii?Q?L4uMRCz9kkwWmMA4yLIVNcKfLpABLr7emBoapIIGNj13MkJb9eND0PolPLSM?= =?us-ascii?Q?Uhjd/g/Smgg5txO3nPFeWEV5Yp7rAvoyXDONv3X1f7ofY5v8Hifqum/YKxoY?= =?us-ascii?Q?vAV3DjbfjfIBo0degHlaGP1YvuOF4ikGvqUQjZ4BLNbdroc1Vp45FkxlgDZk?= =?us-ascii?Q?iMFHZew01sg8PQQFZk/rGcJ16csC1mBFbRVDtx8pNbEs83TPaIG4K08LX6Fa?= =?us-ascii?Q?n5XVOcwD+uSWuNbxxOHGqW5K66tqApJl0O6gi/9Jzf+eKfGiF+PGdI6N08gx?= =?us-ascii?Q?ILJsh61vJ0WCuI2Em274Vk+tLWYaJvO5ApbNbXk/fMyqyZmnHROl6RTyb5ZD?= =?us-ascii?Q?eV7xJjAtEP9yUk2t0CR3sXmjc117acOwkmGphd93xOJ4jPo0/bxVBZr4nceO?= =?us-ascii?Q?tBJ09L8xVvYVKmOXwAI7SpO7QimJf3CkY1oBXkHg8jEYzs2fiAVZ83xLfBqv?= =?us-ascii?Q?yzGwn/YHskeI8YNUtPxznp0M2SwzGSNBdeV+Db559odCcSkQdfc3QtYCil88?= =?us-ascii?Q?Upw2rg32iupgbzbHd7aEIqRasCfS3459pNzSrsZ868Smf7yxUdDSyP10MRmU?= =?us-ascii?Q?xaa/kEcvWbVxZH/NuloN+wjjKHaIi34KMpf4Aqo7RnwY4tSvwjHngX1mNNYo?= =?us-ascii?Q?MZFbxQgBPI+M8iQxCGLOSeCueXAc3MmDZ+R7H9/d581CtYj9csYzwxIqLR/v?= =?us-ascii?Q?sddWE03rM6fefSXi2mT0jwNLTugjWXLvJ5/8cgd9tMx5RveEBrkpePR6CaX3?= =?us-ascii?Q?pfypc9qNQxcu1osF5bD9tgQhgvG6Hr0T7iC95OWGUgaMahdv79Ypdlz1zVZ3?= =?us-ascii?Q?N8QX+6DqB62gt0t8892k++8=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f24ece0-6777-4c35-4ae3-08d9d3e999a5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 03:30:50.9473 (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: vjvzYPkKuMY9aDyVTl+IoU86jXkoK/f3MD56z88ohlJIhnBnbj88YUhLq5BMHnTbWnhIORoFv9Kz1K0cI7UpEg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2569 Content-Type: text/plain; charset="utf-8" This patch added the fullmesh flag setting and clearing support in pm_netlink. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index da1bef34e8e6..5fcf0f979579 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1766,6 +1766,13 @@ static int __mptcp_nl_cmd_set_flags(struct sk_buff *= skb, entry->flags &=3D ~MPTCP_PM_ADDR_FLAG_BACKUP; else entry->flags |=3D MPTCP_PM_ADDR_FLAG_BACKUP; + } else if (addr.flags & MPTCP_PM_ADDR_FLAG_FULLMESH) { + mptcp_nl_remove_subflow_and_signal_addr(net, &entry->addr); + if (clear_flags) + entry->flags &=3D ~MPTCP_PM_ADDR_FLAG_FULLMESH; + else + entry->flags |=3D MPTCP_PM_ADDR_FLAG_FULLMESH; + mptcp_nl_add_subflow_or_signal_addr(net); } } } --=20 2.31.1 From nobody Thu Apr 25 01:49:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2281274jap; Sun, 9 Jan 2022 19:31:04 -0800 (PST) X-Google-Smtp-Source: ABdhPJxQsmlZ/gk1KCQeobU10zI8MjNfBXQ0qIDQtr/+nABOUIf3hSoTQef1X8PM/7RaWv7hB+th X-Received: by 2002:a05:6214:5194:: with SMTP id kl20mr65711063qvb.13.1641785464727; Sun, 09 Jan 2022 19:31:04 -0800 (PST) Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id e21si642042qtw.730.2022.01.09.19.31.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Jan 2022 19:31:04 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3002-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=iEDLIU2f; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3002-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-3002-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE 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 ewr.edge.kernel.org (Postfix) with ESMTPS id 588D51C0CBD for ; Mon, 10 Jan 2022 03:31:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 284FE2CA3; Mon, 10 Jan 2022 03:31:03 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 B8E842CA2 for ; Mon, 10 Jan 2022 03:31:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641785460; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8JnXJuQkan/o7XtXkG9HCawbn23OFFV/d5DEByVPb8g=; b=iEDLIU2fo/mWRRKscT9QQb77Qa034FK8QR26WrgbHOkW4mpAealuKv5L17ReQNoHVV9TkK LntaTJzrzfTyvh9xxzcBI+BBqBxBOd3oBtHrUbWl56yS0b3hg3Tgso4FDQh/L9jQENbUnq dKszcpCMIbDWFIl36tixOX29xq7m5sM= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2113.outbound.protection.outlook.com [104.47.18.113]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-39-4o0-jpnHOVS2QLoIetWRbg-1; Mon, 10 Jan 2022 04:30:59 +0100 X-MC-Unique: 4o0-jpnHOVS2QLoIetWRbg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VeWz3k9Glr/shvK5UD7c+62IJh6cPRkKRrdY6EwU0C6N1sFzvu6ubffVTvuOFv8vts2oa4wZlrx5sF4wBImkSLbMPYYC/ePyU2qKLplsp8kAg7qaTcaYskclc/VRyrwwRJDajj5fz+IX8QDgkT5yF5OHMwmvikxossSUTREStSZcrNLLop4+IsGedbe2MTsyaxMpxgExIibamgYgsrYiFDUl54MMIGxIIDtcCu/p/VXFCfgW9HfiZD6+ZK359OImvhVlZv+pwEJ5YteEZOot2BZa6CELCt0gUewKSKjT1HmBqJnyTJLDtNySPjHOWym5iIs9v9WWVBVV9hf6HX8iGA== 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=GWvZTyWOj3dnQwRdB+Bjs++OGxSvH8RGjVm0WvP2P5A=; b=CBSs9hsCzBpVJPMF1F2Pa7camCi1jJa3+Wgg2faZeqQwV8O58X/l0ODO1eDxM7icz40a9PT/TpYZQkctO1jQFlFCu18Ldg9FUzEaFc6UzcIP7kcMtld5C9zyPXva8zrX73FDy30/ity1tfv7odBFwFBnHBlU8wmAZORMltq1eFhfGvMyMuHbWHOf+LNn9F+TzM/ij6GoQl9/ptT2uoiYZB/h7tb4/dNfQ8JTvkHh+aqBYx/9dJqSuJwYbJb9wXNo2IKdEXPihW5HZxVrIELiQzwDqzfhbfCYm1ct2dup1oJpoN0EVLjqXACwecMLCpOLt/0BodS8Q/6CrerqGJ/nrg== 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 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 HE1PR0401MB2569.eurprd04.prod.outlook.com (2603:10a6:3:7c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 03:30:58 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4867.011; Mon, 10 Jan 2022 03:30:58 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 6/7] selftests: mptcp: set fullmesh flag in pm_nl_ctl Date: Mon, 10 Jan 2022 11:30:04 +0800 Message-ID: X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable 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: 1f42be6d-26d4-424a-ec05-08d9d3e99e0c X-MS-TrafficTypeDiagnostic: HE1PR0401MB2569:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /waAgSVCTrHlcv9iLQGE7Eemo2kpWnUMGy6ODUBvFv7LUQC9Px3j/cx69cTnkBitOKGmnpAvUlB1YDrObk2Ywf2ujAdZDKYsTN5f+k5WFMa69lcrAykrb5J2iwJDmwzhPtngqkjywoQZXdIiGaTFa0S2rBCyBDyQHQZjY2j8pNedKK2bseAaL6b78XxDbm9LwZyXcNqvQFvZ+NFjgMRHzi304PN9+hFH4g3SG8IhQUh/hTY45pl1tYtuAefYv3NUzsBhWEYp8EjcxPfHCyvxS15U/89iq9e+Lnol2DMlkclT22mZJvL30zargz99CU4iQrfx1a1fQ3SKWV58UiEFgmSBGssoLk3rVQPzildjwJBAd7Cs+ZEt945hmoZlkZq/o1BThoKx0wgBqX8pJsEXZw2GqJC6bxa74eqdjalg4W7Sp9wy+k5nSGnDCLLSYK3tM8zRfO1R/5PuV3cGcuUN1k7ChowXXOkf3GWx5Vt8IFoVcf54DN5urHL5kpZg/Qf+Q52+b6QlfbS8hyuEVYkupCsDuu+t32nuEKErVfJD9QsUbushtoKc6AeH/yX4fe9a4FVCi4YIsv298sPK5rJMGA+4fCaiIjJOFSHmk3RamAQfulgNVIGo3BaKiaLHupu/krdaNHcHRWJteztqOWbGOw== 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:(366004)(5660300002)(6506007)(66476007)(83380400001)(66556008)(6486002)(66946007)(8676002)(107886003)(44832011)(38100700002)(6512007)(2616005)(2906002)(508600001)(8936002)(316002)(26005)(55236004)(86362001)(186003)(6666004)(36756003)(6916009)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?spZ20lXnc0XFPXiUSN+aRO1UfKVg8AgHDA0bY7NUOd2mfOWoQGFk+/dY7dYN?= =?us-ascii?Q?7gJ+L+ofp81Y9Esydxj4Z8cvK5oAHNJet6ArMIGRH+BkZLywCFlv5So+AJ9V?= =?us-ascii?Q?ZPjb/SlPA/MH9+z8tPceHvXqnZS70lgdvEl3oC86bpdPW5s/4taZLTGlMaTi?= =?us-ascii?Q?i337nZLGzXqLQ97ARO+PD/BipAFlMgqFbwj3kS/nzH0TQnrkvd423caFyL9k?= =?us-ascii?Q?MSsH9IHrBoE0Cq34o7PF7CUjHX3s9p5YcMdyVkTYUQ5Ty7jEg7oGmrYwVj1y?= =?us-ascii?Q?CdfI9sEBwA1cZkZ65WAcy0r17UkPXmwGcbNfdY1V5lsDeIJ4fB4ZiY5qpKVN?= =?us-ascii?Q?bTxNtS48pRpmyqeclxraEUrdadq6zZjTzgaxPVBvB+QepA/VnRNi9EVnXHLb?= =?us-ascii?Q?jiAq/G7NWSeCAN/vak20huKx+DY1R5u5V6mLYbQVTt8KridWczJMLBwV6Ix/?= =?us-ascii?Q?pG2DTvtAJhZRCQfRxLse6OqrjWQNuylcE/MpSszsQ/jM/NuRv1AWpZWA5noL?= =?us-ascii?Q?gAkHKG+tSBSmrJ0XUrbJOr7L/P7E4nFTsru6+7xt8EXo0JBIvu1vlLkamUx3?= =?us-ascii?Q?15Rx7ymH87n3NY229MIOwpjZxvlsNjprpOcoqTfjvHHJTsknM7P0EXyolFWs?= =?us-ascii?Q?H3vMDCz+xcP9YrSBHxHj4ilOu4FvfwNz+SDl+tjAOeJ+iWrjzoN07hiim/LQ?= =?us-ascii?Q?lxDfYX3fWjuJjBYXUWDn0P9ac9O9/Fst050dh7x0w6Zn2qOTtb5cB3GPJWKm?= =?us-ascii?Q?U4M2r52clcYSgjVDXw4uLyt///RptFcYV2Wjn0vdxTbC1UmYgbhSSh9f+CVX?= =?us-ascii?Q?D4DjXI2o197y2XIotS1nXD5SMuFECVjDcPoWVGQo6NezQASbEt7Oxw+V21mJ?= =?us-ascii?Q?VZM6VNyzenFBJOR+qwZGqNHF5aykDPVpHB6uS0FkmvXwOFq7rpDS7/1bXW25?= =?us-ascii?Q?oYzbGZfuaURczAyNh4gIj0qTIKCto7g36vsXUn0+AryyNCDPciBQdUiNyFWP?= =?us-ascii?Q?AUbyW7OBuwQiT3yjwS9fnoAdPBWn7lfoHHyKVpjSETc1+Ba7/adQG5laRya0?= =?us-ascii?Q?RobIE4FNlm6Wiqwe68HRyyr8DZtWNvqCT7Ku9MNFjvEpEDJgxhzln2ZQD92a?= =?us-ascii?Q?ac1UJNJ0beSK+Xi3V4d21dGDBcqXrI9Oj4EGIymJ6KxUlkd8nnp6iKiGPRXH?= =?us-ascii?Q?CRMKwBNFUAYxCiiPpo/O5flABsd2yjmQPca095kb7rFquYPqUaJRxcop1CHu?= =?us-ascii?Q?dBtbqhh+N+csw+lb/iKfmIvoJQqTDCL+C3TuSPf4sVT+znATNTl5jDWX7crL?= =?us-ascii?Q?/X0n3tabRnPhWDc0+KrdiIWmE2D/CvbVFUYVMbqWmlC0c0QONZOKmH4E7axi?= =?us-ascii?Q?FkUgcShTcVvAE164U0EjlxVINFZqNtVBBxk8r4Rp5lPwStxET3Qi5GRNFt19?= =?us-ascii?Q?ZAlx+nNS/UK7/TbjMxfB/DYskg/WI18FnFB64TmZryN3OEDgTSxjMFe5q2qf?= =?us-ascii?Q?2CPBYBr/uXjmQ8iRMez6Jvq+Os35O4BWOF4RtJxc7/898dBJ7Vbp1xrFWAQ/?= =?us-ascii?Q?T/FVeerv7eOTQEeSmdcjADuDvqJn1neJ52FCKtUxUj0ScErDC/8eWYOD6kM5?= =?us-ascii?Q?95ISplfoqUTiDv0J+9Lj9vg=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f42be6d-26d4-424a-ec05-08d9d3e99e0c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 03:30:58.3060 (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: 2zd5JO19LPGzwe+ESTdEPDcoZb47xhNU+sfV934MKMNBP5hendpbvhLe+Foqbey5Lt+aVe5EIGNnNsVZbqLbWQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2569 Content-Type: text/plain; charset="utf-8" This patch added the fullmesh flag setting and clearing support in pm_nl_ctl: # pm_nl_ctl set ip flags fullmesh # pm_nl_ctl clear ip flags fullmesh Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c b/tools/testing/= selftests/net/mptcp/pm_nl_ctl.c index 85ca37e4b34c..396d53d8fcec 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -28,8 +28,8 @@ static void syntax(char *argv[]) fprintf(stderr, "\tadd [flags signal|subflow|backup|fullmesh] [id ] [= dev ] \n"); fprintf(stderr, "\tdel []\n"); fprintf(stderr, "\tget \n"); - fprintf(stderr, "\tset [flags backup]\n"); - fprintf(stderr, "\tclear [flags backup]\n"); + fprintf(stderr, "\tset [flags backup|fullmesh]\n"); + fprintf(stderr, "\tclear [flags backup|fullmesh]\n"); fprintf(stderr, "\tflush\n"); fprintf(stderr, "\tdump\n"); fprintf(stderr, "\tlimits [ ]\n"); @@ -711,7 +711,9 @@ int set_flags(int fd, int pm_family, int clear_flags, i= nt argc, char *argv[]) str =3D NULL) { if (!strcmp(tok, "backup")) flags |=3D MPTCP_PM_ADDR_FLAG_BACKUP; - else if (strcmp(tok, "nobackup")) + else if (!strcmp(tok, "fullmesh")) + flags |=3D MPTCP_PM_ADDR_FLAG_FULLMESH; + else error(1, errno, "unknown flag %s", argv[arg]); } --=20 2.31.1 From nobody Thu Apr 25 01:49:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6638:38c:0:0:0:0 with SMTP id y12csp2281340jap; Sun, 9 Jan 2022 19:31:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJzhVNbH05cuiKcRUaMP6K/XECAodatpN0r7a/pZgfL1F+GOXn8tMc0psYbEiy1p9sW5BcKm X-Received: by 2002:a17:903:3015:b0:14a:2206:8cdc with SMTP id o21-20020a170903301500b0014a22068cdcmr6813926pla.55.1641785471399; Sun, 09 Jan 2022 19:31:11 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id 78si4765586pgb.76.2022.01.09.19.31.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 09 Jan 2022 19:31:11 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3003-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=BYzQq+RQ; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3003-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3003-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE 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 sjc.edge.kernel.org (Postfix) with ESMTPS id AA08F3E0FEE for ; Mon, 10 Jan 2022 03:31:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9CB222CA3; Mon, 10 Jan 2022 03:31:09 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 734902CA2 for ; Mon, 10 Jan 2022 03:31:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1641785466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IG9QQe3TlSIGtIG3urZCL54T1+FYQbRuQO5Xlw1z7C8=; b=BYzQq+RQxowFp7e7vKLX58sdvnjJJkVviKvVNPxr2F7sFV0NJeb9L+TH9nUIwuMZmpT9YK K13mNIo6UCWyCV3ZrT68yENdE/NFv06ufLlfZ4P4199snx1L2nOcbHYYY1XCpt5qGPj0X2 ETq3kyG9xaLPq5MTI8hfQVm7c3zoYj4= Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05lp2113.outbound.protection.outlook.com [104.47.18.113]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-41-txUVqQXzPTKqfREaIf1buA-1; Mon, 10 Jan 2022 04:31:06 +0100 X-MC-Unique: txUVqQXzPTKqfREaIf1buA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=B7iUbtjWojuCZhwfXMltFFwcOMhHnsLhfiUV1bVx/WObeBAotRyHFDAtwTuzdSqOCWQKhEGiDg1yYvre2/y/tt0ERRzs+ZOu2R5m+oWDCxKsLBPY7yrzvT3h/hHV34DvElk71UYpj4gOtDlNzI1AFwTZ8ld1DROQJKvWTnR/pGf89oALndG8j0S9bAiqW5ninzETk3CgP7xNn5n6BgKv/SJuEgjGOLEZZcQLc8/8XMQIaUNxQbZ8RaMx2h/2DuuI8QGSPh8tclUFNQN+EDyzIXVvzgpdAZ5c739IcSNLz0TdhYjYdgtZTv1CWYl3VlnbRy1RHGopE1EWZyz55X9ddg== 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=CI3a/zSwp9W87nhwJGzs9QJVJkQkfZdbTUkrUSG4goE=; b=hyODdxufUdBLgOWliDSmW0zkrLBNbo6kk9MRXksax4F3ZCzJOHOfWxnLxIHTg+XR1Yka96r6y975QW+fkWZ4NL5jE1Q9zmXlUVEHr2xEabyDWzai1jfVINXqL1zPK+dHKeGz+44aKsuxk0dk58ONuvVW4AYpLNkB8h6+pL112gr2sxJHBoS4MZ/Mz/8ue22VvxvOp/XtzmB3+0YGTgPA5JlH/K5MCCQLDS0Mqi+CJUHZPilN3MSZPwIqit2jUWHyoDSCastSy+tG52L6ujdT98JQJuqEhSKPs//gD9ChHq1Bx4u+6QhTiz4eZShJrdn6EwBc0rLYSyqJUA8mCstDqA== 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 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 HE1PR0401MB2569.eurprd04.prod.outlook.com (2603:10a6:3:7c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4867.7; Mon, 10 Jan 2022 03:31:05 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::b5bf:e1b5:42fd:4dba%4]) with mapi id 15.20.4867.011; Mon, 10 Jan 2022 03:31:05 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 7/7] selftests: mptcp: add fullmesh setting tests Date: Mon, 10 Jan 2022 11:30:05 +0800 Message-ID: <5949ad258a4e24ef86492869f2e7db39247a075a.1641785106.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0250.apcprd06.prod.outlook.com (2603:1096:4:ac::34) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cbc696eb-e7a0-42b0-1c94-08d9d3e9a221 X-MS-TrafficTypeDiagnostic: HE1PR0401MB2569:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2399; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mwP1pqTezGqqLn5FjSRTq6NQNYKwwio+kdc5GMbdv/vfqiafCyKioNujDyqmdm6hdSJDqDYraoC4txWK3PujpxI3n++4omlFkBTcc72zHIiLdQ6g39LYyeM5gciV8uzwaoFV1PGU4cDc+p5Mx3h7ZoXpEr4lqUoPUcdVHmVTqjTUBtv4n4cYQ6/KxC5YuRgxZpwxPwgnNE4N+KPbirk2ai6tzrT3XK0jjNMUO4iZ2KzvHqyIF730ZH2b5O2rXTewwh1Ku99x5RdwgwaqJiUTX4xcFDxntb1fhC1leUO1I7yCl5Jyg1x3f24hDFeNvzO7iDdzG6Fx7SswCpXv/n0pWkRM2tpvbmvQdmhOve56uT82yBn9WQ1KTfuSNW/yREoPJ15ob02gOCu/9ow+khmk1HPdxDzuNYp9KJ/z/5RtpbHw8xGvUxgDI8jA29L5iO68dczlhjiZ4MpZaPk7NoRzY3YjWCDtLsRzp2of1ceURGvnTghh/bn4pkzj/WWY0vCU6Bmelvs58JiQPkkiuMCPZo6wVNb1B4wSGMBrXNuL7zBkrwkc3FPT4SVzNFdj1kC7LrQT2ndLKAYs1y8gsCNmVTWQEELn6JyBGEm2kt1ItmT3wv+giRMzfSkguMpD9iAIh4qp7yH+upgbwQfM55RanQ== 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:(366004)(5660300002)(6506007)(66476007)(83380400001)(66556008)(6486002)(66946007)(8676002)(107886003)(44832011)(38100700002)(6512007)(2616005)(2906002)(508600001)(8936002)(316002)(26005)(55236004)(86362001)(186003)(36756003)(6916009)(4326008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BHulJWDBoGHQZv3DAEfNDqmttl4pkyw9ZJY2/XMfoWcbeLU0hMpdPAJ+TC3D?= =?us-ascii?Q?cV4kLMBslzQpdn74JXdtXtGkZK/SAXjwdhy9lJ//g7BdHDTJHPll7LNMb4iN?= =?us-ascii?Q?x6sfTc1un1ssu/kic+u2XBzxfKZM00VSdqz5WbxYkIXw1J/O/WmVmV22iTTX?= =?us-ascii?Q?5ZetZrpkDDVvB7hWgAoDBA5YuuTCWzxBMrD70Mtdcjo2kIYnOTFMWYF0D2nt?= =?us-ascii?Q?rCJNrhCRYA2Pk9JNoIVbmFlCepH2p3dPd5gOPoBYZ/NedQdQK0UvHTc0TTKB?= =?us-ascii?Q?Hyn3xgaM6wQlPB6Q8iAP61NV3vnn8f1FcGoDrbAI5AQDPeah+KyxGwsjm9S5?= =?us-ascii?Q?hBtLhltuDR89oPGFSwwZY6qMgJ1ohiYZLU07zu0aduXj3RxV5lUXQJ6LaaUD?= =?us-ascii?Q?W7peKQiNex/t6ZpfBtnxhhth+qSe8oNHfuRr+qWhFBxI+m2ECRfiPwSu1VV9?= =?us-ascii?Q?QXGFTjSoTACTgwb7NDGmjXMBIIaEp5ogz+VnZuT12TH+5RjweacTuYCL6/Ot?= =?us-ascii?Q?c1knh9RubHop/M5+rm7vplajSdi/jZ+PVr+/JmHEH8iDZVP3CXPljSImV1DY?= =?us-ascii?Q?oWh1WxViVcjJNT2VigEjw+NmCteKySKsMDWfey4qUpAs3fVRxOKeooWc565l?= =?us-ascii?Q?oRK6pPiAsi5KsV/BqQUsFNApUi3p41WGmFn+YbABjOvaqjFqsCt7x15HPVYh?= =?us-ascii?Q?BruZopApBGoaod0ZDytyeqVRzZfrJhE40+066ctemPMruzJgVVEue+LP5Ktp?= =?us-ascii?Q?KvXozvDgaJRQgSSxHBaEu6vcdtO+oh6u+qz1aLMu0z5S66SXmr0O8TNPa0Bb?= =?us-ascii?Q?y1HY38PLPFET+yLXHe80NiErfWrjfR64Qxn/H32L1oX6TWvE5eP2WKnsyMxz?= =?us-ascii?Q?K/LSM80cueNR3DdLNy9vMyn/9odt5fqZCEHoMFEjZSfpgOGBWJBuZWuqQhhu?= =?us-ascii?Q?BviWIznA1obhoN0YbOO3iOtWBhPDWVq687lNF9j91OQdWvej7PU70BBE3ADO?= =?us-ascii?Q?DBDnmcmfF68ZVyZy8GfyupNZxFNYpU8LCllkf1mZLgxISXT+Mukw7zjCQdTT?= =?us-ascii?Q?Cfi4GCwSA+TjVKR1jpJyUItgzVn6n5FLdky6Zut/rh8uGug49CWjblg0is6l?= =?us-ascii?Q?GJ5SvpZUw1t2Dw0CrbUcwVbK8Ti38pTpfqOMvzxkHlqfPYPIQQQFADdtzx5T?= =?us-ascii?Q?7Q0bOAAh2vaZbNf8vwSCHCRPJ9ZwtCF7ph2ZsjPoB44llA6gyzUZKyoUFcwK?= =?us-ascii?Q?aIS1ZI4zgxpe4ZMQnpxVugYZVSxuur8xF/YpEz9OlN0Tb0W/oAayLKrTB5NG?= =?us-ascii?Q?8/QYRtOavhSdFxAqjrQ4TlXXQuVXATx9Sq4IhpYmqHrLPz5SOCFmt3/b4d6/?= =?us-ascii?Q?iTJX4neHVQwGquTWsZQQUnimH3PLOJnrisPrhgljIYhaUYzMPiwXxI8/4q0q?= =?us-ascii?Q?mCwYPrbKOLXj+8MW0IAYT6tjqwLj6mMX0xOIt+gL6SUm9pZDJzCCkufEVEDD?= =?us-ascii?Q?BRQmLosEkZCsWCRgcTBgZ2mz0sqQPmoro0B98o5l7hMVBcK7fHj/Wyy2mmM5?= =?us-ascii?Q?7eROF2360L7zLQYzUvUrO3fIHjX6QqsMqsRXoPy1YEyWvK0fkZbCtCTGEKK9?= =?us-ascii?Q?yyoVm08/8b3+igFZBFbAIGo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cbc696eb-e7a0-42b0-1c94-08d9d3e9a221 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2022 03:31:05.1492 (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: lyrFxx+gVC89YZlHlZ/rAsLq41UfEWSjvO15gO8jrwE6E+rmzVyssrH3Dl4ZBTitZFTacrMrc+f7Yy/fi3HL7w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0401MB2569 Content-Type: text/plain; charset="utf-8" This patch added the fullmesh setting and clearing selftests in mptcp_join.sh. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 7dbd36c558cd..8c4ee9092e83 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -473,6 +473,12 @@ do_transfer() elif [ $setflags =3D "nobackup" ]; then cmd=3Dclear flags=3Dbackup + elif [ $setflags =3D "fullmesh" ]; then + cmd=3Dset + flags=3Dfullmesh + elif [ $setflags =3D "nofullmesh" ]; then + cmd=3Dclear + flags=3Dfullmesh fi ip netns exec $netns ./pm_nl_ctl $cmd $addr flags $flags fi @@ -1927,6 +1933,24 @@ fullmesh_tests() run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_2 slow chk_join_nr "fullmesh test 1x2, limited" 4 4 4 chk_add_nr 1 1 + + # fullmesh flag setting test + reset + ip netns exec $ns1 ./pm_nl_ctl limits 4 4 + ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags subflow + ip netns exec $ns2 ./pm_nl_ctl limits 4 4 + run_tests $ns1 $ns2 10.0.1.1 0 0 1 slow fullmesh + chk_join_nr "fullmesh flag setting test" 2 2 2 + chk_rm_nr 1 1 + + # fullmesh flag clearing test + reset + ip netns exec $ns1 ./pm_nl_ctl limits 4 4 + ip netns exec $ns1 ./pm_nl_ctl add 10.0.2.1 flags subflow,fullmesh + ip netns exec $ns2 ./pm_nl_ctl limits 4 4 + run_tests $ns1 $ns2 10.0.1.1 0 0 fullmesh_1 slow nofullmesh + chk_join_nr "fullmesh flag clearing test" 2 2 2 + chk_rm_nr 1 1 } =20 userspace_tests() --=20 2.31.1