From nobody Fri Apr 26 03:26:16 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2083.outbound.protection.outlook.com [40.107.21.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B62731C2B for ; Wed, 26 Apr 2023 08:56:47 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E9K8U4rqb1GHxtQz44LtMMhw2zt7UJoMEyKYMEyOl2PPf/zHhowXuWYANiw5XIHCVAI+FT+ZESPs898p+PXSKrAEHp/mUV6o9aQ4159nombtNV42hY1dXhaCR+sj3kyD0pcsmxP+nifCwkHFsVAtOyFUaqns9KUOMlW0hu3FGmq2CAZnKB6D09MyZ1Y4LqXxWibemB5UnPfUjPWX6MHLP5USb7fovVeBqpiXvL7tVRT/2+HfVmbYKYZqRnrHzjmvoY5JOP11XdQ32vuI7m5hCaEAiOl8Hrw84loidkRsYubpllMzoBiDkkPd23vEmr3+6/UbwRXaPWsPeP7C/rSAJg== 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=t3bl3W2DePJSR+A5CQupDySYUYnnndOVDynmbOw3Eb0=; b=OW2PqOXlsSborT7vHhGFrXnr5i5bk2UpdaQpRHjVqUgztO1dh6l9nltg0vKz7eWbpAHeBp3l6EaQVDOq73x3Vuo4qqJABCA6kExTzsW1Tqa7s+nFhdQO6bn73HR4+6XvAj1zElrpo77QfYaNf0KBVvqcyGghxCGX5RExbngMma4BHsz6bkFIKNtOoLin9Pi8XPvGaVDkzkwznNyECrv4Ff/yZiZzQWpBhAQa1s3qoRpabaIs2sB24nwBKlgM4dBYbmyfgHzYz2HLlpPwfGStrI8MS5gzo3bAXggesu5qHmVQ80cXxQLHGoJ0ykzdsK1T6RSNmJqBWFaELxfz3t98Jg== 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=t3bl3W2DePJSR+A5CQupDySYUYnnndOVDynmbOw3Eb0=; b=N5KwCz49p8tU09EREsDNaBaInweaBfwtYCRV/O3zEJpLobAvG44iQMUUd20AjAlexRFD/KVoYjlT3DLEkNad5eQzytfqbkwFLeHpvvVH7izpA9YuwUOcava+NsGtLf0qrmXT5aQDBfDxNSrM7thv+RYuqRr64DTAwbLH8TLWE6iFVAUE5td2uRUzFSAF8u+4Wxbk0ySVqgNwUfhc9pZ3f8bBrx65rQiXtGYwaYOoYshaAL2JqE48r+HGocmIBnR3m846bSA2xBmIkBEE310h9p3u4HbCkfu80YadaExv8rLZZxvsttNyLhGVYroc1gHv6mHFWUL4xfi5RGGDkgNLUQ== 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 DBBPR04MB7500.eurprd04.prod.outlook.com (2603:10a6:10:1f4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.21; Wed, 26 Apr 2023 08:56:44 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.033; Wed, 26 Apr 2023 08:56:44 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 1/6] mptcp: only send RM_ADDR in nl_cmd_remove Date: Wed, 26 Apr 2023 16:56:22 +0800 Message-Id: <829320e51d3eb08db95897ab5a8ad4c20660b24e.1682499136.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGBP274CA0017.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7500:EE_ X-MS-Office365-Filtering-Correlation-Id: 154e5084-c1ab-4533-fa87-08db46342936 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: XoDNDrPFUGfkR8fMV2KIsvQmMVHbqVqEQC2OeTngkRDNf3xCqxpOeRIcflcgmg8SD+IDRi7Fht13B4WIGhbf/k3Z2IGPY7XRi6TvvWgEgrDkiu04Ym2upkS47+VRW5JGnqkyjx6CdJutHrknQEnEpW087+LmNaq5lddW1St3vP07CcE1ugsDNqphTrJ16q98BJZ5hGt4o64njTPVRhJYdBPXIn2Fy6PcoSZFxf0eAfuD7TCa28F1/Afm2prDk//VrqI70cChVsG2NawRZO6BF8V9qhri/lqUFl+9GkxtsCLN9kOJacEx/EAt/gvhtin2ZY7vQuRPks74LvI/K/KJuk/oRuLPz7YVoth7164omRcx74DQdinvarBdCFV1epORSDp+ra31rYF1aAhbTut6jklLadOVCOgvaOfC0LSKou/F59GGbuTP5h862ZScfvDfLrCWvoGCco+iA2bFFxVfyxY8k5DQDpUHCVKE2plVvR4FnAI3lTkvr5lbut1siAB+8QhLPzH4+g5kPglupyQrU42sNVaaXJ4YIESClALLsbU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(396003)(366004)(136003)(376002)(346002)(451199021)(5660300002)(6916009)(316002)(4326008)(83380400001)(186003)(36756003)(2906002)(478600001)(6512007)(26005)(6506007)(107886003)(966005)(6486002)(6666004)(41300700001)(2616005)(8676002)(8936002)(38100700002)(86362001)(44832011)(66556008)(66946007)(66476007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?EyDkNQlyVI/BNPdNJXK/IrZEcX7alir0jIpNrzfXaQczu3XVs7feGHJiMI21?= =?us-ascii?Q?UL7phw118FfhIHekM5JC0uddREvrOaHw8oPGNV0Z8GkSgQBnrm5Dw4eCFY2q?= =?us-ascii?Q?GSXsSAW+jHfR0s3ZkeFO+24LLhsPjefy3bTJIzrKBmpGv5YHNipORaKE+8uM?= =?us-ascii?Q?hWgUJiYaiYsgp6ueu6atCgTZNPZi7D0/UOmFwIj8BHmj7ZgGiV92Xp1bxFc3?= =?us-ascii?Q?WwUS0154Gc4gCkR4BXlVVU+REAKVGLz0IMHKMfG9eGLIH0mkw3d5gJ6SU8No?= =?us-ascii?Q?mUe9B+dCvd1W9pPrMe1YMAbywlOJMYnoA0AEIr/Vx2GP4V/L6ATcJm1IURc5?= =?us-ascii?Q?BCRW858Yb0yNWJgVpq18YqKKzVmKxl5+2iNbggED5DqbZA0Bi2f5Wdlf4moF?= =?us-ascii?Q?TiTHTn/dJcYFOAo+ICqwiqpO/Oo9BJCXBtnU3QNRvVrIezLzqyz8HzKY1O4L?= =?us-ascii?Q?W541ZkSh52pDzUMy8prvlm/adhmAjo683e2UtzLPQyhDXlG4TGUDBBtYeJAC?= =?us-ascii?Q?Y8xZGz0EiGpMIUHgV4yR3U78ndnizbAjmwKaVPugSCeXMguI2wSF4MCpF75f?= =?us-ascii?Q?K/B6CO/58q2KMfdAzwKo+Ux8qn+h8YP18EeDWQgATMUj8bbaKMvQAsi2JvqF?= =?us-ascii?Q?CZqoZ3h5t5thJcybeZ3zg4zBX35vyiNuksEfV/mnPpZM/v0+4Uh/QrNOJvW6?= =?us-ascii?Q?+g6Q1p02jaSYaNGK6v9Hf0BcdPpzgeQSMm/La3Eyk/rnLjeRgO1qO9vUiM+V?= =?us-ascii?Q?B4kPHYsllEcjP4QRSKVicUjJeJj2RA6THmOTjxn3jBkXUJsY8om3RnW3FHJ6?= =?us-ascii?Q?lxD32sUmVMyRTlLa6o96/uYyJpAidIR2TPMINDlTvlqayalHY2b+w/xB4qub?= =?us-ascii?Q?Ny7fKKI+dSNeubih4dZnXAISERz/4Mvo9J+pXmQvRopkpMgnyq7efsAAjFTJ?= =?us-ascii?Q?3Mud+2WMCDq7UDLrcBmVS2ZlPvWm8VZjE/J6Pv4lIohpxEbDPkQCJ55ynvQD?= =?us-ascii?Q?ncCib50Eg1n6FVbkY3HXNaQeoYPps7LLejJPC8nhnSK0y5PilzaULi4DU9zg?= =?us-ascii?Q?fWw3NQoJU22rDc09UDbYsWiSQJd/P11ZBLf5hzlDDLujmidE5SlZm7nymyzX?= =?us-ascii?Q?RG67oc0sUFbRk5HTwNGUoYINcaXs+vtHI9hPLM+2PDZSpsQmmxOWmHeOxWwS?= =?us-ascii?Q?4kMRh/+L9yHtZPrMb5zfpAH2WXVRzcYJju6aQvUwRBMt7aFnz4FZanV4Iano?= =?us-ascii?Q?474XBQPIWdSzdsbAhd2nP9oCndgXY89ISEoPIHKHAWfIO8VinJfIp8M/ryTD?= =?us-ascii?Q?CALP0TsKUvDDGeR9oUO/k5JceUvrghl3Pq+4zXR3Vz8ZDrlYI4p1+Dyw8Giw?= =?us-ascii?Q?pV1ZO0AViSkasuszRYzG0ATdtZhmrRRgAdEyYhSgAD9PFhDTMJSPzXBUbk5i?= =?us-ascii?Q?6iCuTKXE3ULHcRZwxzjoA117b7PSmDrcmVUL+5w9QoIygA9wHGv43tesTxsU?= =?us-ascii?Q?5PDp8x6TOWTXs42okwkMhbPaPO6vYrmnZzJ3NzNn4h5F2e2rXZ3OmnezOru5?= =?us-ascii?Q?lNaktuCjfZbiwP6i2Rxv7pVmIwby1QvFkK/UvLEF?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 154e5084-c1ab-4533-fa87-08db46342936 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2023 08:56:44.8200 (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: KG+4A0odfGdB+qr4jlOZM0vCLerMX2cfaL8QkP5yy8Ay5YU2+Z75a0C8WVr5b9FiM5WUw0I5e6+cj6GY/xpzWQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7500 Content-Type: text/plain; charset="utf-8" The specifications from [1] about the "REMOVE" command say: Announce that an address has been lost to the peer It was then only supposed to send a RM_ADDR and not trying to delete associated subflows. A new helper mptcp_pm_remove_addrs() is then introduced to do just that, compared to mptcp_pm_remove_addrs_and_subflows() also removing subflows. To delete a subflow, the userspace daemon can use the "SUB_DESTROY" command, see mptcp_nl_cmd_sf_destroy(). Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") Link: https://github.com/multipath-tcp/mptcp/blob/mptcp_v0.96/include/uapi/= linux/mptcp.h [1] Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 18 ++++++++++++++++++ net/mptcp/pm_userspace.c | 2 +- net/mptcp/protocol.h | 1 + 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index e8336b8bd30e..784145e6a314 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1555,6 +1555,24 @@ static int mptcp_nl_cmd_del_addr(struct sk_buff *skb= , struct genl_info *info) return ret; } =20 +void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct list_head *rm_li= st) +{ + struct mptcp_rm_list alist =3D { .nr =3D 0 }; + struct mptcp_pm_addr_entry *entry; + + list_for_each_entry(entry, rm_list, list) { + if (remove_anno_list_by_saddr(msk, &entry->addr) && + alist.nr < MPTCP_RM_IDS_MAX) + alist.ids[alist.nr++] =3D entry->addr.id; + } + + if (alist.nr) { + spin_lock_bh(&msk->pm.lock); + mptcp_pm_remove_addr(msk, &alist); + spin_unlock_bh(&msk->pm.lock); + } +} + void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, struct list_head *rm_list) { diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 27a275805c06..6beadea8c67d 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -232,7 +232,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct gen= l_info *info) =20 list_move(&match->list, &free_list); =20 - mptcp_pm_remove_addrs_and_subflows(msk, &free_list); + mptcp_pm_remove_addrs(msk, &free_list); =20 release_sock((struct sock *)msk); =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index c39e172c95db..1a2772902e9d 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -845,6 +845,7 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, bool echo); int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_lis= t *rm_list); int mptcp_pm_remove_subflow(struct mptcp_sock *msk, const struct mptcp_rm_= list *rm_list); +void mptcp_pm_remove_addrs(struct mptcp_sock *msk, struct list_head *rm_li= st); void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, struct list_head *rm_list); =20 --=20 2.35.3 From nobody Fri Apr 26 03:26:16 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2051.outbound.protection.outlook.com [40.107.21.51]) (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 C48E11C2B for ; Wed, 26 Apr 2023 08:56:53 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UOVyUNRWeJ/Lof0oL50AzbhzrTIW78KfYDN7dMgiJrfVfBGwfopgZEgAgpBUF3uLzoNlP2KV6UoMfipSVdFkMRiaoh0OjUI2dVbPFxSblO8rHrASG0GdECuRm+8WCIbqkuguSwlG22CbdUpKJ4Lu+MvzOHsX0+JznH+U/0doe97QBqvTT6xDV9jWPLUJrITndoT2AQdTzqM7VgaxDRTeVE3WPa3MoqXeIolGJhUStojhIZ2sxCA9ruBCQy7Y31gWi480uu7U2SkoQ9v8sGEFbedoCANpHqWxlpkWpAc+SSDlFqeOTZllFC3dwIFcl2wGVNrQA+ZMeBs3HSzsUNVlLg== 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=YLyLKREEUrQB/v2kLSW6hVNPgKS4DjkDMfexn5bUheg=; b=cTLeL+boYEKCRUOKdQC/4RNv4wl47cQdwR/aJO86BNx7FCHJSQaT0sCyD0nHLzaGlDjKovOiKRlu8PGe59I1+rZ0NHIlAGcQPg2gnECQsLrnfRS8vNxbp/M86fLCBA8G7dHOIslz+AuuwvdfJrpNYrvg+9HgvmEf2f9mvR4/vl1Don36QIqWFc1TnbWey2Wq9BJhuKGpAEljTQpUxcOEAGoqKQV0oDXzEfgFlbL0slGjQksZBIXbT+w3OG5Ay+XgkwykOmAM2/i2EV+fb4BG5Q6JAVZTAfWI5A3pLnDB6VW949rooHEPR4mxtQdc9PIL9LgjzXA6vPQbrN52nsi9jw== 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=YLyLKREEUrQB/v2kLSW6hVNPgKS4DjkDMfexn5bUheg=; b=gkE287COvyzWzd+k4X+1Bukgb51D+ebe1Os+HYWXSkXU8Fwrfq2yeoi4255RccGvFdSIa8loUlZ2Xb3ZJvz9SDc5AinWoN+/ClbJcIwp/6rrDvxSD9bXeq2dzQUGbw6P0Zb0o9+nQauyxbOm+X4agnGX4AlEWmS0Fn/oBPr8jOa4qBwVlzgrToztvQEH56gCDRqsR1ZzrtyPnhMjWYA0LD3KaeaReO8xnTTpTPG4VbQRysftw7+P12cvMOtE3LJDHJ9sTJhY0MmcDsk6XEORK8ZBDknhZcRXsgn14M05VNJxHpXOrpepyclyyiBByoZ9VJoQEOjOZNG0EfjX20dT0Q== 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 DBBPR04MB7500.eurprd04.prod.outlook.com (2603:10a6:10:1f4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.21; Wed, 26 Apr 2023 08:56:51 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.033; Wed, 26 Apr 2023 08:56:51 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 2/6] selftests: mptcp: update userspace pm addr tests Date: Wed, 26 Apr 2023 16:56:23 +0800 Message-Id: <2663cbe9ab1203202f2ae587475abc36fa93e4fb.1682499136.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SGBP274CA0019.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:b0::31) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7500:EE_ X-MS-Office365-Filtering-Correlation-Id: b7ea0105-ba82-438c-9190-08db46342d0f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hp4uK13hgEHJvZ5qYvfPQCwDxQ+p5Qq+Bp6k2+AZ+uU1ikhvLbLVeW4gfzpVPRKsLyuTB5DtVSo1gcCac0TSB/uNodx9SMRys1P7n9n6zWCZKWwe4STUvD/4AgKzQCE9/ye3SpIn43Vw9NUZEN1SoTvPT/pgsfPZWfnALbonhM3P5e2K2N1ZfxtZF+eyMCcpQKsjXB4EzO5VQY3HMm+MzOS76kCEZoA+wY4N6fCLAzfI8U8KP8nyz3DjmyaIDzpxaXllBvi9FlolpXsCHxzQM4pzSoFEuuFyd8y2NKhAun2VOMJCzOmQjoWxm4/rXfgdXFCJD3fwLrnv4JYhmwVi54Qyli2t+hWXaTtL/qaEBY7CDZLb5jwgpNu3nyBabJaoFHL5cQr+fUPFigB/4Ixhd560SXWiL2h/IbDqkuV0xzSIckVSsafSGc9LJnp2w33fpe92G+OaBvkQVufIYx9e14AFOep7h2XhiPEPWBJLJGuuekTNNa3vd0VKTuemuwADU8lpXUZibo0y7YSSHA4MrB8Iliy4phe4Nb7isM3xFt0YQSmomtd/U9vj9GSmzyY7 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(396003)(366004)(136003)(376002)(346002)(451199021)(5660300002)(6916009)(316002)(4326008)(83380400001)(186003)(36756003)(2906002)(478600001)(6512007)(26005)(6506007)(107886003)(15650500001)(6486002)(6666004)(41300700001)(2616005)(8676002)(8936002)(38100700002)(86362001)(44832011)(66556008)(66946007)(66476007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?PBMgxmxpLyhyqLA5OOUPWZwjY98bVh9bcnfhyoQaoMimHSe93airbjrRuHA1?= =?us-ascii?Q?dmiwRD1HMNlKcRJiG9ZEexO4RtT9YegdvYebBIoOjlQwJnBib2NrTRxcJreZ?= =?us-ascii?Q?bAVeQ5WgvIEdmxzdOw2SRlB1f+mVpWnTnKV8iQP9WsHzQvVOALWusSGj2b/H?= =?us-ascii?Q?X6Uazo2mq0a3TXylD8xH33cNZNqHaB/1uZHbdlhF3o5rgAyzUFRz4U5kTSi9?= =?us-ascii?Q?k0+ttD7mJAymLmHhHIDmLuDTPjT4Z6c8mktgvjGdKUp7KLfv33ace1V5cS3T?= =?us-ascii?Q?NE9x89Rsl7BdmBaNP3X9XOe2j4TpoCm59UE7HKDcd35O8NLzQWk/NoJ9j0MI?= =?us-ascii?Q?pu7wB9MdKfSRlS6xZa3m7j+AUIJvfVP/kJVbE3Tv/8CqdOKc7pmgAMey+bkQ?= =?us-ascii?Q?TZkIt467FhyDNcNfwFfZPxXfXQPZ5m6+0WIh4C2euesiendLnUgxU6SecARy?= =?us-ascii?Q?ojg3UrAJVjM8msEdSr0asosb97REfuyWLlsx1K4u5wBswnL6c5meVg+ZI5Xt?= =?us-ascii?Q?9NNVTumyVgIzvitfe1V6zWL/Owh9fID57NIeSqzo9LLEhc+Gp55jKJACGvQi?= =?us-ascii?Q?pqKMXKReYaHuot5aOKloCLyhE+wUr9ECl/y6msur5jnYUlAT6UdR++Et/DZa?= =?us-ascii?Q?ZWoRX5ZgZSd7FBtcWs9xJqUjaWdpK51fs2aF5kzHpGnzCBLDtb0VCcOczWFh?= =?us-ascii?Q?3G+JqvjzUR3/B+kOPSJcOtoPvpOqm7pzAI+x5SuB5ZnNriJCpjXrSxeVBep+?= =?us-ascii?Q?uihhhRDqEl+W8rT7nlnVVs0juqd5DxL2ss/LlhtEzfqMONKNOx/+gV2CfC8J?= =?us-ascii?Q?dV0bwPyU9R+mjoJ8KZNvSs91FticEqJyhm5ifn+XgNYe2pxmYC0AOraM2M/x?= =?us-ascii?Q?m3UZYktHFBHoPDg1KIqSq59IxQhBG8tcj+Ip2MROCpnsJXTKeQa2YXwKyxfs?= =?us-ascii?Q?DXIxlf4AZ2JTscbDo8gA7JHKHahYYqv7ZKfJHoXCRHEcKNArxk7iPASzFKHq?= =?us-ascii?Q?mTIWKjSO8iA3hAaI/HaHYWi+J26UydsK/+Z7kuxUy5Cjw3wn4Xb3evDCmOoT?= =?us-ascii?Q?zy+fMQgXTNgleuXzzC+pXugP970VnYTJGjhftsuMU0b4TwC+r3h7GAgc7lH1?= =?us-ascii?Q?2BIldzUUe8XjI9b4+ZGg0HNLumpaHtHylMzfvv5l7ZdVAuEGX5g39PodlEST?= =?us-ascii?Q?WkLrXFmEmuaYK0kiUGSJQenf5YgAHZbY8ct0EfI7OwalMHTGJfz39pCZuSq5?= =?us-ascii?Q?+8vh/LNI0nNtDnaGfHBC9KwG+TUjqPPAogkqXyqe6mDEh7KoPmwhkjFh5F3s?= =?us-ascii?Q?IP2PDXrz92k5g5TNkKLH0u8KGXwOiw5pLTsfBBuD5NbnU6sMQ/ZYv3vLN2nT?= =?us-ascii?Q?M5IFOy6pXeBsP/wPUPQwhCnBM5mG3Z9FxLGjbxVX378bKs/uX2PaG15CdhX+?= =?us-ascii?Q?JD6geejr9iyNzsbFdNfKsXJQZ0iZLl15JHf+Ch5sWIz1U4HEC/97c4B9Qsm1?= =?us-ascii?Q?ywSRhMTaItldYTsLIfcQCKH5oxkfhZNWpVMwSQHtenYsL48z5dGqJPXheH1l?= =?us-ascii?Q?8SfDQ5jrPQ7+zs6tyzmvcdcO/T7NLFpmes6ALMwv?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: b7ea0105-ba82-438c-9190-08db46342d0f X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2023 08:56:51.3081 (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: Kwj+mSX9v0g6N5bY076Aw7XklP/JsFuh5N/oAElTM02t+pxQoOKGBt0YHBaaIfL5Nqi9xdQpoyyuuhcoXHpYqA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7500 Content-Type: text/plain; charset="utf-8" This patch is linked to the previous commit ("mptcp: only send RM_ADDR in nl_cmd_remove"). To align with what is done by the in-kernel PM, update userspace pm addr selftests, by sending a remove_subflows command together after the remove_addrs command. Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") Fixes: 97040cf9806e ("selftests: mptcp: userspace pm address tests") Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 26310c17b4c6..67d5d724266a 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -850,6 +850,14 @@ do_transfer() ip netns exec ${listener_ns} ./pm_nl_ctl ann $addr token $tk id $id sleep 1 ip netns exec ${listener_ns} ./pm_nl_ctl rem token $tk id $id + sp=3D$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + da=3D$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q') + dp=3D$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q') + ip netns exec ${listener_ns} ./pm_nl_ctl dsf lip "::ffff:$addr" \ + lport $sp rip $da rport $dp token $tk fi =20 counter=3D$((counter + 1)) --=20 2.35.3 From nobody Fri Apr 26 03:26:16 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2089.outbound.protection.outlook.com [40.107.21.89]) (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 61DF81C2E for ; Wed, 26 Apr 2023 08:57:06 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=d8RKhjB/kEdBFx53Pobgi41kk6GuTbMLjy4V86VoJYnswC4Hbck+sEQgdBsiEYTGcpbqf6ZV4RWIvlDA+8Qe36BBDc+8oahY3sBVtDY9HfMip32z149ATX6umdA0WTYZX4LH9abTUXpZ/+B/O3YG20bOdfOe/QtQwHuAc8RzGDL0tD0yTH9EAvtR40Va+BngwSux3VkomglKtV9qfdnljdU2L1T+srjTWndHfDZgiyk/ZBLM6jGx/wDOID9Y3qqJOpOg56Uj3rYUhm/69fZc/uc9njiPsCzcJKe+xRFtCKzWuntO06a7Ra35udnomFGgxXpi/JTILPiMQ0JoG+TZhw== 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=QuE1OglS/9nVupcefvppeFx7YltgK13fPiGeZLXIDBc=; b=gp0Xvh16P/3K3RFqKEraKsMK7f+WTnQQ6+wfgJlPSsvqKFl4D9gIsGmKXwMw+/bYE/KoPXKC2ZMLGLL1eZXLGiaJXBgc0HBGZk9/vJSvXUKODllaRfAG2/Vjxq8HXr2wcgJePctSfCsc1jI4niFPFfSMyGtNXn3G8E03YsQfmklFYCtrvXPAx0YL1dSb90K0IEFbNyNqWoTpRRJALRn8zVhgziwDIyywWOZKc1xetNGzbdg1QsactYvLJtRj0Ut+jFSLq4VWY1E0kzg4sSxlIxrbjmDoyjdEqYCHs4cbJGVEmqfyWenA358RtZ18JQ5ICC3Y/NhOY+GtkVMBUl5TsQ== 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=QuE1OglS/9nVupcefvppeFx7YltgK13fPiGeZLXIDBc=; b=jMnISjr8p1/1sl7tPgdFuTdPauhtJmgkTBR064IgYucLfIxsdWRmMrz94AtNsZeBxS4OdhJhWhN/WB4r4dWwdNHk1rOuPnwsKWg5BIcdT+VBn/GJf1YRcDYwwnzznT5KygjT4KieW2pv52vTyrfFokRJ4q3e1invco85vm/K5qrpuR6m0B0H/2ID5ZH95d7tuCMt9HNq1uoLZtPVQj5J2074qPQ3FlZInFi605OQFRK9dvXuZWdgjHAGeb420/VGJZeowbs+ZftCxo2PSVTeth/B50D1hSgF6R2YW6AneKliyj3K/TbmWEZ7z0RwmBjUYusFalvd5Zr6+7CSbJce7w== 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 DBBPR04MB7500.eurprd04.prod.outlook.com (2603:10a6:10:1f4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6340.21; Wed, 26 Apr 2023 08:56:59 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.033; Wed, 26 Apr 2023 08:56:59 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 3/6] mptcp: add addr into userspace pm list Date: Wed, 26 Apr 2023 16:56:24 +0800 Message-Id: <0d5410b79cf461ad9f8bb8a15d960ca9517d0bc7.1682499136.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR03CA0093.apcprd03.prod.outlook.com (2603:1096:4:7c::21) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBBPR04MB7500:EE_ X-MS-Office365-Filtering-Correlation-Id: 0e77d573-bda6-4a63-f14e-08db463431d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RT5UKUhD0G5xatm+AjNSjrdsfYtqC9so1zREI+MKS82Hdt2Bq52DMZ74T8jaOUBtPxenRCCkoGB7hMk7xUDuyRHtNYRsuj4X8CcgPzpTS+kg8Kmcz1QIh3VNAjJ2JWmfJKG5Mz87+OKRXv8Z2UCQEUHMMkIbL5LyxnJRFqJYF+GW80ZcElpxB/d/YBcj0azY0ingwo5RgoLEZw1/7TjxBvKLXPe7MmBsEJC2Cv6CMm39JUPqyeRUbooOw2KlDJnUfZ2lERbQZg9+tSNgG9BRhCgGiPHgQGYFXFo1AiJzWbV9YmcUheholJabJTmGQMKXReCUhCaYItdLHe0+NR6I/QpOoYALKGeHmMZpNi0nuo6RuuMCBKl4Aui+24My6fR3B3f0OFFPyU0q73JnIQzL4PfgU671DViljZLYVO9h0cCmmlaawprzsUTUiqTqVHBgiqT3K7l6+kP0RfE4fsQgzzat1ox/u3m5/k8dhNmDxIZfYio8L5W/Se3pZwLYW17AXZVzHPz6rJ3KEqJgygQ5t+H6E8+BXkfpiZczmkF3L0k= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(396003)(366004)(136003)(376002)(346002)(451199021)(5660300002)(6916009)(316002)(4326008)(83380400001)(186003)(36756003)(2906002)(478600001)(6512007)(26005)(6506007)(107886003)(966005)(6486002)(6666004)(41300700001)(2616005)(8676002)(8936002)(38100700002)(86362001)(44832011)(66556008)(66946007)(66476007);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?a1iFysBx1InfAbyH9zV9C2HaI+lPKu0GgNji2DBgdVkSi39BdrEZO3WCgDRV?= =?us-ascii?Q?2FoeFoTu3t687e5Puzm7GBo68J5QkqBfFD0muG7nIauzTshQVkdwxBmwYjQa?= =?us-ascii?Q?+BLN4ZxhGlXHddNlM4ZOyeV7Xxdx82J9CvvdPJ912wQu2OuD8FvuZ22D3Nf4?= =?us-ascii?Q?g1y8M9Ha2N2HIOmwlmKZATllGEKhDzv8dcLl48keVB8QGPnnUAlCmmVi8Uq8?= =?us-ascii?Q?F7GSR/Rlhjhrk6e13WuTSY84ZIrPQ+FMUtjNjb2tvnHm+Fp2j9bnWFWTjhyh?= =?us-ascii?Q?86mv0FMLeVLN0YZONx639NMkAndgwuN+3vMliszioiixkq4FSSWUq6DIETek?= =?us-ascii?Q?Dj5XhyPhX5h+3sUQuzWLG4dkaFiBqL8CM+JS7rnyImfeJ37/xSHyUmZRx58d?= =?us-ascii?Q?YX18ZECIhot1azLch75Fj31h9ZRbtJGYk836UWhBXk4IZjPHqLXDHUkTwGff?= =?us-ascii?Q?bIl9PjXGq9Z1c7tx5hjNzlWqSv3uNfoxW+J2twU/Zx42P7L5U87IVZxMdcjz?= =?us-ascii?Q?TStVxwFWAJx6kI1GA4rViX4+S3H3IjSb9RNIxFDW3kTdAcVVuQm9y5hP2W9V?= =?us-ascii?Q?98gUsBcYATR+EN9u0WpP9oe0OCyTsmKYblF2NxEQryAHrp8TV6WyBTrARGhG?= =?us-ascii?Q?gglJb5vEIMkgYCYT9J7q8/xUuSE/60lRBFUbPpBb4aAxHWPZKyyX5tbxCmf6?= =?us-ascii?Q?M/M0AcegOQu1oingC6mJl6enrJrqyPAg8EuGPv8iSXNtLoKnN5vTeGxrpcFh?= =?us-ascii?Q?Ik08OzuXDCwVQVEmioh3kRMO2HNCyLQlP+drPjv2cp4toAriMf60tvW2Fr4q?= =?us-ascii?Q?K/2lwK1rX2mjnIuWa8FjufY070X4WHmf3sXuHOOCdq1G5WK6sKvJK2SfOouS?= =?us-ascii?Q?2uRNM1isvxIZTD3NCC5mrcHxkPj8NxCzxAh0nrvzhM4ULPFp/E1rIprOGyQQ?= =?us-ascii?Q?P9mOBVHqt6UtO7h1sX55F/tsfhGUYeSnJKKEcUR3mkfX0br3Bp/uqVvs13dE?= =?us-ascii?Q?4lVEborPzm6N+XXEJRDKB6hyKm8+h+84YCTaihpvpvsyt8B0E0/cvNb74DCb?= =?us-ascii?Q?KUSDXo+iCiSqQ9C1IH/e8v2vchHQ9hCbB+QgdJhj7vttrLQgzpQc/TBC5744?= =?us-ascii?Q?JnkBRqfnQ1Gc7dIwH7iZvzeNwsDe5Q5NkFpwTemhbTd51oWAc8N5gKwO2bud?= =?us-ascii?Q?w5wNV65epqOBjVpxDYTFWjqmajz5C5/2KGu2fzFL2wBtQ6S94Ml3Su6q4Whv?= =?us-ascii?Q?AQrv7DTV2baWzQpixc00Y2pOCmS4WZaGuI4q/M6/X2Pb1cYFtVT+bZMNN/QX?= =?us-ascii?Q?azLPtHIyUbIiuT8MMJR6IDLfeJL7L+RJIdAkLUn3FJ1/AXM7U4rS/BjCBq+v?= =?us-ascii?Q?IecHIZtANHYcyI+Wy+c0l5XTI89Qy83EprIurH1P8L/r7ueuxD7BoHoSdJ4c?= =?us-ascii?Q?ry5rcRaJx9LBZugFNUwaQASaIN208UYmC+K00EBPhUyOslfW3mHRFFo0pr6f?= =?us-ascii?Q?IxPV+AY/OaT9/G+Zol8NpqkrpTKPVRcH7p48ZwOPtE45ordTqUSjOM5+zfPe?= =?us-ascii?Q?iXhsWu5r2jIUzhlXofBOD1LdiLEMuv3PyHGMXvzc?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e77d573-bda6-4a63-f14e-08db463431d8 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2023 08:56:59.5763 (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: Rf7iOjblp6UN6tfs8BC9uEbKtYRDrjlruyLmPfo28lN/GfBlSzxVpgX2x+fgF5Wxvln6LdzJ4dBkcFUA75gBKQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR04MB7500 Content-Type: text/plain; charset="utf-8" Add the address into userspace_pm_local_addr_list when the subflow is created. Make sure it can be found in mptcp_nl_cmd_remove(). And delete it in the new helper mptcp_userspace_pm_delete_local_addr(). Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") Link: https://github.com/multipath-tcp/mptcp_net-next/issues/379 Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 6beadea8c67d..fc96405b7616 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -79,6 +79,22 @@ static int mptcp_userspace_pm_append_new_local_addr(stru= ct mptcp_sock *msk, return ret; } =20 +static int mptcp_userspace_pm_delete_local_addr(struct mptcp_sock *msk, + struct mptcp_pm_addr_entry *addr) +{ + struct mptcp_pm_addr_entry *entry, *tmp; + + list_for_each_entry_safe(entry, tmp, &msk->pm.userspace_pm_local_addr_lis= t, list) { + if (mptcp_addresses_equal(&entry->addr, &addr->addr, false)) { + list_del_rcu(&entry->list); + kfree(entry); + return 0; + } + } + + return -EINVAL; +} + int mptcp_userspace_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id, u8 *flags, int *ifindex) @@ -251,6 +267,7 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct = 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 mptcp_pm_addr_entry local =3D { 0 }; struct mptcp_addr_info addr_r; struct mptcp_addr_info addr_l; struct mptcp_sock *msk; @@ -302,12 +319,25 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struc= t genl_info *info) goto create_err; } =20 + local.addr =3D addr_l; + err =3D mptcp_userspace_pm_append_new_local_addr(msk, &local); + if (err < 0) { + GENL_SET_ERR_MSG(info, "did not match address and id"); + goto create_err; + } + lock_sock(sk); =20 err =3D __mptcp_subflow_connect(sk, &addr_l, &addr_r); =20 release_sock(sk); =20 + if (err) { + spin_lock_bh(&msk->pm.lock); + mptcp_userspace_pm_delete_local_addr(msk, &local); + spin_unlock_bh(&msk->pm.lock); + } + create_err: sock_put((struct sock *)msk); return err; @@ -420,10 +450,14 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, stru= ct genl_info *info) ssk =3D mptcp_nl_find_ssk(msk, &addr_l, &addr_r); if (ssk) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); + struct mptcp_pm_addr_entry entry =3D { .addr =3D addr_l }; =20 mptcp_subflow_shutdown(sk, ssk, RCV_SHUTDOWN | SEND_SHUTDOWN); mptcp_close_ssk(sk, ssk, subflow); MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RMSUBFLOW); + spin_lock_bh(&msk->pm.lock); + mptcp_userspace_pm_delete_local_addr(msk, &entry); + spin_unlock_bh(&msk->pm.lock); err =3D 0; } else { err =3D -ESRCH; --=20 2.35.3 From nobody Fri Apr 26 03:26:16 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2085.outbound.protection.outlook.com [40.107.21.85]) (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 F33441C2B for ; Wed, 26 Apr 2023 08:57:14 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j/C9dDxdlExal9I3sQ063S/6TjNw53ZD3cn9onbCS0LsEy0kp9TtqOGb06YfEye9FW+61dxcT8wIC6QE4Pu5T7DOeV3c7GfGdG9ig9/8cPjGOA5Xppa8leovQ+D6NYS3IRvWGEh9oBD40cpzBksGcZA1YHHBRIOnfM7Cje1q9ljCiGjb0ECix1wxVHj013p7IKGlDKkoeuIr6n2RfN0O2h55ZIGssW49QeoJqIjk1FPEJGshC5H8bfJI+LFLoOLIcyI1G7RoWLY6Y67YyK/x83H0ept9Ce+MolOGHGzKsJ+Nnt0M7T1CrtxtyZakqVWVMJyvqovzjsxGVZDRuyUhsw== 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=wCV0AEWEtidxTEvBQUI1wBNDYg/Myr+Hzq8yss6HBH4=; b=B66YI6WrFjqYpcR2d+Ki3nYm9qNJrTtlMJM6fw7q2Q4gmJv0UmlzrsMaxoZZSLHlnNUDajwPaHC2M6TJXosa49j9UQtEJqaIiV6WfI0ole3UL5PDyfaeFeTo+g7t1kGZ7BhO6rJmqU7foxszJsuXseTOAWQcsMv7NTfBfZLRNoSL8mxsGnalv8vhqPJ53hh2ja5VKnyGXACLHPrMhJkgBTeKIjyRIHV6Ry65gNctaAKy5A7L8DxzlguJvDkvo8ond/2xRBZ9knCIAZf5e24S0EZNWDEutdk6/sNeQhC8qU+HaqsH/6hoO9xixKLcQK6kdlKh6VfWtGBsQrbxZAWtfg== 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=wCV0AEWEtidxTEvBQUI1wBNDYg/Myr+Hzq8yss6HBH4=; b=s51r5JhHogoLBwPAzS+XXVaP7aDiotjp9597Ys4dmfPZZDtuTFVq2unSVS9ILOSkrE7QGufIB/tLyPFfHREa9nI7wpSNb4njLwbQQdxtWXnM7ZZXUb/UlM5EAe/yAWolBOUIILsb5b6/SaFLjMYTj1AZu+lCXIIXvHeObn9raEAxfQfuMjhdCyTUClBKoC0AYTRq4dMyq2HIY8wlNPDJUCGAR8Tylmk8zbxMxcHOi7UtH4x6KD8nyk0s9mhgGPJDN/vonvc2lyacU6y2fsl/U8spAr/5GI3LL2f3P/mrs4mOYNaOTViNoh4kFs2+EPrXSNmHEJpPUjUsT6d4Hb2EPg== 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 AS1PR04MB9237.eurprd04.prod.outlook.com (2603:10a6:20b:4d1::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34; Wed, 26 Apr 2023 08:57:11 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.033; Wed, 26 Apr 2023 08:57:11 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 4/6] mptcp: export remove_anno_list_by_saddr Date: Wed, 26 Apr 2023 16:56:25 +0800 Message-Id: <90c3c446e95c4c70019069208b54a54c1539de2a.1682499136.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0167.apcprd04.prod.outlook.com (2603:1096:4::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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS1PR04MB9237:EE_ X-MS-Office365-Filtering-Correlation-Id: ab58e170-37d0-44db-3e64-08db463438e3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bwaiq8RnanyiePbC0b+lOmuWydliaceKLMUan+QvTMPYnr1IY0OuHEb7T/iwuPjFdDlS2zB3hTMb9x6jPUmmusNr7H9U68svrvMAkvL2sxHtQEH4BSpFyJKV1dY16CABLojQXlNE2rEmH1IScTUvu/pa59pBoLNgiP+p1RHuhUVLJL70TOJgKgs7/qpobOe6kpo6YWGqjceGF+P01Kj5aJSP8bKEnHCVQAyiMGxpOq7c62VqxNxZz+qcbgEuT/ogP9ie1OJgj/2UW+QO1Y0ROsiSDiJjurJJvWunq+yMRoTQoEFwCqxxwIpXMTQtkXjT8uTakGXGwqROWv7Eg8O278YpIuezDkAHJ4LhUy+fWPpSGy7MUbcMkhQ/hob7UTr2tvIoUfRi/Ow7yPjLMEBNI/+MvoDwU7SpCVOI7c3ANs7LP8QO8AmIIjwpQUozxmWi8wThJ5XMoBGm3buCjf4cYkHGfnMGqHacses07wwxXj4fh51ZLol1ZTnq34BGeVErWl55VTwNW5tG/dWP/zsYjGoPePsoMYqE8M31yUZbEsEJ+fBjdz0Rbd+xe8ljpzeK X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(366004)(346002)(396003)(136003)(376002)(451199021)(36756003)(5660300002)(44832011)(8676002)(316002)(8936002)(38100700002)(66946007)(41300700001)(86362001)(66476007)(66556008)(4326008)(2906002)(6916009)(107886003)(83380400001)(186003)(6506007)(26005)(6512007)(478600001)(6486002)(2616005)(6666004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Oewic/dwEdHf8kvW/j2034nQm0uXlnPSQ1LbEjb5huq80Eh3rAKyJh7pJHw/?= =?us-ascii?Q?srik++7c4yju+EdNU4bVYhpG6hUnzu+Uvrntu5YWXTXtQTfdIF/hGofr/xMB?= =?us-ascii?Q?/v/OWElf8vqPEoAQ85ajXL3nng3jlFhqKWwBqPtPsf/tlQib+oczoEpQd9OY?= =?us-ascii?Q?5hLvMRDKR4+fEHz8NuvDlQl3PuAY97nqgVNmMP3jYxtbE8ELlRM6krzi7AAI?= =?us-ascii?Q?NEWSvwpyofUma5SfZ6uOPhSr1McXaia/owJ5+71IfD9/fAaeiD6ZG88YnEFU?= =?us-ascii?Q?YJZzQvXbtlnxgNJZ32eAIsPBYXtJPWFNhD6bhQP/bLhEqjYdC6uSomwqSoNU?= =?us-ascii?Q?7JTWZ26aqEdTc6AUX4R1dQNL6ZU7QPVOVTG8lz/BQidD3MgNx04fcpW63MYU?= =?us-ascii?Q?UWQMYTw73kFNIUM/GmTAyh/GQSk+GgDT6MrjC4tkgk+PiBwLRmliexSfV90z?= =?us-ascii?Q?HatNZiMNbGS7O4B9oK2v+56gAbjBs+inE1sGw50ju759Dq9NLTyih9m41tK6?= =?us-ascii?Q?lA7meV5XGC6cQ04hXt19snSWtz6DCcOXiyMnoMN2eQUF9YlMbLfO8kLL/0/P?= =?us-ascii?Q?CKg31Irxvw2muwos6nSLpus8Z/jjT6dcYGnqrZkoRaXK26yuKx56XOv+/VXc?= =?us-ascii?Q?2PXT9N8TzwbDM94uREk8b62qkF8RtkIdU/Zrnsc3IC/LP8N6o8kECI8I141v?= =?us-ascii?Q?61ZiSTpPyyMsceqPlAcxBeVKlUS7G8Q3YkYbty/tV3FZXLbSQEezABbkEy0g?= =?us-ascii?Q?+gDLE8Ku6lLaA73qQCl1SsId63uZXJgh4ow3WTmBVB82APsYLUprz3cV2i9C?= =?us-ascii?Q?aEVCEbhcuLrhVny39msUE9aX3LF/cS8jrq7ZFNWJm2N98A9MFAKo07/eEqIw?= =?us-ascii?Q?g6tBQMhYP45FYMoto0RSicx+irLTRrPZ+zPKQPcTN6IoXFPyOpEGU1SVdrTR?= =?us-ascii?Q?KoY6yfSpmtj1v0XGlAHE1dSF9w1gWLE4PAo+C4T5y7eMfN6XtYdp08VeQws/?= =?us-ascii?Q?hPiVjaL5zSSEjzYPTXuBs82W7ft7vYFBmu90cpYpIIIv5R05L9WEwRl37F+u?= =?us-ascii?Q?1O4nv2D5mfX6xP/RbNty0acaTJmopc43VnvNvVhdQatrR/9fW/KLZSi9yt5N?= =?us-ascii?Q?uo4gxOZCAybQosbnvOfEapdpO3tUgpIz/bem85GeVNCC+MEi4EdaqYRe05Oy?= =?us-ascii?Q?X9UwTDmefyKOg+u6kFdtgy+cKvw7gtSurHyna7jrNwSNIWxBkwaCukfdEmil?= =?us-ascii?Q?8KxYi/DY5/i+cEH+50nMp8NqJgJ2q0TjOtHeF1liGNT5B5M9RTKvUMnCsJoe?= =?us-ascii?Q?dS9zTYzjScSDwheqhxB8mGVzi2H7S9fGkrH6AxhdarDu6M1WlitOHCbrsOAJ?= =?us-ascii?Q?l6L1abYmPfTmwantDe65SX/wNYn9D1oO3jdoqRuctlgdaW/21zVl4rs0dSC5?= =?us-ascii?Q?PFPM6/+cSXwG2GH+Y6B441PoK+V20zg6WK/He6r/HiX0rTjKZBN8A1nrI0u2?= =?us-ascii?Q?Op934bozcDYj6XZpAJOukysaz3i+isOh4mhCceuh+6SyB/rpnGeqcid2vNhs?= =?us-ascii?Q?m8fv9nNqTFJ2oCHGdi0MlXV3Gd2z7NxOBLv2i++I?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab58e170-37d0-44db-3e64-08db463438e3 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2023 08:57:11.2053 (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: 2vRmzUwzTBRxlioDDdIZBso4TkjA9vx4CQFOl4euV/VivuUFa1ufV5jC0lZ5JDx9QVGgi7t0hVJk9mBGdvlgYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9237 Content-Type: text/plain; charset="utf-8" Rename remove_anno_list_by_saddr() with "mptcp_pm_" prefix and export it in protocol.h. This function will be re-used in the userspace PM code in the following commit. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 10 +++++----- net/mptcp/protocol.h | 2 ++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 784145e6a314..0b34b57fc8bc 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1399,8 +1399,8 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp= _sock *msk, unsigned int id return 0; } =20 -static bool remove_anno_list_by_saddr(struct mptcp_sock *msk, - const struct mptcp_addr_info *addr) +bool mptcp_pm_remove_anno_list_by_saddr(struct mptcp_sock *msk, + const struct mptcp_addr_info *addr) { struct mptcp_pm_add_entry *entry; =20 @@ -1423,7 +1423,7 @@ static bool mptcp_pm_remove_anno_addr(struct mptcp_so= ck *msk, =20 list.ids[list.nr++] =3D addr->id; =20 - ret =3D remove_anno_list_by_saddr(msk, addr); + ret =3D mptcp_pm_remove_anno_list_by_saddr(msk, addr); if (ret || force) { spin_lock_bh(&msk->pm.lock); mptcp_pm_remove_addr(msk, &list); @@ -1561,7 +1561,7 @@ void mptcp_pm_remove_addrs(struct mptcp_sock *msk, st= ruct list_head *rm_list) struct mptcp_pm_addr_entry *entry; =20 list_for_each_entry(entry, rm_list, list) { - if (remove_anno_list_by_saddr(msk, &entry->addr) && + if (mptcp_pm_remove_anno_list_by_saddr(msk, &entry->addr) && alist.nr < MPTCP_RM_IDS_MAX) alist.ids[alist.nr++] =3D entry->addr.id; } @@ -1584,7 +1584,7 @@ void mptcp_pm_remove_addrs_and_subflows(struct mptcp_= sock *msk, slist.nr < MPTCP_RM_IDS_MAX) slist.ids[slist.nr++] =3D entry->addr.id; =20 - if (remove_anno_list_by_saddr(msk, &entry->addr) && + if (mptcp_pm_remove_anno_list_by_saddr(msk, &entry->addr) && alist.nr < MPTCP_RM_IDS_MAX) alist.ids[alist.nr++] =3D entry->addr.id; } diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 1a2772902e9d..bfa7d93a1c1a 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -831,6 +831,8 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, struct mptcp_pm_add_entry * mptcp_lookup_anno_list_by_saddr(const struct mptcp_sock *msk, const struct mptcp_addr_info *addr); +bool mptcp_pm_remove_anno_list_by_saddr(struct mptcp_sock *msk, + const struct mptcp_addr_info *addr); int mptcp_pm_get_flags_and_ifindex_by_id(struct mptcp_sock *msk, unsigned int id, u8 *flags, int *ifindex); --=20 2.35.3 From nobody Fri Apr 26 03:26:16 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2079.outbound.protection.outlook.com [40.107.21.79]) (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 81F941C2B for ; Wed, 26 Apr 2023 08:57:24 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P+of8JX/2Y9yWFEVIy4rRmiOtQlF3Od11ueqra0jPJPfy9cULFUdOL5+Izmc1QfJK1uC1GIRzT9CxTtsvttGKoAx9HCxCQuKSdPMc+tY4A1i/o83HdfThIRxrRjjn8uKD0KvO8eQiLfdGyMbjqRCOCla6rCYFPRbvCbN4bELCJ+1IGw41PLnXKe8cwT9U8dKcM172DKYB9K3F6yG+dUx71hmvMI98XcOG3E+v/kMf07DFOLIhS//Ax7eTmJP966gsrjrezougnBF2oC76rFBslPQCpa10FLyzNgkzCW+EAJ/KuHVFNLaPcMxv0D0k9JG6cZzU2A2Lmz/6w+Omp1REg== 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=aIuhJRRTicz4OSfyhJ/shrS8i0HP2/16yyNL5gbOwdk=; b=efW0DXCIKEaNTZk5/6SGl7qSYNjKD43sWhXQn1thVg3qLFo96q6zmWVbf/2d4oWOIrbXU1vWdnrI/9MDeGtJQSxFnrSyrlCam8ib2VpmSE0jQat5BMJL9r+1xIqmrxUPLgOJ33y07+BW02mBneUhmdsUlH2t3l5t2QfEVnak5UxbdtiMf0eCs4eM78MwTxs91GOi330hYSlEv0cqcjDLemXeKd1EtWaAoW84K1TUp7wIF8YlaPtAEippZWc7f5vJE4z+OOwgB6n0dwv8YZtTwHI8Jgs/0br67uGv5PzDQ88IHwUVqX4kc3229lQ6sn6ht5aNBhc2+Y2nSlR8vuQcAg== 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=aIuhJRRTicz4OSfyhJ/shrS8i0HP2/16yyNL5gbOwdk=; b=2GimO2cmEv/8VKwlcvDgimZ4EDkaO3XzScusOzPO03hKWP/iLmIel0vcQbQ11kMx8WQ9+wO3REbJayFL+ciUDrg1XrzCxWPIQ3QpZ3jlNoRNWWUhLpFS7SGR+oPOxR+NPpKCoXO5fTXT1X7JpBxI6BGH7L8cwKKz+IzVKUEbkICh2Xd16pLwXZVqpDJ77pBUrPpKSKUrAVzSVD/aG4vJRF7JJlqz4Zexw9t+f0DGWCxqSHjmoxaVsJCiLuT69lAlDtrCmV+HVS6cz7nK9yRi3Wt8ZmII+cyTz1BfAuTlrWONTPgI9Cco6pgqvu83CNrOSWSXmHtQkHB9MOKvvvzSZw== 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 AS1PR04MB9237.eurprd04.prod.outlook.com (2603:10a6:20b:4d1::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34; Wed, 26 Apr 2023 08:57:20 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.033; Wed, 26 Apr 2023 08:57:20 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 5/6] mptcp: add addr into pm anno_list Date: Wed, 26 Apr 2023 16:56:26 +0800 Message-Id: <247abcd097c77e86b606dca38179693f8c00d559.1682499136.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR04CA0160.apcprd04.prod.outlook.com (2603:1096:4::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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS1PR04MB9237:EE_ X-MS-Office365-Filtering-Correlation-Id: ec705eb3-2392-448f-a426-08db46343e79 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7uI1IrZwcGXZY2stkKFuhqHjq+1FcrJQrBvkOJ6OPk+ys9jS5pNQbP00FoDHWmAfe81uzOhxpyTPm1raEA7m8sVYdClQlVeSktUBSU2UvhgQpQexguHDkYFGNH4+keZH94SKxVmgfN0xLMVHAsDmmjCs6dmn/JBcUvAGuft5rZTvY8i0fsCuARHkPdEcSxkcsoHUsgotg/6QaqHMW1yLcqwcER5ukn4+E/OvsR+zzA40k/GcW4/xQcMXsGQDuOQ39bUEjQbnDbX5qgZCA4euGJFO3QkSp8PDdWYgLY6xarHiy3bJPFn6kds6Eb/yhcMyXtSh5V3zoh+ZhUo1wZlUjBh8/JUQSBgtE/wYGs25l3Z7wqtH8c29GXlc9eqvU+C7/vo4NYyv+cPiDxgyWZr5J1mmrbFBK0s6NnW8Y896OhHP42TutRHnaYpqjLUkffNhmBuwXjmKk/f49WVsMSXDseBU45y+QVzZbbHjRU+e0L/mo8klWMtAKsWUf1EbByPecCubGE5qMDbq3mzIWmZbA/cK7p+enPv2zeAbT9O8UkA= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(366004)(346002)(396003)(136003)(376002)(451199021)(36756003)(5660300002)(44832011)(8676002)(316002)(8936002)(38100700002)(66946007)(41300700001)(86362001)(66476007)(66556008)(4326008)(2906002)(6916009)(107886003)(966005)(83380400001)(186003)(6506007)(26005)(6512007)(478600001)(6486002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?vkFNSqraR5Xt1zQ8ebPsYlfpVTCgGNvf5UaRM6k6M3lniCT3aAvciR3vWWrL?= =?us-ascii?Q?TgRL/TfaP1W95lJ8iafjruC0Q4tGCCLK8xvqZuTGh5sC4bM76ez6//oqEua/?= =?us-ascii?Q?cRng9WM6mo0KurMWKAwNuuGXYaGw5sxtWuhAXC72tsXnqydnPPxb7kJHIqZO?= =?us-ascii?Q?to/IiuIlhwXC49JmOrOAEkjn8V72FLk6z1P9O7aYRMngNwHNYpat9YNKFovU?= =?us-ascii?Q?yV5xNvjG/nF9BQ9h9DJn41oRxGEFYzQrEdV7OdfxbOVhhQzLmtZ6S51lvt3b?= =?us-ascii?Q?D7LKv2TWO9hFd3uyl0WKT7b8eDcI5a8XFvZWHNo6PmKHt/XEBS3nWJ99+EEt?= =?us-ascii?Q?kvaHizsr2plPm9Cgxe/74P7F6sc21fLnrwOPS1JFNinnB0V3Ou+wWGZvxhiR?= =?us-ascii?Q?jn3IAfv7d4ZE80HuAzFJKMLd0UDbYCkREL0/cjSHwBGNNiGCljwExgX9qIWN?= =?us-ascii?Q?YNJSWdZUbPVUNsHpxpzq2VElc0QHWGc1hXWCpyUuU27P8QiZM9w7vYRcDgLU?= =?us-ascii?Q?ly7CBEujLwRGEcheebXKSf3NyXy4OonY+E3vfzF3wDwb1dEIv2g1NdHVjBZ+?= =?us-ascii?Q?sJPS3jzRiU4KJUL/yWy3l22cg9tA05pOlcHvTBYi5BsWNwqD+EE6GRzntqqJ?= =?us-ascii?Q?6I71Mlp3kJGyrpqYFTSj7nBtKLHBjfdP7a1x7r1IyZ+DyLOENsRB2kp7kjtM?= =?us-ascii?Q?pBZl3ojpQ95ZIIKiEUBQsCB1pQnb3yh8sHWAUv5XRDj/I1DavV2o7CdTVOHu?= =?us-ascii?Q?lPvVKLb1CHoHWAm3CrMID3w+jniCfL9lVEuoBZzuADm+j7yG5ci3a6iZDYUa?= =?us-ascii?Q?bp2ZA3pSxULkXB5Jh4SoQjY3iUVdvkGvMbgzBDi9V+3lWFSqwODfvFa5chln?= =?us-ascii?Q?DSubc1opfUBbejwvm/IF9Co+M8RqQb+5TH6K9A8cM+LH8Yi39TY7BXwnlj2M?= =?us-ascii?Q?s3rXy3uEF1ApTVt3zjwOb2+9yzJwW77O2MY1L7XJC1mBvBOm+cGrm9gSsOdE?= =?us-ascii?Q?YBkRMissR9LoPHDhkx+eOGgAPld6w5xpb8rB4bwXPlm/NclWZjJ9PsvkOOHW?= =?us-ascii?Q?CFCL5uqRQfNtbtKz1pGvmeXckBK/42WgXyFvxFB6xdh5kcrh8u5ZbihyWQA3?= =?us-ascii?Q?5Dx3DIcE/hxEb8bA7cb66ClxnmO4epgV8FaoZlQhPzhmc+zJsKyS7RnUCmrx?= =?us-ascii?Q?fBgs7Uubj4kTwMYlejPadTQkHpS8Zu9ImZ6t7JKnNX28AIl9ijMH4cjx83qV?= =?us-ascii?Q?sJ0AVt656FvZtnvftrWjFHAMnsXpfGKY34Y9Z/eMxTIwjm8FK2rnuApLA4ov?= =?us-ascii?Q?OietbX4L7/HXSy4dxyRC5cf05g5culsosM4SXhTRyg5r/5kAbeHjLbDgET8B?= =?us-ascii?Q?k7R/whJ2wNjdbLbBb59DqqOuvoslH4lnvnahzu1CH3erZIOiNpnCyvwakmmJ?= =?us-ascii?Q?3bgVBShWXifaigxuyDAymiOc2riZNNy++anRfUXPygW1as6cyEjrrAG0CAOJ?= =?us-ascii?Q?tSIT56suQ5eiBEpKWa7V9f1mi6EYRdoUmDHhZTw7Goi8BgDDPai0VxasHVgw?= =?us-ascii?Q?ulQ5Z5Vk7OL/oveX/jPviv8qYkHOA7ISJHUqZxBx?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ec705eb3-2392-448f-a426-08db46343e79 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2023 08:57:20.5307 (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: oBNf/ID/K3FoyqoUYJrGUyYXRDG+7X8Ua46/BDD4ASiuHmA3IVvuqKPN9Lp2dkd7Oc3Xs8R37uHSVYg/4rudKQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9237 Content-Type: text/plain; charset="utf-8" Add address into pm anno_list in mptcp_nl_cmd_sf_create(). Remove it when connecting fails. By doing this, the "REMOVE" command also works with subflows that have been created via the "SUB_CREATE" command instead of restricting to the addresses that have been announced via the "ANNOUNCE" command. Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") Link: https://github.com/multipath-tcp/mptcp_net-next/issues/379 Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index fc96405b7616..ab7c692e8c5e 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -326,6 +326,14 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct= genl_info *info) goto create_err; } =20 + spin_lock_bh(&msk->pm.lock); + if (!mptcp_pm_alloc_anno_list(msk, &local)) { + mptcp_userspace_pm_delete_local_addr(msk, &local); + spin_unlock_bh(&msk->pm.lock); + goto create_err; + } + spin_unlock_bh(&msk->pm.lock); + lock_sock(sk); =20 err =3D __mptcp_subflow_connect(sk, &addr_l, &addr_r); @@ -334,6 +342,7 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct = genl_info *info) =20 if (err) { spin_lock_bh(&msk->pm.lock); + mptcp_pm_remove_anno_list_by_saddr(msk, &addr_l); mptcp_userspace_pm_delete_local_addr(msk, &local); spin_unlock_bh(&msk->pm.lock); } --=20 2.35.3 From nobody Fri Apr 26 03:26:16 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2059.outbound.protection.outlook.com [40.107.21.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A51A11C2B for ; Wed, 26 Apr 2023 08:57:39 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DPfomNs2WmVxQyG+IwsCSu+PDXZzbtfFNmgw5RnHmQaLEC4SlkWgEshMdy6Yz7N7/TxYLp0B3Zo7UHfWiFFIVWC3hCFPJ5azwxniHN/38aY7CFzQEFmMSpObaWQ7lW5iZBecduJceBkRcDsb1NJxO1CmmOtvNDBbg0NSh+dvVfclOZpfi35PF62h7q7VWAgPpSlbhMvbw4CTU2Yty1tvZXijOlIoVGq80acPY1O2eRVlA54lI9GAKPRlzkh258/uPylwt6M2AESEdE3aA0xIAZG0hRb4yFpkYCMLvUlQ5jNnYWOWPv782mbt2LMFQRlB8ZgXMuKGI4fiNrwkpUAcIw== 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=4pQKRGKQCPOSK0aelt1gkY82J+RWhqBVjAQBYPz7ODU=; b=AN5CrFqyRpt9WAo8UaKfMw4v6eOTEFo5IfY1LdpsxeRsnClbtDh60EBtz/xM/nBIDwzBkoDC2U2KlzdLcXOmjyLaiNG9m4IptoRbNoZuTw10eok5NmssULWsBS/lEpZDTLXwj2Fbej3DDQtEb312mMCm7YwObxlk1Q5rNO48PASC0AjdDIR911qtjc1ghG7dD7oLVI9A6d+jhU1W6tk4SMQwFx6jaP8f3iCAYJ+uKYZMVF8gip7AnKbdlWw8FH7NqrMkZUo59/pCICiO3NF90u3lm9kvmJO4vpmyykA0jW5s7gLZpwTrEqMN19q+gMZJEVG/GKXIZxK0NMbTjeX8JQ== 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=4pQKRGKQCPOSK0aelt1gkY82J+RWhqBVjAQBYPz7ODU=; b=s0w1lHfTX2wCU0HK8hdxxPrF8rjcl1pqczLrEj8vMG0lM6/+psvFLNQ/S5vNcZNoJHMBj4H9KbnUKNf5j2lFJP6gOzvbbnua/r0UUvGQkQYxmhg5SGSJAc//UUjwNJUv3INjsqlGF3nsHlni0Xm28EvvYtH+0Uv/a/0oSCnSlzQ+FyAAcJyjTdro4xGK3P6AMttNH4ldHuJ5qXlFOeNJiTF6E8W6ME2V8Ggjk4wapsWQ3U2E18za8BqrZVAunjp7OMiHV9OF4WB4b4gQ+Y1WP/TGSHdUiclrcJq6zeC6LaE3Avo4yGNXSpO1NmTdXNyPmEoGFgNaBpoNHiUp39+8Ig== 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 AS1PR04MB9237.eurprd04.prod.outlook.com (2603:10a6:20b:4d1::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.34; Wed, 26 Apr 2023 08:57:36 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::c16c:64f2:91e:29b5%6]) with mapi id 15.20.6319.033; Wed, 26 Apr 2023 08:57:36 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v10 6/6] selftests: mptcp: update userspace pm subflow tests Date: Wed, 26 Apr 2023 16:56:27 +0800 Message-Id: <6d3687d33b1a7f6b40e75047ab09a625ff79d923.1682499136.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR02CA0113.apcprd02.prod.outlook.com (2603:1096:4:92::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-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AS1PR04MB9237:EE_ X-MS-Office365-Filtering-Correlation-Id: ad543c1f-a93d-41b3-b16f-08db4634481a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gp231SULPLBVDPgnK+dTD1ON32NT0ASUxBj4W58KoXKkRgkW3mHGwWEedZ18L8/ZCxzAq5buMuXYvF5RVK/4ktwDZalsnLJw1mHolY552Y1MP1Gz5R8CUpjtJ73sFbrXAbZepNcdkHUIhJoHk0Jcz5PkNc202z899y/vXZaCKA86HFK8aL0g56Z8qPH+HPx8RQ/bL0a+K9Att7ylMx0mOYuCrFoorGBDqJaxUWYrTC4Iz2axB2glkYlndNGM35YifqVfkaaNEMZ0erwqFCSFzL9I6OXzVBC7mOM7MpqcgYhmo6bt80qbGPFVWLTvbap0HUaaK2mNPzs1JtiAYFbYxGEE3ylVwCNTu3tpsRXJJSu405ZottjF2fGLpmrrySSvvm7G7gVaZprCZWFcoibfC4ZWUW3hYJnieTWOtbF8ADXGMDjlhYpZuScSDNInEjmiA8btaEYW8U8x5PcdqOtcI/hD+pl8U1BMyzQ7ZVSQxJBKlVJqQPNLH5U5N91InUGPYNydwYKRQEfUiS14PJGxUDIyXU3VkuQnxI4bIP4illI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(136003)(396003)(366004)(39860400002)(346002)(451199021)(316002)(83380400001)(966005)(107886003)(478600001)(6486002)(2616005)(6666004)(26005)(6506007)(186003)(6512007)(44832011)(15650500001)(5660300002)(36756003)(66946007)(38100700002)(66476007)(66556008)(4326008)(2906002)(6916009)(41300700001)(86362001)(8676002)(8936002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Bn22r7EL7nmgtA8b7afSVGJhDSMFkaDKnvwMd5jlj/Xm2Uu9ZeI+gWuaeJQZ?= =?us-ascii?Q?Z9GV44Dhie6XQ8+AOJh/2GOTh2ExxjQhnOQdgScmsc+jZkYhm/zGyWmXFz7x?= =?us-ascii?Q?C6FwPZc56CjGYHfwr3Mb/rsPduKHSQdN3e+ZdKx2PAqnJyo1f3FLKp23AN9a?= =?us-ascii?Q?SAW1FM+vQSdJ7nNcbl9Ej1jaW9vn1Jr/n41AtRcHPhJT7LEn4QbJupEBCV3i?= =?us-ascii?Q?IFsle2AxOrMFcx35BnhS8xJQl5xiBP3BteENqyE9wbJMhDVaRtLKO45OL0gK?= =?us-ascii?Q?ZEsdJuhlLzXtfxHoJkTjHZ7v27Ra33v8+AI1tDgtx9dE9uhJTen0C/0FwufQ?= =?us-ascii?Q?dCEO/zIA4W8CPcz8Xsq6vtzGQH8kgn0cKfVE+6XKhLoxXiZnjfdR3bFFMFf9?= =?us-ascii?Q?Cz++DVSJxqPaBebFUYD0UP1UiFpFL8cPfoFgRdcSj0DeeLQ1dUAG+buL9uZT?= =?us-ascii?Q?ASXkguYZADFXDi2Y1Atbtx2obiX9CCcPYqpVYUyGoMBNSejfM/36K4+doHg0?= =?us-ascii?Q?XhyAU5DekaPqaU+cUxmLPI5V2jiMWrwUmooMpN8PVFomHgNyYdHk8QKqb8mv?= =?us-ascii?Q?saXj8vX0YQo6GBX9hGoM/goNetrejkpfnWgROWxXm9oT5W4e9IMioWMEle7I?= =?us-ascii?Q?bV+zkKcSYJt3dGbz0wpDH6lQ8jC+XV4ToqOBAVjCkHtpYJT3OYkTKrZnssWB?= =?us-ascii?Q?edHmuTIsoRt8E6aiiQ5Wr28JfE8uREw1lUovbgK0tZYTWhpwwE0byuqGM7xG?= =?us-ascii?Q?qsJQrhj65MuFiP5qqfvxuD6kplCA4vbnG9dWLBytOGzGG2f2gE7w6P1kTY+I?= =?us-ascii?Q?XxWEeqge0o20NZlZRqBpyOlpMq9EXH2axDUlyJeV4BBeMAY+L1CQ5RJcTuw+?= =?us-ascii?Q?qnbz7vsDtReu++3TMnD+1CU8cxQFDfsIiQqlOYpthR/eyJI2Ye1HpnFEb3kr?= =?us-ascii?Q?CklIc9e34MsvlYcyPtrmS9wwf4oauLbxGjH6hz7qb7GG2Xq1eUkOycIrlYBv?= =?us-ascii?Q?dWggJBOfkiWuy2W8QGGQAV6N6bk8ZfZceytodEIJZBx33yAdqrMdLEGhkC1f?= =?us-ascii?Q?kHhKxNi7s3utuUT6+VEWo0l93mUe5eQiXIhLOAHtIjOVfXifLjS0r8NENAwb?= =?us-ascii?Q?x85UZlw3lifM1cwcMO60EAcrQ2eMiBdc/nYa03SoqL5NusEGmcQEM6YBT6y8?= =?us-ascii?Q?FShx1g6FUWXTbXQT8GmngB6ToEdfECDrVGP2mSFN3l1sNDpOaN/ENjF14tAO?= =?us-ascii?Q?wep55nmmeLchMTWz4edEdibUDXUUi6b5/znjamyyK5b4NDO+b++mM01eCGNG?= =?us-ascii?Q?4squbgNrZBGQ5lQJAS5t4a9yO/Y3tmPn+usgjhDFFWNpmGtc65EwCEzOY033?= =?us-ascii?Q?xbTQICuwogRoWEdttB+4MT+SfUrNynAq3a2Nu5LJ0t/+l4jjlyRCl3G6tTKQ?= =?us-ascii?Q?Mw0rLZOJyZPi/mFlOJAM+ezzrr7xx8/lXeU4pX6AQnCF3c7p6eIylj2NzyFz?= =?us-ascii?Q?lLDAsvxRxX8HEpPX9wlH9GH6XgYsQ4k5ZSapNsvLKCgPs7wzS9JbiQ/+pYHt?= =?us-ascii?Q?wiBXnFnP7kvngr9eARJx3biV711O5CU8YAHV+6o6?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: ad543c1f-a93d-41b3-b16f-08db4634481a X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Apr 2023 08:57:36.6832 (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: 3bRCUsesDYNFYhkDRFYd/BPWZn4cHT+djjb25AVwSukQyLm2uOXsRSj0oFBb/udYR7oty31RMzgUAReApV2zXw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS1PR04MB9237 Content-Type: text/plain; charset="utf-8" To align with what is done by the in-kernel PM, update userspace pm subflow selftests, by sending the a remove_addrs command together before the remove_subflows command. This will get a RM_ADDR in chk_rm_nr(). Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") Fixes: 5e986ec46874 ("selftests: mptcp: userspace pm subflow tests") Link: https://github.com/multipath-tcp/mptcp_net-next/issues/379 Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 67d5d724266a..19fbe1c34a0c 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -923,6 +923,7 @@ do_transfer() sleep 1 sp=3D$(grep "type:10" "$evts_ns2" | sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + ip netns exec ${connector_ns} ./pm_nl_ctl rem token $tk id $id ip netns exec ${connector_ns} ./pm_nl_ctl dsf lip $addr lport $sp \ rip $da rport $dp token $tk fi @@ -3137,7 +3138,7 @@ userspace_tests() pm_nl_set_limits $ns1 0 1 run_tests $ns1 $ns2 10.0.1.1 0 0 userspace_1 slow chk_join_nr 1 1 1 - chk_rm_nr 0 1 + chk_rm_nr 1 1 kill_events_pids fi } --=20 2.35.3