From nobody Fri May 17 05:26:28 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2072.outbound.protection.outlook.com [40.107.104.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9A85C80D for ; Tue, 8 Aug 2023 05:38:22 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kRv5GwdYiWG6Mu9uwjrILRSX32x+z9sbcfIgq9Oy4H+H6uLFMcYCB3lasOEdsDFvnbYC78db5sJn8ZKFoWLJU0MHTO+1ZHStoV4ZdtBupx8pnQQ/TXKQKVPEdfglCgVPBriymOy8kgrD4PDqKOX60d/4Z0phmAcLqrGTNjktNkf70iLVji+EEom4dmQrgSO3CpKaqFXTkEFtmLJFJfXrtHZwRA+t43x0lPKxnJBAd0eyW0hJKrAzwxsGgHF+HZnCZj9rcrYqQVbe3O4xhKdWhooWnbLq3F2kDT+T4iMMR/1d/Jvt0FRnqwUKYUU3Z77ccoS2j7341/xs2O7CqsRdIg== 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=P2XXCJd/g3gGPFRi9FigIonSHLoLOG9WdKxj0s63yHs=; b=MR8+AEtScYpuRGT8UNKFyp2VDSrAUIBI0ZAlkwKAerTGq7cV+zgbenbosbQuIfbw+JDCzW34gHw/q5jARjuAtWdOybkzDLZXDqlTFpSTQLF2dEGNADY/r19hMPohwTKNUu1HjDN20rlr4VgqfeNxFUfkm+nSio8YU0N9/FVm5UkGlaoNWcY5A0fbbFkodbaO0us44gaoxMBioczA43sNDizgh8nc08byBLTEvVMX2m3DOg3K8vYyfFE1xHk7yvGu2b3DPrYWpk0cSzU7ua/ObN8K4apa8/jT3lS3MCPR6AvKCSwS7OZtm5Fxumo/DXX/nBARJEhFGrLfe3yEEQNhbQ== 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=P2XXCJd/g3gGPFRi9FigIonSHLoLOG9WdKxj0s63yHs=; b=vi6A3Ky3ma3PysbRNZPx42bb59MHp8ZL2Hsl1VgZiXPM5fosB6S1xsZfDRzgrpkbXfqf+EMpeR6TgwDto9Q2F4+5wh66xk3sJa4HuTq1KzmIkvqCC6hMVjqnnuV42YVPtunf0BYGzYEmiP58AFioO0kfNfmjxJ+frVmI5GvbjCOcecBXZmSDDPbMiK5KiD5xaUbWvuMoWQlDD5F8nB+IyZj3dFtUERKKU+xIxksqclOR4ppQr3eCnL2lLsOKFXouRJWDbkUJmRTudNB3U+5BOmg+xKTJqA+QGW5KfLK6KSZd8AlFNMegvgO/3PrDuROvWHHlyIDvLW0h+VemOt/93g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by PAWPR04MB9864.eurprd04.prod.outlook.com (2603:10a6:102:390::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 05:38:20 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::6480:1775:c36d:b797]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::6480:1775:c36d:b797%5]) with mapi id 15.20.6652.026; Tue, 8 Aug 2023 05:38:20 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Matthieu Baerts Subject: [PATCH mptcp-next 1/4] mptcp: allow creating id 0 subflow Date: Tue, 8 Aug 2023 13:38:24 +0800 Message-Id: <30ed859cdd93007e7233295599085b905f3ab881.1691472939.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0044.apcprd02.prod.outlook.com (2603:1096:4:1f6::6) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|PAWPR04MB9864:EE_ X-MS-Office365-Filtering-Correlation-Id: b1d56c85-7aa5-4741-41ff-08db97d1ac52 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5zHF+hjtJtjTuXGBQVUAyqyW1+JqAhJZLD8t13nsOvy3TQC4o9I8hzXho2FrnMCcDaKhYGUvuknY9IShJneUKEGZHnKThzSaj/rEdyzuOm9gHa8bLr7T8FHi4BMt/2e4iJZs5/S+yOpHS7rR923FlE4+6KRoxu45xCiogkiqzRYqtPgz4X5auWTuvovhtbgzCLBMHyzrjmf8kk5Uiym03EI9/B60XtYN4QDeoVDIFNmrBzmrHQw7CaJDqQxLP9bWGUphkzvshw9JJCC0Jbt7nf6e5OrNQjC8tmDsp9mZ6Nr4Z/nYLJGFKofktVly0j4ew3jU9HGiT5elB5kZKV9DOJm6cRWjDhFTGrrpr4DYxV1nZEhy++459dASHfJFyNDCtKkSMoKM9EJ8B3TiMFC8dIFGUDvYL3e29yexU006FZd2WIBeGFWRI1ZvRwnEA3kStoOqMjUZzY5PtCwJCfhp+FRExwzpnrGR8ZTvqlbrf8gORuQFMked5V4AdF3cF9Q6iSOY9ZhRVGw2N3qXPCHT7yI8u8Hk2LRw6Uo3hpoW0G5ijznX5e/fwlxdC6xVIxsruw+m8yXEzMCs4JkEZbXmTHLAzetlpB9kY/EuEsKCNGpaBk+PtzHP6cfaZa9TV2vvjrAUIXQ6tkn/aNoFhKGh+Lbb/nr6KH/Se7aORDuGvTs= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(136003)(376002)(346002)(39860400002)(366004)(396003)(90011799007)(451199021)(90021799007)(1800799003)(186006)(2616005)(6486002)(86362001)(478600001)(966005)(6512007)(26005)(36756003)(6506007)(41300700001)(5660300002)(8936002)(316002)(8676002)(44832011)(54906003)(2906002)(4326008)(6916009)(66946007)(66556008)(66476007)(38100700002)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Iq0No1TSdfSqcjjTTUoQe6DukgtYQZpDxX9wcreNitXojVc7AjDPFEt/qA4g?= =?us-ascii?Q?v95jVuBAqvLuW8h0NQ3/yVK663Yqq0BempGhhrKJ9WcHp/xZyTNHuTfu7QA4?= =?us-ascii?Q?k0gVMxf7G9IHL2qk5JblcX20g8ArhP3Z39MiUY2DLI9EWzf+7Ya3yWiMnuYJ?= =?us-ascii?Q?dE2qc5HrNzQqe7b61EhIrr3sK+xntXK3vyFsNarcozkZydfcYTM9mZZedCxR?= =?us-ascii?Q?7O2FVt8fE/5JklJNZOnkmMz0XWyPut3F2dfmYrigNjEcuRG4015wy8pfVWOm?= =?us-ascii?Q?quLX23L6gDcU4p6025/wpv/NZuPufqTTuNlzOpvz4dD/7BxIdZk6ISe4PSWJ?= =?us-ascii?Q?bPxpjAuEPKU/d2pDqlCe7b7yuCgyMVVYd926sElhNFSYnEgub/V51U9akRoH?= =?us-ascii?Q?cskcV9W02tkRLtowoJZOjxBLGeePeA4vZoit6GKhkosmbQiKtiNNKUxTqGaH?= =?us-ascii?Q?ODPAKL9hdwQKIUkHy5XPLcwRgsEM5IEQBuN4579WLYVOEcwoonYOqMvUWzsI?= =?us-ascii?Q?cZSYrZekjIal6M3nnhoUc2MAvJ5DAY9MaWrmAnnwCOYpjWhEgItjgUmwCkVl?= =?us-ascii?Q?A+U+/sV0xrDULkz3TK3vTBJghfjOiK2KcX8Mgq36Q16oeQ/uPWUjpAIfHAef?= =?us-ascii?Q?onJGgqU8/tYq8IPSH5Hpgy/ECTJoYwV4H9b8AOuPiJCgYoCIG+6V7VV62/49?= =?us-ascii?Q?BVjq6hdi7jsE8bTtyv+iSQRdFLRAGCR6KP92WDzRmFowza2W9g9EBlACLpL1?= =?us-ascii?Q?y/v1t8LkrSfAYG9XF1aZLbSRGc7imXm+00JjTbkxIfF3kHadkfUast4eQm/o?= =?us-ascii?Q?X6FCy1aLa+D7wijnv82MR2F45baKvZQKwEuFRYXwGLpSmugp38Ghk+W/C0ZY?= =?us-ascii?Q?e1q0hQUEY8uz3vItSrY0Y14T0Up4KQeP+dVn1tGG/+yd5CESD1lLgUrUOhZl?= =?us-ascii?Q?Rve/2SlE8dpRLkgA2leTbe2fvb9Cprj9nV04IJtwepp1I9PRe+KVsSm5cuQu?= =?us-ascii?Q?pDLYLUTnBSaGMsK30j8zUqddr2DYDq5u312joWQoiZengtyJTJMk73TiutPl?= =?us-ascii?Q?wmNZ8je/FJ8YH1LCHjsSIGNAPxZqVUDVuN0Gc6n1Ule4aP+xVWmU0YT0HYbq?= =?us-ascii?Q?Ut8SCqOPXQQjsyORiTXOSbDarkhfH/gJOBPglF3nndYU1VJL6XWfgYjyjosK?= =?us-ascii?Q?Mjgjuun//tnmxElKeI/vn9kkXHt5b59vQOAXInXGcvqZLAJyXX0zBQDk3br5?= =?us-ascii?Q?v+Um5dRI/88oQPVXE9pDh174bFbTNrLGJUqhIrK6nYKm4Ub1G/MlQSG1djMS?= =?us-ascii?Q?7KEhq2aLAewgtyGjISsdaG43WprUVLu51EsvVKSJAO/CdF0nit8WhpWe1G+B?= =?us-ascii?Q?k5yb4vnCmYhQSkgEzcIf0UiV/bMqrsY2zlokbGLUS/Zoh8f+O8AUVrLY8JUY?= =?us-ascii?Q?v5XNA+S0QEbb9tdcPq2DGeA58iBTIQGRu7JajH1Q6lzGJse3APKwLTxxK2xf?= =?us-ascii?Q?4ti62mqSp6pniyRW5uVe8SYOvCV2hY/f/sCixjwZ/o5Ksu4y4xfOdPJu5Qi0?= =?us-ascii?Q?Wtubk62zFziF6u6Qqp5JAZZ3vYIs+7GEY2d7bsdD?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b1d56c85-7aa5-4741-41ff-08db97d1ac52 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 05:38:19.9761 (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: Z8l2XH1GqDkBvYypn3D7rhJX0KHhAG89zTkcUC61H/8OFAf5P91RCRQj9QrwAEcSpfhl7/vEZEdKgxfIqH4GMg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR04MB9864 Content-Type: text/plain; charset="utf-8" This patch drops id 0 limitation in mptcp_nl_cmd_sf_create() to allow creating additional subflows with the local addr ID 0. Fixes: 702c2f646d42 ("mptcp: netlink: allow userspace-driven subflow establ= ishment") Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/391 Suggested-by: Matthieu Baerts Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index b5a8aa4c1ebd..d042d32beb4d 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -307,12 +307,6 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct= genl_info *info) goto create_err; } =20 - if (addr_l.id =3D=3D 0) { - NL_SET_ERR_MSG_ATTR(info->extack, laddr, "missing local addr id"); - err =3D -EINVAL; - goto create_err; - } - err =3D mptcp_pm_parse_addr(raddr, info, &addr_r); if (err < 0) { NL_SET_ERR_MSG_ATTR(info->extack, raddr, "error parsing remote addr"); --=20 2.35.3 From nobody Fri May 17 05:26:28 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2074.outbound.protection.outlook.com [40.107.20.74]) (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 39C84639 for ; Tue, 8 Aug 2023 05:38:29 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=obAXKdX+A7RrVXL6o/HAx95pcpibZ0xDbcw7EtD5JWxCo/PQMBYifG9ib28d7mGE7tf5FYpjOVzE1n4YmkCPzHvkBlMhiZIGYli13IUWuTpGooE4M6nPtraFr0Riaof7kHxxLP3PcupGPXp0DzxZmoOcxX53vOxc3lHIAqIo96Gs/5bWua8WIGLJdUVFvDlkaXJl+ETdA8T4k40cTiuPNLtrMmaeDD2Uc/k0Vbcqfgket0fATSRYY6qPxtLoUry8fBFfeA6+1/nOx+gNGP6fnXBRuOL6vz8E0spBv7tInXzdhdOPS8ZB3vVQstIjRv3drhiwLwuS03y3GIHzBknZIA== 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=OrSQCl+0KIb6OgFOrrFpfx+pj7N7aQ7WH75UPzpXLj0=; b=jJiNVKznl7+iwuxEjePZkF+6D8NZx/4wHtQVnZ9MQIeGEErb5xLRZnQnYpUB+ekjTL/og8cyh33+TMUH9F5wU8BSwKXOCmr+OYUfcWR95tCuYCw0Sro40OdP7BAqRjFH1+yeqxZ2s4HzJkjD93xrBDJnTqdeLOrA1eoAJ9SnkaqLXxgR7VsIy+qntTvHNlbFY0UPdd/oX7kbGkgNbYGE1Uek0gz8qtQTNLy1ho7Lex+BEZvmBHdloTyQoBecrkw4sDrCeLFbWktNP/O6cCKspdXw+rK33Bdpmv8Tq5BukjVk7trfrKbXRX1Mj5V+W/xOQRVjWKoUu/1OLke39sosVg== 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=OrSQCl+0KIb6OgFOrrFpfx+pj7N7aQ7WH75UPzpXLj0=; b=CTb1OdvFevzCOgpwBwwlLFh/6O3RPFp5E+nvGFiLfNcsX2zsRV6bhr+u4G4odXXWidsBMyyEGzbde5ZzpmGpbIJ15961eO03qw77VcgHAK2Fu2kWdSf1fuby3cFP/GUTFEqXo8b3pPbA4uGSq41AnC2mIuSb41FdPz32ZNmTMK7i9ne2CLRLhQlhmivSpii8wYetx8UY2J9q+xRk7DzOyaY0MmHUdCfYj2lh0U+Drj8586sJFPZy8pJ/Kbyz/AZp/3L7Aew62aPuBo51/+i2kvhAdGDCA7BA1mH/rp3pFwgjN0mOyHI6qR4TKZt/5TLaLkUEVqnSi6Dfgufyk33bvA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by PAWPR04MB9864.eurprd04.prod.outlook.com (2603:10a6:102:390::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 05:38:27 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::6480:1775:c36d:b797]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::6480:1775:c36d:b797%5]) with mapi id 15.20.6652.026; Tue, 8 Aug 2023 05:38:27 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 2/4] mptcp: remove id 0 subflow & address Date: Tue, 8 Aug 2023 13:38:25 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0033.apcprd02.prod.outlook.com (2603:1096:4:1f6::14) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|PAWPR04MB9864:EE_ X-MS-Office365-Filtering-Correlation-Id: 4d2e068e-f250-4cd4-605a-08db97d1b091 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3S7ehOvuvtxvXcKxZ5fjWivt04MuMyU7eJxMxnlCu6L/3srKzqc9Wy2V/4MKyaYtE2CYnoKDL1mzReR4KniOIhlgq8lgUmOGM0BIgqJSgzaCZAYfyUrYZLsI+y57rYp0shehXB7CYpb0uQB2qlvBtRMVK59yDqPh5C4k35BEplLanFkPbFISwdTw7LEpvnht0qcqx2m2FSajxT+N3eZkuRYmQcQxsexQoN4We2MqODHCw7oL6J1izTZ8ZqQ03vQjggZ5tCBYDEeqi99Zt40+mykYumJ7O597w7Qqrsyshlew3jpVLToGNKlqnK7uFkJPE0P6FWUqQjICFqx3VMzU285gR0blZ33AP0sRb7vjRYc/UF2ZEhk10JjcyX4/JgNR54IDCu25RGq1XM042Syrrcpw1itUGxUfXb/vNF1RyW2ovK15fWu8oriomEL6xUDsjimm701jyIFJ6LqQvxD3xUWAJMqxLlJ9SH8k7GRY1XQLiyq6lws/g2tWIn3/VzJFsJdEslp41dIZxBUmNYEokd7I0qt7Y/Umc8QBQtXifcsBw+dnm99CKoICF0SEaqGV+hQ/vJQLjdRchQBBTePy0taAWiEzljFcl8IaoA9If3iSD2cyWdzsYff82Frazh6WQZzsMjQfZ+vKVNybxzY3VJQcNCb4yhQB/+Wdl45iEMQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(136003)(376002)(346002)(39860400002)(366004)(396003)(90011799007)(451199021)(90021799007)(1800799003)(186006)(2616005)(6486002)(86362001)(478600001)(966005)(6512007)(26005)(36756003)(6506007)(107886003)(41300700001)(5660300002)(8936002)(316002)(8676002)(44832011)(2906002)(4326008)(6916009)(66946007)(66556008)(66476007)(38100700002)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Xd/c2lTCuunTcGX/9yRF6sFOM5rcSAt+b6QTJLpcLhiYqBSPp+OgccUSnAHn?= =?us-ascii?Q?5L30daOdWZWo7Hh3M+s5fq83QcGZnDrQXVyjmnRvqWWitj8zuz4yFtb+bfwL?= =?us-ascii?Q?ROVTg9llLgykLV0e5leNTNutPqBuUuffGjochR34KYAWkIFV3frB/1U6Mv7l?= =?us-ascii?Q?JGeOOVJHR1xhgCc0qnD17Dxlh0WANaqliZTiaYKX6oSaRpRVxp+i96cMfv02?= =?us-ascii?Q?5NqpSE02AYC7gsFC6qm6ywK3UWbkUtU91ZWdvsStqZfDlKDjDMQPUIu2l6Mq?= =?us-ascii?Q?mzppLW7aqgm9ZV5546AcgbYrohpJNyEodpS60wC2BejQdOqM8G+fZUxUaQ1F?= =?us-ascii?Q?c3xnwlYjw8XM45YxXb6RWF+zxcJqWj6fOpHnGjX+u6N5I9HXFaUhiVwoQiDH?= =?us-ascii?Q?70tolZX4m/t1ehwYaCtJLS3wPgdkya0jalb177LOv7jrKHY9V/bLLSJBbCgD?= =?us-ascii?Q?JSxUGO2t/gZlUKADbNF++/07Tlgjw242Q3Xka3x8l7pz5nDvqn6niDUy2Q1R?= =?us-ascii?Q?VpKyqX9N1B3BlYI6Ow7VPR4lmCesOpqmQbPZ9+b1Tiznv5F19AoKK2Qk+J21?= =?us-ascii?Q?zM57Mw4N5WCS2NWIkHSOTUtS0NJXhwdlDMHcsSRYyUdowO1Y5jYgjp8z+s1i?= =?us-ascii?Q?ozyks68syOn4NhfsqGaAdMe6Ad0q/i3TUMfhOIKOxQugx0fei009g/jFphY6?= =?us-ascii?Q?Xa6CKtW9b+fE+6kn/nWfFZ8NtD4oG2br4JVtkAV16cVoG5A0rEni/LBD//tD?= =?us-ascii?Q?KbRpqXZg8e+fVyDdfEc3bASyhStlefqUfxwLoOj1Yb34thqtWkT+HjJ6j5E+?= =?us-ascii?Q?iHb8l4lhiaEgt/98ptOES9caSKIr8A3Hr7mdcTr2k7AIvCpEccFuiUqob0t5?= =?us-ascii?Q?k0qjnFzff2/DRjWdOxqMu23vbhDTq2vt2uhQMR4nAhjUYTAihMhpTIhn92Tg?= =?us-ascii?Q?4PbDQtsRh7V32ZQuckeK6hp94ZfTrGCyoPNjxHNwXmC06FrGtfngqb5jVMWw?= =?us-ascii?Q?76Z6SPLhtw9nbNof912FqxUKtOk05+OpY2hcWBBt8FNtloA4Trni9iBsxbJw?= =?us-ascii?Q?Y+anzDYlTg5FTJUucCR4Vg6Z3242Y0pL9sqOXyBvza8PUMUKJ7UCiUQMVW2A?= =?us-ascii?Q?jPMXsJDqlUiiZLQO+xmJgLt0+K4LlKvV853e4FlN9w6EWKp0taxwwrkTz9eo?= =?us-ascii?Q?Z+mNIHv/aSmUxYLhnHV3jJqnjr+IeS46KYY5yuGWR8RS+02JOOe8AN/PcHyN?= =?us-ascii?Q?h3nCxra3aJcxJAjv585HzfhcBGBXXYPHR4UVidA9d13tk8y/F83iuJwcGC+q?= =?us-ascii?Q?nFFp1hq32KYb2v9OcqRCWeI32Txx3BTovJpEN9tsPt7Nu7dc2H9OtvXyFPay?= =?us-ascii?Q?xpswhmd9cHIcrMVj03J/mpjEdYckFQAwx3JycLMixG1ULFohQgAjB9BJ6Lwt?= =?us-ascii?Q?+BGO0u2st1d/tuPiyfa1dRclQ7j+JrYG4GOobTDb4fpiBPTCkk+LTBYbuJak?= =?us-ascii?Q?mytQHCClSRg+/vvUU+BbOVcInBJLNW7ka9MmdXumoM5+RyFHcF+2e/Rmwvln?= =?us-ascii?Q?F/yWCzsN2ZptQKvOx5g+G3btXB1p4mirtWWSBmDN?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4d2e068e-f250-4cd4-605a-08db97d1b091 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 05:38:27.2297 (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: vb/lifdWdIY5U5eTROyumFkp5rB6rMRN0x/j9+BGaUHL/Oy3z5OLO1ZNWoFLQ2rMYvaFhCrWmTcKbenj1e0K3g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR04MB9864 Content-Type: text/plain; charset="utf-8" This patch adds the ability to send RM_ADDR for local ID 0 and the ability to remove id 0 subflow. Put id 0 into a removing list, pass it to mptcp_pm_remove_addr() to remve id 0 address and pass it to mptcp_pm_nl_rm_subflow_received() to remove id 0 subflow. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/379 Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index d042d32beb4d..90472cd62342 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -241,6 +241,19 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct ge= nl_info *info) =20 lock_sock((struct sock *)msk); =20 + if (id_val =3D=3D 0) { + struct mptcp_rm_list list =3D { .nr =3D 0 }; + + list.ids[list.nr++] =3D 0; + + spin_lock_bh(&msk->pm.lock); + mptcp_pm_remove_addr(msk, &list); + spin_unlock_bh(&msk->pm.lock); + release_sock((struct sock *)msk); + err =3D 0; + goto remove_err; + } + list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { if (entry->addr.id =3D=3D id_val) { match =3D entry; @@ -399,14 +412,16 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, stru= ct genl_info *info) struct nlattr *raddr =3D info->attrs[MPTCP_PM_ATTR_ADDR_REMOTE]; struct nlattr *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; struct nlattr *laddr =3D info->attrs[MPTCP_PM_ATTR_ADDR]; + struct nlattr *id =3D info->attrs[MPTCP_PM_ATTR_LOC_ID]; struct mptcp_addr_info addr_l; struct mptcp_addr_info addr_r; struct mptcp_sock *msk; struct sock *sk, *ssk; int err =3D -EINVAL; u32 token_val; + u8 id_val; =20 - if (!laddr || !raddr || !token) { + if (((!laddr || !raddr) && !id) || !token) { GENL_SET_ERR_MSG(info, "missing required inputs"); return err; } @@ -424,6 +439,24 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struc= t genl_info *info) goto destroy_err; } =20 + if (id) { + id_val =3D nla_get_u8(id); + if (id_val =3D=3D 0) { + struct mptcp_rm_list list =3D { .nr =3D 0 }; + + list.ids[list.nr++] =3D 0; + + sk =3D (struct sock *)msk; + lock_sock(sk); + spin_lock_bh(&msk->pm.lock); + mptcp_pm_nl_rm_subflow_received(msk, &list); + spin_unlock_bh(&msk->pm.lock); + release_sock(sk); + err =3D 0; + goto destroy_err; + } + } + err =3D mptcp_pm_parse_addr(laddr, info, &addr_l); if (err < 0) { NL_SET_ERR_MSG_ATTR(info->extack, laddr, "error parsing local addr"); --=20 2.35.3 From nobody Fri May 17 05:26:28 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2066.outbound.protection.outlook.com [40.107.104.66]) (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 2C9A280D for ; Tue, 8 Aug 2023 05:38:38 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CpU0oz8uapu4Ed39vjPMSbGttpvZmxYGTJil/RR12hFjTD8FkLjfIUh67G2pgOslrfPTR7yBw9XOK5zaxg5Yo/YijPGVoyfz5t0gPSs/eX3bA+wx5FfaQiM7nCh/kI40WTN4vCo41siPYgrRZJVATqtUyfccYLhAhJLcYas1tAAD04N4v9K9GDto/gW+5hZgI4Wv5h9GdCo4mpb/gKFXQOduaAu6ZUfyCp0TIGkX97GEv2yTs97DvYpwwmPsqc84UrW4axsLtXkMcSu/qtgmnZFthqSei+GdcV+G/m5ENb48JDAANcs8N0vUEoj16QstrWfLsKdIjnAmikx0p4W64A== 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=j4xY9wNk3xj2xlI53EinXfxcC41nNGntpzbO8P9AbzE=; b=gcMaYmgRf8GWzbAISCCAoCO8cNa2HbKh3UHXOjYJccWCcwK1ltaEapUkrrW1H5I1P9YoTVvS1SOYBMlrwphobaKD7aVgUlRnbqf84CKxCO7TGS6SyVQjeZXCGVOBTcPLzgRQQddawzDxBuMo3Zbfmbf76tQHFSECVpPemJ8xfbKyiQwQsC6IAvI+B7UJhE4Qf2yKPtHZpEQD4mcxOkeIBgd1XMvDwsrwEU+/manDAjj21jRg9kxskDvHpTQqCbyJeklumIpC7c9gNpNVFTBFOwFjWJrLEO4eeJW7R2eTq+stjjGvczxAusSz9EyRt3g61yheohesfGaYK9wr61PvgQ== 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=j4xY9wNk3xj2xlI53EinXfxcC41nNGntpzbO8P9AbzE=; b=KLtmBF3POEWZMkZST0AMPPiM6qjXtgeQITYAS1yzMs6QWmSr7i2DVh67hv9jNATL6w+Gw6QK6Ki5SNLPlNL05pL3t/QBc8PxlXZw0hQAhaP1GcrXF7a2mGCZusiro6fPIi7G8JTHhJ4gx3LKoSjucN4r5ZJNhTESKs/2zertxc8HeOMMcsz97cipF5WnjsuTIpGILLYOqcr5qswgMO9gkhL9/WTF/uJxJFsmiidYY+GdHjahIEPd86Yy2/fmuNjyY06I9qoRAQCe94sANS8G35nrYUQAAt5aTc0bfFZCe1UbcC97RiJzPaCMPoOsW1+tXojcgFav3LJZSPEc0SnpEw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by PAWPR04MB9864.eurprd04.prod.outlook.com (2603:10a6:102:390::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 05:38:34 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::6480:1775:c36d:b797]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::6480:1775:c36d:b797%5]) with mapi id 15.20.6652.026; Tue, 8 Aug 2023 05:38:34 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 3/4] selftests: mptcp: add id argument for dsf Date: Tue, 8 Aug 2023 13:38:26 +0800 Message-Id: <4f105c7c700ef0c139c1ff5e7d4a5d844e3d06a6.1691472939.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0083.apcprd02.prod.outlook.com (2603:1096:4:90::23) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|PAWPR04MB9864:EE_ X-MS-Office365-Filtering-Correlation-Id: 10ff2969-3147-4c1c-a1df-08db97d1b515 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: setLw2IdsytiNZt0sKy/sF2ciIYT3tOql4fkH2UeAZOszubeUG3YQGinKZgn29i4U6cBlXEhdDViEsUPm2+DQJqtdAc/30VT5xPZ6Pkel/OiuoHTrbAW8fMhMN29Zw72ZB9CbDHEgHHYsahbJAeIeHXrzDHQR/+SZv+/jMCuGvNCi5gtcauIDfFx9HxOw6nwJGgQsLtf/fqK73T+EphYCR4BR7PGJcjehxlSNJmV4QIwDLr1Ilxo1Jk9yTnAv0u4968tbHmsnnFdkjD5TX2u/1vaUNNxSqaywVUjVZa+GChS1O9oaPmwnwYks3PvIHlRiY/tfho6TtH8N5Qf3Gqojc92pcIs7BHBywIXIRXl4oitoix9nrtEDHaNwe6c/7dDXolNo934fNhJvynX7+NMuGa1rXoX5fIgGjD83QFoKUtgZKLGQWCSkbyYaRJ0DqByLHI8VG9Appj2PbObv2awL7QxJRptEgUKKIfHYAAkZnjeMpGNhK2TvpW6OKiFiofN6JwSMWvMUCMbwTo4kKE9GI8QHr1bSfyx54M4DCySk61G3VJmye1yjpuPbMD24Zs6ueyrR3HCohrP96AdVh7ct/ZA+UM5jM6QQ7igEXP0U3RBZOkkTP2jl15NPyVtvBBTb/4cZ56M7Vu4PPimyv61cdFdcgL+FsE3T3v/E7J1Jzw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(136003)(376002)(346002)(39860400002)(366004)(396003)(90011799007)(451199021)(90021799007)(1800799003)(186006)(2616005)(6486002)(86362001)(478600001)(6512007)(26005)(36756003)(6506007)(107886003)(41300700001)(5660300002)(8936002)(316002)(8676002)(44832011)(2906002)(4326008)(6916009)(66946007)(66556008)(66476007)(38100700002)(6666004)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?NHu8kEVM4Og71jR/mDcCtZW7c2A2uM7Fu136yaWknXsOmlAUTNuFx1xuRJJT?= =?us-ascii?Q?S8N8sM2H5CMlqLlqjwSDmYry9yiAMklCnCm6SOBCO3q8pk7bFrxOvMRIl6MT?= =?us-ascii?Q?8YbigmmHAby6/LAg99BHsYHIzkjzPoRkOE+RTpIhwd1WUwvUD8+wu+zChF0v?= =?us-ascii?Q?L97D7cMp0nWRZYxgoyBeFc5zOqP0aO+I1aiD+pVk+eJKUBHYvP/7eaW5c86o?= =?us-ascii?Q?u/JKQracWLncFcvEvjjFPYYiDZkOLYLCk5y2N8Yd+XgkPfMkP7spnO1ldw7E?= =?us-ascii?Q?EOUUCGGeq7Zv/5qrAAZ59jyAjA6ZM4+D7MB57NhxFnzCiMdfXuwos1E7VDA8?= =?us-ascii?Q?LrI6kEBxQVbp8USLaaCi6Vj70f1hkjBOfzVihk9R3lWgZ5KIW6E8r0h9Ro+a?= =?us-ascii?Q?Xr4rs0lE3MFr2nU2CE0rksCwQOi5fN86h+RPYFzqT1ObY4KRVfNhdYYGH7CO?= =?us-ascii?Q?Ld9iKHfh42LWOoCVZ+PaxMbat8D+pX95fMD1CE8EXOXc/VMFLmrNP5vphU0F?= =?us-ascii?Q?HFxn2o6ZGMRcXgdjdKuvVaddKvnaRyCjTtOv3rOI2LW+Ss6yW/XC9idb5F8x?= =?us-ascii?Q?iPIKFkjS0vNIkuuCq4u/oq8puPDmHA6HZPmRPwnkXVzxX8sFZgGF914TmCyA?= =?us-ascii?Q?SrZIOWS9+EGJLMSW0JhiLaGBpxNNPhBBA945sCGsRRBBDC9Q+mkKxLSy8TDa?= =?us-ascii?Q?qE/5QurfhdKie6kkpvnXVBJgmtJWMFh8zE9OJkq618s6mY0p38mGIKJZLTyw?= =?us-ascii?Q?+s9WLP7X4iSfyVtXavkdMIXdZxgw9WQ7UJ2a7eNViE9oCSjegk1CQXhATun5?= =?us-ascii?Q?x1gn8TrM0yZhzKKzU1LdGXQwYhbMK0DUozW9nB+DzAiDodcFDoTPabjQUXlt?= =?us-ascii?Q?SH6bUuNxhgTDm1K7qSgsE4j5Ga8aCAH0LSN2cJ+z51zglAv1aihznIHF3gia?= =?us-ascii?Q?si0w6kr8ZaEDvwxphBohcFDMSBKAv0T643+esHzS1jtIArBG6y03LL00VJy5?= =?us-ascii?Q?gNdgdIAFaVRudKVOed2YdqM99o9g9+HCvade/Q6PJkb0iLhwxCOymZ4fRyF4?= =?us-ascii?Q?/yFghrBx9aqy/fxxXl+P89zIXeLCjfKjoIxv47+Fy85k9GzIIsQzwrMsZU/N?= =?us-ascii?Q?WZaXZYJox4CqjLbj5eDp13YPagcTZD2rrAB+6OhjSZzRjhnuA4irkfP/aZs4?= =?us-ascii?Q?075wjmKXImsGdmFY4LDSXyJMo0DF8uRqOA7VfdJ9gnMHZ8FBR1UI87DcNBPh?= =?us-ascii?Q?LRDRE9vWR7BWq5I4aISfKZ9hRsyx9gzt073OJ6tiD9QbMf8QSsQJSxozSzUH?= =?us-ascii?Q?vCxpL8f81v28XmX/pHf0O7Xy+KphK4VchoL60qKDyAHMWp6ofm1rjZlJ5rTx?= =?us-ascii?Q?oAb7R79g5nRh8k1QmxCKYqboW3yGLYAKUVYvFAH68lFlxxyOuBCz2fMOVYz7?= =?us-ascii?Q?jf8mPd05tPFrKiVS829NfJBN/yQseXRwFTkl5H2qyq0skcTQ7B8Qq/lnm011?= =?us-ascii?Q?IVdJfvrnWPy0qzH7bGzHcwoSbMPJ0AVkz7mT1Y5pOtPcDSP/D852lHCzzOxr?= =?us-ascii?Q?p41WdwH0l4M3pHTDMF0/VOZC/tyKUJU6du8WIM5M?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10ff2969-3147-4c1c-a1df-08db97d1b515 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 05:38:34.6472 (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: LwP4egQr118YvRA1xaOpq8rIO4lkVaxMmSs1LmWo7jP80TxT+XXfZ5hbEp4GLpWaCOoKYUYE/TZBtB3zcr96Yw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR04MB9864 Content-Type: text/plain; charset="utf-8" This patch adds a id argument for userspace PM subflow removing function dsf(), to remove id 0 subflow. ./pm_nl_ctl dsf token $tk id 0 Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 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 49369c4a5f26..6e078854f440 100644 --- a/tools/testing/selftests/net/mptcp/pm_nl_ctl.c +++ b/tools/testing/selftests/net/mptcp/pm_nl_ctl.c @@ -358,9 +358,40 @@ int dsf(int fd, int pm_family, int argc, char *argv[]) off =3D init_genl_req(data, pm_family, MPTCP_PM_CMD_SUBFLOW_DESTROY, MPTCP_PM_VER); =20 - if (argc < 12) + if (argc < 6) syntax(argv); =20 + if (argc < 12) { + u_int8_t id; + + for (arg =3D 2; arg < argc; arg++) { + if (!strcmp(argv[arg], "id")) { + if (++arg >=3D argc) + error(1, 0, " missing id value"); + + id =3D atoi(argv[arg]); + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ATTR_LOC_ID; + rta->rta_len =3D RTA_LENGTH(1); + memcpy(RTA_DATA(rta), &id, 1); + off +=3D NLMSG_ALIGN(rta->rta_len); + } else if (!strcmp(argv[arg], "token")) { + if (++arg >=3D argc) + error(1, 0, " missing token value"); + + token =3D strtoul(argv[arg], NULL, 10); + rta =3D (void *)(data + off); + rta->rta_type =3D MPTCP_PM_ATTR_TOKEN; + rta->rta_len =3D RTA_LENGTH(4); + memcpy(RTA_DATA(rta), &token, 4); + off +=3D NLMSG_ALIGN(rta->rta_len); + } else + error(1, 0, "unknown keyword %s", argv[arg]); + } + do_nl_req(fd, nh, off, 0); + return 0; + } + /* Params recorded in this order: * , , , , */ --=20 2.35.3 From nobody Fri May 17 05:26:28 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2054.outbound.protection.outlook.com [40.107.20.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 267C4639 for ; Tue, 8 Aug 2023 05:38:44 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gxQ4YiojBl36sAvgRqk8rPNmUgnBdvwOZzp9tqnlm1/k8qA3GhTRlggmS0hbJf6gZS13orAJKjcWgH0l44LF7vnOzUSzipLwHVSCdWNRibrtCD7tpauJBrjo47ki+JNINr2qDyg/7EQ1ERd9rWeQDFZQpwmN6fDkrOvmDc5M46KnuhfXVaDPDZEF3fZBrBQvfPaRwiK4Zbf7kUgZPtR0PWQDN+5FjqcpGopLzOkxiGGt8jLO+4lqLd1E9nS9D9N6aOu+BlADLN6MppjmuVIK0sMPDbpRp3lRSzndCLzqOiN/tomwxRZ/lpBHVoaB2AFkBYQ0IHKjTNdqbF3JMrFKjw== 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=rdMAnVq1Ul7ZBmuQ2AsqYk2P2DWHPWcFIOLasDdMIQY=; b=HJzZcrW55jl8Z7MbFHN7a/RSkfwzNLjZN+t++BsCebjRGaQCsvmCpe188BfMiWCiJI6HixVGQBNq3JSTFk0woL9t9pDJ0pYI+AIFEgkmWUFDbHCDcBumhqPZbViWU3RarpLa/L/uIUQUYhrZd3JxcBFKwNFhskgsasEG8gO2frCraLeYeq5jCax9mK6OGrSa2/Hrjx+hpr2F1vtnI41kslRzDMBtrppjtDE6PYmMwKI6gYd70gVQFVYmTrft2iVzr7+ZYSh8nzTu1dCCaVVRz0oDsSWQ06V0s5j8f856AtghZ35NQDR6g6wafxHClYEt65xnpQ/oliKgJy+nk67SVw== 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=rdMAnVq1Ul7ZBmuQ2AsqYk2P2DWHPWcFIOLasDdMIQY=; b=GQeLz2e/8M/fLMtlop5rDg7q4slYUdDco8Z+1nRvCPFjhU+onJps01msgRmGk3+wrb1QycZyxfgHjdL5ZB1uC2/rJN6pcFK1VGkHX4DgkDen2HX1enXoIjsa8bQJGro1AZKSUizsGFOpHMbcTiZi19APOniBGfEshlb4lQuCwBRPY/nXnfW63ErPExysrlN+1a+7YYRipsps11ynLrOFeJMegQTXAOiI7p6omZlaovu5CDIqjZpVQhQaYOzvt/s6uhXJ2frrod1GkhKEMzYaFboSZg28v0hyrHDzytMJs3I9kCqVBY/c9VZ82div6uv2ARHY0EqqCVMlZsdHxL80Nw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com; Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) by PAWPR04MB9864.eurprd04.prod.outlook.com (2603:10a6:102:390::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 05:38:42 +0000 Received: from VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::6480:1775:c36d:b797]) by VI1PR0402MB3503.eurprd04.prod.outlook.com ([fe80::6480:1775:c36d:b797%5]) with mapi id 15.20.6652.026; Tue, 8 Aug 2023 05:38:42 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 4/4] selftests: mptcp: remove id 0 subflow & address Date: Tue, 8 Aug 2023 13:38:27 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0090.apcprd02.prod.outlook.com (2603:1096:4:90::30) To VI1PR0402MB3503.eurprd04.prod.outlook.com (2603:10a6:803:d::26) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: VI1PR0402MB3503:EE_|PAWPR04MB9864:EE_ X-MS-Office365-Filtering-Correlation-Id: 7ba4f44e-d0af-4b77-314d-08db97d1b9a8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: KET6uv25+NdM/27oOV5Fpwov8e6EBZN64eYm59Z7dm1P31mf4p/3n+H4xoPZC/6xm5sAITt/HuFvg3xvMp05OsWR9LVxzvoRn/EFRd/tG/fCcIGFs++fEO5Lbl0JNtggyRvweQYtOytIHveQj9tTddBaLlzpURWFrtAH5bmjJihJFLftfGOiQX8nV5TGDCAyVx8xGgReeVOP+59p3ct0YxCcmiqyeiw6Vqk7cpA9eNiZVEVFvRiR/NjBmTy5+IiEjzSQT9xVSCNdnQVNg+dCXFuV62KdeQvBU4/5VpNxUn762siZ2iVVRdkliZHuJOnMrqVgPKxDYI9Jk918aUO+/FsEYmzGJxaGqb/jldHksN+JLNOALmE9MRICBWiR1aAgQG6ROl3k1j8nBYyWreMh+T5NYSYswgDyto248yDQhYSrVUw+5sbKgluSCXAWT+mPylQBP90jO6jUGNK6c8s07XZzCgSL6RiRdoOMMn9SO+9YdpAFDEpftT+EGvLlAnb68AzgpCHGY0YbeHFH3tbBunP/avHO8x8u/aTqkdKo58KQDtiV1MfRkR4AR6EaHjkvas+nimcoF7qQ+SMiZRUB65gaY6lRJq2V+u0/2XoyS4Wqx+tb/GWNdJjsbg+mKy2FPWde3wy2nUygyc7ppERD7QgsAwyfXRJ7GcKktRTdHC4= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR0402MB3503.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(136003)(376002)(346002)(39860400002)(366004)(396003)(90011799007)(451199021)(90021799007)(1800799003)(186006)(2616005)(6486002)(86362001)(478600001)(6512007)(26005)(36756003)(6506007)(107886003)(41300700001)(5660300002)(8936002)(316002)(8676002)(44832011)(2906002)(4326008)(6916009)(66946007)(66556008)(66476007)(38100700002)(6666004)(83380400001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4eSr41j2gn2a6ivz2a6S0CpFMZtL7Tt77yAFQu/XjideSeWl6Vb5ptamaA8X?= =?us-ascii?Q?J3qXsAhbGlCaHUAo55lD+GBe6nsUKEfiR+rSe8qSQmr0J0usXXePXMmKOQKZ?= =?us-ascii?Q?jGc13lR62xhocDQ19QVJLPbwEhwNHhAB3Ph4D0V8xOOd8lc3ZIqgVaO5Sms9?= =?us-ascii?Q?8jVjS1D3zboxoUo3HJj9v3OT5BC0m5/ofxVOrdTsRMROUpVsPZboTEJNNL+t?= =?us-ascii?Q?jE//3zNqhRbENu3+rBZombIp0fSwwDjJY1sZJs+6F68qhAvCrpkM996geHd3?= =?us-ascii?Q?++ACTq/9xDjNBg3uF+9i4WWX1/if0wByp0bujkkhnbfGWaexORWYrh2r37Gq?= =?us-ascii?Q?JJLzmn4WJDoB1VDQniFPD98vuOZ6NkbCiPG3ks/EjN1oK7Fii4bLD/FwHuCF?= =?us-ascii?Q?kU1ZzEyiAkqms+BAG1/HWrjh4RrPmJUPd0UiChXld967RgWUAGNI2XhHsUxz?= =?us-ascii?Q?jklqQh9qNBxA8lwToWZEZOx7aTuax9iKiLl7KXYnWDe0cYWvCWvBZkdZ14rC?= =?us-ascii?Q?kyBrqlJjHZ2dSl/dLiJp5Sel0sOVm+1fv2ujAxEv6XvddsIa6h3BMYdpL+VR?= =?us-ascii?Q?7n3G7HRc2zStMtTb7i6bj5QbNiQpUHKxwGgK7MnCcTcsUUIDXsosEbf6Ve99?= =?us-ascii?Q?jX7/P+Rj6qgQvQrpBFEyOZiXfNctyAPM1bsXKS7fhHWLx5PVnZ10cBpEKdM0?= =?us-ascii?Q?DlNhU1CyL+miBwov7ncYuG9aCPvAgxdM4mSSEg4glgxU7cx8CH+4tdpVGSEy?= =?us-ascii?Q?py2ku1k+wmuMud+jiwALsxks+cOLIxJYfscEkNV5pSWtENzcUSZzPqx+kWB6?= =?us-ascii?Q?cRbdBRe2uti9YwXzHzNtmi1A7j7Z6WcG7iATxYQ0JroE9GIT80zNCE0AfUGy?= =?us-ascii?Q?PMgQynKyUQ+QzammkwgnoRx8Pq4/B/X5lq+nmRK4EiTmNs4AY2B/8SkL4b1r?= =?us-ascii?Q?BXj3uOygN6Eb3m+tbGZOOPuK6BWnNdKe3NZMB0eaalIqZaOO5io4NWg6wPdo?= =?us-ascii?Q?vwszWnzfMVvORYJf1Rl+ORgGK5WqvWFVXgFlnr6LRQfQR7SE6wUfP4HbAt/i?= =?us-ascii?Q?kEGjI20V34PZokUBOxvegnB64RCWlpE6rFj3dt5ShGzubKborMqE19re5Kgt?= =?us-ascii?Q?BFqK2ZmYaIBbFNt/aBbfUAI/b+XFxAemRCqbjIPzsH25WH8RmQU0FC3Rf7am?= =?us-ascii?Q?JctOOR5o3OXxeIzQPuMyi2V9BAw5rbkiBkKPsfcje866iPuRETfhlI7UaPFT?= =?us-ascii?Q?63mvr01I851r0rf0aUUAP93FqhzXLS45+WgfnnMRM8DjCyU+RqVI3fL/oh3n?= =?us-ascii?Q?IjV366B2dTZ4PNGC4r2aG6EdmGTo1bHaFWWDvLH+77FiV9QKHg9lhMJFk7IP?= =?us-ascii?Q?yOzxtUv25PdVGMVJbyCbmOekJ+p8EkgQgkpIDUmxPVBseUBo80DxUyXJy9vX?= =?us-ascii?Q?WpTT/q3AdXqdGkeeaO1JGsTxe3NrPcNAe5tDJFsI/vsqJ/Hha6p5dZeGuLB7?= =?us-ascii?Q?7XRLPtxJFtxul1UXVF8ivpHhtTerxcHTowBg90h2UYF9zjF5IoUAgaBnQApo?= =?us-ascii?Q?4RYL6UNtF9jqgi/LVdP8tvlga4XgL6QUOuHDuSu3?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7ba4f44e-d0af-4b77-314d-08db97d1b9a8 X-MS-Exchange-CrossTenant-AuthSource: VI1PR0402MB3503.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 05:38:42.4343 (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: Vstm4eJHhISNtfEyjH1fsFi0J41sOjEz5ipmZcfxZllMa6aqU/NGinULZ+12a7BM9b7RUe+/yxkQeLVrIgXZMg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAWPR04MB9864 Content-Type: text/plain; charset="utf-8" This patch adds a selftest for userpsace PM to remove id 0 subflow and id 0 address. 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 ee1f89a872b3..9bcfacaa4124 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3434,6 +3434,30 @@ userspace_tests() kill_events_pids wait $tests_pid fi + + # userspace pm remove id 0 subflow & address + if reset_with_events "userspace pm remove id 0 subflow & address" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + local tk + + set_userspace_pm $ns2 + pm_nl_set_limits $ns1 0 2 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! + wait_mpj $ns2 + userspace_pm_add_sf 10.0.1.2 0 + userspace_pm_add_sf 10.0.3.2 20 + chk_join_nr 2 2 2 + chk_mptcp_info subflows 2 subflows 2 + tk=3D$(sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") + ip netns exec $ns2 ./pm_nl_ctl rem token $tk id 0 + ip netns exec $ns2 ./pm_nl_ctl dsf token $tk id 0 + chk_rm_nr 2 2 + chk_mptcp_info subflows 1 subflows 1 + kill_events_pids + wait $tests_pid + fi } =20 endpoint_tests() --=20 2.35.3