From nobody Fri May 10 02:07:09 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2087.outbound.protection.outlook.com [40.107.8.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 A03CCA45 for ; Fri, 14 Apr 2023 09:11:27 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=m/9OaqZNeXgzKvFiY9o5mpIuCIFoAfKN9xxBkD8bHRKFppK72eL/6257B7O9LW7FaI6xAW4qPRNadktXJot5sDx0EyBYvCu/DEsg0tS0rwNMZRjrj/cwiEE8VfPn0ysX9RaS8xDcjAWUiOQ9yKmeSTs0W6oXFVolWnc7BpJSDI5mTiPz8w2MVGkPM/OH23hUpLdpuHfpdUw2woDt0LP/v5ViIaz/t802OjFI6qblo138DylD18YdYVDb1ks5VVYhtyYoI/R/vigO9DVRIQJONKb1sKNryw+OLxhPv2r7b3O/yIY7HVrBy5YEGfsCLWRjfog65PFDpF+zVp1oJ7lBwQ== 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=rvWXY+rcygsHpFQ0NjObfWxPO8Dfl1bxguZBZoojt+g=; b=YjGGT7UrkJ07UFGiV1AL2qmcDIV+n66rUvNX3tScGBAY62UOZUbDest5Dc8+m/tVrHnDPhvMi2+NJUj06rO1l9iQ4ZcXPSS6VC3NARnfifp6+nLMEUFE7bhoFQTIurvgJnlCaDYV3bswjfLWuoEbLM0dVyKKCg5Wi7n8psn65w7g60J8rAWtU1T5P8tS+rnXi2kP0MEEq/JM3B/5X2VpGuerXtzEOfvkaZmKZuHXXg/PZsy6Wor8Qwzl/sYISVngaeXK3H7DGiK8MMUrDb/Cb95aajPFDvfn1hjR/fY1gFPGtSuX70URTLR9eOCCFhhlnhPozu/tdGG1boErjKD4Lg== 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=rvWXY+rcygsHpFQ0NjObfWxPO8Dfl1bxguZBZoojt+g=; b=Ymm2qMHhPri6qK0Y5ck5aERJYPRGGKTJVvq55YKvpeMLXkGDjFrHF5b/t1b1oJv2lWB4KQWXdcc5ZJFUypTGzDlDdu1NzxYxhhm+yXptMS/V/dfzuE6OAulOpbIVk60C9YGCC0bWXl4xO/Tmn2o5ciBuMNoI99YQL+rUwSBKMylo3AHXA5FMHbu3Cb8xMQC0leotLPCoR5z8LjiJwVL2qEpdKKCqG92J3yWge5AREXgTk+VecPMeT2SKkvClVR0bt+Nl7uZjaNb1mHiOSE3urfn74emttCXBgYtNOjMUQugdPJUbARtmWnwflyQsH1EnozxddMUMEXKyinudw4bXeQ== 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 VE1PR04MB7263.eurprd04.prod.outlook.com (2603:10a6:800:1af::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Fri, 14 Apr 2023 09:11:24 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a%5]) with mapi id 15.20.6298.030; Fri, 14 Apr 2023 09:11:24 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 1/7] mptcp: pass addr to mptcp_pm_alloc_anno_list Date: Fri, 14 Apr 2023 17:11:04 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0044.apcprd02.prod.outlook.com (2603:1096:4:196::17) 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_|VE1PR04MB7263:EE_ X-MS-Office365-Filtering-Correlation-Id: c995721f-c8a2-4a1a-14b9-08db3cc838aa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wetV4jz72cme24j3SsY3xlFq1og8ZvzmGMAcxjttjd0KhyGGzLbXD9MWVITECGXr2nZfUgBDd/Oxas537IEESbdXvhyDsiJwohxWKawj1PQ9NKREdvxUUHhYBS2Kl3tZ539bRyHb8CuTUl0MeQGab6CaoaQFZ+SGA/HyMP4OcRMYQ00D18qAwYtg/POecQ8jj/HBO0+SpmSM2zJf2FqBcGPr9qCe2U2jYZCwpGD1bBbnN1s1z2Vgdq+Hrp9z4NTFwmMsrp4rduxUcKCxcD9NGPz7zcxrQB0/VIT5s5gs4pzoButwuRYVePtD8dPipOnN+1YCBzIvUWk2igK1zAUT+ydrmyuq5gPTPy4OhkXlxEJfIMvcU8ux0nqf3OGBjj1hBSZRoJH/R+I2aBvewKHSnA+lYiVwcqy2BbIfNaFHV1PsLKwPvOyaH/7MfpkJ098egeGC/CNAd+y30ixb264LcUxpOvJnU+fqS+X86LrZLDizEqUCqyg6vs604d+vjOw/kH8gZsJlul80j1Urhuiow1N2aoMCDsDd80Y9srt5wPXped+XTvks1xcDF6fstoghOtHuhoptj8HtY4FPM/k536UWbHMv+oTekIiPBuozlNk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39850400004)(346002)(396003)(136003)(366004)(376002)(451199021)(186003)(6916009)(316002)(4326008)(66476007)(66946007)(66556008)(107886003)(6506007)(26005)(6512007)(38100700002)(2616005)(83380400001)(5660300002)(8676002)(41300700001)(8936002)(6486002)(6666004)(478600001)(86362001)(36756003)(2906002)(44832011);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?i+RSfOcLcWqrmFIZ4fKkazVogFZxqkQgzvw/4am+PGFf0b2OCInAkuJhFMt5?= =?us-ascii?Q?xdXa1iiQj5EYBBJ20/vzH4sDdCxxwYmbD1kdp1H7S9mLSf/mRX3iNpSRIJsn?= =?us-ascii?Q?zMsL4vTwNZUBWNIFBm8dSAoHCwJALRJYZOXwFGnohWP3Bu2qLd0/a2FBGbax?= =?us-ascii?Q?EEBAiazmjwhY4aKi+3cnEJASjr7jAHTlqDchoh9qLhfPsE1E7EliakonyMqQ?= =?us-ascii?Q?FZKu8zhy5h7hDy6CAkaSJ0/D76eX3+5QjG49SXCAGYNEK5QmO+w9DTd2IB9A?= =?us-ascii?Q?DsWpmZiHi4ufuUCChq39opeU4QUMDlu0RT+8sarltmBI2VukNez5X+01yoYm?= =?us-ascii?Q?C3dDZmhRc8xtE22rTEHEUSrccf7Md3lKGdqSBx0nAkEpErDcQGmxeWtAgLUy?= =?us-ascii?Q?7pofZeRRrBEauYUB8OaOMxZaGBy4GrW4hJZVUO5YwfCdsko3PgmcPeTI6Ic9?= =?us-ascii?Q?4lsvMgp5xGx68ypI150AnQWQctvPicqel8cuvq0I0SQSiXf0xMcuG+nVI4RO?= =?us-ascii?Q?TBV+TC90AkrEt+8tRTWtYobbVLb5sczhIFGSgWlAEGPg8W4ik9p8HE0e4oTz?= =?us-ascii?Q?xAFmMJ+lwp/3/nDqsL5j3ZGH5IdGc9fK7JWz9N1iRyVoBdM+S+I6vrAfnonS?= =?us-ascii?Q?bFSQyJgQidmhFSMNB+aXluSlQfW/QE9jVvTpg/Jxq6Z5OCetykHBMErhs/qR?= =?us-ascii?Q?HN6euf9TRDG6dgfWtezakP7TrVMTZAhzNdyF4PBr5lDj8k5TDBuHaWdRvvha?= =?us-ascii?Q?rIALUT+ThzoRCu4p6RHJHnfgtplgGK/uFW5/k3WSbFeqUIz+/T0dKvuT3TFJ?= =?us-ascii?Q?VpHrFG5ccGad3YFrwI5NHNPbBxtXqkpFDDexnCL9iAGIjLs66ZMtB3xqWYG+?= =?us-ascii?Q?9q6FMKIfYXm8zIEZdjJP9505hOau3MwQWie+B4cSE9DBUY3sxWORWJraHHtq?= =?us-ascii?Q?xocoLfTM0+6urx+s7ZU/Y/aB20tf+er7UiJNPQB5lAscHTvwzQzzHLA5KnQ7?= =?us-ascii?Q?d34soXBVRyvKDBdUfZqGgozswUBetAXYSh0mk1eZXAziHmJAp/VE1F01XeOn?= =?us-ascii?Q?TSVpm4D9HkCbU7Q8UVm2c2gOXhDnnd1pZJKU8JwASWxqWv+rJG4cFn5MRYuT?= =?us-ascii?Q?9jCjkaKS4Jy0aZTNIX+1yl2BjH9a4LNiDAX43Apz9qOeeFJQyCcVuK/RNQNd?= =?us-ascii?Q?wMYwHzEbSGdU7cHuFSHOhtvJcNkGf/5/+/jT+BP/Y40ueBsP+NV2esuG0f8+?= =?us-ascii?Q?vtyuH57+8n3GmM3wQKV2frERlYMhvuu3zF7eZpov1ZIFLh4bINnphhIacPSi?= =?us-ascii?Q?u5NrRpIvAJjt9ro/cQCYlby+bPN6evq1wiBMroxkvzKT+jduPldg+6y2xXf1?= =?us-ascii?Q?45xIxUZN7Vis2JI3VLKGjhhMayyyu1432Gp5HYTB6TOKsEMzhdAp9jMY4jbM?= =?us-ascii?Q?mfcCHHBz2U8bWoPZ+esTB56oiO7oB249dU37cPXVxnMhcDNoYO8s8vsxwkIT?= =?us-ascii?Q?B16uRqv+Czw7uNHdZ94lVbSidUiDtdqJIjGBvz+B7y/bM8Tj4T+TMBOQ1D74?= =?us-ascii?Q?4UfF5KB6H6TsibE9wPle55aYDsg5gHihBiwwVDMZ?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: c995721f-c8a2-4a1a-14b9-08db3cc838aa X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2023 09:11:24.7358 (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: F65mg4E4OfGgfqlEqP5+MTQWX8s/1pQ5bKTiDTBcVlX5VYCRG2CM1cn0YcJANWxoW8la6wWHhBffU60cFaVE7w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7263 Content-Type: text/plain; charset="utf-8" Pass addr to mptcp_pm_alloc_anno_list() instead of entry. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 8 ++++---- net/mptcp/pm_userspace.c | 2 +- net/mptcp/protocol.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index e8336b8bd30e..a02822111218 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -342,7 +342,7 @@ mptcp_pm_del_add_timer(struct mptcp_sock *msk, } =20 bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, - const struct mptcp_pm_addr_entry *entry) + const struct mptcp_addr_info *addr) { struct mptcp_pm_add_entry *add_entry =3D NULL; struct sock *sk =3D (struct sock *)msk; @@ -350,7 +350,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, =20 lockdep_assert_held(&msk->pm.lock); =20 - add_entry =3D mptcp_lookup_anno_list_by_saddr(msk, &entry->addr); + add_entry =3D mptcp_lookup_anno_list_by_saddr(msk, addr); =20 if (add_entry) { if (mptcp_pm_is_kernel(msk)) @@ -367,7 +367,7 @@ bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, =20 list_add(&add_entry->list, &msk->pm.anno_list); =20 - add_entry->addr =3D entry->addr; + add_entry->addr =3D *addr; add_entry->sock =3D msk; add_entry->retrans_times =3D 0; =20 @@ -574,7 +574,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(stru= ct mptcp_sock *msk) return; =20 if (local) { - if (mptcp_pm_alloc_anno_list(msk, local)) { + if (mptcp_pm_alloc_anno_list(msk, &local->addr)) { __clear_bit(local->addr.id, msk->pm.id_avail_bitmap); msk->pm.add_addr_signaled++; mptcp_pm_announce_addr(msk, &local->addr, false); diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 27a275805c06..4d0e54fab5cf 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -170,7 +170,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct g= enl_info *info) lock_sock((struct sock *)msk); spin_lock_bh(&msk->pm.lock); =20 - if (mptcp_pm_alloc_anno_list(msk, &addr_val)) { + if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) { mptcp_pm_announce_addr(msk, &addr_val.addr, false); mptcp_pm_nl_addr_send_ack(msk); } diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 5a35c77723e3..990c21a97975 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -822,7 +822,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, struct mptcp_addr_info *rem, u8 bkup); bool mptcp_pm_alloc_anno_list(struct mptcp_sock *msk, - const struct mptcp_pm_addr_entry *entry); + const struct mptcp_addr_info *addr); void mptcp_pm_free_anno_list(struct mptcp_sock *msk); bool mptcp_pm_sport_in_anno_list(struct mptcp_sock *msk, const struct sock= *sk); struct mptcp_pm_add_entry * --=20 2.35.3 From nobody Fri May 10 02:07:09 2024 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2045.outbound.protection.outlook.com [40.107.14.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 D71EBA45 for ; Fri, 14 Apr 2023 09:11:37 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BZBt+yJBr0Plb9l0O+Ds2FTJAidGtY0iSxaXggX1DMnopadbXzWzL1sr++/lZMAgkI15Dw6mR6+XqMbuqsLBebT31+rGg3lKjj7oZ/NoGfQCvZXgPew6q9Z+9p2u5HV4xjHuJUtTHFU252Fp+8/a0xXaywX2fXnsZMjEg1v4IhwmqZlPy6EFQN5NSYyjUSGLSpynBfxABpp46i7WPIk1o3ll8d6pu7obFZHU+kBXSiFBSY7TIJBSvZyRVEbeX1i5O7azXimSj8BmaD40fYjOwJ9qjUl0tw6EN24IBsLUWccBrDpXlkIR+ACk7T5hCuUGsAg2qBZ00fmt5pQHDTPwuA== 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=G1OOp8bXi7EpwnMMjwxihycnv++9icP74XgvPQFCUR0=; b=DAoMJXThqUFucT+tRYwig+97eJ+AjkPya5YBGqPP8Q1rV17RlVdHDo18IpiwVFJQxlARDnLwMvFOmYmE9vUDbq8YUxLyvPFtkWxBMuPfo6VNXvFD+o3yCNHxGp/Fn37zxmy4WDU3fPwc4Xek2TSH9cm0aWR929UVq0XlzVMlndV7/w48jYMVwgBCQUrD2BqkpyD8Ap00tpJh1bb97kOyJ4ouMWEjAX3LimzVhp7pkPYDAIEiBeT7V7ovA/2CUXDpBleDrT2Ewx3pAR+mcnkkKtwKOr7lHzHkpCMQdoio+b6Q6ai+58MRJI0Ew/PCbskGg5fgES39/M3aoQLf1Av50Q== 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=G1OOp8bXi7EpwnMMjwxihycnv++9icP74XgvPQFCUR0=; b=2Deyi9nhHZlk2YnngE0XM+An5Ss+Xvv1CAsnKy7De7Gup+Ga33iKJpF1cX99dAKhtf9gO31dvecD9bCjimTXCAhVmJwBYDrSQ1f7I1rhvCVidaq1zW0YJh6pZF9arzsGgeQrWyALKj6oN56kXymaNfe10+IRzxLqqrvn0z2NkJa0s9xZynAjP2Uvw4nET5seZcp5+KTZ9b0nFbZ4Be9NG5Ns1vOt7MLhRUlg4U/kkezgT5Le3l87aO7PbEiTPtenz7YeYp3WRjfYDyN8ePdoRdjovjvWAHn7D5yR0NCC1U0ZU6f+wjVT9QIJmHkmjp5i3bB7IX4DFXwgxv5bJO7HIg== 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 GV1PR04MB9088.eurprd04.prod.outlook.com (2603:10a6:150:23::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Fri, 14 Apr 2023 09:11:33 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a%5]) with mapi id 15.20.6298.030; Fri, 14 Apr 2023 09:11:33 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 2/7] mptcp: only remove addrs in nl_cmd_remove Date: Fri, 14 Apr 2023 17:11:05 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0023.apcprd01.prod.exchangelabs.com (2603:1096:4:192::17) 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_|GV1PR04MB9088:EE_ X-MS-Office365-Filtering-Correlation-Id: a5dc673e-a41c-4110-abeb-08db3cc83dac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mxN8vl0zdi5LvDxexamgdDzHUBO/G3rNflHkeaG1glWwxFZ/++5X2HNmFb1wgRItnGkOs5JS4mubN26V1IcjtwUZOdztINRnT773RnL2sbBxslGiQfwD3gJdAE8VJ0JnOp/dMw0Q1BUnNEogJe5wpKUg+nMHuX6IFyEbBrJ22tHWE9Gc3yk/qjOglWfLbPpS0Bk/bF+3sfh+15VbEuQsZ4UsPyF6gFh96LfiFPJlbLCwxc1dsX1Kpl2JkAobJCN4G7TNc79LNAUn+3yHN0yyx5Bx2Kpe5EvbV1jCz54+JeBKbHu3rnOlRfiTeKANOOpVz/PRYcYxpOuX91pC+ZK+g/tPL99h0mu5c2F7E/kaalZizxAL2fXMHWSwk+63EX6rIk7/cs6FUfWS8Okupe99KybzLJRPdRRcA01ieEiGj+513/GvvxCKfQIFp+LGB5I2+UIhTSYcaZuWYPk5IKuNJlVYyJzVAix1ngCB0ngRm/lO6+A53HJvRTD+Dhew+1pSSprTgHy4Jqhylsj7vtuOHSdKVO7pHbbDow9oiTr3aywmai5DUTUpLl6jHgzT2uEC X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(136003)(39860400002)(346002)(396003)(376002)(366004)(451199021)(478600001)(83380400001)(186003)(2616005)(6506007)(36756003)(86362001)(38100700002)(107886003)(26005)(6512007)(6486002)(6666004)(2906002)(41300700001)(316002)(66476007)(66556008)(66946007)(6916009)(4326008)(44832011)(8676002)(8936002)(5660300002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?+ZXk/qIoNqK7LiyGM/7H/rwLSoErFQYzTJXu180yzet3uFllmiwIeIzDtFeh?= =?us-ascii?Q?WGJbnE5Q9iXujPdbuY/V7f+9i1NxVcGLEnSz/Qjh83nH86S/Ui+JXuXQtMIG?= =?us-ascii?Q?1fD1p7vW+j4bFXhkiGY0G3qkcmJd10mKM4SEwpXuOo0onGafLALm1TqBulvH?= =?us-ascii?Q?wlkxFWdWRcCGP1JS12Uy0dDs+xiAu3ngn1NfSMM8GQvFurYwy8MnWf4q7CRs?= =?us-ascii?Q?V0ntMBesdSTGu07cOhGsMl0o88nQQAsLql9ooxGaJ2PfWNCFGv2Eb8AMr1/7?= =?us-ascii?Q?L7xHodkx3VqoYenjINPjRQ/hHmPoKPYcLlb8/Sm6k+8+URP6VLrE38r/gnL5?= =?us-ascii?Q?VKykFW6G8v32UuJcDIUxue8WWiCTgdXqrTDA719/RkozT8maoeGouMOpa51R?= =?us-ascii?Q?du7ry34SwdGxA36FbRaT7y/T1OpntLqaQLtWjF1jQ8v7ebilMLo2X5bWlos4?= =?us-ascii?Q?QJ7M3Jv5K3QGxbyMX2baAMvV+GYcpBQ4zOgIrhYJl+mQQBk7TFrSx+YsmQf/?= =?us-ascii?Q?+aKM0Cf9g8odGuNyYAGlQ26rSSJh9uu0bXgTHejAtQi5JSjfT1BmMWXqUz1d?= =?us-ascii?Q?Xpvz026ycsAa/xJbaXM33SIoXYo8mZE/gaXJYAZS6uibWQd/j8bcfixkTPzP?= =?us-ascii?Q?GvVyJRYYOGfQvreHAXoDqUDETJj14IZyf1+WK+qvM1lbsHBdzYSgEHbQOHgX?= =?us-ascii?Q?zeG3XHtECjVdB+Gzb31qcZjixisLgO/zhH5J8S1wC2WHKrHTaw/5xRMB2ECe?= =?us-ascii?Q?/1yZFywsOmUKcflAaHlvogRgVYuaY+ERN1AnqNp5BAjg1lfAmDo7XIPgw0bD?= =?us-ascii?Q?OPVdnI6P91eA6o0ZVVrrUOsjf5Ktb+7p9642JfeK+TQOfbD/YHJOt20MBuA6?= =?us-ascii?Q?BqpInIrRA8EGRqknHraO5BVwSEd64SNvvtqIgiidpRTA/JjrtrRS/82nRd8L?= =?us-ascii?Q?tZkQ/MNVM7ZskO3svBqUnCUyXtj+dG4EJ6PjtslUAUWzWl4K0iVgvzslqMob?= =?us-ascii?Q?nzMM2gGV6MHLxgMbxN3LkR2QeMVIKafG0esn/wJHcP0o8/RfjMOv5hwkOogI?= =?us-ascii?Q?O2y1dkRUWD+ZrGz+p+R8WmOkTr4MXq330jnOLo1EoviL/okkKSOqqO9z7F9A?= =?us-ascii?Q?UlUSch0j0+rYCX2bTXOkGa1rvQowbYC8/1jdF9lkCC7u173NY7R5yppLsHys?= =?us-ascii?Q?ML0gvo8a760hVVlnbGf55n/0j2Agtq3WT8StEM+TFfoUfBDXQSXkWxrowJ7a?= =?us-ascii?Q?ppNeXVPQaJvWaXTkVIOojebFSCkG6u6Fpfr4TgXmc85Remll3tAXuI73IqqM?= =?us-ascii?Q?ZQhXEKDphv6oqZv1Lpq1dslNfB5mHPS9HbN0hO+UCCcsdASp3TGUwy6agT0f?= =?us-ascii?Q?th/lJNYrOXr2hRplUkRm/wT/KoFrlxRT3bWk4uB3qqKlZoSO3Gs3TWoRQDC5?= =?us-ascii?Q?JsTG6TPUDu0F283mFgNnIqLIOCdiS8XcbanFpc0xIAaWz3EEvdkogRg/L9Gs?= =?us-ascii?Q?t7seUay5nv2+0Cg8nWgyQX2FyQJCCtdq3sMyMkxPjd4V0M4qPlYIPx1J0W1M?= =?us-ascii?Q?0UE9rfLWsBYcu6nvTkf1DthBdIzP8/w9LE+8wK8u?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5dc673e-a41c-4110-abeb-08db3cc83dac X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2023 09:11:33.0506 (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: JPwtMuKdPSGShO+XAvuoYlhR4H8LNG00H7E8hDMKogXOIc2k+5h3eyUFG726bWfYGUqTq1YTRAOeQSn3R9WaWA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9088 Content-Type: text/plain; charset="utf-8" Only remove addrs in mptcp_nl_cmd_remove(), add a new helper mptcp_pm_remove_addrs() to do this. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 17 +++++++++++++++++ net/mptcp/pm_userspace.c | 2 +- net/mptcp/protocol.h | 2 ++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index a02822111218..dd15ed96fae8 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1555,6 +1555,23 @@ static int mptcp_nl_cmd_del_addr(struct sk_buff *skb= , struct genl_info *info) return ret; } =20 +void mptcp_pm_remove_addrs(struct mptcp_sock *msk, + struct list_head *rm_list) +{ + struct mptcp_rm_list alist =3D { .nr =3D 0 }; + struct mptcp_pm_addr_entry *entry; + + list_for_each_entry(entry, rm_list, list) { + if (remove_anno_list_by_saddr(msk, &entry->addr) && + alist.nr < MPTCP_RM_IDS_MAX) { + alist.ids[alist.nr++] =3D entry->addr.id; + spin_lock_bh(&msk->pm.lock); + mptcp_pm_remove_addr(msk, &alist); + spin_unlock_bh(&msk->pm.lock); + } + } +} + void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, struct list_head *rm_list) { diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 4d0e54fab5cf..07714edb9086 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -232,7 +232,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct gen= l_info *info) =20 list_move(&match->list, &free_list); =20 - mptcp_pm_remove_addrs_and_subflows(msk, &free_list); + mptcp_pm_remove_addrs(msk, &free_list); =20 release_sock((struct sock *)msk); =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 990c21a97975..535c1b3ae6ed 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -845,6 +845,8 @@ int mptcp_pm_announce_addr(struct mptcp_sock *msk, bool echo); int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_lis= t *rm_list); int mptcp_pm_remove_subflow(struct mptcp_sock *msk, const struct mptcp_rm_= list *rm_list); +void mptcp_pm_remove_addrs(struct mptcp_sock *msk, + struct list_head *rm_list); void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, struct list_head *rm_list); =20 --=20 2.35.3 From nobody Fri May 10 02:07:09 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2080.outbound.protection.outlook.com [40.107.20.80]) (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 BAC57A45 for ; Fri, 14 Apr 2023 09:11:46 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Rp1jNk6yagUbXa9A9z4dThsW8aBFiJ00OSQZB8RyVCf6h41HkXwEBUYCoBDRd5FlNR0YzhhQ/QHw9JJgzHiGpVK6o5BEqyKXjoG5oYZlC03CWoMQOgpxDO2/oZocSAgjWcUYf0lKJzwCeoPMmjpKbHb/KwIhnbzyQt7p1bBLvSIdjSDkqOBVehai4e/uqmQXqs/lv6ZF6n0g3oPPhiYtqi/73V2wnvrtaPgY5bT8pVwfCYKgnpb2vaL2YCpNHN7WT5VjAhqMQBxzZniHvtCABdLs1MFMgyrbJd4hoZG+UfbnFbXAlOOoESBb893tUMomUT59/xUzYPgBHESYKxSV1Q== 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=s6XN6Wuz3ZTBOexgqx9C1aDjo2LBPx9eylk4rW7wtws=; b=FCNjMJvmVAIanbQH5TZXkoQ+rJCV4QsGqbf5kB4TpyBq64mjeZU6I465W5KQm+BtlhRYjs6zehuWY/ILqF3VeMrGoAat0UnlB3966UyzjR/2hWPTGn7q+F40TDfNf9k6A3PhjRfYYkEYwrezIh5+y2MCaa/x4go7L1Bu50Dyh+tF+1QQYpV7hxN0y7T5BqoDs5YhtSDT1b7DXLARqOuawEDprgfSDLw8TWNLXIIbp/B48hqLNvLdOQqshygA39Y2Cav71YC2LQbTJNgykJ1PKg+J07CuHqthQ27MqujUWf20es5zJG8JNmGy8t2v38O020u+2hbtd5LDWC4vIdOcqQ== 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=s6XN6Wuz3ZTBOexgqx9C1aDjo2LBPx9eylk4rW7wtws=; b=FO9eO0GMv3kgnPVmGsPUY9e62t4fAff6fUIKHD9dKvQZ7JVFR35Q1Tc4clc0RBMFf5Oy0t3TebrUdfFkw6nUdHil6s0C7+sYtgUra29r6P+2G8+PFA+xa8SGrqgJZuXgTsEREDurhHIGrWLeQopFc2z8vfk+2PRjrDzfTdtJGUjtJBP/WHlEWLiCI+maojF5XkeUQNmc6Ubp8iCYdUaSUhiIDka2beBC7N8iC9F6o8k7IEv0z6L9GmU/m8AN/4yBbGENBLMqE0D8Ff9I2XMJlPVQDz9fM+b4DUshay7bwU9XQod5PxdikwUwI+pCjkz6dFrm3o3LemVxABA+PiQ7nw== 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 AM9PR04MB7553.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Fri, 14 Apr 2023 09:11:44 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a%5]) with mapi id 15.20.6298.030; Fri, 14 Apr 2023 09:11:42 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 3/7] mptcp: don't clear userspace pm addr id Date: Fri, 14 Apr 2023 17:11:06 +0800 Message-Id: <63539b68194e4eb842fa5d784ed5803b0bf69f32.1681463340.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0029.apcprd01.prod.exchangelabs.com (2603:1096:4:192::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_|AM9PR04MB7553:EE_ X-MS-Office365-Filtering-Correlation-Id: dedc74ef-f5fd-4831-90ea-08db3cc842bd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tl6E4f5D/FAZVGoWZJTt6mcmwf7uC9GPJ8eSjIxtdENUYBKT7b1ZH+iGYOAWpvBFBVg881BImS+plWOJPqhAeDFl68shmjsm07PeR9INx0uNIZk8nKhG3llIb77oZ0Xwmg7sp5Jklpmf6Z1TbSRibuSov/yKpVuUTpAFm4erzoWgTu+LJSa6Fhs8TjjiD1pdV5SwN+7wPCBWNTYSIZ6YBmDMgDbZxUaARAQcTuSDu83geyMHuH4ArioDGG8MQelnIKVBkt4RLxJAz2kjtvvic/1gWScg83av9EZmQOcqlF2oLgph2BGKPVHVLAQMBcCfTyJGJs4J12zuI3+Nw0q2KXAPGfd9MxS8bvKNqteMMm7IQq+U7nXrsQa1cI9jjqsKzT7/wQ3MJOAxEIiQHpCFGgVGMpDhlWqR3S8v/icNKJusvhQyB4Dc/MQ1BbYqpudRcDdTvBXjao4P5oWaBu3tiIsdcjmbm0hhgK4cEOVOFwlQ4YD9LH20SZWq9ejrz/KLhUmV+Hi70SOysVMfomFAKKxW6Occ/JzXkt8a2oi1dyD0dY3M9aSEpS0sw91Q1fc8 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(376002)(396003)(366004)(346002)(136003)(451199021)(478600001)(6512007)(83380400001)(36756003)(2616005)(86362001)(38100700002)(2906002)(316002)(5660300002)(44832011)(26005)(186003)(6506007)(66476007)(6916009)(66946007)(6666004)(4326008)(6486002)(66556008)(8936002)(41300700001)(8676002)(107886003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZtHuDuhQpxUsiPWT9BiTRHeeQvlS9bghqFnB3PEAlGOj2CiRD0BVRPtv2nZu?= =?us-ascii?Q?T55OqxkBonPnrTE1PNi1Jlh+xYd5/IRuj9PcfWpnR4orFStjWRrgNYvE21vm?= =?us-ascii?Q?+1vhZskeD8Wvz1/AW2v8r8cfzCbTamllvQ1IWhwBIP42nnkr7X/CylMOSUiQ?= =?us-ascii?Q?OHlaJpgpt1AgzvVGoMmQajZu+IwmxP3+k9YqclX/d9KcwWjg3GFqVpPWHAUg?= =?us-ascii?Q?hNN5byIbJeeO6QCbv7v0ZGzudJka+EcuaevJceu/yxLgDLinhW2wrlIzDBA0?= =?us-ascii?Q?eAmABIV1TQ79EmOSR6PjmKVNA0HeoFItatAnjCbhLP9Exr/Gk0rJIzaNzDuE?= =?us-ascii?Q?ZUtWsRE9tXfLM3Yvh6Kx8P9YjPjnCpMwB92cttcSKW3ls/xUfV39aC9jp5te?= =?us-ascii?Q?MZUAu240iBueGHG9ZpPaf72Ono5fy5LTObgDQWfDhFT38vDjLxGUBse/D17n?= =?us-ascii?Q?tkeIiifux6FGmFqksTbQftnlxltx/1csZORNpdf7Tqj3OIrAiP22SeBN61ub?= =?us-ascii?Q?lfAgj5RVKLb48Lzke4D/1IvoE6f3vQHHU6U67paDdfoRM55cINWenP7gfhQv?= =?us-ascii?Q?CDoJP8Qcszx7moOQqa/ukQjNz+yjiFWDl1gBeFwsm3wC3k4q5VPF3MPmBa7g?= =?us-ascii?Q?x+VfF5lJuD19DCn+CvktFIg6RNCwIpaj5kZPtbriHjVF7sjl2fr/n0JZ1IA+?= =?us-ascii?Q?wUWToLdS1ZYGLJ17MQPx2bjFnJv+SBhVRPS+qjhbYMWlGLY/t42dtRj0S81+?= =?us-ascii?Q?nLyxi/kBxr+sAoQSSw2d8rY+ZWE1o/t7eOkPTR14dOjMoj5/tFxUDTNx2nSO?= =?us-ascii?Q?qiXZWvSSpCjJKC0lpvH7Ft0Snwvwtomig2izZTugW8j33XWJsnYaMANW8UhL?= =?us-ascii?Q?5FA49RbmWBNZ0pfzIvVnn01LDK2MeuE/xG+3rS/IEmP2PYwnuYHv2iC78wX0?= =?us-ascii?Q?YGJPFvEKylwlGI/hZmEc/DVjEXRK2aWiOdaI50ZIXi3DGaUewrZ8MaOOVYNp?= =?us-ascii?Q?KzNezsBBtXEux7dRA9YDTepgS4RTaM/hl2rXRi8C3HfR9e0r97r4+0qhvJ3u?= =?us-ascii?Q?2Iq+2nkY9Z8wLSbMNZ6w90T8h+t87N+//mt+vajTPODdcpm/fT9c51SfX8cG?= =?us-ascii?Q?On0aGq72atmH1hmKRVsmjumMjXwQDCXCEoAfQI5A8qapWWTLFHg44DZpGomN?= =?us-ascii?Q?u1DKQo5Rr1rqZZBr+Awwvx0pwZIvuo2couMMIsd8Qt3z5qHE273CgifCKC0y?= =?us-ascii?Q?P8RtrEVJLX47VWgXnnT5nNywPC/eNc3VSXcrNMiSNRpAx7Z/4Br4/km6Glz+?= =?us-ascii?Q?kMixtaCM0+5bxs7JZ83fzLBF4yk21ynUsm31VSD/lAD/8j0HdDPNLqe3gBQv?= =?us-ascii?Q?a+E8eGuCfdHD57RpkhxXmlrWg9cr+qQafx/R+qiF0vjgoqigzDJzrvvvrnzv?= =?us-ascii?Q?YKLCmshUfsaiEUDec6akmyzxkzS5v0h49DjAjBd3GCgs5W1zG2x3yilBQ8xy?= =?us-ascii?Q?piXwAIgL58iQ5OGyH/eaB+rNnHgv5YkEQKOCpA1mzH6oeVmsOTv8Ek/9h1nb?= =?us-ascii?Q?wybK8p9QNC+o8f/7Z51ZQQPIJOEVdobe/EQUYhZt?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dedc74ef-f5fd-4831-90ea-08db3cc842bd X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2023 09:11:42.8986 (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: MqT6ezWqyY0xlQxDHA6HfqAJ9fj2sr1lDOrulWaDbdBQcvCIOWps1EadoqQS7CDxkvbjx9YZxR8QpP7jABqJwg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7553 Content-Type: text/plain; charset="utf-8" Don't clear the addr id in mptcp_userspace_pm_get_local_id(), clear it in mptcp_pm_nl_get_local_id() instead. Signed-off-by: Geliang Tang --- net/mptcp/pm_netlink.c | 2 +- net/mptcp/pm_userspace.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index dd15ed96fae8..ca1d141e3a93 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1055,8 +1055,8 @@ static int mptcp_pm_nl_create_listen_socket(struct so= ck *sk, =20 int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *s= kc) { + struct mptcp_addr_info skc_local =3D { 0 }; struct mptcp_pm_addr_entry *entry; - struct mptcp_addr_info skc_local; struct mptcp_addr_info msk_local; struct pm_nl_pernet *pernet; int ret =3D -1; diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 07714edb9086..312fdce174fa 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -113,7 +113,6 @@ int mptcp_userspace_pm_get_local_id(struct mptcp_sock *= msk, =20 memset(&new_entry, 0, sizeof(struct mptcp_pm_addr_entry)); new_entry.addr =3D *skc; - new_entry.addr.id =3D 0; new_entry.flags =3D MPTCP_PM_ADDR_FLAG_IMPLICIT; =20 if (new_entry.addr.port =3D=3D msk_sport) --=20 2.35.3 From nobody Fri May 10 02:07:09 2024 Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2048.outbound.protection.outlook.com [40.107.21.48]) (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 1AAB8A45 for ; Fri, 14 Apr 2023 09:11:52 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YlxgHooKYirq3dmsHIePXlof77gbuMpVr7IsrsGiS6asX/Lopu3oNqpsP0bqvE8Mo6olDUwB8H0XlM6rJtcaoX0Ped/qVT1xt0Xv/DnQBu4Yijj/7QpJjX3cyxSFjPRdNrnaBRnOv0CP6P3FQxQFx9a3PEGW1mzd88djMhStyqeL+E9WIKqvwHIntOiVh8MwWoKmGnyr0TWtRmrZZQ1+uS/gRFQFsE1ctp/qvaYXiEEGsxxliI0SxlcuDcU1Az7N07tykphzKQS6ZdIksD+r1uIW7VrOevdicsEoIV2+XTS6NaxvGmDXPAEbb/CcHIZwMarILizW3cXlOb2CV27myg== 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=/Ja6Uaz48Q/m74auLGtZhgYuR/QkR1M+XZeEt8OirdA=; b=noDw956wb3I4m6vAv1VUzE8tlO4tFBQYgRx6F7Q0+mVC9roOw+3YpUthgnd2BsBT0oBWyX3ubBOQY7HMC7VtnkLSI2rctVz7xrzlsVchr4CwDGrUPyTQcayLfwFBbfYLEu8fc2pT+W818uowq06JQY5D7lEBKg4sWDiFOJ4Vr8kQ3hOlTIei8V9FsyCsii+fRCyvhMKOVAxjsUb8H2zkSqzMeyAMJIGdrKCuRQzyiQ8G7zOczAC5sNWVBoeJkaYaDDf54MOWnGkn4RI4hiJhYv7vereKqBo6A2qzGWd1TDhSK9y3VmlpGXbmvShZpzBlHyhoRWpOOj7Q6vkb58uuQg== 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=/Ja6Uaz48Q/m74auLGtZhgYuR/QkR1M+XZeEt8OirdA=; b=AathLd7TVhuxgodOsAl7RXm5PKJPl0AvGUhiy3mxl9bztBfqzYy7ttm62bRF6YYZ0GntF1MwooaE6jUcUQ5cjh+RJwTYUWI2/eQP97wMBNGrvRIfFxiPgnO7s2VBc4GXJWq2TaU4RZoeqMA3UFBCmO7POXUPoOFawIQTZwOZa/Yi6z/jF3cw0vdk1FfQbg/2LMufNCHPMpeh5Hz+UP2Rc9v2u8J2Kol3oBiCzCvJ7JYrzwDfoJKrtrPC7yUsYtgOTp4Jq2uK2wpoRVQZeI0KW4jtgxQpw9Q1jiYDfvz3yeZAhxvIo0pGks1r8LGmrIWsh9SbWoSvHYX7C9atDoDxDQ== 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 AM9PR04MB7553.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Fri, 14 Apr 2023 09:11:50 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a%5]) with mapi id 15.20.6298.030; Fri, 14 Apr 2023 09:11:50 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 4/7] mptcp: add addr into userspace pm list Date: Fri, 14 Apr 2023 17:11:07 +0800 Message-Id: <064aa29832dfa25337877f33766da1ede5ed6843.1681463340.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0032.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::19) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM9PR04MB7553:EE_ X-MS-Office365-Filtering-Correlation-Id: bfbcb214-3841-4125-c1b1-08db3cc847fb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fywOcb56L5EteVWHyUFkQAgcG3oeyF2o+sMsqlJB7rtPX/wde2C5FLmWuFRizakKtH5lZ5R0VOmoxoQiL2sgQYkll9FCiU8vpHtImC+71zIZeL62l9mbgX4EKao2xf5FJk9Ciz+T7losghdP5mHmuho/1MwH3HVwWJLZMaMw6ejK0Eh/6l9vdjbVcIxt83dPP5OcvnL2i6nsyEiAlvWWiSHFEd9WhR3MKzD6gYmwjCZkzyfjPMHyWDwVXaHUl4fEAdAlKfOX1wljKMYrWUHMRhrMMwDyWgjlpMakyB4jzOVlBD5aBFqQsxm5RSjGwvi6FENk9Ry9dOEyyZnbmgGCzMS/RyKxcPTPTR7aIct+kVlHpJNRPT/zoBI43fX8EC3f58PpBIoQ5kZA2FdK/C2dgRNc9CGNrACyVf4HxaPzCSGZ5Kcq8gSkmT0NcGbLzsno+Lws4VIhyGl6DY+IHdrItMafx1U8IjJDbHK3Ps3MOnAgpQ8URiqexOlFTJtqMn7eFmwuaQy4+TXaeVeCkXuVWpZPFU1RiMc/UfN7z+S2Cd/zubEW2bfsiu6LCkBPYeoF X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(376002)(396003)(366004)(346002)(136003)(451199021)(478600001)(6512007)(83380400001)(36756003)(2616005)(86362001)(38100700002)(2906002)(316002)(5660300002)(44832011)(26005)(186003)(6506007)(66476007)(6916009)(66946007)(6666004)(4326008)(6486002)(66556008)(8936002)(41300700001)(8676002)(107886003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?sr3uAJFWOR1EdUSpcvpBKYWSHdiT/piAKb6wygFFB++oSSazBoeocaZz3bYD?= =?us-ascii?Q?Lk7Isc/7bQaeYAeeYdCCVVW7XnVl93L/qQyQaiyamyZp8ANOds7/KXOZFHzA?= =?us-ascii?Q?0n3wsfgZmzmpoPoUAOATzhZ/2APJZUmtlhkKRFI5kZ3HV8Z1wBtPJy8BvzUw?= =?us-ascii?Q?T7pZWRx5dRRpzO4WxMFwpXu5/zCi9Rqv4w0U0SucbfxzZJd2Ta4uc4jyLlhE?= =?us-ascii?Q?NuPgJ8FHfeXzyShoQK4bv2Wpiah5LarePFJMgP0vnebdLuEVJxDIXhlKqXTN?= =?us-ascii?Q?3w+IiiG3XQXvy/t8coCXZuHhnbo7RyDnFv4jnxTREUL2y4JQqAH58T1rmxbt?= =?us-ascii?Q?gFKAVcLDHMPibPlYqfqiFwyJ/Tm67P1t6S9oD4uWdi02f7P+OFt3Pnfmgpr5?= =?us-ascii?Q?j6J65B849PWoxbnbBVBhWsKkbo5QeKF08P2CWfPj9m2LuofiDCHmIREDhots?= =?us-ascii?Q?OF6+LWbHxDfoLfsK/wzIMjfRWPvdBC9vB/1g9rXR9vRRXAQIeWcBCR5n+B1w?= =?us-ascii?Q?jW8HcnKSfbEvyBzkIgGc9tz/EpgyBSMIhYpPGP6aCn2+yOFPDKjkYuV4A1i7?= =?us-ascii?Q?Dh2NM+6mIGN9zIcSAiUc1rUT/dgsj7NA/oouQ1qZlWkYoH7eAG+glV8TPr8J?= =?us-ascii?Q?RA6Y0ajj30pKHCqElq9COn8ayMbFrt+Y+skpU1TAZn9KA2cmeO1USuuAYQ3z?= =?us-ascii?Q?k7IUHpQohAGVUNUIDlgyBMaELvTAlSmAqWb+7X7kX+Es6OiCM0QPQa0XgeNC?= =?us-ascii?Q?4kjK67+Hgp018j1GrSgJnzBQoz7BZ/DZUzUpklSDB4GF7zIcQgjbY9z5bLRj?= =?us-ascii?Q?KcRTvgttR6MMuCsEbKpnntYKrVwjokBL+yRhjDY5gVIjDU2EqZeWgC8VhWDx?= =?us-ascii?Q?2DdRNbKqH7Qsc8BS1vqtyWJAYMA2mOAbpdbS3yxsZm687WD6V589WFdGCet4?= =?us-ascii?Q?pY2RIfR9cq3TR+ljYAOFFBL25Awa9s/1SsZhxwIYQliEKlar7OCP+jvL87ii?= =?us-ascii?Q?ZXDgxaW/ORrcFWnMTif/PGH8+EYw54jeQP/AqOLYuX+ZbiaPoDQN74TXqJfd?= =?us-ascii?Q?14ACxqaSfRuUD6QAMO3QSXsoJtLeBFGFCxOr8ZjEkqhf35Wx0nCB8cwlFq7Q?= =?us-ascii?Q?LpIgaFKBpjSAad4JlooCmV3fyRhofVDdUqJny/LbsITmS00aaXTdcIsu8+Xj?= =?us-ascii?Q?TRUeBtUAuyHEEMl9vdhYuUURE++DhKqvI34OrYVKbr9UiXEfPaPmJm8uG85F?= =?us-ascii?Q?Q05LbznxWlDMqHwgG9qyUkakErSyuNGUczAQfchqKD0eT/GG5J6OYgof+2lH?= =?us-ascii?Q?L3DgF9Cwk81RGtSZGKcUcCzTVkceCpOYNTq7KN4nMJlVF3Zi4cr6o1VlJzOn?= =?us-ascii?Q?rGbikgTeOC+8t5VBlFUwGNri6uq63v4MgHtuFXqW9jASd3Lj93CI8vKSZcJD?= =?us-ascii?Q?YQZPQTpYc7o5V4bavztYq5w0QjsYqnV8cw5gaIdhN+K0Xn86GMNHyxpz3+qg?= =?us-ascii?Q?e8RxPWsH8Rp/RILoIdKTG2K1cBu8J113SO2//GJkik/j4AkE1QzKaHBJ+mNh?= =?us-ascii?Q?6RK9GXORQp48SMWlyPqxxh+x+joN4p2tXSuoVQ6a?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: bfbcb214-3841-4125-c1b1-08db3cc847fb X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2023 09:11:50.3404 (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: 9Qmj5ALf5cv1YuD0bzmUNobGTHqG3b0JWYiFvzC6uHio9Wlu7zlpCyFqHxb4/tgYfqC1WSHZjDPjjLzWL1C/iQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7553 Content-Type: text/plain; charset="utf-8" Add the address into userspace_pm_local_addr_list when the subflow is created. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 312fdce174fa..99a3968f38ac 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -301,6 +301,17 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct= genl_info *info) goto create_err; } =20 + err =3D mptcp_userspace_pm_get_local_id(msk, &addr_l); + if (err < 0) { + GENL_SET_ERR_MSG(info, "did not match address and id"); + goto create_err; + } + + spin_lock_bh(&msk->pm.lock); + mptcp_pm_alloc_anno_list(msk, &addr_l); + msk->pm.local_addr_used++; + spin_unlock_bh(&msk->pm.lock); + lock_sock(sk); =20 err =3D __mptcp_subflow_connect(sk, &addr_l, &addr_r); @@ -419,6 +430,18 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struc= t genl_info *info) ssk =3D mptcp_nl_find_ssk(msk, &addr_l, &addr_r); if (ssk) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); + struct mptcp_pm_addr_entry *entry, *tmp; + + spin_lock_bh(&msk->pm.lock); + list_for_each_entry_safe(entry, tmp, &msk->pm.userspace_pm_local_addr_li= st, list) { + if (mptcp_addresses_equal(&entry->addr, &addr_l, false)) { + list_del_rcu(&entry->list); + kfree(entry); + msk->pm.local_addr_used--; + break; + } + } + spin_unlock_bh(&msk->pm.lock); =20 mptcp_subflow_shutdown(sk, ssk, RCV_SHUTDOWN | SEND_SHUTDOWN); mptcp_close_ssk(sk, ssk, subflow); --=20 2.35.3 From nobody Fri May 10 02:07:09 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2053.outbound.protection.outlook.com [40.107.20.53]) (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 BC49CA45 for ; Fri, 14 Apr 2023 09:11:59 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jnMbTkCIVZaXaUyt4a8JP6P0vaARJFS1F6zlGHqKib+aAx/PbB9sbgVVG/pY+S0Z2UnXWzotwfZ3//Qd8PuYGdZLM2UqC09oI/Bg0TkoNmBEunZlfXhsbRsS9XHfIYGPCgNfae87wXEr/h1+gE6OeWi5wmID014CBzg7uJy/hqlgFpd/QLp3f/Hk/60jUL4cJP5RSuGRWlUXKdEYQJuHZU3WJEdLOeJE23WDuuvKNeTFI98vKR2rUoQ2kJWDA8pj1meXGgrNhKpv4PIDGR219a7dqPzft/Xx9HZATN8inJ0eP3ZT8aSiCOxPK7QNd1271eVtiACRlNaJiBsVLaCmKA== 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=0eroes/aDw+7YKreUCcujTo3qfNo/RO5+kgxApb8l9c=; b=RO65RyErJ6xF9pbzogBf/Ekh71CdkEeWwnsncGLdeWSPq0fiJm7T4m+AvgwO+B0CYKhkHh4IKTw/yK0Oc5Sqyj/xuqJq0+d4/+cQR540TZZWc1fS9qoaWcAw3CNxqCukQ/yTNMppy86rMasTwziuvd/3Ww8UZZOf+rezM7WSDCXduG9YsDRprvyHUMxf27eLGawzfG9A7pJlBairE8SDN6AdF16NEgR0YQjgri7WLL6qDXrXtgNxUUiuqKxXnSjaMaQFFAdFmsHpw1BElvee1rU4ARt8MXbiEjSLwuH5PYDaGD6fY0sktzBT8xHe8hS5S40/FYTbL2fh/2TMvWo1RA== 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=0eroes/aDw+7YKreUCcujTo3qfNo/RO5+kgxApb8l9c=; b=fNmooS8a6FKhBYQbjXk72Qg4QDNkTMa2jLuu5ouogWN63GJE93IyW9EFp1MOQEC/CsNO5haG5WEiGJr5kNSzAlxeBlnjTTwghUy8663FKelMRvOwAHNgNTQTRDXZc+3v1ZHeqU1/rRiIgOTRyRBQqcH3LT/T1UPjcnU/TzBUWtFmwDIRUSjJ3EpsMgCmlbjC49NEnyuly/Nd2tn11XWTxCHcm1nGWKdZCIBaxT14IV41ujNC9cvxjRSO0YTaOmsRNV1EXaq2UzpHKoRFHOKc1fByy7GI6XkBUIHANTQIwV/a3DxcdxVOpgwTAyVozc5zycrUDD/K9HDSEkNNvYr5ww== 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 AM9PR04MB7553.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Fri, 14 Apr 2023 09:11:57 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a%5]) with mapi id 15.20.6298.030; Fri, 14 Apr 2023 09:11:56 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 5/7] mptcp: increase userspace pm add_addr_signaled Date: Fri, 14 Apr 2023 17:11:08 +0800 Message-Id: <55b8848e621adcf43ef2c4a96d6d600ff44cac6a.1681463340.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2P153CA0032.APCP153.PROD.OUTLOOK.COM (2603:1096:4:c7::19) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM9PR04MB7553:EE_ X-MS-Office365-Filtering-Correlation-Id: a37f51b5-2c35-4a2f-81f3-08db3cc84bbc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RpRUOQMkRRFn0l/S8ECeTySR1ARiFIzaHptb2m6US+iSxDilbm9zT2yIHv8pnho4KtV/yatvtRQvGAwZJ7w7+h9AohweXTFV7SkCRZaQrJOzTkpIAMOwt/0apJPLNWjZAETmHZzHd9UrUZUhlMPo+QwIYoEq9bR41YJeQxrp5JSCzyitD2SVXkWiGqRCVbDoGaAWbsNXXvIpsooiBN/m7N2vhd46ixLMi3vm9Ol2x3P3Qwd/XTSvSXfihih4EHs7lLvgLdyMFXigwnhWyM6Wq0MG/xa7n7bD9vbTEA09AuKQJNkwjFhGQdLHIp7QaDw9DM5bxP3N398wBfvo8jwZl/TBp0oW0tapRbRi6A521Y7H7VZ9wOj2omVq+K1lMSdJcwOVnessoBIJ4ZteSXIxjvpbnrYzFnr0MDYYgI6sgj17GplhiUj2psImc1cgSadGZChf771aYFCVYW7+G7n78dc2gjLRrv3+AXD68Iy/ypFF8I9edvxdrX9uioQ1Re0huucMutHUmXuExyfaFJw4mLx/JL0OBAE5WUA99TJ+VYzhfY3MDrjaR3SI0mcsuMVS X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(376002)(396003)(366004)(346002)(136003)(451199021)(478600001)(6512007)(83380400001)(36756003)(2616005)(86362001)(38100700002)(4744005)(2906002)(316002)(5660300002)(44832011)(26005)(186003)(6506007)(66476007)(6916009)(66946007)(6666004)(4326008)(6486002)(66556008)(8936002)(41300700001)(8676002)(107886003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?y9FNvWY8cZZpyeMX47mzYAEixp324NASPPF/8K+TKKFqTQNP2IGXcFMdyNEB?= =?us-ascii?Q?pajfeKos1ozUypeyD0xpYQuJqkC1QOykVQCegyV+LIMdliwYjExajPDplgPJ?= =?us-ascii?Q?eXMJLOwi9RFUeWhnQv2WWmBY6MEM3v85PTYjidLOU3fyTg2eJh0uEX+CkLlr?= =?us-ascii?Q?WA4GiyFPRAHMfiNrz50lI+QSCAsMKBolVsq75FzmZQzbBeFW39871yvdcqjz?= =?us-ascii?Q?y5dLyQPhdsAtJswmQbSdoSvmLvOQqOyOsJ7htvej8OYBWHg5I6TwYutbH+ws?= =?us-ascii?Q?XpzFkTMxio5Ba1u/CmotXIHQ49Nne+0EdAzkCiwiR9rhost/dt9X25s+N8Cw?= =?us-ascii?Q?IE4uVEGS7OE7M141ampxszphCmWeMJbmzZ7B9JIUrYs8Ks1f97LGiiEzxgGR?= =?us-ascii?Q?WTUZXiNpvW+3psxXWES0Z/Liw80RacwMw7zxIvBwk3JGztbb+WyAwNfxmxBE?= =?us-ascii?Q?Wl/9zEunPiM9Piva3yTfROwwynlmuU5UEqh5WIc61A5N7hmaFrtBNXcN1QGp?= =?us-ascii?Q?TTYf2fG04I9+QoyK/yyOqsVvxzzdCsLWg307HLbn63Lz7J0BW7RkpJlD1oiM?= =?us-ascii?Q?MxhaLbGDWCGmGjZT6C+zn3Uyu7nv89YingnTSU0syFmTLlibP1L7Q7hRUJXZ?= =?us-ascii?Q?hWa4HClaXX9bYcLLUPYz7r5eN2hJcTwwce8lOdjyxHJsacJkhW03SQqgcvH5?= =?us-ascii?Q?SZe/rmFeZjtN+9++4QAbcf7DuW1DTGIeIklwf71RGca9MFAPsxwCOfQ25XXT?= =?us-ascii?Q?s7zJzjWiE6mDt6BRQMr0BL740XDHInq2SJjLZAw4y7QeqENub8+Cpkn/y8n7?= =?us-ascii?Q?tl/+O0oBINwDkFYNCGzIPW0EnlDJniSbqnzCIk49dg0V2it9dO3zg/qDfAy8?= =?us-ascii?Q?W5hTSipsMG9/fRTNpXnwis9hFpTrLCg/pWwqqELIsVaEGn6k0FCKeKdNMX0+?= =?us-ascii?Q?347H8dfWOMp6vOG90BwtMQMYtwPKcQxa8vRx8SeqSqhOFRQlN+3CjZ4o846w?= =?us-ascii?Q?D5OYnCUjwoQvOJMgQx4mHdQGdH8p0oLV5NVdAYGwv6WzF43Pze5Q9yimtTF8?= =?us-ascii?Q?i+XQSb+YQGTwU3WsnbiUF8tEh89QiWbfjRJH/8TYVRA8w3wjOHXQgBwO1xdM?= =?us-ascii?Q?xpCFpM3hohKUIvHQC8llbPIK6iEk0Yui+KYz9xxTMbon1in2iDOgpvqWyFL2?= =?us-ascii?Q?Y+3kkOGlW55Z2GaaIBMmmWm7BB0MdbGnJ1Le9VSIrCfQnTJd/Ac6G57PyEVx?= =?us-ascii?Q?k5lWrE2fxx8++EUb0lxQ4Lz9pVW72ZsPwUmDFbVKSo7sV+9OTjzY6LCLbof4?= =?us-ascii?Q?6JXbWrIVQLQs27T1xjC4KNxREHw9XExRvJ+6ZI5SwgqLz+esRsXqx8wf2OnV?= =?us-ascii?Q?HrPeJ0/Z9j3w1TOZnPab6t7JRwetXwfL72/BNEZ8oRE0lK7DZidKYCEsWhFb?= =?us-ascii?Q?ei6kFX+zkt5frfsNYI97BYYv8zLY7wPUfN3OHaVgNiYCWIqOO2kkjCFL6EqU?= =?us-ascii?Q?2hQWoDV6CRxoHmEHREMkn1FZW5URWWGVWGb0WujY6VXTwF8u2CUGytSja2T2?= =?us-ascii?Q?g+iNLG91tPL58eijolH/oy2DMBlYGgXHmOzRrf0m?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: a37f51b5-2c35-4a2f-81f3-08db3cc84bbc X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2023 09:11:56.6551 (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: QecnjNKWnVOXKUL9x83el0qyXUiy5dwrp+7YSSEICDkJ5dVG2VukIOEuI5hEHOeA9QLqcozOYNwI+wLbFv1oeg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7553 Content-Type: text/plain; charset="utf-8" Increase add_addr_signaled counter in mptcp_nl_cmd_announce() when the address is announced by userspace PM. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 99a3968f38ac..e5b250d39e57 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -170,6 +170,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct g= enl_info *info) spin_lock_bh(&msk->pm.lock); =20 if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) { + msk->pm.add_addr_signaled++; mptcp_pm_announce_addr(msk, &addr_val.addr, false); mptcp_pm_nl_addr_send_ack(msk); } --=20 2.35.3 From nobody Fri May 10 02:07:09 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2068.outbound.protection.outlook.com [40.107.20.68]) (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 64039818 for ; Fri, 14 Apr 2023 09:12:07 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=c6xx/Qx40ANgANSLT3s/M0tTdXG4nW3KBZjZOMSU9ItHf71+3Ume6jD5KXFFqYWsrPfDD2QhkWEYx4zz6U8vNF5+bhWlnNmllNm18Lc2yyDzhNsA4jIFRnHPEBHxOTVuyISFRjp2imfcre4n6ELTjx23vjElBa+zMocnEmBr1rn5hsKoPBN7CdGj5d2+cleup4vXBoR9GJWoPdEAXXv7jcHrtZ0Sihus7Lk5THzcBC5jETrSzX4AEjyp0EsdJks56zJ5d4NVqkNs6FlyXBioVdrqxO17TiHeadLx6R6rqcI/yATfQ32+h5olH+1xJ/cejB5jbRQ/U4xcD9fbzZwTmA== 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=f3tlLo1KZLco+YnpY6eyAbAQYuM3x6ND4bK0HKteHXg=; b=J6alEDWCioIwSGE3TYBQuvlmep3sGxU5U/YbBaPCm2ed+HlLfTOckwjhqCtlYUTJwtvD8xmLcj36K9zy/UPiKYOW0HWU6uGjXdAOpYUcS7nL8BOBtLwqdXdpVwWgFO7uMrmeY3lnuF44BMi4tHSWFdODGaPT3x5LxQ1emOK6isp1LGjLUs0SF/bz/gpRKNsVC9EkJEWK6KxrqtWPAGOc4UaaS3Aw+898ZbBFx0qY9fRkNFyJw2VPh4+eHZiQ7JRBTgfptY2Up733D0c5SvxP2bTqSRfOXMZWWd9VT3S1d5VKtbV9Z1MwyzamOCz9wgRKZN2+h02j+gMc01rNwqHXNw== 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=f3tlLo1KZLco+YnpY6eyAbAQYuM3x6ND4bK0HKteHXg=; b=pkW952BdydrufTcUPhZyLgOT2K9t8PBsunJ5bJ5x+VM000vTRa2LdA7sWfURr5aYuRgBsrv2I86agDXdMf7yn0SPxUO2Fr9nRMPGHwyEFu277piwMaLl2/BL1gk5uiGGJ//nAe6Dugq+QEbGchFcWrrVPNx/GOzZGvKm/l4y/cF0cc34MuW9NJg8SQU+LPNWEIy/bY5l0/GPWelHdPWJLAqHKUoMGWXiGRDe1ECB8TNCVOyOZzZyDWeU93FVE+RkFLT2N9sLrp/214K3Zq6enko7DaS7wRFNRZKHfHxuMvBX5ZfBrQP8S2aJLDXepRLOLVi6t7kXEn087/n7p3+fvw== 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 AM9PR04MB7553.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Fri, 14 Apr 2023 09:12:04 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a%5]) with mapi id 15.20.6298.030; Fri, 14 Apr 2023 09:12:04 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 6/7] mptcp: update userspace pm subflows Date: Fri, 14 Apr 2023 17:11:09 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0240.apcprd06.prod.outlook.com (2603:1096:4:ac::24) 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_|AM9PR04MB7553:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f9ace0b-b24d-4350-4422-08db3cc85088 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VMCW/W8pREP+5FMqcu2z+AM3gdhqkvDOeZbrkgmZMhI/QtJnuYtoAAPc+HnD87vZ4Miaq6CAA8m3zZ1bqOOe5Wl4Ksi/iwsfTpDrOFWTHvN57AJ6hOvii1oTVPTDNRs8RiHBzNfd71czFnb27t3iPlaDG179wtgHGeS/xBxhFgJ+CJxoMrMPDBUmtvAJYMEj0QzwLBQrpvJ3Q0K6lzahpyh5zcRurjunmhrxnKP1ptMViagcWZ9MasLZInPiIuEPjg6CBXitkcSZHWqbV9iYYZINQ070uv43SiwdPyQ0a7XPw+sTALpeCwMlxIAVSeuPFQXqawMcN2/LDFUf2NHgJV1MFSjXxSXzOSVaO3iBqQ54CtPqXlPdxaurt3MLIFm5kQ6CIa7UtsT/dgDP/vN9H3iP5e3jG4PhqVrakcETmMlk2HBLah9Pn2NwKk4n3O0fZDpPr79vc//ZJLQY1FIlvE/TmX/g+pu50IxYdAqyBJPXIWZj6q3UWtkUJ4fkfFAGBD43m7akXYuaXOFCEHeM2VJlyARGMWaKYQDDKdS3pqQH8hroZ5GvflSqsl4Iv0oH X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(376002)(396003)(366004)(346002)(136003)(451199021)(478600001)(6512007)(83380400001)(36756003)(2616005)(86362001)(38100700002)(2906002)(316002)(5660300002)(44832011)(26005)(186003)(6506007)(66476007)(6916009)(66946007)(4326008)(6486002)(66556008)(8936002)(41300700001)(8676002)(107886003)(15650500001);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?y5OgwdrqMVXJducuePJc/YwC97SeZBjfNPg2lZIOvB3cj7m8KYtgPPO7z6Wo?= =?us-ascii?Q?OC71GYBOkHeq19Znj85op2sS6yIHVPUGzh0PmIR5rxD6tgZsqnUyWs6RMk93?= =?us-ascii?Q?AmIrIWlKXIUv+r7jXQ57w6zqYMbvsw0BRegXwukK7heqVf5R3ge8+IMcl67l?= =?us-ascii?Q?abNjMCXjr+K9MDqPPaDvz2ZnFBJ8luLAMQdwuhdOfHqcWgq5ab9Te5HaXlmG?= =?us-ascii?Q?PbPYjOmdm4TW8AyHBJIuKKnW/UwOnDFynTsFS+ZRdJrN8tmfd2YzqRR012cr?= =?us-ascii?Q?BmKWFjfGXR0VqTm6GaVdhV2S5BE0+uPmQsy8vkRIqffzhkZTngHpQFC370Xf?= =?us-ascii?Q?kWArac4JoHxpO75FMgdkc/tzGNrXIiL13yygu8FModrnE9pvWmd4f+usSJPR?= =?us-ascii?Q?DyfDgitkyHWvf9IBe9+qN5e3plFKrt8Vmrb8Qp3/WAA0/L5Ql1blUsut1gFD?= =?us-ascii?Q?EbLZFxtLVE7lcITQlxVDK+jVYVpnGjOAs795+b7fkTJA8QLOXiWhGRbtLvrI?= =?us-ascii?Q?K3l7PzWQa+8FQK5ge9jRhK9ds2tvcmQAo+yfI7npH5vv2djqjZli5iBJ/WHi?= =?us-ascii?Q?53KPu+ukDNFQZ6HOgxCqNcEI3sGhLETs7c8DnWsXj0B0VGZ+QOsQPXxWM4j9?= =?us-ascii?Q?pDfBiUoGdmvAlJEVgoGFYTzdPkzWqB5ocRan6hoIFfCtF6x7YqYDBf0fX3N/?= =?us-ascii?Q?XP1JcWoXPApivlDKdScPtO+/hzZLSEolQjl2dsUbCCSh1vT66NsSt481WZCi?= =?us-ascii?Q?TN/BDFprBisvNVRy729mXn3AWO6FAYuziVkLAm/YPL7LkRe4pmfKda6G7IG9?= =?us-ascii?Q?mlErzKyD1gAjgR1a+SnLrHDs6xLRGHwDdQYOthOdqvF+nB2f2vsR3fm8DF+C?= =?us-ascii?Q?tWuWUolxlX2LFCkEsFVZBbGoiYWc50V44cb/OlBXm7ww3vURsM8Qvypl9lQN?= =?us-ascii?Q?UKtI0InOLLBYOGZyZgatg25h/2ZRjiKZvF0cv2XKtF5sswQ3ZeXWF62NQk2K?= =?us-ascii?Q?RocgtQzKpINv3KyjN9MvmgfuKzznD97SaVbuRyJMyngPxbkcEj4eIkCC7MIZ?= =?us-ascii?Q?YZGhui50dzqRTADVEnh9UqSgA3wJSBZd2AAXkozmi46WTCkGU0o0+FUOpCV3?= =?us-ascii?Q?+DkSJSsvojoD92LhSgIM4rYvssbfUjSzjAc+CvOT7G0XGq6fJobrMpWbA9iu?= =?us-ascii?Q?uoguBr8QhtiXWXu/K5D9X2XU6EncB5qpeZsa1FcGw1zOxyAfs5yKG8AnfWFc?= =?us-ascii?Q?NzMb+WON0+cRp/xxses4H8SA9Vgi2YRi4KKEq7xOVSDyya0DAwGOrK3e/SX0?= =?us-ascii?Q?e1vBt+sAivh7jVdHCjggICD26ugdGH1WDfPnKnGysZNcdMBfesc1q3HyUqNS?= =?us-ascii?Q?dkDkcv2ivFu8g5OmKyZ02nx8bKv6TU+xJDNsF9NpoAosAIG1R6IqT5shkCl6?= =?us-ascii?Q?nhgcQKYGNLloIBrkEsPj5XZHEHUxPGNUCD0f5+dLarAJWUTze4Z81tap4+49?= =?us-ascii?Q?e881k0sQsVWo+Xk0KZeYitu8T81h6c1CX7K69MKHu1xOsdxBIUe30WlLZDcJ?= =?us-ascii?Q?G67t2P39pKPdhn+ijnhVmCpMus8CKNZDpfPVNm48?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f9ace0b-b24d-4350-4422-08db3cc85088 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2023 09:12:04.8926 (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: rD0iozcuYRFy76kYzC1jZPrO4Z+stDoJMlTT/H/Tgc6ze/KLqFTTeOPXaLJHnNN09I8lqwDb80KrHEcRpZlM1A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7553 Content-Type: text/plain; charset="utf-8" Increase pm subflows counter on both server side and client side when userspace pm creates a new subflow, and decrease the counter when it closes a subflow. Signed-off-by: Geliang Tang --- net/mptcp/pm.c | 21 +++++++++++++++++---- net/mptcp/pm_userspace.c | 1 + 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 4ed4d29d9c11..bb01f15d8e0a 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -87,8 +87,15 @@ bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk) unsigned int subflows_max; int ret =3D 0; =20 - if (mptcp_pm_is_userspace(msk)) - return mptcp_userspace_pm_active(msk); + if (mptcp_pm_is_userspace(msk)) { + if (mptcp_userspace_pm_active(msk)) { + spin_lock_bh(&pm->lock); + pm->subflows++; + spin_unlock_bh(&pm->lock); + return true; + } + return false; + } =20 subflows_max =3D mptcp_pm_get_subflows_max(msk); =20 @@ -181,8 +188,14 @@ void mptcp_pm_subflow_check_next(struct mptcp_sock *ms= k, const struct sock *ssk, struct mptcp_pm_data *pm =3D &msk->pm; bool update_subflows; =20 - update_subflows =3D (subflow->request_join || subflow->mp_join) && - mptcp_pm_is_kernel(msk); + if (mptcp_pm_is_userspace(msk)) { + spin_lock_bh(&pm->lock); + pm->subflows--; + spin_unlock_bh(&pm->lock); + return; + } + + update_subflows =3D (subflow->request_join || subflow->mp_join); if (!READ_ONCE(pm->work_pending) && !update_subflows) return; =20 diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index e5b250d39e57..4da7f0ac7d8d 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -311,6 +311,7 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct = genl_info *info) spin_lock_bh(&msk->pm.lock); mptcp_pm_alloc_anno_list(msk, &addr_l); msk->pm.local_addr_used++; + msk->pm.subflows++; spin_unlock_bh(&msk->pm.lock); =20 lock_sock(sk); --=20 2.35.3 From nobody Fri May 10 02:07:09 2024 Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2044.outbound.protection.outlook.com [40.107.20.44]) (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 8A855818 for ; Fri, 14 Apr 2023 09:12:15 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mOFBf4YLlqO7hW/2zdyS/pLIpg2kgwaeIdNJ6DLYx7KlzwQNIwYmbOs2fqwSfuKkuW4Ruazsc24E/3XidpDD9RYuOx4xBkmag+waZe2AYs9P/9dnXIBjrkZNJR2OsbkSfhzSfFWS5E273GIlTPdq8sNh2XA5C2x2WNDIEAWaGKsoKp+UvnfH4MaQ1EyGY/zxSTqvoZtpAB0/wsiJPPEbu8vVkRBj1XX9+IvbLOtgON/8Vs8GOyUMHpJI0Uq5RlmXPZ0IXcBMhqVRi7nUr6d60Wf9hH8GLyzwAc22GH91v4Fuy0xFvt7iZuKVmOkNdm9ZV+/LADQUxY2QHSXoCmdeUg== 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=W4SJ00ZZTM1ldwM1Wj0Az7bgj+IGTUWcCsZq5BsediA=; b=eb6/0+5Gdo1LT0fjKiiObpmDICvhG0yZfW5UQKCmzrgRxD7b+CuCkzZ/6R7cSVNMwJYGayhGF9yvwHsROYm9FIiv0a01hu9+sYrEamtZ8PdpbpIqRVAUW8v2ct4ZPUaEd0d6mHpdhJCLUTkM+KpLRKtx8E5ugik0Wb0HdYLNXcnKyawH1AM3nRMTV5gLiQnNqGLcYnOmlObyZ53I0eao7HAgPFSOMECNNgyy7QgXr0EfE8e3QnDl4wgQlktNrJovR9/m+U34ERrRoivYc06Ay8eZqWDXJ3A/j8ddyVj7pvoQtRRjCgSHrPSjVMPY41z5kh5tVn930WMcB5wWmn2KUA== 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=W4SJ00ZZTM1ldwM1Wj0Az7bgj+IGTUWcCsZq5BsediA=; b=k+GNPceKoAtvbUs/44V3PyeeSRMrCp/97xkTXU/MjXQKwj3EwfT30m5PZk9qy5HC9yMw99q3Hoo8zXnR60Pvuetarw1WDRP/W3tW6FH53XrfF4mLcpVWMWCYBi1+zidqEDCyHKl6aUK2IU/3U8Y93SFS8aFBOUtEvVTdrIJwJdD6aCkCWXcy0xCvp8Oa9CP+uGK34B8oaRUJiSgHdd451EAzA5bnLmK+OBSGJC1IiXo6QbYFsOWZgjijxUisBcGLMLDFdj6YmeJUARxwRdFK3HFDdMh1NOF0ZK6m57h1HHaW/0rKW8YM7gIt+uZHNINqfqKHCW5ZoFjSVtEgSJ2cIg== 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 AM9PR04MB7553.eurprd04.prod.outlook.com (2603:10a6:20b:2d5::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.38; Fri, 14 Apr 2023 09:12:13 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::7feb:1f7:3ce8:327a%5]) with mapi id 15.20.6298.030; Fri, 14 Apr 2023 09:12:13 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v7 7/7] selftests: mptcp: check userspace mptcp_info Date: Fri, 14 Apr 2023 17:11:10 +0800 Message-Id: <3ddbc897e2e5a766a2b4df591e747126288661ff.1681463340.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG2PR06CA0250.apcprd06.prod.outlook.com (2603:1096:4:ac::34) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|AM9PR04MB7553:EE_ X-MS-Office365-Filtering-Correlation-Id: e3fb2d9f-144f-4bd6-8fa7-08db3cc8555d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JKVenQ1rp3hxvIclmB5NFth/jThnLmu61TshupNlimKg07+nqc0H+D7nIxGtnk09Rj5mbYUBRLN44f1AGZFsc3s4jsy1H+G0ImFsEzFi+CPCKH2JVAzhwsYLPnD8ij7hiIdDEFMjLlZYBkDhQt4Te0P1+rojCBrObQPZ77fEL0WGgnUoUb9fHcA7u6GFC74CnIMISd2SOLB3NaEX4sQosnZG9yXiCC5S8H+QMR0Ej7iijZpGYTT3wchSd3oLtJvuRVrx+xVo5q0li4Y7ekcaqGn6QQxTUA3Wt1GiH+f81i3k4VXUUVESZG1lqqDzxUse3s7kChmrgUlKlS3KnS7wStjyGh0rOgG1Y5dwLzKVVBAPD3rHS/wdPJFPTfB7PCrVB6W3Toq0vTdxiIL3s59xAQND0ivtpgxMN8G0Hwnik20tkWy2zwNnwwZT3nwfgdYwYIls4UK3q+OtfAoYD5keCWLUs2mLCZgjR7FQ4qlcwQ61skb0SEDtTJXgL48lLpKv+3pMXdfi20hO6RiDqed2fwQyEGzbPusMo6s/UPf3eGAy1496EP6ayOI+jc7EUit5 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(39860400002)(376002)(396003)(366004)(346002)(136003)(451199021)(478600001)(6512007)(83380400001)(36756003)(2616005)(86362001)(38100700002)(2906002)(316002)(5660300002)(44832011)(26005)(186003)(6506007)(66476007)(6916009)(66946007)(4326008)(6486002)(66556008)(8936002)(41300700001)(8676002)(107886003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?BAmr+/6yzdCDtRHUkKcVqLysWeDVQ0nOUT1KFbp1cZx17XVKjCSIAmVe83Yk?= =?us-ascii?Q?F9mRlQRhjlDjJEO6D0y9FoAae+Nsqaz9Nia8K3P+qPHwzAyhF9WxP0bHJIvh?= =?us-ascii?Q?IoepFzyCZbTZeu526I25HsheeYKIlqVqUb2tAvcbeULvsEQ6g6f6cKcDE4ti?= =?us-ascii?Q?WIs+QX7yGYSo5Ve1qNIfb8p2hWCIgzEgBN+z+SRz6bFv4uySwkGNVQM3UFNZ?= =?us-ascii?Q?k301B2aoc2ttyqvsWEQlL7twNNkhqQOeB05FX6IGKypbuoWGSEDC57SYD821?= =?us-ascii?Q?nyJxeEgxSG4+u/Ey7nW7efw2LnjqRxj9cHseWux3x5+0FiDofKgr02dUCc16?= =?us-ascii?Q?Krm5tyujy0t81JSRSBZP3GGI6FdwW3Ow/br0kddX2Oy3M84U4BkUH9GfDf9L?= =?us-ascii?Q?6sdTd6axYm2zfDeKb6ElQ0UksWAL8Jgm+v+/c7AIbwtLv1o3/mcEbLEqI/pU?= =?us-ascii?Q?kp+7hZpSecd75Mglz5tftN2pCw0N7MRalUl8xyxXTWOXoeoGQykowxOM54g0?= =?us-ascii?Q?eGrnTfxFfzGf9B/gC5tESliLqh2NszRhsmWa/AgnsHsf4UErtgruC3jRH3+e?= =?us-ascii?Q?LLp1aiGx1n24QQe2kDa/mai7vTIFxoD+8g+K/cvJRsrvIZT0Lsdig9de1Kln?= =?us-ascii?Q?NeOYNFvwmOQO3L5a9UyKooqiY5QzCGeBjwYVHyeSG1DlUIxLOIPmHDYDWCQ5?= =?us-ascii?Q?+0h4SuI8QThbG2sP85SE4ZjpqX80eo8DpzWZKOKt7UFFjkIHZrRckXPacwEI?= =?us-ascii?Q?xNTEFYJgcNUFUBFV66agngfcksoKRzv1SzTBq81AGYZqNiDg8cHPF1efv+ip?= =?us-ascii?Q?K93ZAWvoYlgGhdU4U86rZICgF1+N+egq1wCmnOrmHwIRM6t4wg34blKxHH8i?= =?us-ascii?Q?NnXwISJKoNqurvhk0K31VDbIz5fHnpnNrXgfNR1USMMpk07G1pAoxBNo3dwo?= =?us-ascii?Q?D8L4dRVUfvl+PRGLOqzO24KWFKtfkvcHpW3Aj7pERqSK3KMxov4q4BNcfJWv?= =?us-ascii?Q?K7vV3mUW6zatjEkwgW+eEp949+wHJKSTLhvLy6QGpek9JRpT0fi2J1GYzn89?= =?us-ascii?Q?sattWyozoRawO7AAPhIq7/G/uj8wOQwolZNeSJIwOe+hP3r4pUmA6k8tyEOB?= =?us-ascii?Q?cqjuUrl/ajgtv+WVUqt/kK+BXBh9/eoirFo0T5+EJ7Dz3WoQ6vqLDns7RcyD?= =?us-ascii?Q?ZytZ6w/QisHKyp4eW3vEnkM9Px3M6xMAML1v9z5VhQJnpwkcdvjrWwb1t1ne?= =?us-ascii?Q?QCGhrn3aXKOIOxd2NlRkbQ9SxXFgNMDnneoA3OJw6Vzf4H8LkXoL7FNBd3ow?= =?us-ascii?Q?A2G/im19H9YOXdtlxbEEGl+62SwX54cpiDu8295zBGJXaGPWrgst0T05imPi?= =?us-ascii?Q?ADoyqSvYnbbHthwW8qGK95vgRXwqPedmFMonu3qidAURi11fQYtWO05abLGV?= =?us-ascii?Q?by566Tw4KlDKMAKVWcL7NprfwDBrNv0l61Rwn8Hg4/pBkmQUiTfqPAV1/o5p?= =?us-ascii?Q?FPYn4m83ad4aOYR7RUhkgPxskzmO8Qsf5abgUSUjTlCEMnDkEQRdBqTW/t8Q?= =?us-ascii?Q?VzyDaKCziaX6mfdtwYmrnQVthmHR0X0zUXg6Hp/x?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: e3fb2d9f-144f-4bd6-8fa7-08db3cc8555d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Apr 2023 09:12:13.0748 (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: Tz94S5HVaq7k6MxODbK4mbjm+v4eb2g8jYcFtuD1ZAlZ50sqjNXFUEH+GBUJ+Dc9u4RvhBjUTFcOdxT/rs43Gg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7553 Content-Type: text/plain; charset="utf-8" This patch invokes chk_mptcp_info() to check mptcp_info of userspace PM. Signed-off-by: Geliang Tang --- .../testing/selftests/net/mptcp/mptcp_join.sh | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index fafd19ec7e1f..bc47b99f47e5 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -842,8 +842,20 @@ do_transfer() tk=3D$(grep "type:1," "$evts_ns1" | sed -n 's/.*\(token:\)\([[:digit:]]*\).*$/\2/p;q') ip netns exec ${listener_ns} ./pm_nl_ctl ann $addr token $tk id $id + chk_mptcp_info subflows_1 sleep 1 ip netns exec ${listener_ns} ./pm_nl_ctl rem token $tk id $id + addr=3D"::ffff:$addr" + sp=3D$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + da=3D$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(daddr6:\)\([0-9a-f:.]*\).*$/\2/p;q') + dp=3D$(grep "type:10" "$evts_ns1" | + sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q') + ip netns exec ${listener_ns} ./pm_nl_ctl dsf lip $addr lport $sp \ + rip $da rport $dp token $tk + sleep 1 + chk_mptcp_info subflows_0 fi =20 counter=3D$((counter + 1)) @@ -906,11 +918,15 @@ do_transfer() dp=3D$(sed -n 's/.*\(dport:\)\([[:digit:]]*\).*$/\2/p;q' "$evts_ns2") ip netns exec ${connector_ns} ./pm_nl_ctl csf lip $addr lid $id \ rip $da rport $dp token $tk + chk_mptcp_info subflows_1 sleep 1 sp=3D$(grep "type:10" "$evts_ns2" | sed -n 's/.*\(sport:\)\([[:digit:]]*\).*$/\2/p;q') + ip netns exec ${connector_ns} ./pm_nl_ctl rem token $tk id $id ip netns exec ${connector_ns} ./pm_nl_ctl dsf lip $addr lport $sp \ rip $da rport $dp token $tk + sleep 1 + chk_mptcp_info subflows_0 fi counter=3D$((counter + 1)) add_nr_ns2=3D$((add_nr_ns2 - 1)) @@ -3123,7 +3139,7 @@ userspace_tests() pm_nl_set_limits $ns1 0 1 run_tests $ns1 $ns2 10.0.1.1 0 0 userspace_1 slow chk_join_nr 1 1 1 - chk_rm_nr 0 1 + chk_rm_nr 1 1 kill_events_pids fi } @@ -3148,6 +3164,10 @@ endpoint_tests() pm_nl_add_endpoint $ns2 10.0.2.2 flags signal pm_nl_check_endpoint 0 "modif is allowed" \ $ns2 10.0.2.2 id 1 flags signal + + chk_mptcp_info subflows_1 + pm_nl_del_endpoint $ns2 1 10.0.2.2 + chk_mptcp_info subflows_0 kill_tests_wait fi =20 --=20 2.35.3