From nobody Fri May 10 01:52:25 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2066.outbound.protection.outlook.com [40.107.249.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 D6E2D20E1 for ; Sun, 8 Oct 2023 10:26:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="A5XIEhW5" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rfgic2nOit6iG/nYasE6lT5Qr9QA7X50AXAxmoLwBhiiV29obuf0hh/bUP5Xa73B6pp2y7Dnk+YRI8uHdic4PwtwgytTewCialnR0mCQrROEuoa/AJoUOv8ARgY1AYh0POk8B76we5lOGCcdx24fvXglOU5iHGCM/zAS2Sicwc5UgrJsh4rer/dnShHiTtHFkXKJ7zjyEN6MvK0wnpgcgf5DTyZ5SbfCwfqDNCQYa5H2PCoP6tR0eqyZF+VFUQ5A5fgdfYoQfSAq21737AuVxqO98veTzv/cF8yYHWgBmSEUK+sfaxArAGJOyZ//M60TedsmxefFO51JovZsJdTFNA== 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=/J2xHLMj+l06mHXwPbLntVzmQlrAysdJwE/trXPiZxU=; b=gkF/aXmOQhAwYer4E5QAkBcu1woMk5DsjD0tN+0SAMrKGIMf1J18pOVptnxFILc5AMjby+wZ3wewNSNJlPcfRabmOFfq+zxZ7sSARvtjdSNCPvqw0w19/+llE9vAnUouU6v2JwZqT9yrVFuqHldOlRdAkomi1pln2+Q2TPFSv3McGuD5ym5r2HS6jsHg99I+vNeOTXaKYJGjOkfBJZDNizF5jZwA2ytDHXEJv4hzoAz2H3lH5ROo+bKYMwdy6jNQnFqon9QFBU3S0JC38icMBxeHKBQOkDY99sPCLIw9y21V053XoRcUdRsnprKEycJECdT+4xN93NzmT0rguYmmSg== 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=/J2xHLMj+l06mHXwPbLntVzmQlrAysdJwE/trXPiZxU=; b=A5XIEhW5eb8e21ypkCnbN8oNcx/0Bn2Cckchi1iBYIqWkrAHyp5U3HfMhAweIa2XRZ/sR0GRyrh8Ie1T9DNNhmXIyiVa3FbPIoIanNYqE5DTK2NzU3V5y5beSuewBPIR6QtbnsKiKVJ0PUdLRSl0mrnLbfmakmIG2XOvgDs9+xt2eEyAHr5ZCl4s01CwzYXpy/vwCkkbw49PZ1SlqiBhl6diTI+c+zoKmdfPzPLixxZV18tkkJskQONeAJChqqun0AB1tUbQwE8LH90gns75MkVkZmBwuaNiirOBNw82+r3pB2YcJVekaHJE+x1IBWcKbYkZRlq67Pan+64DS+jmpA== 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 DBAPR04MB7222.eurprd04.prod.outlook.com (2603:10a6:10:1af::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.42; Sun, 8 Oct 2023 10:26:05 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8%3]) with mapi id 15.20.6838.030; Sun, 8 Oct 2023 10:26:04 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 1/4] mptcp: set next subflow to msk->first Date: Sun, 8 Oct 2023 18:27:07 +0800 Message-Id: <6a31565e01d3474be56bdf62c54d0c20c065c65c.1696760702.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG3P274CA0003.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::15) 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_|DBAPR04MB7222:EE_ X-MS-Office365-Filtering-Correlation-Id: 72d85ba8-abde-4084-fb3f-08dbc7e8fa36 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BQy90D0cFyNtur8XFgOm8LEl4E2SMBP+rU50sTtle3Cx7xS8o1l4Ln96uB5F7hFR7gVfG9U3DV8cELVsYjQijQjadVhd+z3CpZeYZ3CT4torWOHg4PEB8oCBkvgBfSCKkd7WKbubrNENeUmgQ/51YUCSmgLBRkMKEDeEBAK/Y0avuc6hDawxs6CoBlSBjLG+2NOw1Fh8ANxK3jSXeyyiDBryQUdfwvjWgoskjbK1gilnGhoj+QEcN82lU+Fnb5sGyyolFZugG+YnkzBZwIabJnXUfoWcrV3wcNq8wwZU0IDechb+Smt/2sBXBIdwMdPNgm/ARFSSKhJ4iYUpjclq3x8MAUgRruS/Vohu2HOvoft25Mlhnrsa3h/yFf4xw4pvx38qtc3gQIu8yGvFdDbgZg85LVGWOi4XV2gYgNZqolUZcBG2J08R2e+6OEPWPUBWEDTQsMalzvYGgxtuBPL2upfFl04T7mt0vIKep//DPGQz7sV8r8vTrkIOJcxaYPJYnwJ+CzRfTLuDimYD5SgJX8nQbo/taNBI3YhsvCVvdzLQd8aOvRTZ1jBh6aqN6vwdaOzKUXmRieEyqtPNdd094Wszl+Z4S/o+X+/4IbHlGCA= 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:(13230031)(366004)(136003)(396003)(346002)(376002)(39850400004)(230922051799003)(1800799009)(451199024)(186009)(64100799003)(86362001)(36756003)(38100700002)(2616005)(26005)(5660300002)(8676002)(8936002)(4326008)(6512007)(6486002)(6506007)(44832011)(83380400001)(107886003)(2906002)(41300700001)(66476007)(66556008)(66946007)(6916009)(316002)(478600001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/sB8Z+E4pbeYUCylIvTGh/sLmfhv7HbhAE77/XktuE4Z/fYVSUuXubViUtYd?= =?us-ascii?Q?MUM8U5kzUuvonr0brrFZWVZHdNlfINKr21whHcu4IgCizTFpRGRY4ZQtGfmm?= =?us-ascii?Q?cyHpiw3jp/9vKOpL8rnDscpa1mvJgIMSzKqszObW9WizYQQ79HykUc7KZsRa?= =?us-ascii?Q?PjsawHXGuIWIHXtL0/ZUZjMjZnAtfs/Upkcmek6gP8VK9CliEB+AYZl4FWY/?= =?us-ascii?Q?6hE6DhzOWLq4+ypAwVf7mqTJQN/eKEWzS/6PkRHwcygboEcdnMudtrmSRCWO?= =?us-ascii?Q?MDW0uu+MZdb20IIUsNpwQKw5DuKTZlmnOLZ28FVso6eWIL817qKyjup0V/Zn?= =?us-ascii?Q?l2cDYCJeo5pzswzeHIqNQBXgPlQxMaxmGDtcKI7HsCHKfwUnMIfN6GZh7zOe?= =?us-ascii?Q?GlKdtb8ko55wRr+7mlaFB9riDmOpGcDHK53CKe6E17/fJzVZoIfnjTvqFmIX?= =?us-ascii?Q?UdwJVq/xCFvRlL4SDtGwjIzTWkqRn7WDgsh5DfSS+6rkYaEr5oLSQSA33Mhv?= =?us-ascii?Q?eZStxCfNO/o7mB9Op6Z9kF3kSEgYOlFxJsDHuWEU2d3mC09TaXf8DxkVJ/ww?= =?us-ascii?Q?+5l03GxPAfC0equpmYoPiEKbARboGj6PDPPF0KjasvzqMMNrcZqmunwnMsWv?= =?us-ascii?Q?d/AsD/bWiP639EFF863Y56fgYwyqP0r7QXR/QhkMt0a0oguI4LWfzX6N1RUz?= =?us-ascii?Q?Hy3Yvv6fRQl9mWhajdkSC2qy7mRThQCI9zB8TaV+7H3nDQgHAqtIdJhZU3NY?= =?us-ascii?Q?tUnG7SaygrzHV6akMqPxt++6Nnztpe8fm8iPcGecwQtXAq7iIuzs7lyjL9D4?= =?us-ascii?Q?6zcLkKrFd0zx6l3ludVNbomx2zHuHpMaoWfqbdQZIk6OOOx/BKL02gaqGlCq?= =?us-ascii?Q?EPndRfCNgzaDcm8iU+Cc++yFRV5iixBy0dwgb2TId07CnJxV7TkZQB1jE9iN?= =?us-ascii?Q?ZhhsHv3FDBFlh6pJO1tHZdZjI3DocrqiSzj/3gZ+yQzN7gQ7debm+FV78lvs?= =?us-ascii?Q?VpiajtmL6KLy4U0b8P3hGoaaE/2LewgGxjPHAxvT28PeL/WJNQrLgS1Dn/rC?= =?us-ascii?Q?rjd/cF0YkUG7/3YM9n2Nwl73DiDus1s/UsbqkkhPglcxiXv6EDMq2zZ/Wyk+?= =?us-ascii?Q?ZL+BuYLAuJiynNb55vPVPgwlM0/fEInHRTvhsw464/NghJ+3S7Go1LEBWBVo?= =?us-ascii?Q?DQVK99qMrpi5+9UHPKPWurpPA67AaIHXAamTfKoKWt9zmYasN+OqLwwl9DST?= =?us-ascii?Q?YRNDJh37CvtU/9Nt3/JW5tzkaowNcVqUKFD4KTjxjIEUXCklvR8y4UuT0mm4?= =?us-ascii?Q?ZB1UC8V3mN8Wt0qG68OlX1aVJG8xmiR/EWujBLGnipTiB5Lu/7g+tAU83d4L?= =?us-ascii?Q?mEq2wj3QoTkpBC+EbHAlFXFZpe9aXXgRRqr7JOiEraV8Sx9dKd6rE6Zy5rob?= =?us-ascii?Q?yt7xfXqjiiweMdPrMH2QemJA9xtDrfwH5S/j8d4gZV8siQp7ViYXfb1GdwHr?= =?us-ascii?Q?oSug8jIAl3AYbhIvhA7qCTuL0v3DZrsJlUmjhZ5cBweeR37di8u7HYVIpvO5?= =?us-ascii?Q?lJNrc0n23aOI8t4hGQJOf/EdKdMTICr+xG91mkN6?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 72d85ba8-abde-4084-fb3f-08dbc7e8fa36 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2023 10:26:04.8320 (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: +5Q4r6bxUtYel+A4QQM98VyhoXhZRTmrKzNlVlqyFYsS+ZbQsYaaLW66RlfMBTn85C/ieVFmveOhxobvZDQ5kQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7222 Content-Type: text/plain; charset="utf-8" When closing the msk->first socket in __mptcp_close_ssk(), the original behaviour is to reset this socket. But if there's another subflow available in this case, it's better to set the first available subflow to msk->first, instead of resetting the msk->first. Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 30e0c29ae0a4..fde65d901f47 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2396,7 +2396,7 @@ static void __mptcp_close_ssk(struct sock *sk, struct= sock *ssk, goto out_release; } =20 - dispose_it =3D msk->free_first || ssk !=3D msk->first; + dispose_it =3D msk->free_first || ssk !=3D msk->first || msk->pm.subflows; if (dispose_it) list_del(&subflow->node); =20 @@ -2446,8 +2446,20 @@ static void __mptcp_close_ssk(struct sock *sk, struc= t sock *ssk, =20 sock_put(ssk); =20 - if (ssk =3D=3D msk->first) - WRITE_ONCE(msk->first, NULL); + if (ssk =3D=3D msk->first) { + struct mptcp_subflow_context *tmp; + struct sock *next =3D NULL; + + mptcp_for_each_subflow(msk, tmp) { + struct sock *s =3D mptcp_subflow_tcp_sock(tmp); + + if (s !=3D msk->first) { + next =3D s; + break; + } + } + WRITE_ONCE(msk->first, next); + } =20 out: __mptcp_sync_sndbuf(sk); --=20 2.35.3 From nobody Fri May 10 01:52:25 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2077.outbound.protection.outlook.com [40.107.249.77]) (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 62788BE4D for ; Sun, 8 Oct 2023 10:26:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="CnMvstdU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QNdUramnHRrwhXkJ+IxzGWXAoKOSpXToqQ59XAuIVcbZJc1Xsdoy3QsiILUNq8EAPWVVqNr4V2ct74Sr/XQi3xbfVqenPz048HYkyS3fgQui3n9FSew5jrwWBUOggXPN3zxS5iS7qdy1Sw94IuVM2P0hr34N0k5NfrdfOxtnuo57Jp7aW9DKGoXbnKH0rDSnlPW7ejmpw05viFppxs85YjEoS4kEIf/eLW8pTSO1E6K7I5m4iLRoh+EG36uJF1uMo7Gm8cO1HZ2WKhbI0XqJzthjnLp+aID+GOpyi95nNuYTDi48UtVZz6sZoOnQfMMwP2/T4SN7H/9Y58mm0CYe8g== 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=ue5fMZ6jieTGa+5sWcRUvmv+6w4BOJ/BE1pvC8RLWsU=; b=H00Qw4C3ng3IHW69X/27hdyg+5v/Osvj5HrD4mCRGoa9NfVA6w+hfR6UDWlvToHpSSlqfnJQvCjs0JLALFMD5PdgtoAvXUyRg6cVK/oVK0bC4ppYTwBLBiE/x64xWvPBmER45xFOE3vLG/HWWGa6iWIaSYFruTeuyUK6yDPoGwYA5ePjaq2VmpxxXpo8ojy1/snitzlJDvcjkJrLKcw31hTOWyqlFWZdo8rHUbLLCGT7BRj/7qKbjLmwndP2VRqzT+fdvr8royWSvFG5BlLkK4aSQv2Hlqk+zSHdT9KVElJ6EaKSZQmSu0HC54YBkImC7VxTtA7gUwCEGhxISU15NA== 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=ue5fMZ6jieTGa+5sWcRUvmv+6w4BOJ/BE1pvC8RLWsU=; b=CnMvstdU5O1+yqoIV3YAVFv4dwCeLaOtvv2PewBWBgtlGbGgHqXV2IAfllaQGSUykbgsB8htI00OUeQpu1i+yONXsP9rckQyb8njVydxqtLc/am6cYWE2JJEKV4smDYfwo9YD3kqIdwtCyb6qVcyLWov1GypZYNR99svXbF6D+3nwINmJCEXrZ1qztWkhgulwrQpCR5moy2AYhQV/04d+rftacF32Gq5Nr2TEYUaS/2ymx4jG5Ef9O4ilGUDwtJN4xORx4Uo781lspnQIKnfZjQjCkx1isXBvDq7nOaxfSdahp2ZTyCPvGqSGsN8bAuPyfuRQNkIotyT7AdyNO6CGQ== 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 DBAPR04MB7222.eurprd04.prod.outlook.com (2603:10a6:10:1af::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.42; Sun, 8 Oct 2023 10:26:11 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8%3]) with mapi id 15.20.6838.030; Sun, 8 Oct 2023 10:26:10 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 2/4] selftests: mptcp: userspace pm remove initial subflow Date: Sun, 8 Oct 2023 18:27:08 +0800 Message-Id: <1c1cbfa1233832ae989bad6a4f541420f3c43fd4.1696760702.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG3P274CA0008.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DBAPR04MB7222:EE_ X-MS-Office365-Filtering-Correlation-Id: 0512f4a8-0382-4cce-3456-08dbc7e8fdcf X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OQ0/XBLjA4uhZY9hJYUI4kRP3iOcboKf01aTHF8djPDBn7FMo4kddG+hzPOZ/hj7GZ9Wt0MG0tuRf1dzuVieTDOhJEZWDk0xZ/q18JG/dU+uitRAI3NI2xvgWsXVPzBx+kn+Ia8YJmGkVlIZoF5cqAR6HJRnczbYlPDXURcsfSfmfPqL4O3T6QN3QL+lq+jyeOBpSBq7JkllTxexA7NcHODW6/u7FwrFejNIFVyywlqjtRGN9Kh+vPUb5BV2LApUgQTn6Rdb8gu2Gdg3IRMW6kkEbbeMXdbmPAEDRT6q6Ha+Wln6SpJ8Os4BGNMoZRKGnyX+v9qWVCSLqiSY7LqA+RP389JSBUJIECcK86FM/pU6UiciTu50ho/awAXphfalgcqJzXcCKR+MoBpi15PnkItMnLzluuLgP+psqKBx2Ws16tbnjHEo7F7dShd8uOp1OLZ42v4g3KukelxAboHYUZKMeXaiNZ9D77pToedkhErqNx5TCGEYuBs5t0R+UB6sUVDIxl+92L3XiLYblvxQ299TSovzwPq3qMmLwrpMDJhAvdEo+QrWU2MvWqA69Bnd0TX8EKXQmDtY4DJFnPCvEuLVrQdAXIsjwPbS5BwRiFU= 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:(13230031)(366004)(136003)(396003)(346002)(376002)(39850400004)(230922051799003)(1800799009)(451199024)(186009)(64100799003)(86362001)(36756003)(38100700002)(2616005)(26005)(5660300002)(8676002)(8936002)(4326008)(6512007)(6486002)(6506007)(44832011)(83380400001)(107886003)(2906002)(41300700001)(66476007)(66556008)(66946007)(6916009)(316002)(478600001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?E8WaZi1YD255yobH8/oDZ5GgbtAnCulLXPIc02RKt/Ec+ocS4Vwqa3hT9vEK?= =?us-ascii?Q?GIiEawrWBCOLEsBcuEdFcKVmOzD6/PkJGuKQSJ+bTvHPyDGgB2Cm0EM9ytbu?= =?us-ascii?Q?UR1GbQ8Vta4puOkFqnvxWd5ialOHuRppO2HEZGFn/LDjE4ztG81SKuhfmfg/?= =?us-ascii?Q?K9OWlzCR/E3YYJlQylX2+XMABwuE9SZz2eNkpETqlP0Tk1IF1HI7y4g9zm/w?= =?us-ascii?Q?vHn26jRGxxX5gHWqrOsVqwYehWgAXkf7Hv+yR2DTj3hhMMz4u4Mq7ygCSbNT?= =?us-ascii?Q?HEbmT4hmkg5r0tWVr2M1dds/Mib//+ax5RrT7MsRdl0AifD1MFfUh13jYb5W?= =?us-ascii?Q?YrrmmqeZ5huvnoxnLlvp8FL4iFqqSt9XCHUmtm/szYsXA0Zqh0NzN3ONzidH?= =?us-ascii?Q?3xqpxZs9qUHyo3nwrqFV6vS7n6ia5ElnXqIg+8bvJ9flgNohjRxv01SblJR/?= =?us-ascii?Q?5uGTr2BtdSKCqwBf8OY4x83mli70RLJmKXWuD8zx9cdvB/hr7/LTvzwxtMtq?= =?us-ascii?Q?1tuer/jhVqWtQzYPS1R+tXML3I7rUosd1DpGpTrcH509MzVyjdrRUnDT3a8z?= =?us-ascii?Q?nxXJq0RPc2VXmqF/98jXOOzNM6XJU5qpI5Z7pRrRieae9EVWyi3dalYA4tZF?= =?us-ascii?Q?VxzwEykw/0ihdgc4IHvi7l8PJL9pNBHxJrod/G0W1WJYYtjEN5ZNWlYT48Io?= =?us-ascii?Q?IgShkrkQEkC3kstKYtPGDgp+4v2c6KFUeh0ULzQ4qcWObZ8m1QtooW5NcbcN?= =?us-ascii?Q?AK2yVzcBTJvmZihL1BaD+ByB+cBNGZEqo8xQswtCkObv+ty7wpMqUVnijFT0?= =?us-ascii?Q?gSQtFi90zuOPjMnBwFTZdqp9RBMmhHGR4c17eUBByc/mh0ZLtiuzuSkiMJBG?= =?us-ascii?Q?/dHfMRBJIkQzX2r9kPlK8t9JwBB6H5zjbK8tQTczqyiOSKA4zyYvl+fV797a?= =?us-ascii?Q?q1uU2u5ohoN7OFxY3EHWP6OdneO/H13wdMzZFbbjeHPU9z3GL/M6BtscQdJE?= =?us-ascii?Q?23VlE2RdSfquawwLG9yq8qZFQvRee5hfxbucXZaOZrXxVSnHDWY7uJquLbEw?= =?us-ascii?Q?A6VeuAPAdlaNvxww6d2LiGsTWKApJKTx3VDY3wkaDV8gyPJbHZVEiYACqSRg?= =?us-ascii?Q?Nq4LKmiQsmhFQ14z45tVyEmApRkGZkltyRx/dh0KP2zUdosjWlA7AlcFs+Sz?= =?us-ascii?Q?uW/8dzb1+F+HeZljAu6HtKttPnBfiDanWe5HE10r3SA/G+QCoqFGj2Sx5yD5?= =?us-ascii?Q?QX2hcy+3fARoWWBmIfHCf99GQ1dZXrbkaBa50eBmBQY4M63yeNVJhTOWw1n5?= =?us-ascii?Q?bEAx1NBStB9KjZJsBFy6M+VyiVK8w6lm3zUDYr0rSH5e2xA+dJaQqvHXvG5H?= =?us-ascii?Q?bUFXhgkJCgB3Yt1+jUpNjoE2PEMF0jZcpQObezmGiTEcKoM+3Hx0j/ca3imF?= =?us-ascii?Q?6ryp/T80deWwpy7IQhqmM9Mej3k1unNMXIxG0oz1PG0Ubr0NnynlA/vFellx?= =?us-ascii?Q?+2+3775KCMF6awGS6YG9nWSsnvyd0ufZ6sPBU0AESx3QJL5/q7F8Z78cy0NJ?= =?us-ascii?Q?aN6UQpOh51t0q8zLQXaoQm+k11zxcqbEU2GwY0um?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0512f4a8-0382-4cce-3456-08dbc7e8fdcf X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2023 10:26:10.8865 (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: rJeVWBhXZhfR4VZnFYsVdbOXL1u74E8qrsrss8Zi0AL39qMNB6bRyHM+vNBKOwgdEtxsN6Zj6V3ms04R7EXcBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7222 Content-Type: text/plain; charset="utf-8" This patch adds a selftest for userpsace PM to remove the initial subflow. Use userspace_pm_add_sf() to add a subflow, and pass initial ip address to userspace_pm_rm_sf() to remove the initial subflow. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index ae38b428e42e..ce691aeca99e 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3490,6 +3490,27 @@ userspace_tests() kill_events_pids wait $tests_pid fi + + # userspace pm remove initial subflow + if reset_with_events "userspace pm remove initial subflow" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns2 + pm_nl_set_limits $ns1 0 1 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! + wait_mpj $ns2 + userspace_pm_add_sf $ns2 10.0.3.2 20 + chk_join_nr 1 1 1 + chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 + userspace_pm_rm_sf $ns2 10.0.1.2 + chk_rm_nr 0 1 + chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 + kill_events_pids + wait $tests_pid + fi } =20 endpoint_tests() --=20 2.35.3 From nobody Fri May 10 01:52:25 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2054.outbound.protection.outlook.com [40.107.22.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 D7F9D20E1 for ; Sun, 8 Oct 2023 10:26:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="Asj0z7r7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WY+Nc84Clcq+R+DILLlKAZGI2kRg3qIgSWqEOIk05bTIslNzPp9jha7iEdEciajYm6gw7bM4WLZgF/0BsyN/jA0tO+EJkDMqElt8nwC3mlCSM33rA5x4/CuejLRC2Yu3IfzNkXCh61B1F2f6cyzB4fjgq/V9Y5j7zu/gKTAPvRW8OWp6G8pY2ke5QlhVnHB9YNTr1eJiZfic+lobKl92pThp+/lnioOoDo44BOJoixDaupcy0UZtQTwp643u5RN8+//wJVhs748lBWrV0qB7iYXusJ0c1YZxhi35c1168zFBfvcqyNYnjOYH2Cy5fa7M+AUatou6Fl7WMRf3VNABEA== 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=TKec3J81LeiqqlecrQBw/SwyjIqivGN+aQspdHQh4tw=; b=CnC6AvvD9z4AxGhlrJu+IFgoQVkuudpENEx2sleU3MsK9KA+a80C8pXXsmMc0Mp68luLRyyyXPTxtoWwW64sJlprscKe7w0V0DhsXNBOlryLwHBh1P8KQgnirkhNGF1yChttqKPdTXE7vEBHgmeMJfVYA+8c6N4Zw3dD4vW6Z4ceHtoZbk3/XDHVz7O2pClaozgmrm7Mqatjcz/+GgkBlIZtrl+roDgtLnDuFh9Zldxf+0kDRdnu4Pa2mJwF/rS8IInyxAKTwTmuI0h9bU7IrvCIaRPLZUMAYluIL1Gz7xBWpO8LQHmh2F/KbumNY8yFfEtWrYr+zz9d7cPhJenzbQ== 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=TKec3J81LeiqqlecrQBw/SwyjIqivGN+aQspdHQh4tw=; b=Asj0z7r7LaiYVSRqE07p4KdtzKl9MJTGLpK+6CI5J5mHqXn6GFb9yPfTrJPPIk9O7J1CRjMnJHedkFmJp+s51h81lZo55WLsKbEcsTa39XVD+hWnJZk8qUUu4ujy0iXnqaAx1t7FIKMf7C6e4SZ9TMVLq//pxv1Zs2tcVpquLBbm0zao7024hNkHJV+8AjhtuOKhu6oRWOezSqUZd/dWai3zf2Ir/ka+NDyvkFyh2+9cVkGdg+GqJopjzuHKaovZlH4N42eIJTBWE2HD4wOK4ORB/9wzLzE12IhinC53I9GMiyWlXZQIcnYXqroXbdlAVFUkR8tlWBgFcMFrHTDiRA== 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 DBAPR04MB7222.eurprd04.prod.outlook.com (2603:10a6:10:1af::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.42; Sun, 8 Oct 2023 10:26:17 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8%3]) with mapi id 15.20.6838.030; Sun, 8 Oct 2023 10:26:17 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 3/4] mptcp: userspace pm remove id 0 address Date: Sun, 8 Oct 2023 18:27:09 +0800 Message-Id: <8cc9892f0516f304f146318aeb21a6e935cdec39.1696760702.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0006.apcprd02.prod.outlook.com (2603:1096:4:194::8) 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_|DBAPR04MB7222:EE_ X-MS-Office365-Filtering-Correlation-Id: 81f99490-7380-4652-2ff1-08dbc7e9018b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sFPNkw8TSdeNRAtcDm20xdnmxQZBBY1BtSPdhKuR4ei2WT+v6QSZ2Oksd6s9HHagl55CMRadDu6D399ibFZpKj4E7Ml2Notsk0liHFOXyF838EGcdBTxjAWSrZk8sKtR+3I/CxpsDoEcgH+7rFRhswtUt8YdpnpYHGS5eZ8F7prLGKEHvICN7Mn1gyproqQzK5k4JQZuybzOz6hLqx3Vo6+JNYBy0h3eYGLJxZ+mx9KC0QZLxzKzIX6+ekp0w6UtaJs4bAi0MXVPHv3ZzcID4mHH/KgaXiTMpZ+AXdojX1cuBYj1OQ3e0YrVJpDgjYl3vsyy/GV0rcnwuDQHDvMfe7HFJ/6UniUZQi2cvgulKHdD1nl/LnmatuiNItR2vmkh/GQ6fWV8QQe7mpbf/qMvXomnl0fJH6ipoL9e4ALy1d+9FnBbTiwVz48Ue1mcEwYi66bwXnWxLgM7FvI22HEwuLCCVJo2d+ihDoaTbzBx8hD2S+JPqZj0dxil7skmy7niSMVA7eYzaKwFa8pZcqzfsP9vUIixGY3zyLHofLxjt2xyYH+mIP1vltt0m6j7BYjWbtcscKOo9VXm5h8YcvGr7mixSHjoSA6P+PpDdaBSEOM= 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:(13230031)(366004)(136003)(396003)(346002)(376002)(39850400004)(230922051799003)(1800799009)(451199024)(186009)(64100799003)(86362001)(36756003)(38100700002)(2616005)(26005)(6666004)(5660300002)(8676002)(8936002)(4326008)(6512007)(6486002)(6506007)(44832011)(83380400001)(107886003)(2906002)(41300700001)(66476007)(66556008)(66946007)(6916009)(966005)(316002)(478600001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?v1Mbhx43UeZ/BFUm2DHwIDYygoX/6c661DHw3o8o03gsvM25cYUu8be3MvKE?= =?us-ascii?Q?PgMgFko6q+LidmC2rsVvn1xJKmits2VG5vNUl3fK3aR3N+F+MK/OkpRju+4a?= =?us-ascii?Q?EDhrx6Z4B/XKI3/6ddwGmjPVK68rfJrvNOKAcRErc5rMiTDoWgP1ExTKN9lN?= =?us-ascii?Q?cG3vGVYHRWAGuIg3CTK/NZHrItsxgAVfzy4ILV8ggNwlfQkE7aEnFZm3XvjW?= =?us-ascii?Q?NEtgyd34g3M3Q9w6xMu2ASV2WmL/WHP4sewtA6XuYJPg/YxTodLhh76NLSQS?= =?us-ascii?Q?M8T9k23szg2cRl62Lpo+ebP7jYrcwqr/hQapHf9NfjckWElAybqT2Bjd2Xws?= =?us-ascii?Q?3eOjDZZc8A5EBbW+Gb9w/ECbMLWFD2EKhoiNPjib/eEuAZtYkjPUEaFRHoU1?= =?us-ascii?Q?eyG42UHNFP8x/spKBUqyuwbFlgcoPtI/7OIE3OZRQ0GV9J4l0PZZwJ6/JRWJ?= =?us-ascii?Q?4XFoDqPPLTFeylgcujqHfS4wf325CLySj4pmKfUcZrUE4C8M+xN8+GINYBD5?= =?us-ascii?Q?9/XILaEPdpbjhpy3zyQkH6qVOpvsZXcXp3G7dBvcd4FX/dJLPgxbLM0bTcRi?= =?us-ascii?Q?4uOchiRWfkNpltE5ge8QZE6iBwrhB3zHRe+woyCFsMe6e5TbwsVKX6Nn1nVM?= =?us-ascii?Q?3Y/1H9tWdTJbE5QByAIpYAdrNPpbtiGicksd4XTtGE23maojRG/hAMbwag+1?= =?us-ascii?Q?hkvJCPD+jQ+bzobMbdrfnOLNbrfVnBDbBURpSsvqJ0m42kLAZyWUvyZQk16F?= =?us-ascii?Q?8qPt/Qg/Oepy/H1asXSgznQnOQA4YZmWwSFIcosfQqyyKi+3A0pDAo/Tc14o?= =?us-ascii?Q?85JFXA7hXYzZjkOthp5YOAIuiJyB+pN8iRH4OmHcdE3OYCOc7mQE3GVUjgMM?= =?us-ascii?Q?qBGT6+iQXA4HIgqizMZtUCLqLH6O1T568S+4fIFa6xkBBo1lRslqisbqjan/?= =?us-ascii?Q?2rwwpaFf4VTxiv1oWRxU3prJBIiNYHQZskGTHDRzuPfiUUnvcqql/VcuekS9?= =?us-ascii?Q?1vRXSUT2LvKpO6Q9N0TJcteVeoCa0jqFDfvrUqGR02u1tKONryPdxCbz56QY?= =?us-ascii?Q?59CgHPw1lNKgw1p0wSLmmGM6hqaAcJ90atbKmgbTTRITovbRy7yIp07fdH8f?= =?us-ascii?Q?3F+pz2dPyqgqHAuu+SOegLv33HunlYbXSLs9TEba10Df74uvcnuqU4RHZpDA?= =?us-ascii?Q?pKomvyoY/fGszl16Rt7HojBcmTcsc3E98BWYdtWdTvdyatWAbaYnQ+akM1ba?= =?us-ascii?Q?o+mZDqhhZN/IZM2bDez30a08dVnJLODkNSoglvTVd1diLr78OYJo28Y/iyNP?= =?us-ascii?Q?qz8dAwUtQSsrDnXxUr7XnSByhoFJxGLUoG4+KRoFpfwmdpB6dEAYIF9VsQ09?= =?us-ascii?Q?DDmiOVpdNN8RvhCO19Kvg4SoP8RsiNpnWP1Ode+7SrKbf/jH/nT4hwsAH5YC?= =?us-ascii?Q?bQwYojpoIfoTLm5OgT/S1n4PvAPNoCsNq5Lv2LYZRxB/hDenCyvW6eD1/yf8?= =?us-ascii?Q?bHMTDGXTDjjrhvtQxC9Jygx/2omauEKXG15nHgbcIisQwCW0ICXMG9D0vtmo?= =?us-ascii?Q?dH1alRZyXBTT5BfpKvmXZBNnTpVlO6B/+VGYw0HN?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 81f99490-7380-4652-2ff1-08dbc7e9018b X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2023 10:26:17.1522 (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: NuuH3/3vmul/Bem165DjAL7RNA63nFVDcsVzjf09Q3I+N7InoQDOd++CUN4gD9740FqPS10VAJkzYijIJpOyuw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7222 Content-Type: text/plain; charset="utf-8" This patch adds the ability to send RM_ADDR for local ID 0. Check whether id 0 address is removed, if not, put id 0 into a removing list, pass it to mptcp_pm_remove_addr() to remove id 0 address. There is no reason not to allow the userspace to remove the initial address (ID 0). This special case was not taken into account not letting the userspace to delete all addresses as announced. Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/379 Fixes: d9a4594edabf ("mptcp: netlink: Add MPTCP_PM_CMD_REMOVE") Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 6b8083650bc1..ed9db6a4e228 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -211,6 +211,37 @@ int mptcp_pm_nl_announce_doit(struct sk_buff *skb, str= uct genl_info *info) return err; } =20 +static int mptcp_userspace_remove_id_zero_address(struct mptcp_sock *msk, + struct genl_info *info) +{ + struct mptcp_rm_list list =3D { .nr =3D 0 }; + struct mptcp_subflow_context *subflow; + struct sock *sk =3D (struct sock *)msk; + bool has_id_0 =3D false; + int err =3D -EINVAL; + + lock_sock(sk); + mptcp_for_each_subflow(msk, subflow) { + if (subflow->local_id =3D=3D 0) { + has_id_0 =3D true; + break; + } + } + if (!has_id_0) { + GENL_SET_ERR_MSG(info, "address with id 0 not found"); + goto out; + } + + list.ids[list.nr++] =3D 0; + spin_lock_bh(&msk->pm.lock); + mptcp_pm_remove_addr(msk, &list); + spin_unlock_bh(&msk->pm.lock); + err =3D 0; +out: + release_sock(sk); + return err; +} + int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct genl_info *info) { struct nlattr *token =3D info->attrs[MPTCP_PM_ATTR_TOKEN]; @@ -245,6 +276,11 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struc= t genl_info *info) goto remove_err; } =20 + if (id_val =3D=3D 0) { + err =3D mptcp_userspace_remove_id_zero_address(msk, info); + goto remove_err; + } + lock_sock(sk); =20 list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { --=20 2.35.3 From nobody Fri May 10 01:52:25 2024 Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02on2045.outbound.protection.outlook.com [40.107.249.45]) (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 0EFCC8BE7 for ; Sun, 8 Oct 2023 10:26:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="rpokZQPw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lUueC1EO6+5YSY4HdqQEV/+0OG9wIZicOSEBbQ/MYGhvRafMrxlfwpiiAViVeSQPrfEkc7DW5XCEsahlDUazHD8MzATZDd2Coz77lxJ/b9E1OnlCz46yAHne/25HSCIRbukyBAv1xXYm78w0CkUfHUu28/Zu0VsOiI6J1GlJKoYAojZSDCrPM21RZsjy/HXq6XvouG9sKGsbHLZueW3i19NQzuFUsCLevom4tpUDiUnQ8QG2M6nG+vNoj7cdbSvt8v+a1akN+Y3aBwSPt0+aBhYvgZDHpEICooQLjqntPBwMejTPxDjtywdhqUQsHx3I7JoL5NqgCsqG9Jfy7Uy1EA== 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=hN63uIWtDhQJ3budsnSs5mI4RcH0IS5fQQ9d7gfQalQ=; b=EwzdMoyGxJEhZG83ZMdA+8jj3p0uSfC3Noa/0OxDmsn6vU0PmrT1WyY+VHrAHJ0IXen6SPy9JXrBK92CWxUDqJJOwYltiTvdJC8pbX1pISJAnrdM6dzg8/uYvlKAdYHPKwM1asz1hjGsDSrNFf/7J52TviDJZGiCy2RDWyI5uP3tvwj8r07SeFFxSl+wdTY5OuquvEdNneHF6rPHermUhSfkb8qrAeHRB05TMlbNJMEeUMqvQ3bHJ6l3AKAk9vczCbgtYcrAYaZYC6PO04jcI5Kff5Dda93c0GBJcdzAQ92tc2zIffju7ELDVqDxV/XM3JKIaIhkxSTf/tuNdL6qfQ== 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=hN63uIWtDhQJ3budsnSs5mI4RcH0IS5fQQ9d7gfQalQ=; b=rpokZQPwqL8r35QIUmCX6SFn3qaBMXH34tLCK+4Wa1gCaeCvdqSg9W6rHEyodxbSk3eRk44wKsjXrGfygHe3TZCiGKUvJksZ/uXSasQwJ9hPRO2SpBRokI3/vkBFvxl0bDE4sX9DLb36SMtOX31NJuhmCGA0jbsggfG/nkLLX7MgkiIH0KyTFAt8EWSaI7iaIUqP3qRgYC/t6fUO71qi7kg8c1mOluueBvu8tEcJWSkXDkhlVR5QZqWN/tNVqhdDYgshtmHGLTkyfBL5ixjKuCmQbBJI38b64UK2gIPTt4J/JUa+6PTPBhH8c+xxTfaUbrvgAhRO6gSBr+SQcJ7NvQ== 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 DBAPR04MB7222.eurprd04.prod.outlook.com (2603:10a6:10:1af::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6838.42; Sun, 8 Oct 2023 10:26:22 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::3852:4f89:9891:73c8%3]) with mapi id 15.20.6838.030; Sun, 8 Oct 2023 10:26:22 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v11 4/4] selftests: mptcp: userspace pm remove id 0 address Date: Sun, 8 Oct 2023 18:27:10 +0800 Message-Id: <3738a4c89c049ae3b2832206390a39471331865d.1696760702.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0006.apcprd02.prod.outlook.com (2603:1096:4:194::8) 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_|DBAPR04MB7222:EE_ X-MS-Office365-Filtering-Correlation-Id: 06a78dcc-2e49-4ce7-6d33-08dbc7e904e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qUJ6nJbbc86bxGcLdrthnhBYPKGTqh8JjmaXMHtpM9L6/ca4DpcQ8LdTCsPBFCNNHf4hp7VFvSkcC+LaAa5FvdJqaN6DWQvLtWRsdw/Wf2acIL36a2DzUrDzkNWE4ZbKBV81vpCQWfvRLrffVX3cgWR/h7SmPShdjmF0FuJq09Q/DgUMbO4Lr8jwLvhQs+Yua2ynM0LxfzkV+bXwyy9vib7IaQKAHr4ScOp15eLQQ0cgAmVumZYZ5k0sfU32Ywhw2mOxMXG9CLhb4H8yKlpaXzYSH4skakuclcw4X6Auhmd/h3R/moBXGI0u9RbzGGL9vO10x1FPzzLyY+RYGqADm+ajs8gWk6JewqyqOK9MX6R2H03KyZrcdlihhliB54fvQgnBVAPZNGCMudnxAfNpMKQ9lG6rJyoKheKydcDTvlMmmzdFbJ8Ir4xOOciOxBDh9IZN8yQmppU65i5jaVN+Y5DvJAMFIgmEQDUExKBVhOOItsacSDRfgEKr3evzM8DY9hjZAtY7kmWluSUVuvIDLV1AGn0V9YH3LqJ0CA3815w9jRHIoPZ2eJp4WApXaba8R2G5JgiBo1C7R3+MiDU7zWDxW8zbBalo9LKfDM4d/io= 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:(13230031)(366004)(136003)(396003)(346002)(376002)(39850400004)(230922051799003)(1800799009)(451199024)(186009)(64100799003)(86362001)(36756003)(38100700002)(2616005)(26005)(6666004)(5660300002)(8676002)(8936002)(4326008)(6512007)(6486002)(6506007)(44832011)(83380400001)(107886003)(2906002)(41300700001)(66476007)(66556008)(66946007)(6916009)(316002)(478600001)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?rfGAZR3jtvkGifZTNCEQqZ64GD9uNMBLH4naIPjRri3HugElya0gauWFd0mP?= =?us-ascii?Q?kQ2yC2HisAT0VdXoNpoBVj0/1/XU88Wc+tm/Q8N+++BpPPbSrzzIBZKu+D5f?= =?us-ascii?Q?bgLB31nXkrlUN/653GhO5zmeOfHBFqYjfUBsCPuZ/uq5je7i1d1LTuu4lB7S?= =?us-ascii?Q?DLEGLxpm8o6+8WkiJ/e7i3Ry5XV4mFG0u84Ri5ggGj8iUaV214Fh5/MK6Gca?= =?us-ascii?Q?RERRn8U1zIgVAj3SFDaNFppll/0SKktLTcAr37HLc34TVl22Hb2TELuIfmla?= =?us-ascii?Q?P/Vh9DyqfwX9SfAq8luUNYwwZyI1Y3zsKWPAvA67g0MPCNepxKhRZCz33LPw?= =?us-ascii?Q?T8lUvC5PCw4sKoKsmc/Vgb/V7Yipi9FqQ7FBJabsj3yal0OUgFgSgVqrRNdX?= =?us-ascii?Q?UwPSF6uVclXb1dj8HKbagHL9aCuhO5bclyq5e1Hro7C7y+NPJ+uHbIioIvc4?= =?us-ascii?Q?hBQhvzfqYQRXEsdgJfQgyVevvXSpJeEWqjNFbIOilBFbuHx5TazoBMC58j2f?= =?us-ascii?Q?OMLfmVLc9pDVp5oeaSyx4xGz+9rUSfC9ns92PuyGXKV7lb2KuuVC1M1dUX0o?= =?us-ascii?Q?OiGhp+iJH6JBA10r47NZDOJwlejFjU3jeg2dmpWfKQWzEE53v/+TRiJjWMv+?= =?us-ascii?Q?veoztz26ONOWmHEVab3T3J1Czij5pXyP29QkcEvsSI0Cy1iY5oDUYfreq6aV?= =?us-ascii?Q?OYqSrmDHECrYpiw9xSyxaiWw+H4WxW0/8PfOoi8V+nQMDnrNhAWY+B6FiEtZ?= =?us-ascii?Q?/BzZMxyji5kV4WgHzN8hrLgH9xVDH5UObR3I6iq9COxepzQOpUBJKNxZzW1D?= =?us-ascii?Q?aBEFG6WQ5G5dFjuan7tsIek/5IWmaPmMdJf6Abv5I3e8adGDQVQjD6tO+EtU?= =?us-ascii?Q?9VfXBTQ2G/EgDsO2maIg4ANQMfClTXZRofdeLq7XYV5TY8FbU8cJOxhE1Dmj?= =?us-ascii?Q?j3IRtyMlVkYDIHNMyPR2OFV87i0CaqTUlj508Fx42qQ4vaLYk7Ejj69NaTcc?= =?us-ascii?Q?V4UYgCdQ9/vlvYjtvvlOVb9mP/8yxhX7DbWt8t9mWbYOXs1eE8xZgLy7jjwM?= =?us-ascii?Q?NmE59jLSE1Yb94at8uIY9i9eYrhFW8V07hrv60BxLo/W97nqB1uSGats/Ptk?= =?us-ascii?Q?sv2cBYxcJ9sgatxGVB6r7MolbC2B2uiOgwNie69WHiu6jIHz3egdvBpKncaN?= =?us-ascii?Q?UIq9BukbAa9t3rlwWrxWmjnjIYuIXMLEYFZyN7rauxsrgHeXlvr6kDJUHj7h?= =?us-ascii?Q?9niGw7qbv4JNLBMbAnyxtaxunIM0bcJ9y2bNZ+Zt+THDelXx0rgjh9JG8Eem?= =?us-ascii?Q?RL2ajHqR2rYPXwMWd6g0TC+gcV2SxkVxTg/SFCYNl9ifGFVJLCnnc5V8VkDx?= =?us-ascii?Q?u+8GUV1Ym5PMyuCseVacvyOKi10TEVkVVmNHWsupN2OfFy0UtopNqsTbSGTL?= =?us-ascii?Q?PLYHR0HzHDVyyLzN+Ko3h7ZgIHhvrbYkC1pU3Wdr8wiuDQD1Jbyj2hFiCH5r?= =?us-ascii?Q?JentgGOk0ikrITFqi3YF6r504h3ksfwsIjRK2OSeNlF5bYQqQAMDYhQ0r/j1?= =?us-ascii?Q?b56IcvO79VLs9uRDi8mknulZs91E+xbv5ecP7DpJ?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 06a78dcc-2e49-4ce7-6d33-08dbc7e904e5 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2023 10:26:22.7950 (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: HoiFvW+umT6K9g444VqVwg/fH9jDqXLrAUUhg61ist7I8DLKdDYJsBnye0oyTmCjYIdnTLA03b6oC5WRYUUbng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBAPR04MB7222 Content-Type: text/plain; charset="utf-8" This patch adds a selftest for userpsace PM to remove id 0 address. Use userspace_pm_add_addr() helper to add a id 10 address, then use userspace_pm_rm_addr() helper to remove id 0 address. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index ce691aeca99e..30b9e367cefa 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3511,6 +3511,29 @@ userspace_tests() kill_events_pids wait $tests_pid fi + + # userspace pm remove id 0 address + if reset_with_events "userspace pm remove id 0 address" && + continue_if mptcp_lib_has_file '/proc/sys/net/mptcp/pm_type'; then + set_userspace_pm $ns1 + pm_nl_set_limits $ns2 1 1 + speed=3D10 \ + run_tests $ns1 $ns2 10.0.1.1 & + local tests_pid=3D$! + wait_mpj $ns1 + userspace_pm_add_addr $ns1 10.0.2.1 10 + chk_join_nr 1 1 1 + chk_add_nr 1 1 + chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 + chk_mptcp_info add_addr_signal 1 add_addr_accepted 1 + userspace_pm_rm_addr $ns1 0 + chk_rm_nr 1 0 invert + chk_mptcp_info subflows 1 subflows 1 + chk_subflows_total 2 2 + kill_events_pids + wait $tests_pid + fi } =20 endpoint_tests() --=20 2.35.3