From nobody Mon May 13 03:18:30 2024 Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03on2087.outbound.protection.outlook.com [40.107.104.87]) (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 39180FC13 for ; Thu, 12 Oct 2023 08:51:09 +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="GA5NrM3p" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cAxYFtyVoVLhl5pnAr2YWPcdWivrf7KY/dHpX6TWq8kQHCj9IYopE+DgJNBa9tFwOOKrEq3c0Dd8PT/lEFx7pQVEKe0L1turhOcZR7GfUQn75+pyPX6ERcfqrHGPJkBjS733NR1KxR1ro+AzBq14ZWVwEER/kCFbNRy5+04lTEpQ8HW/sve2ELhQqft/1uXjaIEu45gE3Pjt5nqmaSBiBTumXYj6DKKLgN2nFHwqE0D/tOhKvCBjWWUJXqlC1dqLaC5X5uND2snVgThfrb0E9+4uAPV4SmT9NzKJtQgx+6lRYnDUsnCysz0blHBevMZEOFmzxSMaHa5U/M+Df6AkAg== 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=zRd0Bif/P8noQUpSU597xprr5qSWRiRqC/fpPuazJ+U=; b=bxequbD6dCSLFPqB5IGN/mH7dnfhbo5Qjmx8F1npUuG+qHdrv6MdEI2AgvntQf73BZOmXlhqrAfYFALwjCVv6UjaCmW0XKzoJihQmP0Wjp4p9+/ENs+GQPyFNtPdhYMRbHYjZD9oI8+yVfBVojqtWea9cwDASdt/GELwABoPVB4wW93+EuegmwLhTSovHYDNJC7R4Dll9xwTfh4ADP/leJ/luNMIpJqkssPpA9mGgqYMmfScb9U3YJe+0vE+J46Tkq247dQftgPTvdLB79VIvfrJc0IzZygFaKZ7gCc//pZQk0aQ9KaEQ397VAWs9SndB/Ivw6KFkqvXFRn9wbcw5Q== 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=zRd0Bif/P8noQUpSU597xprr5qSWRiRqC/fpPuazJ+U=; b=GA5NrM3plPWojtmPEspiMR4/io4XZarOiPkwz2hXf+Ci8NJu5X7Jd8sJqajf7YNb3Fgwj5RfC6ZL4xmmGrzQNxj/99A55IOowcqUJTa+wK75RCgmTs/acSF6BhU6ylnFcmNSBnvgi7HdLTwDuTuc6cRhMCG6q6VGLHLpSmOyYC+Tty/bCmEikUDv5YxZOqYi9FYo3H2tPEmU6n/Nztd4Ytw1Sm9yywMCdCnbtvVfntMXhL/jZTPDnEeg373nYWH032hjXy731u6203x5aasOc3xGOIgLCik7IxI2Squxk5lVMOrkHK9a4T+Xk72nyAkm8kj3RsSDnZiXdwF/vdbN2w== 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 PR3PR04MB7212.eurprd04.prod.outlook.com (2603:10a6:102:8c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Thu, 12 Oct 2023 08:51:07 +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.6863.032; Thu, 12 Oct 2023 08:51:07 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Matthieu Baerts Subject: [PATCH mptcp-next v15 1/7] selftests: mptcp: join: no RST when rm subflow/addr Date: Thu, 12 Oct 2023 16:51:59 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYWPR01CA0019.jpnprd01.prod.outlook.com (2603:1096:400:aa::6) 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_|PR3PR04MB7212:EE_ X-MS-Office365-Filtering-Correlation-Id: fd4eae8c-ca2b-4755-5d1b-08dbcb005ff8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WhRAVmCMycIWW72SFPBic0kGXAXfs2ciociRcb/DrXwXxBNfzZ3xqab5nlxm2LYnnrigGgG0kSmsWPTEv6afIA8Lr10MSeFYvcY9o6+V+ZGybKVxBwd2i4SjdaTVwSeGbxe8IDGFAnk72AQr1HGHph+R3f5Gh6ynjelp1ZlKNz6qF7B76ts9Ve0kF+Upo4Ek0Jtw20GkRkz8O+s97INmC1o+DlIzxc3LBDGL/ECsN0QqSTj+HxOLEgpvHy+k9PVdlmfu4k/WyRpNYCeTLq2/RPzK+8ncR5wKEmXOoElTFYSx0cZ6Ptq9SOLkixWOWyI9xjORh7Eho4uqmCAf0Xllifesyrs1XY5F6xb9zcjJa34ruoGFA+ZB5xFFbhv9JCTsGCroYAbiIAPhES0UTATQ7j5EEDYFCbkxUTUvfwqgayKXKs81bjnpwuLp4NRbmlurb5Xh3TeiFJV57G4uidS6UvusgmIdpP5vsKhGLeKu/POooI+vE+Iw2DATFg1PM5gRQ7+0vIxW/zBaoX7iWurWJxJbzWGDgmbcN75x4Sp0tHWOR8UThXNS8AufiYl/FfqJ 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)(39860400002)(396003)(346002)(376002)(136003)(230922051799003)(1800799009)(451199024)(186009)(64100799003)(83380400001)(2906002)(36756003)(86362001)(38100700002)(44832011)(5660300002)(8936002)(8676002)(4326008)(66556008)(66946007)(66476007)(316002)(6916009)(6506007)(6512007)(6666004)(41300700001)(6486002)(2616005)(478600001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dpUnYJYOF/g+71KmXPK7O12FLBOboim9urgijMhy4Rmi3MmfuvI7sSn13NO0?= =?us-ascii?Q?0U4uVN2d72RQl0N+w4Z+xAXZfLBwOCH+uWN0kCyc+Upi+XkOtkBsdW6yHu4P?= =?us-ascii?Q?snMogmQYmhUOP4UaF3+5VXftG1pDKrZhvx1lAnfnpEWsWF8LFux/ZghPU+NM?= =?us-ascii?Q?Ghq2TlLMkpTHC2ltY4Zv2ZBR6TL7CSx7CTSBzhkap3KoIo5uWq892rZI77mY?= =?us-ascii?Q?4WU91Q2syGWFxBU02c+ijnDBWhpsMGdPFLia7X+cDxkcvENV1e9qAqoBnH6d?= =?us-ascii?Q?+V6qz5xeVQwQed/aHYcqaCsrME1XRCFu/GUcbVat6U2kCC3vYdN/PIQRvHvQ?= =?us-ascii?Q?YTQL99Mau2ydw3m6351A2SlEJd+aQbuthgyJiKE9Wi8b8fM9gHBW+bJwbE/1?= =?us-ascii?Q?YrX7VuZKK3Blj2QIaffi6x1yVpJNghP4QGaGfmHoW5FXSH4cxI71RulRfImK?= =?us-ascii?Q?XuvOVSaKAD7oTEj1uY0hiiWVCdWs6ARlav70FzqP/NztcN5yG+0tCmsuyESp?= =?us-ascii?Q?UyY5XuLwLbs7IgpdWK1ffd5yN7jhq45Et3Gxuoesn+BBVaZChXTzD3KfJCdV?= =?us-ascii?Q?jJqb3HFUI95cEsS9Ms7CtU6/W5sR3jKyoD1WjNVuIvZNf3Tslqw7jo8aThiU?= =?us-ascii?Q?JfdONHBc+lRPQ0ZrEQtUiN/5QT6swp4YVOaaKhsPd+5moWTx544jv1ionJaC?= =?us-ascii?Q?brbLyEsCJuNhlmitriMrl5fKmgc/CUxpkbBUUcCyHUT3V/O399ZzG+J7kJGt?= =?us-ascii?Q?C7WWI3KPZLggpLx67YfC8ztoht+agAFbuqfbiy0dqd0xbK9Avko/eAXQcf28?= =?us-ascii?Q?Fy8kxIC74Ggts8BwnIgJ5IzHTCMAoeP/84raqoaAD+3m0rCiXNyV0uJDJIeB?= =?us-ascii?Q?OYtImz3njQh8gcLUBphxNv4ItmEH6DRxITCDg/rbt8Oq/34qOVWY+2t1mP/U?= =?us-ascii?Q?aDICXsjP2kliIDojpjVcEEWQdPNcr1/+FDHl9MD7Io1kauNlRXPZEG4xNQpp?= =?us-ascii?Q?zSKG1phFc741MvTf0nDPePHFz9W3Dt4AFCunKMRhyYHAQqFwQyjNx2/b1nRn?= =?us-ascii?Q?kj35I++DhzPUZNM3B+Rxuu6F0yRswrgHrnEVBb5dUj++WT7x/SsmOJFhn8rw?= =?us-ascii?Q?wvQeEulXLIi4i6rFoHbIwu0d3gSMa9hFlR6G500TsXMV7xLSOnTLPqVSxEy/?= =?us-ascii?Q?C+YmER+2cHt4Im0iLh4ohR+4KVCjYlG9S92il7QJuYCt1sC5tBTtEUTe4V89?= =?us-ascii?Q?w2hybyMm2dQ1gV5EJTeWKg9HlqIXUqKhuqFJvYHp1XGAbxfoCRynvSFk/dTU?= =?us-ascii?Q?OWFJ4BrT7j3omHJUcUgLjL2uTqJ6+Dnktoo9O7NyGEjNGoqkpKU9PbRvVyo8?= =?us-ascii?Q?48+V2su9jdH3kF4hNQPMqJYQetjTOz5Hx/+67iD46Z09PthvvqKGxSpyUlE4?= =?us-ascii?Q?lapWhk1bNtX6/HGPyzR63UmySGE1OG9ST3mIu/pbZshwdyKKFAyydtW5LhWA?= =?us-ascii?Q?O22uvQOHVQGIHdnxKh7ULBKZIYa/ZjqifAQVPoi5WRujE+i1wrZyodfDM8Rc?= =?us-ascii?Q?uhQZYhtYNnDak+m7GscNIltZBbcMyYq9GZj4Reur/rgU9X0vYkyqe4ruLiQh?= =?us-ascii?Q?5dZVZJbgggx/brTvRRjXnkym5BDPGR2QS/jlDgJkQXGm?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd4eae8c-ca2b-4755-5d1b-08dbcb005ff8 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2023 08:51:07.7112 (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: YEq4M8NlKM6JtS6HO2+MqPmhVB6u8jf1P+BzPc+S/8s5N3O4pm8pi9p7hv2QJPnGAPxnkPSv9gAyM8T9TDN69g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR04MB7212 Content-Type: text/plain; charset="utf-8" From: Matthieu Baerts Recently, we noticed that some RST were wrongly generated when removing the initial subflow. This patch makes sure RST are not sent when removing any subflows or any addresses. Signed-off-by: Matthieu Baerts --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 01480663c102..ab6908b7b143 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -2343,6 +2343,7 @@ remove_tests() chk_join_nr 1 1 1 chk_rm_tx_nr 1 chk_rm_nr 1 1 + chk_rst_nr 0 0 fi =20 # multiple subflows, remove @@ -2355,6 +2356,7 @@ remove_tests() run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 2 2 2 chk_rm_nr 2 2 + chk_rst_nr 0 0 fi =20 # single address, remove @@ -2367,6 +2369,7 @@ remove_tests() chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert + chk_rst_nr 0 0 fi =20 # subflow and signal, remove @@ -2380,6 +2383,7 @@ remove_tests() chk_join_nr 2 2 2 chk_add_nr 1 1 chk_rm_nr 1 1 + chk_rst_nr 0 0 fi =20 # subflows and signal, remove @@ -2394,6 +2398,7 @@ remove_tests() chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 2 2 + chk_rst_nr 0 0 fi =20 # addresses remove @@ -2408,6 +2413,7 @@ remove_tests() chk_join_nr 3 3 3 chk_add_nr 3 3 chk_rm_nr 3 3 invert + chk_rst_nr 0 0 fi =20 # invalid addresses remove @@ -2422,6 +2428,7 @@ remove_tests() chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert + chk_rst_nr 0 0 fi =20 # subflows and signal, flush @@ -2436,6 +2443,7 @@ remove_tests() chk_join_nr 3 3 3 chk_add_nr 1 1 chk_rm_nr 1 3 invert simult + chk_rst_nr 0 0 fi =20 # subflows flush @@ -2455,6 +2463,7 @@ remove_tests() else chk_rm_nr 3 3 fi + chk_rst_nr 0 0 fi =20 # addresses flush @@ -2469,6 +2478,7 @@ remove_tests() chk_join_nr 3 3 3 chk_add_nr 3 3 chk_rm_nr 3 3 invert simult + chk_rst_nr 0 0 fi =20 # invalid addresses flush @@ -2483,6 +2493,7 @@ remove_tests() chk_join_nr 1 1 1 chk_add_nr 3 3 chk_rm_nr 3 1 invert + chk_rst_nr 0 0 fi =20 # remove id 0 subflow @@ -2494,6 +2505,7 @@ remove_tests() run_tests $ns1 $ns2 10.0.1.1 chk_join_nr 1 1 1 chk_rm_nr 1 1 + chk_rst_nr 0 0 ## TODO: currently failing, Geliang is working on a fix fi =20 # remove id 0 address @@ -2506,6 +2518,7 @@ remove_tests() chk_join_nr 1 1 1 chk_add_nr 1 1 chk_rm_nr 1 1 invert + chk_rst_nr 0 0 invert ## TODO: currently failing, Geliang is working on = a fix fi } =20 --=20 2.35.3 From nobody Mon May 13 03:18:30 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2052.outbound.protection.outlook.com [40.107.8.52]) (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 D8992FC13 for ; Thu, 12 Oct 2023 08:51:22 +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="BEr1UYV4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TZ/lytoUlDJjSEmb65RP8i8zX4v80FqvZ3tfJuPHAcFPJN2JnPQ2w3puMRXVT19S7/AyDPwv6CL0Bwv2KpusWGEPhzYJuqX+pmgdVZrSS6+UxXAoNsRqhHfBgqdQtj9umKR5HrKymXrzHpGfCbWDP9wBUqVFwxLhDgm6S7Z7xl4Xi6lNLg0A8ry1fx73zwp/9Qhq0nOCw/sYuBcqS2rLX1r2qW8bb+TPoMjAFcwPTN3iK6IwTJ+M5Lo07sZaYnrukUO/dDejDbc2Tyh7wQhuRU7Kkqbx2QHa4Nq0zwS+oxsjqijLEJBm5uJjylEVW/PmBWcP1OXUytCUo6RT+IfzhA== 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=z0yS3cDi9k1TVhY/Z2tsvNEnfjIbIkPbwwTd7wQBaTQ=; b=mXXuL6/D2RZ4ADQFx6goLGzib17eIV1k01t1NJ6iTXqUuqpONRQaHNyteCnxmv6T8pg8Jjdlg18AQZrCKf0iKiw8RPMAvsgwOQ+s2cCiJcRjvvI+cSPL0e/fG1V2+XWe+6m51/x2GkR47lCBOfEjrdfSZyp01h2NSpMyjyi6SmB4rQDtvNRFznUoDBlyj2h/AUICBje07dLtZQauiT7a2+ArsQgtddyUs8OMk0S6gnsVcwl0dQ7+jBB1M1iBsZ8Lv49FO3n9VxXsB1JnExiDOrgqEHXzqocYmoJI3PlnRaYm6/0l5EjoqRJPnI6oiojF0o5c/7Ltj2XmVc25o0NP9A== 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=z0yS3cDi9k1TVhY/Z2tsvNEnfjIbIkPbwwTd7wQBaTQ=; b=BEr1UYV4Pf385PceQpZr7AsD2bav0zXu1TS3fi+bqgykTOmSTmIQ7jKyrpKJXPLTQoPFDKOdUQpMYYWGAV4uaDK346pI79uWpNA4pw9QcROLeozx0/QWYz+lQoz9RavcDOQL/7UyI1t78SAQPYg2Ix/W5+Ru7hg9yA+ykD5PDWHnSTiW5tCqIQSiEZyMjjHeYHX3nq5gSNEuMt2QAlD8YuCR6YQR/vrE1qydiSzQ8F4sJAtRaIjKx0jdV5IwcrSkPdWy9PcEu2qHMQgmhbV8bCjykAcEvG3TMw19ihjZ8IDLsrzA1A3bRB8h6Z0/kvhOD6uKF2QGC+8/XhI9NlmUVQ== 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 AM8PR04MB7923.eurprd04.prod.outlook.com (2603:10a6:20b:24b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Thu, 12 Oct 2023 08:51:19 +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.6863.032; Thu, 12 Oct 2023 08:51:19 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Paolo Abeni Subject: [PATCH mptcp-next v15 2/7] mptcp: add __mptcp_subflow_disconnect helper Date: Thu, 12 Oct 2023 16:52:00 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYWPR01CA0031.jpnprd01.prod.outlook.com (2603:1096:400:aa::18) 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_|AM8PR04MB7923:EE_ X-MS-Office365-Filtering-Correlation-Id: 2fa88cef-e29b-4e67-c0af-08dbcb0066d7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sEbLIVvyeS4nd2GrnlXO26rNrn8QqprzMbKbZSJlRA7Cew3MjYcjvWPjQfm082QZ18ZRv3W9sjG/2/UtBXO+0xwMrqKVVUN5LmIy1B7FwoqCtsDpy5xkOpzgegw5hmz99acr8+V9jnVjuG1PBsGlPhsnPjKaK5dogETrYwyvo4fCUwmiwJYU0OunMYSbPNlBYZPKQ0+C782hmqExOS/6jpbqUGpEHSEXnPr9M/4xpSGWvx7fbB3rcwY0GmbB3An981GvErkQhLgyjsUkX56thasn9yUB9c7E+XZR5fme5sQx8c/P8+nM/0DyPKzuOgm/4s+06/Au4fMHvjhrNYozNteCvt8I/T1DiaJzmmU2wsSw8c3b8S3T5rwKNu40IoOy4w1ZA6MGgJyyhi67rHF82wT3uKFhs5kxVsJoaANOzM1EZfgBtGzS0cmBKl+AD3l63KW2Jb79uydUlDOvG+WQtnOk4efDNHhFAtiePDoBsW5d67jaQUMmPutgekD4Imo8uHOkhG+jSejmQy7S99elUC/9gTRvEk5bSsqvjLfZyFpFjBwGDHtHiXlkZSaciA69 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)(39860400002)(376002)(366004)(136003)(346002)(396003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(38100700002)(6512007)(2616005)(478600001)(6486002)(44832011)(5660300002)(8936002)(8676002)(4326008)(86362001)(2906002)(6916009)(316002)(54906003)(66476007)(36756003)(41300700001)(66556008)(66946007)(6666004)(6506007)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?RLRWfcx2VbJ1XeTeu0kTSJkQ9j7myglGPpJMTwzhrOZ3zZet1UJIxkgezp6F?= =?us-ascii?Q?OvC6+2jLb+zLfb/1kiflJeD/QwLs354vg7spZ43gLbrjsHjApjp8/pe5o/sS?= =?us-ascii?Q?vGwWeQrF2rB/jTHuqioY3sYLY1beeqi78bPT56VcrCUpP09D30F6H2Cx90ig?= =?us-ascii?Q?xXUypOovXMRL/Ifj4m4FPW9QpBU0KiVqIUaQ8IQZkYmZJZwole1h0bVwDgxV?= =?us-ascii?Q?lItiWh/jNtji3WBJ7pwWArZS+ci5jJsXO0TNaljskVqXHhm94Y1ykZ1EQLwF?= =?us-ascii?Q?AOz7tmFBgOTr72TsX/B0RagpbECbvhjhBes/+6q16sdkfrPqnpS8MCULuJLo?= =?us-ascii?Q?EU32kAH26Xm32PuzoTwr5LCkYsmRfqFKhlwKoHKOpFoLnzs25vUltQ8mQ8ed?= =?us-ascii?Q?e6A6HWF6Yyh8UboMslXqJZQs9kYIrnellZWMMN6RPDPk3lmxWia1j8jiCpTE?= =?us-ascii?Q?anNXUCDTA/GR5TOYhbiNE26hbpeW82b7ymlICHcnCMdp60NP6PO52CHQ49kK?= =?us-ascii?Q?IAgAaAHiu2eQMch9qMqEsAsZrwBWlEEOeZAjkLi2pwBPIbTbj029Nbl7xX1S?= =?us-ascii?Q?J3ZCnk/qfwVG9Yxp51TEXr0KRnLWYksYHShGfywEwbKWCaDmKxWWGpEMApao?= =?us-ascii?Q?jngrNii36RUAQT8er5AoeeOk7oolnMXMHFomNmwHN3MSUjpPuoMxADkTEP+Q?= =?us-ascii?Q?o6K07yQOBdpcch8PbpSJ8JnhidOPAks+uSHGjqo0ytdVWpOgNf0DUiiopf87?= =?us-ascii?Q?8/Voz4VTW30K5vo7awIJ9OVGMdwdU9eZ61+Sx2kqxhGF3XOUCubUi+GfSF8U?= =?us-ascii?Q?GxYvBdOmyDu21zgi+kOXi+0CvXqs8TGeSh9nTEUeXOJcs1gcgFiphy17+sVu?= =?us-ascii?Q?RBO5Thhzp4tK1eKkBPmU/7R/PkCrDQnZ709TV3RBWpy5JMFAAP48Ok5O69HK?= =?us-ascii?Q?689EeC2aQZy65U0aAlCoRxDqiXpm/iss5C48HqQ4Rhmv4RbdhdukGuYzK4wW?= =?us-ascii?Q?yXnAfmcTb7U95krl8pU4R8womsKSqe4r8n9ke/0PK3ZQtIkyA3y7GOKM/8tD?= =?us-ascii?Q?+VT4CUlKL2DXl5KQPT/4t+4P+PIlXcNrFtXz4apCOnGppYIgQgv+eFsfvrZs?= =?us-ascii?Q?VyXAjELS6uc3i5QTO2dEuirUIklWT2Lu/c25BhF7rgTMFj75rviNZ0WVdjOn?= =?us-ascii?Q?sMwkFxTu/6kVC6jJ57DccYhQKf2Bt9bgqBP5flrZXKAPaorGw6iy7HJX1bdB?= =?us-ascii?Q?3A2qVT0zdti9Xgx0pYQirLjkSlH3CbvpGBSNhyphMmQSbclGdzjbUWcMdFLf?= =?us-ascii?Q?N9roeKDPgneuXF9DU3f92bxZv/WB6xKxuQPnonjRCTtX1Xivv62kL/yw9NtU?= =?us-ascii?Q?k38GtFwMFdfmNZ5y8tOLl33yx3ShbjlAhun+mBTmcrUKLlXy6hWYpggtqFua?= =?us-ascii?Q?4SyYuBny8BjxfZoEyOFX4FzFxeNZeMcbgL5BEctm+J+3prZC7YsjcpE46+3C?= =?us-ascii?Q?TxD+gGZXrMwIzOPdDg+yzsZe+hq5Z6xqJklelkNBf2RRR6DXoss/lsyx0gSG?= =?us-ascii?Q?vHYbqMOx/Dn3JxPXqGTGorvXu3jEa5h23GbJU27Ah9ZAGdL7aUCRuqCui8sW?= =?us-ascii?Q?NbrleKh/lB90EKukysniHTE4vCn89jf45qwjXxykQ3dP?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fa88cef-e29b-4e67-c0af-08dbcb0066d7 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2023 08:51:19.0146 (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: jfoZHvt+OmfbG2kbySfIAxHK17w0I0FJ3aO75AMjvmjlh8cc2JFx45F7PKkCHnopVT0Bz0HPxQjkLh/zB31XEg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7923 Content-Type: text/plain; charset="utf-8" When closing the msk->first socket in __mptcp_close_ssk(), if there's another subflow available, it's better to avoid resetting it, just shut down it. This patch adds a new helper __mptcp_subflow_disconnect(), and reuse flag MPTCP_CF_FASTCLOSE in this case. When MPTCP_CF_FASTCLOSE isn't set, we invoke tcp_shutdown() instead of tcp_disconnect(). Co-developed-by: Paolo Abeni Signed-off-by: Paolo Abeni Signed-off-by: Geliang Tang --- net/mptcp/protocol.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 30e0c29ae0a4..1a54d55f8bb2 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2366,6 +2366,26 @@ bool __mptcp_retransmit_pending_data(struct sock *sk) #define MPTCP_CF_PUSH BIT(1) #define MPTCP_CF_FASTCLOSE BIT(2) =20 +/* be sure to send a reset only if the caller asked for it, also + * clean completely the subflow status when the subflow reaches + * TCP_CLOSE state + */ +static void __mptcp_subflow_disconnect(struct sock *ssk, + struct mptcp_subflow_context *subflow, + unsigned int flags) +{ + if (((1 << ssk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN)) || + (flags & MPTCP_CF_FASTCLOSE)) { + /* The MPTCP code never wait on the subflow sockets, TCP-level + * disconnect should never fail + */ + WARN_ON_ONCE(tcp_disconnect(ssk, 0)); + mptcp_subflow_ctx_reset(subflow); + } else { + tcp_shutdown(ssk, SEND_SHUTDOWN); + } +} + /* subflow sockets can be either outgoing (connect) or incoming * (accept). * @@ -2403,7 +2423,7 @@ static void __mptcp_close_ssk(struct sock *sk, struct= sock *ssk, lock_sock_nested(ssk, SINGLE_DEPTH_NESTING); =20 if ((flags & MPTCP_CF_FASTCLOSE) && !__mptcp_check_fallback(msk)) { - /* be sure to force the tcp_disconnect() path, + /* be sure to force the tcp_close path * to generate the egress reset */ ssk->sk_lingertime =3D 0; @@ -2413,11 +2433,7 @@ static void __mptcp_close_ssk(struct sock *sk, struc= t sock *ssk, =20 need_push =3D (flags & MPTCP_CF_PUSH) && __mptcp_retransmit_pending_data(= sk); if (!dispose_it) { - /* The MPTCP code never wait on the subflow sockets, TCP-level - * disconnect should never fail - */ - WARN_ON_ONCE(tcp_disconnect(ssk, 0)); - mptcp_subflow_ctx_reset(subflow); + __mptcp_subflow_disconnect(ssk, subflow, flags); release_sock(ssk); =20 goto out; --=20 2.35.3 From nobody Mon May 13 03:18:30 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2041.outbound.protection.outlook.com [40.107.7.41]) (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 919EF1D53E for ; Thu, 12 Oct 2023 08:51:33 +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="sVrkfBFl" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lLVwRGCUe2ZrX5w+hi6pzLlugYMP+FuFDO/8ZXjRv9f73RWRJm2uZPdK+XQrTmhkQQS0Z3PQU8V6eg17prGBgSZH+KMXjswkZW1JgWTp/4DVkfx7WV6OZnke9+guWX3gAZGjbRfyH5byfhSF7d5cYxvQfMeuX+qLqbcArzMV3XO+nmUYFee/O9uXzz1H7xZO0IO+tHdqpJFdu8xcHKvlz4sAFnBQTmwXkjthXdNKsaf9bbQxeftR9EgVVMWQw8DK4bP54foxnozXXH36FuPbqtCSvLiPps9cS708+gr5QWYnQAixl5C/5ab1cDOH7St0QicyjHuv1qjJu0VRhUjyFQ== 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=8IQEvFh6gdXeD+mG1BZ0f58gh99w7hdhkeuxHo1D1Lg=; b=LHND1/rVIOm3vNjHROvlMzQevx5hT9YAjssS6pfVqjrkYyXj7hdnpqO/lOMkYAzpeDuA9yrDCvaKmSdyx/ECRzbobeTbTc5/WSiREn4tx9wi8M3tOsXJj6HWvyksqax9eGqgekbaveoJLpvucvs/XU0mxqe0dbKCUk1Ag1nYisyHNUlv2mpuYOIIxxEqK96ht7mGYhwPogob/5WFlv4LDg0bZc0AaL57ZGm792mAMHZ/MC8qpbrjrTsj0Feefvw90zIJpOWLiuBVDCuvN7SL0DCx9YLNhU8AUawMN3ouZKJrxw0EplYSL80R5Aw02vJiP5bUYwEFLMxkxNB7TE+3lw== 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=8IQEvFh6gdXeD+mG1BZ0f58gh99w7hdhkeuxHo1D1Lg=; b=sVrkfBFlibycDcTSKGtk5HaZhQ8LMcO3jAWSEzaqazzLAX8/hqOBcp27oETbQCNsF1Nj73eZkbF3qojIYBIHMrYbqAen7mIWFwc84odgnFgz2F2LkgLr3jniqrAFZcXwpophqawnYGqJym8gVZOdNQLEN7Dx1xUL34KoLQubnP6ECHT1FKRoJDzGvOMb00CnCv9bQsEigT6UBSYcztbXdX7agxxeIeqDVIa8US24poBJs/WbkUOz8kAvapPVXzS6RojDy4gPlE4n7fXI62D6hpjOR2saxMKC6GNimw+1YBqBou2go7V55b5MCNh5MXKMCGNYTAVrGyKq/Qi+Nyx/4Q== 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 AM8PR04MB7923.eurprd04.prod.outlook.com (2603:10a6:20b:24b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Thu, 12 Oct 2023 08:51:30 +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.6863.032; Thu, 12 Oct 2023 08:51:30 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 3/7] Squash to "mptcp: add mptcpi_subflows_total counter" Date: Thu, 12 Oct 2023 16:52:01 +0800 Message-Id: <6e9e20ed1350ac793b682042ae32be6808c1a1e4.1697100600.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYWPR01CA0028.jpnprd01.prod.outlook.com (2603:1096:400:aa::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_|AM8PR04MB7923:EE_ X-MS-Office365-Filtering-Correlation-Id: 9fddeebd-a33c-422a-11f8-08dbcb006da4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1ZbTpGFo5MertYYV8v5WuPmn/A4406pK1fHu4fT3MZhfe2ONiEHnl3eYdFpNIAEyrjEjUnw6VRF4rQLGcLDkAe0dZgwJXT69nPASNjIPOvfe1OEqPLrx8aCVm11SAqzq25vhjnHibbl7nryS3TiUt4/9DwaR2if17HFWr2PWXKiU2zQ0a/+neBr2tfZxSHiKPB4g9g0RHuk+4Xr+qg2VftxMquphIe4cNW7wuGiSrGLcUf+EEjNG1hh+wfTNGyPWE9REn9fc7WtLLU6pvyrVVDiA4evrTzLY6TUmtrwyyD08BNkp8re299SNhtREEI0eyOmNp91epam4i3F6u2sC6KF6+phDjOHAkOslldm7oZCs01+XbJYY1mu+mv76aIYIRH4m4SCPkHvgdc1G7dvocySoxK0QpJhvzVJYUgFJPViICqjue15rQ7kC+HUH3sPhuY/ypqffP8NhGVonTJVfJH755SdKNt5PjIR8FqbO5fXMIJEgi2V+UXoorHNox7PEjGaLJBnnUZAS0uE/k62f9B5YXmVY10xcVxw63pz001lIouLeMvZ4zxJzSgvxIiNa 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)(39860400002)(376002)(366004)(136003)(346002)(396003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(38100700002)(6512007)(107886003)(2616005)(478600001)(6486002)(44832011)(5660300002)(8936002)(8676002)(4326008)(86362001)(4744005)(2906002)(6916009)(316002)(66476007)(36756003)(41300700001)(66556008)(66946007)(6666004)(6506007)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?fV4ubpLntKTu+Z/w6V6syEmuWfMpHEuDYnRWs7lNpa97IuJJYSY2cnh1Z+gG?= =?us-ascii?Q?PBPie5kHWS39rPreHYn42ZOsOR9cuHNrrdRsxQW7VHBFouAusc9ns2uJMAeE?= =?us-ascii?Q?Tq2wDmU0DjFfenWNXAZMrqbAj3IWKyxHttkjkKl/uP8AulTy637IgBz6YQl9?= =?us-ascii?Q?9rnBO2Ur8Jn79xrl2jlJvaot1LmqX7DKDHMk8e5rAfLrhpyu78lzhfAHyvD2?= =?us-ascii?Q?BJUWxBioGjyKY+fMXd8wDd4uu16r7ov2p1kwjlSn/SY+fXdfVYne6Im5GVix?= =?us-ascii?Q?eJBNVqTFobOyKfSBVv4Nmrw/XxO26rAy4j59JwuhCXdtwdOmV6XEoRXgX39f?= =?us-ascii?Q?THKJjZs4U5NDUG6k7GMQz1A+GRM7/7w9a/XsLrwpEhTUKvVqld2v2riG+HD9?= =?us-ascii?Q?EAFnSMoWVrKzc9z8nj9I1xUnCY6ACoArNze6tLPb/Oam61Sw3/DMfBVb1Ef5?= =?us-ascii?Q?5mJAr/RsuxbTJ4eiP1AIMv897oy5Mel5hLsiPvDFY167t2E35UA6Hy3oQERq?= =?us-ascii?Q?jJXLa8g99Btkz5CyvCpWh192XgCIlpq8A1t8PJgI+iBa9kpAsESfVIb9OSe0?= =?us-ascii?Q?91PQu+Lygk0FEohhSHqF27sYSW3NhfihgbQgxSWHusqRw6bvIttdVinEaYHh?= =?us-ascii?Q?vlKmDjsUsqNBWXx/LoSvirCfLgw4Q7LKluA0ig6K3oFqxnRvwLr6fdPHxPX2?= =?us-ascii?Q?njUWnKq3CrkNorP3Z2t7z7SrGfX7gPL+vkgs9u0/5jT5PhxNhMvZpwtxdtfW?= =?us-ascii?Q?+41slRCABeHIvw/8kNokGMwTGLmPS5AvM0F2LJGW++Viy+iw7T9u/9zF2/BY?= =?us-ascii?Q?gwhjDvvVUZVEfefGZSmEv5ehSUuA7W35SsFoOGsZ5yVE8TrTTtOHFEMB6qDQ?= =?us-ascii?Q?kC0aomvgkyyah9Yre+qjU2LSi0XNT3VhRrITsCDf684vo5rtXEvTGOMkjZkh?= =?us-ascii?Q?CrKQKZqYoCZhtqjLz3aa/7BEzmOG6HSBwmTbSs23QmJmPEpN/aXuRhwtAPgi?= =?us-ascii?Q?ksyGGckRLAMRxB+w54X0pb/N+xQpzmwvl6pC2mnJojXuJjijk2izjCBOfOE5?= =?us-ascii?Q?au76H8ji/IyKVdRMePc25Ku5HNupZanY5RYWM5ycNYVN/Hzhit3BSWCv0YzT?= =?us-ascii?Q?N2aA7VqWJCv9Kx8qlcvUVqEiiXKTjnD68Fw/e2pEcILCui+ioup2frAoTX3y?= =?us-ascii?Q?RWDJ2bzPkPDY3KqULDvQaVzfHZsklOUp6AG87M6oHPRlJ9zJDzqib6J2nRGh?= =?us-ascii?Q?7+VAkENlslaWz0xJyvYVEHNVuGi0EuzZCibl+G3lf4rHhdmKXW+VdAT0zgph?= =?us-ascii?Q?lplLSB2n6PR2qUTSEFKp6CAnUlA0plyfB5NV3XVZQfdMTF+45iZK3BWwMrJi?= =?us-ascii?Q?A399cNcGPEG4gxJYkAK921a+mqXz9wwv/cf+O+5xArD1AP9k7tL6kdGjMo/0?= =?us-ascii?Q?9wLmEhgozBfLC/pYdTXtiuGTZVr/er3OCjcom2Kz7C41Kk+yKFl+0qwcZI33?= =?us-ascii?Q?R869ZjCowFS1f86psRHAZsQA7TnXlOr95u/A8Qb2Y/0Id5E5TWaSaOHq+sz4?= =?us-ascii?Q?uQvA3rmBF7ChI0g9QTm029DTc3AqP6Ly/18h7hsgz9fdtUcdu2jymzCRQUKd?= =?us-ascii?Q?+oP249ELRMxBGrjhMlW0sOsUwOXVlCVDAjVb/payXjl9?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9fddeebd-a33c-422a-11f8-08dbcb006da4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2023 08:51:30.4101 (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: e+hAceFylI5kH+1SNnwI6B/EEIlfWefD9DTa4cJZGAP5K8D/iHKMChWQlgALM411X5CCU/WKDSwk+Euu4T8Smg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7923 Content-Type: text/plain; charset="utf-8" When the socket shuts down, it's state is TCPF_FIN_WAIT2. Add this into __mptcp_has_initial_subflow. Signed-off-by: Geliang Tang --- net/mptcp/protocol.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 6508179e94a6..ccb97b747527 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1081,7 +1081,8 @@ static inline bool __mptcp_has_initial_subflow(const = struct mptcp_sock *msk) { struct sock *ssk =3D READ_ONCE(msk->first); =20 - return ssk && inet_sk_state_load(ssk) !=3D TCP_CLOSE; + return ssk && + !((1 << inet_sk_state_load(ssk)) & (TCPF_FIN_WAIT2 | TCPF_CLOSE)); } =20 static inline void mptcp_do_fallback(struct sock *ssk) --=20 2.35.3 From nobody Mon May 13 03:18:30 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2047.outbound.protection.outlook.com [40.107.7.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DCDA1D53E for ; Thu, 12 Oct 2023 08:51:43 +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="TZWAkfYl" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PuEFJzSVKz4D9SBCaoitemjGvdNxK2tVXCD/WtIGDDvgqT5fOERBfGSJ+GXgMSDyG8qQndRA4+S1PXd6Vz+zor6STmMvYDn33E0rgCKYok4Gi+ljlAjHTA85w1feslQ7JYtmjCMFeJ2qwtfdgbPH1xMLL16iC/+cEq/T1Rvua69LY0Jg5wips1w790h0l+xdo3WiPfizjuThcYgKCXTctD6lvzHGMT/pNaTbY6vxmMbRxcV37I/se3Xu9jmSzFwzlatEahxCoPT/QpwS1aCfQx1BHDOGaZTqet3XFXdy26YvcVHgKwIrBNWRPfNbQhQW5MZKyymAlAuQq5RuJ9w51Q== 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=jUEfaUpg3ds7kvR3nhG2UUQ/9pHx7Q3VN1a6vHRpTCc=; b=OXun0evRnlrreL/VD1w8/iklYi6t5T8DuAGIYs5cFABlmG3LdGsei6tj0o9JRS89MyKgKh60bUFqKg2VSMOl3d3n+7uxnh4QiygJaNDrNDOEUYZpV0HwTIpMrcjNxkWxhp6pDF1RRwKJdMtOeexD+yuaYH8KceAHpSm2cQJM59K6D1PilyVXaxFhsbRvozpT1DLBAuzrQLvfh5lRb8leLqQx9S1v2d4/U8+qIPcc7uwuEqlzhDpbgCsZ5Hxw3UvnCAL7Ztj/WcckRBnGlalYXcQuRcvYdhCVSI8nJyuiJLhGfj/9iPSxJAmMfiA4XZd5XSsjzQTAKXr8A3BEiSt/Qg== 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=jUEfaUpg3ds7kvR3nhG2UUQ/9pHx7Q3VN1a6vHRpTCc=; b=TZWAkfYlWPMnuCEeSxpwCUCAqoOIPR9bIHG+gZfllE47ZxFv/gdTFkLi6/+KUbMLHqfn5jU4W1KUJa0Gr1uCVDmTlS4SMhEt93g1p8OPBq9BlDFLpwoIbf3q9WJAlpwwdUzaWbwYwsTFSb20vgUnAFgrafIpwU+goj/XT+NAhHgKdafkJ/oJrruT4ouSlu8DdPWU6RQEajmQaVH8au4//uFyBLUxtEnAIr/fF8o6SP/xbRmwrDKjH11XuZv9JyHOl9lKBzkfZsYc0YTap961KIQjBsQC9I4XX11te5unfVi9XgHxUya0nftx0ESk5Z+1bWbENN1oa9IvQSIYwFxQew== 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 AM8PR04MB7923.eurprd04.prod.outlook.com (2603:10a6:20b:24b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Thu, 12 Oct 2023 08:51:41 +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.6863.032; Thu, 12 Oct 2023 08:51:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 4/7] selftests: mptcp: userspace pm remove initial subflow Date: Thu, 12 Oct 2023 16:52:02 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYWPR01CA0025.jpnprd01.prod.outlook.com (2603:1096:400:aa::12) 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_|AM8PR04MB7923:EE_ X-MS-Office365-Filtering-Correlation-Id: 30934833-dd65-4b40-dc0d-08dbcb007447 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: x595rdlCPvYrzbubBku6rpL5/5kRx2olMKPjsBo5r/U7sC2+qHvxMpvwP3O+YKGm2Ahf/tAIOcKJokaF51hJQc/m/KWFwfMSYfssgWep8srwA5Rl1XC8qEWt5lVeScx0T7lgPvQ7DlAYcBKNp68Cl/IxXWLCK9MjjRG80UQXst198/wfx/+YIIB1S/ol3tO+3YguWjCDSfM63WTxyIXKJQoWMHVAO4QPhGGATMY1hA6lsoeFCcmh9CBJx7KCAoSZ/vl+ulWb4W8UYWDAtD0xzBKikTLVcpOc9Jo2LgOGzAMfNCNntjBl7IXH5sCGr7yxvrW87ghiAbYsxrx49/loeneQWqJfNqVEHkSudJbyPFDkpAYfO8neq9hu9lXZmQqwRtqRBcMamw9V084J+iMzRphrVqQaXYPBqvCcAMyQ70IcsQqrBw6Eep24M0qEo3Y3vJ5Mq2XRgUxFX3qtpJgW6a8n/8FXqtl5mhBiYi/551EXwZ6+E1cMDkXMZBiI77vBgeAJ3kbY+2gEfOq4lX8Cxw5kFsIXYWkqAYfatTHUD/VF+1A3p6nURzbZCPzq4Pdf 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)(39860400002)(376002)(366004)(136003)(346002)(396003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(38100700002)(6512007)(107886003)(2616005)(478600001)(6486002)(44832011)(5660300002)(8936002)(8676002)(4326008)(86362001)(2906002)(6916009)(316002)(66476007)(36756003)(41300700001)(66556008)(66946007)(6666004)(6506007)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Lv8LzVP47Serjx0ep54h1RcfaCgPHIH5GdmGylBHsxZdwLKKm3csWSDeBAO1?= =?us-ascii?Q?R9XJeoretgOl8CQPTZ+ysMM4fyysyf+nEOETsypDs5ueE6wOqyRsUTvUf/WU?= =?us-ascii?Q?5fk+XJ18tDhEwkFmOi0vEpt16DdD1eGQams5CXNO5ankg7oHIV8DqddmJvbe?= =?us-ascii?Q?VGW4uVbugx/y3+0+PoCmjJ9s3g6UERwk0+L5U0/t70GRhkF/xRW5qrj8WX/p?= =?us-ascii?Q?eO/OvGMuMR1WR0qYsm+Jcs0LztspqyW16x6PWV/XkGu9JOapaFiZlHL69M3w?= =?us-ascii?Q?AjKD4ChtcLUiLeVJwwglFXcp2jap+qo80qU1RQOpO2jlMnhPfQdB1so88cVO?= =?us-ascii?Q?rud1D4qCej88v3/42cbQSojKgezf2a4lgsneeDjojI9F2LpimHgyg0Isu6yT?= =?us-ascii?Q?OwQ6pIaicCHbBVyvjfMO5/oYt1b0XPmS/FrOJ5CdMvv+sZdNXuLhQ8efmG9K?= =?us-ascii?Q?egOcFmnmONE22eL4Bb186yGjoRzLr+CxU8eME7YKZZrshzOv2O9762Scpm7n?= =?us-ascii?Q?ZU5a4J9DHGYLdGTq1IdiCsJPJJOd40eccir0E3GzKyJHOqqP6eoLGZVptwrz?= =?us-ascii?Q?X4akF69r42TKZthMvi0r1evWXzYuMZwTu1Nwbr15Lew+LauoXGaxjzg2P4CY?= =?us-ascii?Q?7MbDMS5bTsk4eo+TOSqtjWSDSmotTaJMO6wXlCTrUOSqXCP/suuoGUtXk+Tt?= =?us-ascii?Q?S8zYVTV8LrhIVBOTy7ceTfQiDEfZdaXcqzHDxGfY76ruyq3PDnKsy9izhEnn?= =?us-ascii?Q?kEZI77bTPr8ZsnikR3FFQvs6gSLB1olrNBKxSumzVqhkF6lAsQ1V37Umc++o?= =?us-ascii?Q?ckiEs6Pj7jTVuRd4IoUlH9jHJA90IURlgElI2NmIw08Eyjk7jh9HVOxoceUq?= =?us-ascii?Q?GAUVz2TSN6CzAAsh+2xVWEy9rLh26AJFmHf61KrNMX/7GDD6WAh4tHbUWx37?= =?us-ascii?Q?wbS0MmkwySL/UWgKZ4hNgTomsLVMfGv3so7n6w5cGDq/h4MaEBNLGnCOWg4a?= =?us-ascii?Q?nqabWQKPtYNaM/VFlA1luXa+/y3+PkJOUUQ0gjLp741FOCOq97/VZyBlg/Fp?= =?us-ascii?Q?0RjPGLLRS0d7IiUXHXoYQZWc9OnTXSj5OdylmZ96BdhPgHaywuIgr+jaYtRY?= =?us-ascii?Q?3CoMNTUZNpZarAm8bFksOw8Cc35q984WGIGgSBH1msP2bIGtifnPpHngoC2k?= =?us-ascii?Q?oVTQBs19osJTnb8D/6pGphrsFuCBm6y57AdwDPFDRU6I+XtoAzbcxihK0Z+L?= =?us-ascii?Q?ao0aWE73kTf/mlUmGB8c5GDMPaveEMlw47K0A8V1VKWlQIlogc3s/8y8COCR?= =?us-ascii?Q?mjKR/ACNiYQfd3OWZjLvM7tks63paCpRzcfZw97J3iEORx0k11NbI/BxW/Q2?= =?us-ascii?Q?jwrXb0mE6zihPLOy7/47XNzb/Bu7vZxTGLEDA2QNRNw3k9sf0HfmwgRbfBwq?= =?us-ascii?Q?muMFBPfCAYODUBthGc3woupEp0vcInyW4esH3+QgVTpRc9+4WQ2wNpcoAIIw?= =?us-ascii?Q?93YiOHi0Qe9aOHYqICFaGdJbCiMOIpk2DmfZNkUWAPo+gxeXkfboNsaC2/jU?= =?us-ascii?Q?c0soyWSes+bPMdwdH7pehguLdbxhtbq5Qe1RGKF6nw9q7YLqqV+b/v2xUT9t?= =?us-ascii?Q?1/UbBsLjJdvsQ5ulQlp2BU6jNtceP8V2dQZmUP7Gjh5w?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30934833-dd65-4b40-dc0d-08dbcb007447 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2023 08:51:41.5427 (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: 81H4vyOwZjKfCnleU999Xgi4hpI1EW4cAwmhMmA9A7xdLwwqFMjwoZ2Hy/wvUgvoOnZ6h4LTh0iof9RAoP1L9w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7923 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 | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index ab6908b7b143..154978481409 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3507,6 +3507,32 @@ 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 + # we don't look at the counter linked to the RM_ADDR but + # to the one linked to the subflows that have been removed + chk_rm_nr 0 1 + chk_rst_nr 0 0 invert + chk_mptcp_info subflows 1 subflows 1 + # No subflow removed in ns1, one + # subflow has been removed in ns2 + chk_subflows_total 2 1 + kill_events_pids + wait $tests_pid + fi } =20 endpoint_tests() --=20 2.35.3 From nobody Mon May 13 03:18:30 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2079.outbound.protection.outlook.com [40.107.7.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 821BC1D53E for ; Thu, 12 Oct 2023 08:51:56 +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="HHKGTPEi" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FF0MvfsWQzf9ap2z9SJ996A/ggrq+1uuUovIn/mao1uTaIbPXgIA+nHswSVy41FoIpSykXFURSKlV/uX7b+0bcHc286TX2EbY1qgDx4HadRz8PTEBGYo4878f19MIg1dOR8Aw0G4/+wbMhiHxDIPfCxv14+yZ86X/OElaXodvND7Xmuho7a9msEkzBPQ+loIiO7SgDyz9+hBqLRvKrvKyxiFD/T6S5xbFrm+g/ue2ABejCXGAXHB8/xYtIB6KPbRYmTRFJ9O0qQe6AUQb8cQdSvFmq7Cam5V0x61wDS+RSK6y5yfHW49iHPT9N5jqvjyR8qe+xtAzFFD5rumsclsJg== 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=JF9SqZpDHJjR5kQXzGZWWiFtHP5q3yVGiq85xPy6jr8=; b=UkC0l91qv2ylRVWNONHm+mO2g8ZDFJavoHQP0yqshGtuv8dW/RrL/M9d5WUXisQel5NxxLWwh2wIqXOjEDJi00s78UVBaD+o6i3SAreOm5EMCzFSFsjk4mNkudbKullsEZP1INOqbV3cuDL15FmmBRkSH5Ln5nTp2Sftw+w4zMrNSB5oH0Aa1wpa53iBgT32My0f6W/ATfp8gjBEtn4AAmSicW/hqCwy/IBEWOQnA3HiX6BO0GlBuWnB1jACe6HzrlCd5sM6iRbex68AhrpvykgiVFotkwVdlfld+I1okTqmoEge8BBuGVkJp3Wva3N4MRM2szg0pWuYZgo/Env5Ag== 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=JF9SqZpDHJjR5kQXzGZWWiFtHP5q3yVGiq85xPy6jr8=; b=HHKGTPEiWSxZtfe3MG1Hf72SrAGUICBp4qOJ0O51oJsFcUBTo0jN6SMKrAPBXtDtUVZpHZmFCnc9U6Oe2aywsH88GgBPCnPDKVlzCGiAkn6nMXn+NFNo4rFHIGGDLHWMabB0ObotCyshTXr1NQCIyzf8zmgQcNJNtmk7vxcjicf52WxZrkq7+k7fmv06I43ROgl5LaizIXMNXf32LM1kaKp8bLJfX9uZ+F6alSR0oCubjkkfBUvpjA+RkFQ8ovgzqsza1yXSNI9SwjTHtiVyiEsxRywUC7yAwj0oZ2l+MJqm7/tRlOxfUUmWaOxVYDS9QEdiDA6QmBxy/9Y/Gdj8SA== 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 AM8PR04MB7923.eurprd04.prod.outlook.com (2603:10a6:20b:24b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Thu, 12 Oct 2023 08:51:53 +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.6863.032; Thu, 12 Oct 2023 08:51:53 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 5/7] mptcp: userspace pm send RM_ADDR for ID 0 Date: Thu, 12 Oct 2023 16:52:03 +0800 Message-Id: <8e7bd291fb4877721cc61ef6572b579f91a87a03.1697100600.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYWPR01CA0024.jpnprd01.prod.outlook.com (2603:1096:400:aa::11) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM8PR04MB7923:EE_ X-MS-Office365-Filtering-Correlation-Id: 23188a4f-672e-4a57-d744-08dbcb007b81 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iJDGo4YhSoxsdPCPxOehDtSG3FfxeuHmoSscGNrTYtWu2IIiDRC9/9Igrdtn+iDheG26Pvhsl2C3j1YMQeugOdMVZP0Z95Lo1lckIOP7q5tonJq6BgadnkbhVAgF0vyfUjNhKmqzzhcqbqytZJ89Ah0x9v+ozjHPue2+bqCS1CzKs7VY1SYylPjh5fJVhXp/SBY2Y14LKO9b6ypzeeQ79x8kRxjGSaNIFcJZ7/2F/zQ8Mh9qjjlYLMY82lwZhiQ1F7Xbph/WAonL2lIpQ3aobLe4+EPtUNXHiZNmUh2XAWDO0JO+u+v631VYUmCrQIRbE0gYmEiIFvGFQ2O1pgfJF7wY7E0JvTR3i0f2dTpT/WFKhKaWBvIh+5lGdGWeQ8KQ2gCLbBH1iWqE2pBNUGFiR0ckv/FOLSfK6ejxz688hHSnq35OQZUy2JPEslQQ45WkluqTRcIqQLdP2lwrFYb/+zYGMV07MHTQiuqJaQGiXWX/DiM40bwHTns8mlvfFHwgMEXCH24beCAYt40AreTvq6hWwmJy8rbHBKpNVUvqs2U= 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)(39860400002)(376002)(366004)(136003)(346002)(396003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(38100700002)(6512007)(107886003)(2616005)(478600001)(966005)(6486002)(44832011)(5660300002)(8936002)(8676002)(4326008)(86362001)(2906002)(6916009)(316002)(66476007)(36756003)(41300700001)(66556008)(66946007)(6666004)(6506007)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?6FFcFPO6hnh2tAu3/gObVL2bB2+uY36uLBpc8vrW3K3ikN6cR+uW9m21NfeC?= =?us-ascii?Q?PxlNJTORRjbYAw8f1TY1j2MZglAP4wvHJ9f8JYoISycmxNgh88jgcHMpgKiY?= =?us-ascii?Q?kER9PDjhMHVN9qVh/HfOrM+rMQ/YkI+UB2arAOdM2PGsvbc8lwWoj4AjY6ft?= =?us-ascii?Q?mQ/tir5z8l8TmhDrJiEC0vOofljICbeQB1XpdHUICvTG04897M87eYQ9HMt8?= =?us-ascii?Q?b5Unay4g6NZf/YDdGpulJMWLYJb1BIU7dXiOQl+VhhRPLwkCdvrKOI1sfdmE?= =?us-ascii?Q?i0F4K+t4Hx2xGfKn9BvkjM+dPWc72sQ/DVpeHF2soQbJJAoAr7IhYns1cAPM?= =?us-ascii?Q?fxqvMpN+mIuii2wRsK/qe/MhSDiPDVDDIR528swMxuqzuMFj+oGCe0tBVefk?= =?us-ascii?Q?dWcimR4IbMrJWL+IjpZ29dxjvC1rjo8UtouR2k/MLpc/Ra3AXvLCU3ayBMoE?= =?us-ascii?Q?TJdSpmfuUkC7UK3HePjxrKq8GhkaC3QTTOHxzqyJPiFfO4FApaePrraOmGk0?= =?us-ascii?Q?165DFjDVWb/Qdx8MmJ9k4q5fGo08thTi9DsZtBOGwZVlp5SOVzfEekPj0IR/?= =?us-ascii?Q?1JEyeVB3KppLBkVuZr7cquqAELZ8XNhXPWMkxATvYoWEMkDwXGSkR3apslcS?= =?us-ascii?Q?xA8pflB56yu+l69gE5YKV8juPqryjDLYzP9USRuQcK+b6bo7PfOPJxHU26dR?= =?us-ascii?Q?S1fAutvxs+J4xlpeDjPKp9ospAD4WBVJspLJrwyQdxCulISmUgzuQ3x5Mbcd?= =?us-ascii?Q?tccGebFjyquSUcmgQm9QyfKR6t3fH4KQxpAV2haeWnlNFaVKmUEAqmj1s8Vz?= =?us-ascii?Q?521G5uoIeSjtELXe6yJ0GyA9voLdgX1MfK6ZKTkC9j0zwCJMcKCMvTaLkTo2?= =?us-ascii?Q?1jxmGcUGIT9mqrIHjvN28hLd9lh2obPoLN/zLiJUK4qJCP2c7CdGmqxl6Mrd?= =?us-ascii?Q?KKoJURzD2eFoFoedL0UAA6d6963uV0QT0bbb++R5mudGVwLeHoa5hjwmwR2G?= =?us-ascii?Q?PvzriEDIIxPqqHDH2nCqwjTjwhk9KNVfvi2pO8X3o+n6aal6pXBRCqNg9QJ9?= =?us-ascii?Q?NXVXYKlzVmqG7qofZq2PhJ0E9nfGkmsX3gvAiS31u/VfAekVZhYaYfp3Lhyy?= =?us-ascii?Q?9/1iyNrBXdWIvwjZTQgXDXIQjCAisl5oRPzP2kHgJLxn4KRMZzq1scoRqzST?= =?us-ascii?Q?E+tJ3/Mxp5XB16qeZoF+0sJvmsN5ajdOb3FPgIrJUFPe8JDOv0BWYr9GMmZ/?= =?us-ascii?Q?svc/my8fhhO0OtAZKBWa9X8UuhHutXHCn1Gu3f3Kg16ewsvPc6SXXCysfTcJ?= =?us-ascii?Q?5e3kVzO0lH0lHffqKIQ7KAeUZWge1P2M2qeKP7jKsoybBXGclFMvDx5CUhPz?= =?us-ascii?Q?fszXULlesTEyhPyZxDQcub0CQw8cLoqX7wwNMtvZSiw2TTKZZMo7r9ubGxC3?= =?us-ascii?Q?INQoiwuiakm7Rj73WlEq6/kIIeXG6zCoFNUPxzMYc0i7S8j9VxPPaycsmwDo?= =?us-ascii?Q?6x4c5z4IDgKOp1n84s5ZfFdiVJinubK0eQIWpOzbqxC9SoFM8LnkAEhzpD2Q?= =?us-ascii?Q?9ow3hZxmab6ZdYs9e25QF535DkvMlddxCIixqO74koiaaQiKnnQv0DtlGB0P?= =?us-ascii?Q?ZZLLWRdlevrOMbRISaUw219Io5LMVoe7rOsn0a1bV5Ar?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23188a4f-672e-4a57-d744-08dbcb007b81 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2023 08:51:53.6991 (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: 6dAgU6fmQoOZu2PPK9xzRt36awJJf/M9+9RWrzG6C3th4WG68V1jER2mGFebZy5HmodiK/IGF/8FO5yg4jkpnA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7923 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 | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 6b8083650bc1..ea50e694125d 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -211,6 +211,40 @@ 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 remove_err; + } + + 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; + +remove_err: + 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 +279,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 Mon May 13 03:18:30 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2071.outbound.protection.outlook.com [40.107.7.71]) (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 367D71D53E for ; Thu, 12 Oct 2023 08:52:04 +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="w0liKCWY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mfLuFZtGDZaD91cIj3kZfQ2g8TRQpR/6GPMOyv/TYOsc+5zTVxUxKf8GrelWq861W3nhymDXgukT6v3RQz0XE7mAfSQ2ZtCv+M1T6mA/vEm+BiRzwcxU7VV6scWvmzkcU1aj9KNCsm3RLL8iE7xhk9OdlKlsPeUUeeBySpU4hqGhPZHkclEZCKNca8TFepj39F9rh45xPDV/EQ3/iBOw2d/Pe8C50u86nRTGPazOM3ZOR3PWfkgDt2OSImuYF/9HtELJZ4wQxz+waF8rMYG4pqi/IGCR6b5tamme51tiYSJ+duNnqND1h7Sp2g8Tuoe3sXfc/QVgZl5t8EM5hvod8A== 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=ITrTqUSiTFPQLH+n/E4UD7SU+WUhgfcHxzNk2VWjDqk=; b=CpWPlZGynkKl85Z4e/0oApL6KbRKfRrrVT3D9vZeucRT8MKa2eBYbWHifXmNn2Xyk94xRcxIR4ft5Qbe3C4kva8W0MSkH3sW1DcG8QRb/k4CUMlPaLJW/cpUDGxgQprRnTpBFd0gZ+ENrLNXwO2LW1EuA4BJ/sisZ7sFkVGPCnIf4T2SYEtf+q1GI0VBkyI1ga730VC88wI5I+8UxiltZqZQcWujVKW3A/afhzha1EurOEjNcbycTmsD4NmqueBUZs5Yjrx5DovwsX8AWk3UMFyscE6NbD6wej9rp0+92qWakgOI3QASvDq6+ZlO+t48eco1d1cr1xIoV4FAipkvfg== 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=ITrTqUSiTFPQLH+n/E4UD7SU+WUhgfcHxzNk2VWjDqk=; b=w0liKCWYl9eVhjr8j02iABIfIiN8q1nIUBXSBWdKXtc68oTWYC44LLf8NTQy0T9wMnegOcIBRVNBsTT54RIg3gp7DZlNAbYay5qI40Q0LiVhvATxbLO0ez4yYkr/WAglc1jIVpB8WkN3ZfZbFo0ksNTBbhf1teA1XDa8etci3cyNfS7/bjWPvx/tiPT4DIMe5xQUsPC3bmsksedMLFnrRc/XgBRD+UnQfzMX7tb85bHl0UQE178VPlPeGzGxfry1aAGATKeNUbO2NBm4kXGV+IYqPb6Ag98iVrf64xFgu9X17NWdDbazQppor7AUOX/8NxyB7+vSPZY//VdkldvZOg== 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 AM8PR04MB7923.eurprd04.prod.outlook.com (2603:10a6:20b:24b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Thu, 12 Oct 2023 08:52:01 +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.6863.032; Thu, 12 Oct 2023 08:52:01 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang , Matthieu Baerts Subject: [PATCH mptcp-next v15 6/7] mptcp: userspace pm rename remove_err to out Date: Thu, 12 Oct 2023 16:52:04 +0800 Message-Id: <2090fa3ed8f7ed178c20826c8a4321526bbf33b7.1697100600.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0053.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b5::12) 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_|AM8PR04MB7923:EE_ X-MS-Office365-Filtering-Correlation-Id: 7de00253-5037-4cc4-3916-08dbcb00802c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: W4QaCy/ApWhIL2c3XLTG+quRgwGIS3BiiD7tkCCUhrYEN8UaGSVEofx9uvhWxsoKYBbPDMl2ks57v6E1UmpDHLzoH+/Vi9MS+T3OksLWWVBUyXUFEy8LoojwX4NGjxHcQwGaGNVmY4XBwR8SmMm3J6jl18NO0tuGYtKKwFay8n2dT3Oxwgfkbq5M+T8mpZtz+D1wGSpP1QBSohW77A1ubFFzmF1i2ADTeXBdzOvuqr9XAHSspzFKOzNUlG+gIzGmGKT/8DxCvYEYBTH+v4DjGkj2v7foW2NqN4snoq4JtCahGO9KV98BjoRkewTfIKZ4RQZgrlh5XvDd1c02QcwDGJXM00AJ3a+4LeBO51u48i5LSk80p6sPIpImstWwIOC0zE8al+d6AJAvesoR3H1d1U14lT+Sa5M0+FByGaQIrj4sJmVdBsKohXs17iLTAkMdcuIIxkn8gHrt9DYFJRon2epi2YQ6LVjFfmUxXLZCub6Ic+dKUIMRS15PoFuff6gn/VRiX1nOLbMNkNnyEuNtuxyxXYiOQaPkGHyaLigNqWVUnePiOvF/OSeKkOnahWVs 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)(39860400002)(376002)(366004)(136003)(346002)(396003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(38100700002)(6512007)(2616005)(478600001)(6486002)(44832011)(5660300002)(8936002)(8676002)(4326008)(86362001)(2906002)(6916009)(316002)(54906003)(66476007)(36756003)(41300700001)(66556008)(66946007)(6506007)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?jckSbWfYckDNyCJIHLfIb85ffR9UiPhubEtn7l0JHEjRQnVac8o/UYbpoRGP?= =?us-ascii?Q?TCIjx4/ioC2hsmLWFoXbkTQ8yUAnMakP9joz4PImdBp9dLH5K+tLh6cz9DjS?= =?us-ascii?Q?4/y6L4jZVA3qQKEGnJi5zcG/biXrU1NywTovz2hsk5p1Tf7egZA78wLgi+ci?= =?us-ascii?Q?O3VMxCHZim/shFAc80Q/MTjPdRv+cvL/ULR5nWL8h4OrP+QJOpLKASNtqseI?= =?us-ascii?Q?p5eXsx++QE1uOadXJM/zjskH+9MxWAAjL3qP9/MXS19MKoqs2xv4jQ7GlOMe?= =?us-ascii?Q?iXltaGq9yFyH/tsIvGZiCPLFWjlw8dY+uBUNOSYXA/wYP7m3n7LES/GZRYSO?= =?us-ascii?Q?qqNVn+4kY7UZWtRghFy0XJetZyyNHsNqUGx+FTuuBv7HDsuQCP1YGOW3Y8gr?= =?us-ascii?Q?/FKARaB6+p15jJPnozHwSTUb96GpvqIZa3WIXGsWmB5/ph2E+k+TQMHpd+IO?= =?us-ascii?Q?0JjA2otNg1CieHDOaBeJE9ZabwiurWmUK0HCcxDZPb0avmeNZcVoXnfewLKB?= =?us-ascii?Q?xrA+7R+4tZ9EnuA+Gib+FESsDlERiksUifTepGTAhkL67BE2UeXMXY7koI0s?= =?us-ascii?Q?zNfdqPqu96PZVw0U4EaV5KmZaiv7NCRdve2WAf+I/ei6ueqYF0b6+7aTvJwH?= =?us-ascii?Q?0siUpmIlriEUAZLjqZkgv0Z/vUz2XHssq6LGqYIQTcDtwG5mWJJRx6FHcE05?= =?us-ascii?Q?QZdilVQEr5q0fBBrtDnm0misI8+jskBOwzubIFvJ9LeerdRXGZdb1fR3s1Yk?= =?us-ascii?Q?O7BK+cxEKs3yqfRZ2fNt14wnnoSkdx15P2vk8JbWr54aFskYVWalGO6IIQUF?= =?us-ascii?Q?0/1iIHIdU/bqcJuw3G8PMb6JsxNNqQG1EdFEYs+qbTdNsQZxDIfrnun6hgvD?= =?us-ascii?Q?Z13tn+Y10IhNGmEUe8lugW52cRIESMIncMFAh0QDLDIDoQK2XnbSx+sHzcRk?= =?us-ascii?Q?4EGYyYLzIKGcBTg665oU48JgLPoPoi5fZTsjTCeqIKRmuZCm3BozpGo8LCoe?= =?us-ascii?Q?iypA2oRq1Az6zsdFHhKRcZDFQihTfdw0MXDEZ5+OrQktCHDRfGTkN1c2CbBd?= =?us-ascii?Q?zECBvT5HPI44fy3jDrhHr7OV4sDWBYppPzlGKUu+N5mfD2rpdHvgMoYexkeW?= =?us-ascii?Q?Ih3jNKMsjDGKqrUrOccX7lRe4zFEtbaQDLtKZSQGpRINBi3zUAsLHtaoO/hG?= =?us-ascii?Q?7qRj2AlRJpFTTzFG8FcFr7nPVsvbYuKy8KjvAyfeqDKhdORaa/mkx1uQpOV/?= =?us-ascii?Q?paDHY0Lo08tDmd5KmePuVwY/qF1ZfWBqknwrk3f3vIdIOz/axCvlEMXsTo03?= =?us-ascii?Q?LXNarhvLWH28rXxrkZrI/r3TOwiCdpUC0tH6WELxY+3BygmQpLqSpx6GvNce?= =?us-ascii?Q?eWJGi18lvSqaS9Po/JU89AoUjpAenDxx5IiEhqMA9M3juUcXvgqkVab+GLEZ?= =?us-ascii?Q?1xMTVCD1T/9LNmh+8WirX24FR4a8+XfpDngaST9hKep9tpmPLM7spg8N7cAb?= =?us-ascii?Q?xBM8fBwmMbvosgIJ4up7VegVhpvbGQ/ppHRc7EA7Q4F+XacQY/Ei9QRGkhjk?= =?us-ascii?Q?3ftPZ4wlB9R5WSXsXXEuUd3Pcv0qJddTEpVtyfF3SHUzGU8q3+2C1yMc9lI6?= =?us-ascii?Q?2m2qTNMzhxte+Be+23+YYPz5fGEzdlwuSeIgEJ/s0VnB?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7de00253-5037-4cc4-3916-08dbcb00802c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2023 08:52:01.5433 (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: E8RRUmZYvKBqd0sh2l1OnxALfmgg+vxvlS6B9lTu+Zl0dIZd1ZScskOKHxoPYkT5wwdcrt0XMVzdInR2t7Qqsw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7923 Content-Type: text/plain; charset="utf-8" The value of 'err' will be not only '-EINVAL', but alse '0' most of the time. So it's better to rename the lable 'remove_err' to 'out'. Suggested-by: Matthieu Baerts Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index ea50e694125d..cdff3e631d2d 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -276,12 +276,12 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, stru= ct genl_info *info) =20 if (!mptcp_pm_is_userspace(msk)) { GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); - goto remove_err; + goto out; } =20 if (id_val =3D=3D 0) { err =3D mptcp_userspace_remove_id_zero_address(msk, info); - goto remove_err; + goto out; } =20 lock_sock(sk); @@ -296,7 +296,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct= genl_info *info) if (!match) { GENL_SET_ERR_MSG(info, "address with specified id not found"); release_sock(sk); - goto remove_err; + goto out; } =20 list_move(&match->list, &free_list); @@ -310,7 +310,7 @@ int mptcp_pm_nl_remove_doit(struct sk_buff *skb, struct= genl_info *info) } =20 err =3D 0; - remove_err: +out: sock_put(sk); return err; } --=20 2.35.3 From nobody Mon May 13 03:18:30 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2059.outbound.protection.outlook.com [40.107.7.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 13BC01D53E for ; Thu, 12 Oct 2023 08:52:11 +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="CpuLrLm4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LRoiNr6M5fFiAN3zwTJW3wykyH2pFta/Bf3wZ2mPvsuL7YK36+xOmCTan4Shh14kTkfvScZs5LOocqoDKCvG9OytR0yvosgOTIlze1oalsSy1rgnMJ01ihL0nIZSg6c3vcXd1UjnI+MoizN0qn3tqFmv17CFWrsp25upB5Txmn7UmBP2ogaKwC/6hNUbQvvMXxm86YWYYCoqU6Va5gaHJwcA5J9Sv7fSSyn+u0fiLHjh9dTokvVD+3kW4jkkvMBd9l7sRBUAuAg4hoJUapCtVXeKXMFHzy2cTIEGP/FTM21yOzzCk6aUV8x1uQO4sOf7f2T2l1ldbu9HHEoMpnBf6A== 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=9WsKAPn5tfQTHaXstcyjLXin2TuVuaLR0ZDswpYnZ5s=; b=bXzJpwKgTj5MniBq0Tr3oGD5bBssHfZX2gWkdtBF+7UdhKjXCe0mvca5rAzDu4jmj1wmLYuzKOovMcdUMTmNcs/ue1qb1Sg0femMkz4t79eDed9SOEpQVKUF/KNieAG2LkLGvkxS5dBmVrA52VfO6J/jZdTmcNFOlR1/NDfiKT1i6Wf9v//i/4i3pVhnS3R/zWGBtLRhKeWbU8R6ZcJzAK9Iu90wHDd7KgMMq1SchV0RlilLZm4pKV1SAQYoK9d+0lyLVXPEaMzVkG6Wxl/pvNqblBSB4iL5MIzntN/Gs6tM0HNL82PNFTzTBSD5ZBdlMcJFKNbitiBLqxIUBP98Qg== 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=9WsKAPn5tfQTHaXstcyjLXin2TuVuaLR0ZDswpYnZ5s=; b=CpuLrLm4U+gpKprPeKCX12loOdJSf0p/LTQv7ow8KpUE8xPiXy7NBS6lehwij4tp5WXmunj+ElDDT82FtKgWZQEhat/9uMBb+xWhj2d7nqwkkTHp4Lk67YrxoVjqd6mbBrIo9hun2LtqjPbUYxCewrhR6xETDm4U64Tyyh5iFJVbaesK6dUS4tsEvl5ZXTPMCI5IqUv52s3UIZt5S3lFw4zWL5nPv87VXRQMgtG+efnmHnLrnjSRGApii5uzK/Zp6jrBaMDt4OWrOG/1Q/KyPh8hFG1nUsiaZDQTMHky5eYMsHjDJ0v5Pr0536RUdZYGWzkc6IKuhFj2hI+6/FAkJQ== 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 AM8PR04MB7923.eurprd04.prod.outlook.com (2603:10a6:20b:24b::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6863.45; Thu, 12 Oct 2023 08:52:09 +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.6863.032; Thu, 12 Oct 2023 08:52:08 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v15 7/7] selftests: mptcp: userspace pm send RM_ADDR for ID 0 Date: Thu, 12 Oct 2023 16:52:05 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYCP286CA0060.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b5::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_|AM8PR04MB7923:EE_ X-MS-Office365-Filtering-Correlation-Id: 965ce97c-c38d-4055-2a59-08dbcb008483 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1dH0xjD2B1XdIX7F4Cdn9CMmfPYGEXmHYVIEuLBs1pR6U12vG1QmTYbQrejye4WvRLQkVu49ehl05pEL6F+I54WhBx5SvNVPdQgIsU4AGsMiefoOCsYBKQfimkMWbJHXoCFpPpc9C48z3dKM4qsIV8atQyxtmU5QNy0q9NAfoCSq9YsLDTuADfmDnXp5z4sM/eCmGnEX62DnTUmgMtOjuF8iPesYu+/TLzo2xIAEhiqg7vr6f/7kpfgrjr9k4meM8FtGgJ9gz5gBdCutbwrcfZD4EsX4A2rC6O9QfntftKj4qDvD/eMBhAeJsRVeeaGL1htHYbaUvypVd4PtozocFnCFWEKDoTBNdu5HCkdt9/o2d5bF7GXcmznbM67MqyNVNUpB77GTiaBVwT8b58OY4QJdWB+6h74nQgRFWVnZHo6x8NTnwV7u5qsIShCTwuqZhnnilOwPz6HMdhLbwqL6+TU2FmRFSMAKN88PuCbZTNPSKCJLz6GDoAsg5Uo92MGQC+Ej+swSTDb0PKfmLqx68PMJZSoA2k5G2wY0VtzG3OHYCtJa+J5dCjywedv+VX7e 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)(39860400002)(376002)(366004)(136003)(346002)(396003)(230922051799003)(64100799003)(451199024)(186009)(1800799009)(38100700002)(6512007)(107886003)(2616005)(478600001)(6486002)(44832011)(5660300002)(8936002)(8676002)(4326008)(86362001)(2906002)(6916009)(316002)(66476007)(36756003)(41300700001)(66556008)(66946007)(6666004)(6506007)(83380400001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?o+LS7Qwp7oIslLE84g+PDdM8XrtK3Buiu6un03kkrBUtvvxm2qGjzcR2LbEG?= =?us-ascii?Q?OxP3FUAP6WoQKbolb5bglTj7Cd1VIh43R4I62kGncTsVZowQBun7cQmxeTem?= =?us-ascii?Q?B/uuu91Ysm4M9yzxlani0KBobDzSpIqcvb1mz5obyxakXtHgly52WA5gALl0?= =?us-ascii?Q?FHRFeJzkW/6e+Ztv+pwM5SgXqsgJHTyBxjpJpKBO7HUy3nzdm7W/AfjiHL5N?= =?us-ascii?Q?GBFXExAxGCZjFWuN/wwH0E1z6Y5GBWoMhNfoQ+UaSAmnTqieLEynIwtEDNUr?= =?us-ascii?Q?xPpYNeQ5Xw7XXCUSK1pgL5zxKDiMtsi0fqW5ukLvAXJ2O0jYVb+n2ZzokVTK?= =?us-ascii?Q?Gw9dw693Fce+RztSbU3X203zvDeRu/njJJlGECNPoX3n3BHZZneEVhY/OwtW?= =?us-ascii?Q?w4pNcE/hk69Qx7uhU4qOMKjFQQ9Zf1QnX0ViUTs8yEhaPkMmp/YtalrMgCRa?= =?us-ascii?Q?FKUny0HBzWfd98+3JM1P5vgNna+q2TtiASncr2CQ6nrQqUID4Q6AsyZagsjk?= =?us-ascii?Q?xJg0PDYaSueS5Oq7edFuGN4ZbunBZ/c15NmyJxRWMWq2SiugsMAuGcPmJbbf?= =?us-ascii?Q?j3iLgn3HBxAUdTg2ym4A3edcSUmQy5hvMHRtgWqmwjEjUDQDOGTyCfffey1R?= =?us-ascii?Q?Q5MV2swVtJhGQAnypT0Kho+zqwgY1H42t2K+kyykIQ/DoIHIrB+o1lMwoeB6?= =?us-ascii?Q?tzBnMVCUA48n3OhJwjFV/iiJ6dD0VKjMhdgbCcL7uzkTlEDgaqz+QjQpezJT?= =?us-ascii?Q?gCGpqIaBBQ3X+qfcpX1GNiGwtnF+aexBVJYGavDAPR1KV1a9IGVLgPWth5mC?= =?us-ascii?Q?ZNrOrW9xj1SZP8aZL+VlItG8GMrafdKPNXeOIPSzFmKrfoaEexRsW/Acss8M?= =?us-ascii?Q?pqHALYqUtFDejmgKj7d+qig0Zem0hkt28lmQevwTsGBEBCN/WUf4nYF0eHNR?= =?us-ascii?Q?+vO7ChQjAMKtSR0Yb3SNvIdJBZ+bCR+p1bMdrerP+j1Zmg9wbK4PuBuEQc94?= =?us-ascii?Q?DQCduvKAl2MmDxxrw+nGqHCm2mBB++gZySedAhxNrKZdGlbkpte8DpPRUI2h?= =?us-ascii?Q?khdtXUiDVjOEsjFa31lz8Tszr08v/QyJqRqDjsKclRCTCabYWKa9r4+Zy1Le?= =?us-ascii?Q?Oc9DSQxCg9r3uSh/9e0Cx9WGorgRG4ndWFHqgcI+tAZm3W2EaUAkFdDayo9x?= =?us-ascii?Q?0f/ttxY9RaSEUcFwnpejpYU6G50fQDP6OzgESepTvIX9Dg9KjrsHTuNZIASk?= =?us-ascii?Q?xCUMLED6QzOn8WB5py9zorcedNrLcurOGdCfHfJZuCEsNL7of6MV3zaI7Cgh?= =?us-ascii?Q?0CgWFYOHZ8ffDy4Czto/i8tbsYogce+ByxwTahp4QxG/TkwRAll2pEp4INTz?= =?us-ascii?Q?qXLuspTlK8GPYrb9YF6VeuKAk6DR1wG+JX1BOCRalSvm/vrCcEr8tuTNfnaN?= =?us-ascii?Q?6DUOHZeLeHzfC4vZOQGktAUHfowQpWWeZtttm89S4PMGT+3WqmO9jFUhOX4q?= =?us-ascii?Q?RBVDb6iMlu8NxFQI+/ZqiRh03zTYVbhA6xsDDCa+EQiKO3X6O8MiEYdrdK9X?= =?us-ascii?Q?SWdHvM1w5ivl2jWXrG/s4A6rWnzNfy7o0RHMHjDGdCIaxo5pBhDToW7hCchX?= =?us-ascii?Q?9gklEjckO3gfMd0JQQD4MyMw5WR3gYEmjNPSWZ/R1KAL?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 965ce97c-c38d-4055-2a59-08dbcb008483 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2023 08:52:08.8982 (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: 8zX/EGF/QeTXwn/YzhN03LGRof4TLB5XBAw2G1fgFMftwtBN2GxNi8e6LZCtFBzI6vRh2/m8EvU2H0K8MZ6NMg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR04MB7923 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 | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 154978481409..0ef6499e7539 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3533,6 +3533,35 @@ userspace_tests() kill_events_pids wait $tests_pid fi + + # userspace pm send RM_ADDR for ID 0 + if reset_with_events "userspace pm send RM_ADDR for ID 0" && + 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 + wait_rm_addr $ns2 1 + # we don't look at the counter linked to the subflows that + # have been removed but to the one linked to the RM_ADDR + chk_rm_nr 1 0 invert + chk_rst_nr 0 0 invert + chk_mptcp_info subflows 1 subflows 1 + # No subflow removed in ns1, one + # subflow has been removed in ns2 + chk_subflows_total 2 1 + kill_events_pids + wait $tests_pid + fi } =20 endpoint_tests() --=20 2.35.3