From nobody Sat Apr 20 16:08:01 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2044.outbound.protection.outlook.com [40.107.7.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 3ACE117C6 for ; Tue, 14 Mar 2023 03:00:37 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kz9DIDVLPzBZyC/vYx4ukIQ0M3r9sRHpVbcJ0qPVmv4G3ZpREx9a17JLNKxhmydQ/y/tIHq31cAgzpfrbUEmHmyY//CJou+BweIaaEOOqXvWxqbiXyJUMgxfserRJMUC9noCQhsdFRU7OZH2Pi7yBRggjLWx6AjMzh4a/92dVWyNBhSqQkZa1y3L7tSvWkTedieZVugYBUsfrH2RIQKQUzFSA807EN6N/BqmvSAonJVQ3s9AfTx5S5pSvFUpBdL3sdRi5kaHDDLrV7D1M5RY2EphnD+ICcCij6um9FwmpL1Jn4+xo0/BarGgDOp/gUcYU64ToyPz96k8CPFE+SYCDg== 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=TwajF9lNBsqY7bvbCkMlVPzjyxa5LGUI8Zw9kn7gAm4=; b=mUtI5diCwDhrN7RqavdgIAc7XNDknbTR1pSQgZSWT41POOjwWZPXqOUk7llXUS8Gp4XE155GOnTeenYmWv6bcQ0IOsyykHg6YDWmXrYJO5Iv2zZWG0DRTIYvQ8Zf6tOI+HLJqJ4l/yUUQ18ELJp018QshR56aia6xkBbuufmLwssozGHbqgkh5WxOC5bTn+lkUmF5qsfQIUL7/a75q+aN77hQMmjUUnq2tsiZdOzVPSkyu6oFNArBU3/mFpyrmXnJt3O9u/UUK+fj6qdQ/E8xEiOEM7fmxkBsEQib+50idppopy9Wpqt0YoVNNzc0kN0pPhzZmyjP0UgsXNkrFkFjQ== 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=TwajF9lNBsqY7bvbCkMlVPzjyxa5LGUI8Zw9kn7gAm4=; b=1HR0JNRh2pNyKohNR3CqphEde40d9DMeioXRSGXCXOQEP4pOy5TJSO5Ir6pWhaWUzWdUtLxWM8X33+W5WaHKGJWjNftOxfOft1IwuPoHF/dh0y6eEG9MDBPflj8Ze6kDwGavtW2R1nRIWXB6pw4F87pyf2Zok5S8nWxuXYUYvVHo/Lff1UfoCWfPRDwbIIjpnqyghcQWQiBkgHgknZvF/4gPhAGMCqQvr2Qd7AvT2Z5Eadpn6J/VyFJJ7glGsNNVgAnbSSTafnGA1yy0J/QaGjc+21TdiWfZDcnwb+4iQrhaPwhdrlZ5d0mOrvFleY9HufLQ8Y3IFkNOdLAkh+fYDA== 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 DU2PR04MB8838.eurprd04.prod.outlook.com (2603:10a6:10:2e1::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Tue, 14 Mar 2023 03:00:34 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f6b0:27af:a96f:ab6e]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f6b0:27af:a96f:ab6e%4]) with mapi id 15.20.6178.026; Tue, 14 Mar 2023 03:00:34 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 1/7] mptcp: don't clear userspace pm addr id Date: Tue, 14 Mar 2023 11:01:40 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0013.apcprd02.prod.outlook.com (2603:1096:4:194::21) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DU2PR04MB8838:EE_ X-MS-Office365-Filtering-Correlation-Id: 75a6cc12-f0d5-4b4f-fe65-08db2438478d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IHhpocPB5FJAo7nn9cv6XolgvudAMqTd3zqNYVJbo7Kt1kYWjcwkouLdb3Ena0uyK31hEHVFxmQ3lHvgAM3FkmTuOMn4u/w0GSXho1FHtdJ1dK//DBOCvqSfD6KWenzQVPxx+LOaNtd+9saJc0mTpI+ldj0ar79LpRDxGVFIiMaZADi0kDVA//WmgB9EeHh1df8dELqmklAtv02Z+5oS+AUueTiknLplIwxSi4+OJlyyjeLDy/S1MAIDBMwiyS3k3BH6om4XibCNsnxAvI8G9eYPzshUlkuzP0xpWsK24q2gcoV+QaM3CzJ87BVt/2cTFLeA2JhCRpDY2MDIMSyq1WdmBgt1tlhByLRSQ1MPmFvXmSuE3eEWEH+qVOPGQesWjjC0W1c/C+sKyz8XSX5ZJx9FB6iZskgHbM5nTgnld9/4elQmFWfsk+Iz/TUx9mV5YoCI2Krf3xs33V5CXsgWSN7XXZaIwoxauuuCZICIkQmEjuM9bjC0ucvE/hOXwA1G1INB3wmvnsmw198izv/WC0k9sIB29J2CZpPI/aQln23DRD7MYugk5UVUCZnf+VeKgzlr1DCALUNRl433Fjrm7y2DLNYvPBjfkphWLmaZidCb/FitnuqJsOa8XNHf4NMK6pslRntOGuacWckrBNehbeBRrvkUjXFefJv7jZIhrbrFrZwFPTQ5MzbMp1bKcY8v 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:(13230025)(366004)(136003)(346002)(376002)(39860400002)(396003)(451199018)(36756003)(44832011)(5660300002)(83380400001)(186003)(478600001)(6666004)(107886003)(6506007)(6486002)(6512007)(26005)(2616005)(6916009)(4326008)(66946007)(8936002)(8676002)(66556008)(66476007)(41300700001)(316002)(86362001)(38100700002)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?trsaw91QmjAsbWty6ZHbnB0CZEjgDpzs3C90XYTmhHtuZ8tESbfS+WzKTCXr?= =?us-ascii?Q?5NBKOsWmzG5QnOZSwWV4aVV9XxeLD9yJF6t5gajIuAJCsyCcqUyyTSDPc4dm?= =?us-ascii?Q?J9CzHVqRSWP6IuI66KeZY749cGPcW/C6/8tIhxqU+SG5gajzS7Em7enWmhkc?= =?us-ascii?Q?ONBDYNoXabN8isI+9Se5xmYf/+iqRH5nWkmvDGzt572hcmPLPK59+PqnulSb?= =?us-ascii?Q?Bm1XweMLTV8S14GdWZu6+LFMokr/ymjsZvye+bYxVAbuwUQ47kOrpxdjog53?= =?us-ascii?Q?eVZbN9ERG38enQa1ZvgeA5X8LdEpdoXRWUc1+qYMIVk5chcnMTVmokpD14ca?= =?us-ascii?Q?cSJfNvy1YCQ26EQux/ATTBfIfLZZ2Pu5AcVEEjkmvd8U+N5QHNYNYT8o6uCT?= =?us-ascii?Q?lDsaE96koTb1g+W9EJ7X/xneLniDPgzA2Xo+oUgH439/xZ2Zdegh0RBKmjH7?= =?us-ascii?Q?wgr6B3hKaykGAYJth29WhoM8p9CxCm/HQz3TvGUBfMcTbZX1LeQPZ2+byk5W?= =?us-ascii?Q?ZkTwRReH7SxI/rWGPwtOL+FnfPN1ryocuKOjFlWhhaWlF8/HEp2M2QQ4mTud?= =?us-ascii?Q?6GQgT4oH9wsIbTyOK9H6uVXbudJn//TbPOFsJrE4q/niChLIHMUKhNyvqm9p?= =?us-ascii?Q?l57BGkK8WPIuTEYdkHb38ohZ5ygP8YW4jlhjnXin1Jo5miYnyXy8CIcaWvsN?= =?us-ascii?Q?V6jxsroSEiKonvOl6HEDefgfgTzgOCWRDIC4FbsBAIfok0rQQCUP7jpW3ZFx?= =?us-ascii?Q?ChnR2z/CMWxWesnEVqETftEhwwPZN9kLYkAXyMZM4lERB0l/iSNXxPTWqvvp?= =?us-ascii?Q?rY4YXf6lB6WNiCw1zciFbNpDfUM38kHor4jcSR9sllLY5rUIRwrHjwdZ4jHx?= =?us-ascii?Q?+o8+cooZZWMvA/iqlkMIajP8VrcVYRyU/Huio1Rx7+Z2sc6OcmplBnPwpJT5?= =?us-ascii?Q?4wZs6UxQAw4tPh/JnYEAEZmQdd7OxpIGed24MnrXElmOPGT7U5LoM3zlBLOc?= =?us-ascii?Q?69knitt0r2Nc1f/vanaUtc9zpbiHT+awJO9WQxLiIJKVhqZXv1MM6IiiuZT/?= =?us-ascii?Q?yFvXucaqNxB4voLxas+QoMX6eBDQMpOk+GdvzSKbNMMg/1KrqPqm3vGncNBu?= =?us-ascii?Q?kWe4Jlj1rXWI/EXWONo+GTCYY12VE9AWFqMH6694zcFA8+TA9TddEbpNPpkr?= =?us-ascii?Q?eFMiNhDc9f+hP2NNiRCCcl/yfI/IRPBbxf5sfuMbxrHeoCj5ixFFZF8YJf0v?= =?us-ascii?Q?DDBYkoDAek/fJVrIXsjomzjjpreEy1H3Eh2wWd7FERPXPLlpQ/hC7FbnH7kb?= =?us-ascii?Q?Vbuor9Z/FRPPtGCL1Jbznb+jThVE5ZIKLxSPpEpfa4qYQJG312I4qpdgtMil?= =?us-ascii?Q?rjArKO4FKWAgYA0lg7quBcS5QVZ4FFBSv8wa1Hjs09WBjxmgsROzyYNz/wRV?= =?us-ascii?Q?rj+A+4PGoSv2M68oD54xBoznjg9YhdULZCeEvhXIj0OwcoYCmO0AnJPI6qIc?= =?us-ascii?Q?cSLH7IWUX3D/doeALv/ofrWHcFUwqK4fZruphYOrc/JgfHJoche/Xrk9k2G2?= =?us-ascii?Q?upI7NbgCFduv4nCjiX1a/r9CopIX5FOcXCUzY7I3ncwuyfhRtIQeqHi0z9Ml?= =?us-ascii?Q?VQ=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 75a6cc12-f0d5-4b4f-fe65-08db2438478d X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2023 03:00:34.1719 (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: fQ+gDcaC4b/HerNo9k7qgtBx6ZNKAcBG9FucWii52oROntMw2B70HOwKEpJRhmka4i1FbxbQ1LLVeQHR/Wmnaw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8838 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 67995cb4f8b8..df15d846e7db 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 a02d3cbf2a1b..fe4c29a17466 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 Sat Apr 20 16:08:01 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2082.outbound.protection.outlook.com [40.107.7.82]) (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 01DCA17C6 for ; Tue, 14 Mar 2023 03:00:43 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lP+WR18SsLujnxp1OxyoFg0ucm5z+tZUFQ1bpfGsxXPL1f1FtUyueP7NLwPxLnIRf4PxrJYQ6IVbqg3TqZePFkOx7v95qWtF5JQwJVg2qqHYc8+2GcFw2dO3twQS93eZrE9lTy9x/oamzPl+ljTfHRlokOhQHxPcAek8nr3dmhR5Wt9VikGsKtWmtFD4ajKA3BcE3W/lu//FcqLIkXBE7IwkPJs+85IkkbGyIeva/2jTZ3gkwIkqofusPIRB33ZiwK8XacabFPHG+90jOs09oiyNhRpgFlVrBjl0LL0CcXjLAVkVngVxOWWsFC4zEPTw3BvRDK75A0rvRbNPSbajCw== 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=zBhtd/ANFziG0QmGj3k4rTed5mTyRh/ckWhW4PnSemU=; b=i3twxzKgjwF7chVy47ItPziQ/usOzCIkbyxXjK1vjbdVPI1wGfywGBTlQHwnzUrTDhrqrQAQpR10UEzQqYGgUtFbDEWRQmbNPVKDfu5Pw/kHGxWEPPRq1VRxTbVb6P0wHqKgMB5h+e+5zmj/nk2W3ddZ+jvWYLrG7GYN6pDFkdfvML+yIurTeIjK1nFnIf/r8KscXuXvKJTZyZspK6olWqELSUmK90SZhhFQYgXnCd/+cdA8AknnwRqFwgTAl7tuJFws02WQkOhtoOiXyxHCJOXDkorRcWEfu8e2zWIZrv55qLI7Snbq4MEJfrQckmApswNiBSh42fGrJE5EXZ1AVA== 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=zBhtd/ANFziG0QmGj3k4rTed5mTyRh/ckWhW4PnSemU=; b=IoS8rDNONWDgXawxZnPGdpQ1TJFCUBUH+JHp3C9QODwmgnfH6HYQo83qe1IP8te9Hfj3gfOgO68AnN6pUPTn7JzM0hRC7JaTvKh+Rr2fJXAoqFq8zwpsqsRFWixEfxTYipy2bmg4fNiKKmgN9gdtWdRXCju1G2QZMbG4eUpxtC970hoFU5HMIGmaou6BsiZN2622xDgVsbKKMPF5O5UA3v0UlvDWbRvKnywF61e5PumY7vbHVnNv1NpZim2E2IweU5tbNqvwL9s6oAhKMD95zWRDNp1pHKeHgGEdOqFsap6z5juSuGoPfwlSdT85GwAoOVyvFSyUzEs/m6EyTLqN1Q== 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 DU2PR04MB8838.eurprd04.prod.outlook.com (2603:10a6:10:2e1::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Tue, 14 Mar 2023 03:00:41 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f6b0:27af:a96f:ab6e]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f6b0:27af:a96f:ab6e%4]) with mapi id 15.20.6178.026; Tue, 14 Mar 2023 03:00:41 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 2/7] mptcp: add addr into userspace pm list Date: Tue, 14 Mar 2023 11:01:41 +0800 Message-Id: <7f59cf86d68c27fb9785d4a8d84cbf9ae1437d3d.1678762832.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0034.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::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_|DU2PR04MB8838:EE_ X-MS-Office365-Filtering-Correlation-Id: cf629521-cd88-47a9-54bb-08db24384bc8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fjFEyBg1q0YwolMV/pB+6rvqzAxys6I9zz+PJmJb0HPQoi5XrwkkdfGORCcn8FYS1GLrEgBY2QTQiEoTMIQOhdGZZUqv5Pj7naAznKMFMN9CYqPC2IAdKk1/TbcUyt3PQjiqpZs5UQvnF6GF/y01lAfoVwUihEvgIAUSA+Gkm95vaXEKq8KZURmo23bdG9CDX0eE2PDyVXi1EFa6G/3nwJbwEYCJB+V9i0tMpexfwnOuFxXu9fTvMTksjn91MgVWv3e/1ITpltECJf55E8wQrl5Hs/aJaFS4btAW3Vm7LVJtZhQRVbIoIxaksXmy6plQFfL/Lty62/+KMW6SPgo7t6k088hFrC2x9Wvm4olinZQlRXNhWSR+c0x0BNcjjuogQQ8xItHYxCzFJ0r5LuA3OvbUJ1LrQHsypW3T9m+VKcXerUj1dbs/CFdep2dG9UNU3VhFPoBdtz28stCNtI/ZzVAiVKr/ve9cr9D4FDpom94U1lxiP1/CE8vymrLHGFX3hIBkqGvlNuuF+YQ9xqyoctRnX0RstpFLAdNpn+2MAjZHlhxZRNNGEgy/qHzKBoXv3lwhRhdC40grbZuh9T7S0b7+HGb3BMT7zlMXNWNY6mxBLx2krGUGuY8sMlPInw/P7VQRArTola5UQpTjB0xJj2oxoeChz6eaLiGKv3twOt6jJCPOBzZPEQH8sPgAYchj 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:(13230025)(366004)(136003)(346002)(376002)(39860400002)(396003)(451199018)(36756003)(44832011)(5660300002)(4744005)(83380400001)(186003)(478600001)(107886003)(6506007)(6486002)(6512007)(26005)(2616005)(6916009)(4326008)(66946007)(8936002)(8676002)(66556008)(66476007)(41300700001)(316002)(86362001)(38100700002)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3tp0Z/1poGzFKVkfprgUviJrqDyTUj71MSIYJOj3Y9qBymRN35akOTwQJ25W?= =?us-ascii?Q?eQb7sCuylXCpg5SN7H3D/njTzXs2+M9PTOBnnhjIJirwezkcW437hCwLHoIr?= =?us-ascii?Q?cMwxoMDitolkcICJRmxrGmB2ZuwkdEsBR84fdHAjpV3PpxNAhHnhG5D70CMC?= =?us-ascii?Q?KtGG64kCaopznpgYhrKuQO0HfrPN3sFx1xMlm7EMWRFnxiJsnM3xw8a7dqfp?= =?us-ascii?Q?V7+XRM8iDqylrgvR8Lc56Q9R4q+jR7WvYiEITtG81hPFfPSk9vy63eMHkd7l?= =?us-ascii?Q?ii1eqqU8egDOgQ8itz9TSUU4h8PRec4ymWqEF+cU1u9KyJUmg+keoYVB/lit?= =?us-ascii?Q?xRL3xtYh/x66pucTbFwmqtG7zBe7vIcvTpgmM4faqlskxS33R1tqrhcjSu+c?= =?us-ascii?Q?335fkh88SL6DwE4pmGNPj2uTdXDyU06UbeT86uoWnzXC8RqlXu0Op2HygZOo?= =?us-ascii?Q?jUnHsYFmHzZUakBfBk1PROexc80zltOGcOJ8UQ5RO2PYE/umn/iCgAbE9tAU?= =?us-ascii?Q?iFTtJ2Ac4TOzIEaQO7PoogV1v1xKhk6+/6t+m28HAB9ADIjdfsqcdrC8euWg?= =?us-ascii?Q?rw5ydUE1cXfI7f3NyixZUk74Uj+AwtzKlJ3kS6kETmUMfC6mZBqfCi5k7VlY?= =?us-ascii?Q?VbPz4rEMSb7RNfkVp/mBaqs+nhoJoSNwFkBX3pElCMo/SLuR+s9CU7QVshiE?= =?us-ascii?Q?Gm8TzT+rqR+AXhddyb0c5T1+6qB1sdQMLhh33gqAuO7ooH3FlWqMGUwB7DlW?= =?us-ascii?Q?oVXu3YxznEj72bNZAq7v8NRHXID5eGoUwrQTZqHxA4TgtjuuXVlfIF4B3voJ?= =?us-ascii?Q?D6/yhkbwd+76MvsZE2INv7CyDxk7GbNqcGavYdxYhZsCpVMUBwhOGxkkomjC?= =?us-ascii?Q?4ZskIkO31rpGixMdE4xEH8Y/fY004k5o3QfevcnQ6nQoDRIIAAjxQUxgB9Fe?= =?us-ascii?Q?LeGI0M6GLUmJTdfiBJ43iKixsEJ/lZqPiG5h1Fjni9I9WGKSLXzEpbdZWs1X?= =?us-ascii?Q?HiFFHFLHfYE+XZ1+FW6q6uGS2T1dFL/d5VPJzBnsvWygks3Lg0JYm+npoHwX?= =?us-ascii?Q?mOXK/QFUbNPU+wGRorWwEcXDrKmh1I0oahQO5Xt0vpMragmYFlYqlIT9y6yc?= =?us-ascii?Q?un10tJaCyYDZeh6RdhdedF6fP4LmwACoytpZEziomngbzfTsJhV8obDa7GGo?= =?us-ascii?Q?nTqtI3n+RTA4DROBeE9zmZLdvZTT9DMfkmxlWbAM8wVRQL1xK/0u0cc2Cmcy?= =?us-ascii?Q?7Cz0CEcl285w1Qr7Zf3ejkUwVIfx9CskGcVeCgkvHlN80qXx0OWtrM/0qLVX?= =?us-ascii?Q?iy4rhnR9T9Iqgdmt1GgmEdaIUGg0ZFtxqR7snxq7veKQKzRtEhvXS0MG2zCg?= =?us-ascii?Q?gprY8PeJ9KnAokoVTm4gHn7lOYZATxOSNXFWzT1ktgvW+DSpEqg4jsljil0m?= =?us-ascii?Q?893lZA/3/HaT8u809U3VWf/bpzeF3QojUgWGus2L16DwkJoPNJEM2pQ4g3r4?= =?us-ascii?Q?JdG0wuqSIIRRW1PVLpSf6kJIwqVFSPSR0jzzgicgLsCOJLYwTSMb5nWXFHkI?= =?us-ascii?Q?ZMx+bSbvkFOW/Rsxa/0nZFRu22HutnONznr/ioCpb874gBApoT32GmDHKsu9?= =?us-ascii?Q?3A=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: cf629521-cd88-47a9-54bb-08db24384bc8 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2023 03:00:41.2808 (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: w/zAbkyfixlucfnLHy5pFznKUHcUbOXPs3qqBICC69rX1y9oqgvz+rbNc33Z4Ayvlnu9QwMWfWJs2aM0L8QVng== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8838 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 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index fe4c29a17466..49f41a040485 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -301,6 +301,16 @@ 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); + 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); --=20 2.35.3 From nobody Sat Apr 20 16:08:01 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2072.outbound.protection.outlook.com [40.107.7.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2C52D17C6 for ; Tue, 14 Mar 2023 03:00:52 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tgtc2PBS+WCPjcX9bMKP6dD91WQ4RzCbJs9LEs1qyky4a6pvZP4GS/6MSed0T5AWqZyl37gC2UaKGWKe7blnEcKjsOTb4xPKTHcE5dCgMXmeUkeZ0UVZJgW2XlOyXcrzWz6eYCpJzXPKYFWhOgXMNEsmVm+xJaSn/JU4VCpAyo0gRP+xzvgZD3aqgG4PGzjXaKM2XJ04yVan5+nYF4zOLHZmb7AdFo0hezInEAaM+V9aL+YUPsQBYI6vw73RT72dtiJckrcpYOPhPc+phOxTKslKNgUCi+ZIeMNu+8FmQGPumkmPeB4RTWjeBfFUDlcBDx5bWnfzJ/JO5IdEvcfx5w== 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=uuFJgbTEAPvsiFVhkcDU8nf3lgsgsmz7+0gD6qPjqNc=; b=Idx1sDYXm1m8MtvAKrrI5uADeq2QWEmH060FdIZLeqGoxNTlZ0RfeRsLPmR5+M2pJeu260viv3uLdSjcGPBhExSu2Wp7k5jwNHBR1qr5VXotCcqeVy6X0pnv+Rq5cgWQZdDtJLrOnqSBvEVlw//M6lVYaTgXb38jw2glxCVDvLj3N/nkxwEQcF7656Px6QmlB+C2BW+VGAiqLC7dxIO3mgpUsefStk4fpH5iaLqAecgVxpMgh7Z3wSH1cSBls+bBfGJ+JWEttkA9P80ndC1s53r8jyXyA8i9aMRIzXn7Wm3dD+hA6kVVsrfzbnJLwMMqEnSa0XqI/CEbgtVfw+5yKA== 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=uuFJgbTEAPvsiFVhkcDU8nf3lgsgsmz7+0gD6qPjqNc=; b=2UVVobenMuaMV8jxVIh0yGZvUqu7hswBCt0SIsL7r5BxMsp8DayZgf1B0C6PhuqzClOu/uVOISEhGjLaJvnawT00MG1JrSD9hrOoxTiT/2EQPT4174j0NOSiICTyIcBwRjtXFfunG8MOTVCOo5bocgObSTpAm+0eqFI2PNkvOrd9/XWtwR8f9eVcDncF0l1DCkRX4vCs7asCgYNHiM7JhP5zJaelW9IhwN0j+9spSVqnxZbszgNTfIGy/y3eUEbCUSNv+AwDQch7AAWJJ6WAaca70uY57KvnYLv3ZW2KrVbrohxgMHYV4rWI50RmNU47yoCOy/74kyNpWtTbflcM2g== 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 DU2PR04MB8838.eurprd04.prod.outlook.com (2603:10a6:10:2e1::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Tue, 14 Mar 2023 03:00:49 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f6b0:27af:a96f:ab6e]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f6b0:27af:a96f:ab6e%4]) with mapi id 15.20.6178.026; Tue, 14 Mar 2023 03:00:49 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 3/7] mptcp: close remote subflow when destroying it Date: Tue, 14 Mar 2023 11:01:42 +0800 Message-Id: <18ab65a89848d11d9cec95049b47481577906b21.1678762832.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2P153CA0022.APCP153.PROD.OUTLOOK.COM (2603:1096:4:190::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_|DU2PR04MB8838:EE_ X-MS-Office365-Filtering-Correlation-Id: 5a853343-1b0d-4fde-679a-08db24385083 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: d3Xj4h4PZ/SSnlpMfFK6a5nch/ib8YsKYIkAJFbiD0ob4RG0DSjqr8y+CURpgJ3b3/90VkDWGf3TKARMuF1dwJUtntlRiShLP2QCfX9rRtyxVcoW7Bhi8jzosWMtWO4QA/iGGnRHa4mzM9LOSIapb+DmXN4YYyfX13F2jMdXvnTBfAo/J9g/ocfkI4pPqyQqBPl/ng8q9LHSjVxw3lc2ctqVPU94yHVLiPMVA5Nofpw4MfFK0EziMKI6V61+1HLAe2BAQTdl7sKJ0BZ3rJ8grY2BuZvSyw6MigkdrZpEe6xyxVmTLyk29pkxAmPj0f9z8i8mbWcpdTbmR+ImS0CJGNF9NKP+CxCiuyjaX6ylqaaEkkbI11UipqkU5Nmg4S5gjB1nEDDW27YjBNigGMrXqpPz7Uld4+WPdMK9aYNTJIgKuY8RU7YFV+WX5q+4oCQ/VHy8jfQx7+pw1gpdQkqUxtv5pCzSoO5338FoYNgio3dp9wdC7psYMrs3RMgpXHzY9PRW0poGkkyxdZVlvMDmcq4CfyuBjOqsHtP6PE09/ueWdoj6jQV14M7q/RugeQeAgzE/0AUajzouylloo2s+qJ4iQvjSIVGU1vZepcrfSnXPCXQlABdx+6/lP/dfAlX41zZRvnqhfyPrbotrKqwm9khgT0c9rBtw/n5xjnlhwGS55wsffg97efxte3//fcqE 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:(13230025)(366004)(136003)(346002)(376002)(39860400002)(396003)(451199018)(36756003)(44832011)(5660300002)(83380400001)(186003)(478600001)(6666004)(107886003)(6506007)(6486002)(6512007)(26005)(2616005)(6916009)(4326008)(66946007)(8936002)(8676002)(66556008)(66476007)(41300700001)(316002)(86362001)(38100700002)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?5jvCwMxbAD2YBXmH2n29D6x8PZpPKBf6NjKnLmH0RSFuplfFJdUhzCwD3Wp/?= =?us-ascii?Q?eT+2RKIRh2Mzut5RMQTDK9k0lAkmXO9uS7LWVW/I1AGdkLVTI/zlmz7Dos+/?= =?us-ascii?Q?2RhfYRl5bwymG4puPkooRaWnZ6vTxqyFYWQ1kLzh+gQi+lZc8nRkCVhXsLPx?= =?us-ascii?Q?/qNkRK0WAafl62/vYjKbMYgsWyskfn8yf0ECljlNstDhduuzRoJf3puhH5OZ?= =?us-ascii?Q?PnFDPBdLgFWiiJYRknZ4iFJd+deIvtYN2rvVPPq4pFGdSb/76heR6a5P0LFn?= =?us-ascii?Q?ye1kIDG8KZUaOSZm7Z8WQjEnfGX6KSwZSj43ezo8T+UTr04UErRYFGqIfgIk?= =?us-ascii?Q?dzhYDzIKoV0w3svoPWfm00eHAU01d3lYdq8NQoTYGm5bkJ8pUjVx970as6kI?= =?us-ascii?Q?KbeMhHoId0y0HZkKFA+fa2uMxFc7fQiHz/dvObYokEPYAaoDrIqjQfziFuoc?= =?us-ascii?Q?HLPflznn+32p/SevZPwoCxuQQ7/RpkacTSrvbBDQaoWYxeTvyoSE/8MYX/+r?= =?us-ascii?Q?/ctKz1AQ3OT47pMyAMW11kos31XuEwEwA24v8OpURuVkqJYz3zsXcz0KJo8v?= =?us-ascii?Q?/H7TD9XZGHnEjlsxWpqPbC4QOfrJGRNKBnkZ4wSDSPYo3OjnhNzFkqYu65Ci?= =?us-ascii?Q?wa6axvtOOa7sXlwudiUiP9HvNuj0oR+Da8XgzE+fHzLwcm6XWmfR8OFlTChP?= =?us-ascii?Q?alCRHHYUKycO+CbAxVymCdtOQdrDtnz7NsgLEAy6LmViHvB2pvrQg3cYOTOB?= =?us-ascii?Q?UIeD55as6bwJT/EEg6n540UcKlGH4ryf3FAx1BqYneq6BiiSFlToPxLBCKMf?= =?us-ascii?Q?Sm9F9zlyjFkzXItgyD63thNWzADkNom30oHtHISKpdNw0CDhz4kUU7dgdeDC?= =?us-ascii?Q?INQegkHiAN4ef1aM301VWNSHJolCJmQj5Bd9lTG6T9BNLe7VDsRw60qlXXw+?= =?us-ascii?Q?IdZdh5dfXZKV9rOzFY7Rv5SLu4qp6jqDJs/UoaU9ExKBXnOsNVdaIGWHL56M?= =?us-ascii?Q?SF7KL7cF6/ejPRvhURIjToiVP1Q+DADWvFrhWBZHzi7SoyZrABXLH/iRLaDm?= =?us-ascii?Q?+5YS0BMBHw3NGB37kMfYblSe8Mej134bupwVnIyLq4Q01QaccOwZvEfAQsrF?= =?us-ascii?Q?m/9Zk+/vAUK+o7wJiTHD0XRHDt8ctzj2Bc4i1T/Vyr739uY/aSDMOJUThILu?= =?us-ascii?Q?dj+r3sk82VD8PsMAqldqyWL2hUs9G/Q9pzXrOafKbEhunRDP/7iUy/NGcsLp?= =?us-ascii?Q?wF7rEJc2xmb+qcj7EvLPKvw1RSyb/71+wmYhh5286Yblj6Bfuz0eFxT3+GTh?= =?us-ascii?Q?mG1MTQ+3khnPBGcp7lcT0JjkvOMWfE9NZi8OAjiITaTcP9JMt/gGMR7uLrqa?= =?us-ascii?Q?K22FEfKO8Bx7fBSMyFmlL/eaLhi8oC18ec+NGOIOINj074OsKumxVp0pJe1H?= =?us-ascii?Q?n10VCPX77CDHnSAtYNOA0LXIMYNvvdbpqyqSzB7LI8kNXfC1x/WUG9z+7RZI?= =?us-ascii?Q?5xe73DunwRrczvoU2dvzcNzQjQsqUlvKrLTFXfcvb2xrQuAmMQ/jGy4tcpfi?= =?us-ascii?Q?CJQbVqThxuRV7yHEA9/ofdeRJjnM+I1lXq3Sb0mF7vU1EgppBzNbnqxXGWT5?= =?us-ascii?Q?9A=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5a853343-1b0d-4fde-679a-08db24385083 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2023 03:00:49.2177 (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: bxgA+5kDCTST/U0klF9TJ3mBxuhmR2tdGkCHhZJIzx9nbxJWQh3VWKloYjv4S96io/7L9U6CzJAhhnru/MZDPQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8838 Content-Type: text/plain; charset="utf-8" Not only close the local subflow but also send RM_ADDR by invoking mptcp_pm_remove_addr() to close the remote subflow when a subflow is destroyed by userspace PM. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 15 +++++++++++++++ tools/testing/selftests/net/mptcp/mptcp_join.sh | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 49f41a040485..ebadfafaa203 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -429,6 +429,21 @@ 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)) { + struct mptcp_rm_list list =3D { .nr =3D 0 }; + + list.ids[list.nr++] =3D entry->addr.id; + mptcp_pm_remove_addr(msk, &list); + list_del_rcu(&entry->list); + 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); diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index fafd19ec7e1f..506120401abe 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -3123,7 +3123,7 @@ userspace_tests() pm_nl_set_limits $ns1 0 1 run_tests $ns1 $ns2 10.0.1.1 0 0 userspace_1 slow chk_join_nr 1 1 1 - chk_rm_nr 0 1 + chk_rm_nr 1 1 kill_events_pids fi } --=20 2.35.3 From nobody Sat Apr 20 16:08:01 2024 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04on2070.outbound.protection.outlook.com [40.107.7.70]) (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 5FF4D17C6 for ; Tue, 14 Mar 2023 03:01:00 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IcRceOBLBsV69y3MKRybEGBhZAgyjlCSH1gIrrsxiCDlMF4r2NWjyBy6DCyXu8stWMUa+EwY1YqrxglGoXTRjgqTTnZWJCjJhQzWKWI+pYXeuwg0wC+NiTCy0jmE6ROIa7t2dtKWaIPCSaxOxeFLSy7Or6LSdG+9IlM0FccTNvqDYyhQs3jnTESTa1jfQDkCJpPjpE5K57QQgxqlgXvE0CmRMXUM7fhgsXscSqDGMCR4DQVNaJdsENqyxbhc7QbNn1e8ubNX3Dy/yvW1YbsXebUJXqUcdkq9JQZEpdVGQ43x+1VmMU8OJa/W4OzsQxImo6PEnV+/MAOtr08Ej3VrGA== 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=uLK4g1Wuo7j3ByCTZUM2TSNz+NB73vV1gcs4ndkluo0=; b=iXMfFb764wwOGlIGHkSJV5gFeoFDMZ0iC3UCa9SoxiJHEmxRF6U7grERgXDkvjeD2Ux5gVZs34epaknDY3j7VN63I6fSRgdxXRkjNKT7Igm5zVrhvbouU/ccc0G6Q1htmW+pW7yaXJlotX5fj7hfBOedK4I/HHeir6kV7gJwLanwOHo3DeoRdsT66aOU8Hc8CHDOx48af4r1zjpw79l0bJEzFk6AnS7I1Z+0SZfBfPoeEMycRtkniAeTMdVN4LLfkxweg8WshLNh7AX9m+sYBudckMHwpAh2TuJ/NZeSOJfnlw6nfO9+V3bTT3fovbHuQoCIlgd0m7aqWEkOWfBi1Q== 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=uLK4g1Wuo7j3ByCTZUM2TSNz+NB73vV1gcs4ndkluo0=; b=ZD03/QHwocmj/3x5haXevpb9KFAJmUSeHEp5T5insZWZpKHS1F5TXVGvS0ih2yQhi6Xw6IRkvqmeNXT4Q42/+FvHDqDMMKWB2gY50FGaZqfVEHKPACgAhhFPq1TbH7uhZeypsIHM6JZeJBbCJqDjX/q6E0e5sfweif4wtHbEfJyt308EHRjLDpB6g5XDwnw/BovHMT0fUhmngMnuR8uNNaN4I0jufd1XkLuNyHmjO8I5ygHvOs39u103vC7yxoVWS5QKu1wuI9rbnwAtQzKmJe363ZzR9epsdQzkt5WGWVxKLfPwwApdU7ZeSUuSLuFNOndaNdKRXo6lOwg3psq5Ng== 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 DU2PR04MB8838.eurprd04.prod.outlook.com (2603:10a6:10:2e1::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Tue, 14 Mar 2023 03:00:57 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f6b0:27af:a96f:ab6e]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f6b0:27af:a96f:ab6e%4]) with mapi id 15.20.6178.026; Tue, 14 Mar 2023 03:00:57 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 4/7] mptcp: increase userspace pm add_addr_signaled Date: Tue, 14 Mar 2023 11:01:43 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0025.apcprd01.prod.exchangelabs.com (2603:1096:4:192::10) 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_|DU2PR04MB8838:EE_ X-MS-Office365-Filtering-Correlation-Id: bc745077-d89b-4c87-289a-08db2438556e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UN/HtVL0SWeCwx5sEhYGQXAOjz44AJriX3auHH/jAca66H5qWq6TYRmI06SN9tz2vzbn5TZPi6sOD+PGpn/ot0JrY73TQEi5nxDlGZEFtlihyWtIrOj+RZmfIIUdqTy7/XwGB8jgHRuOV8rDWNgVHJynA7Ezzy+sr4g/X0ItiOZ/uaZw+AgcGYM6ZLi7/6fa1oSZlf+NkpV8nh1WQqiCIky7Mz5+M5VyGfyqIVXbh0xHAYEkwyAPa1/ojAQC3DIYcvHcW1gTcRtkWBZZKpYg27VaHnMC9Sowe6H/7YGwMseoHI2dyw5bRdOCvEVVWWp7fxTn63Shhjgf0PkAx9l2VPvgHNH4vR6WwIPF+tLZpwmuj6vJR06KcwE4/ywflPWHVc0LJ52GSRBhNSN60VH0j33/Ll9DoACqm8ZUfKEH+jmHhfi9ECyJ3GCy9drYObbhpFSIg7smuEV6xdHt/NTIMr0YQ0BO2+94soO5rYWK5J+YlCOatGlbWwy7y5CDkolmYWM5gAwUYx6my9ySPD/KwWebI7hhR5syQA7LkMeqjBIBNCY1j6qPNxvZeXSwPNW7GisT5MaP4Co205lyyq7UJ4dDdb/FkKAyzG0WPDiZdf4K306j1f/ZtN6XvTsCK0ZPNfwJJfRvJGe50A4oTf7P83FxqzT7l/oJTHzKgf/2P7AJCUJ4FjKSQXjJhWdb/gAN 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:(13230025)(366004)(136003)(346002)(376002)(39860400002)(396003)(451199018)(36756003)(44832011)(5660300002)(4744005)(83380400001)(186003)(478600001)(6666004)(107886003)(6506007)(6486002)(6512007)(26005)(2616005)(6916009)(4326008)(66946007)(8936002)(8676002)(66556008)(66476007)(41300700001)(316002)(86362001)(38100700002)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7yJLT61HBQ34MeXLzxBIuo/96ZgdN4g5ifC5kmLfGvWO0DqPTPdV0Ca66Wht?= =?us-ascii?Q?/K7eV8KysX9EB/B7RFnI9NE8kstBWh22mNm08ngCYkYgZ40j1rK1jYSfN9rF?= =?us-ascii?Q?kHLPqx5MVKXw+yySf/Ky0A6ui2qdivFboISHVKKpmc3clVvIxLZiQyt0tQEh?= =?us-ascii?Q?OVSfDtQqwFSVMToix8HGb19SOLrwlvEe9JDIbO6QA261WxVj7KluiQTCX+8Y?= =?us-ascii?Q?jyFij2cKVhJ6YxOmvGTz4lVwBPUlykHnaZ7W0JDsSR6fsz1JdKWOU9/a0imN?= =?us-ascii?Q?jcskaQsznb6/tfgcdQ5Hlach74JMCTj3KRTecRFV4530vSMdh3bcewgeQEdP?= =?us-ascii?Q?ZBh5D4Ou74EZL+ssd8T/XzWvPyKSBOYVI9B6U4eWuLshtKUm0lqcERGAFAnB?= =?us-ascii?Q?LhIoqwlhkhqeFeokfBITEM0DNs8Ixbk8o75UAj0uqnwStBMzUhKMMvwfk0NQ?= =?us-ascii?Q?/+wwrbN/tSGeBdVbeOaJPCvockWbN+5KQc5X1InQO1kYV92d7y4lYPbHUA10?= =?us-ascii?Q?IJYc38dUB0NNSrbl93EadGuuJnMV2my1WANQyDASyBnogYwPgUtovBkPtT8E?= =?us-ascii?Q?TTQfwzkOy9E7GPq1nccS/pzc9BXSShpPIi9POpYq4Mlzt4JKA9tbQqdCsyVb?= =?us-ascii?Q?ciqoD2kRKJn5rA+AyHIQDSkUdpEKFbcSPqKBUzjjAe/17VB6kgs4jVl2L5h1?= =?us-ascii?Q?c7Met6m1EYy9do6Kz7aMrefivAPcnNLFi91psTZ4AaVnh8ZSaqEfX4v4GJZ9?= =?us-ascii?Q?lsmxP2WGjYXOQvlLrI9SBwYEXJ6REQ8lZJOgdU/Zy/KPcDRwm+vU2/sw0Ie9?= =?us-ascii?Q?H4weV7UKzSm92TWfMmsYNYS1M6veqm0M1rytHPjCHAdVWzXqjTQNzrDy9rL+?= =?us-ascii?Q?nE6UyaIt4YtBDnQAQRuKwlXInn+elR6cwWHR32Se2nolQD8iUJ0bwWAeXUYA?= =?us-ascii?Q?1qIzMei8sFiDMeYQo72P9xnuRbu2mOO/IlTcd41FMCfRU+Frv0ECWo/+PdIc?= =?us-ascii?Q?0rHwdpepjLqKnnpWGP6VZpepBKsQlEPBWzKyvh+N8ix/0nSQmcIWrOwNsc8G?= =?us-ascii?Q?P7FfBCO7APpZeIaT7QvGVyj/oEsu7VaJOFpec4r1XpNGKyHq5SQ1uFVh3vxJ?= =?us-ascii?Q?rNZoLVys7IyDx0abQMud6llrnXd1O6YhlbtCcDzH7+jXNt266PEwgHPo5iyE?= =?us-ascii?Q?VR6jMcp6jFDaek2dyS3+HUckkKY9sk0btI5wb6V3eU+ZIZD/IXTPc07cOSWc?= =?us-ascii?Q?mss58kCsKS9kIJOVgS4wCCipmecM8PkUnVm1Ml799OKwlbUBld/4ZwwA1wpb?= =?us-ascii?Q?0+O0oMh9yZz79NG+OrBIZx0ftegTS6ki7V8frp+T4UEqAL6EzUS9OxfCwgeE?= =?us-ascii?Q?Ic5ewnmFUOKC0cphgSym4HnhiajWZPZaTGazU0G6OjF8+k/f1f1n+L7iltQk?= =?us-ascii?Q?X9eaaARyBivDjf7yVBs8kc8EJZNTlCLPHKdwyPBXKUuGuquyIYINMCwPtndT?= =?us-ascii?Q?zOARN3tV0whtcGXVNXzB+jMsLF+mPQPI2xUX01rfKGAi8AvJL/3EmhcaXxT+?= =?us-ascii?Q?sxP3QNjDImTNk5b9kem5C3FN111CX3Nld7Nl7CEklvkjAe/1vNdESr6AJ4Zp?= =?us-ascii?Q?gw=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: bc745077-d89b-4c87-289a-08db2438556e X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2023 03:00:57.4670 (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: 8gtpeAymjWbQ4dHL4vgBqXKf57D5LazEcAeEmWdskAQdoCi4x/gzL4X2JRkaBXpfe+wJOIbGpW2ImIMeO0dMmg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8838 Content-Type: text/plain; charset="utf-8" Increase add_addr_signaled counter in mptcp_nl_cmd_announce() when the userspace 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 ebadfafaa203..1e5c2753c4ea 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)) { + 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 Sat Apr 20 16:08:01 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2078.outbound.protection.outlook.com [40.107.8.78]) (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 9A40E17C6 for ; Tue, 14 Mar 2023 03:01:08 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HShUH5M+rEZrliTfR829FjAFExsFWNQqQmvdRmRiVBWiaf/1bpm0UhswOwVbDWbeHPsY8SNZ1He+vLkkiZAjzsCMat3B/t/cdd/lPkvWCh6TrQJG0ncTvOtrl3/Hln51LyCSkZnC16i+1BCbXgKeqcFhUinjeg1dMuMQ0snPHtpd8W9ck1HPi7i5zYsvtzUjYBWcNz7uorADaJ9GOhSCjlQMil+W02zaZBMf1W/7lQb98vy1jOMEW6tRjkllm/iGDa9LEfCUg+v5yLm2dbRAVZiw7XiL0jePnHe5XHPUcz76FSZDRYAu92bYW8Lij3mY3OR0/b8cZ/ioUuqLriuLqg== 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=+Q3Pb5hhORrKYruuZclE54GgXOTu3VlffPTcDcOMQhQ=; b=i2oxYlOs30vCm+BlgOvYSapg/Q9swbj/qac7GwLwKsatKiUD8grFPLWaFwMJj83XcLbj24bdG04WEl9kQgBIVANFijvXbFVypdHM2Fqo3lAgztp5duhpUxCmdiAk93xbgfuTLI3XmUaH1LNPWNsBC5Zu2FjiHu7qIXBs4ZjGNaET4gtLXMOTchSRZewFrpWm9cgBMr792xHSxMS+GxidT63dVL+uWfU43OCw+3SiMv3gZ+W1jcJol+d4trMJMhWODu4AGExxSUEak8h4ZkWnh+VzhFZRjhMrDL1tmj56dbge7WL6DW/OEFVtU+hXxIg/Lft1YYxV/q2qCZP8MvCuaQ== 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=+Q3Pb5hhORrKYruuZclE54GgXOTu3VlffPTcDcOMQhQ=; b=RLzrDMd9xkrzYJmc79QxVsIhCZ2XbkevEuTu3bD4Vk9wS93H3eNCf/uGwyhudRd5RHujrwWaj1fLs/nKf5/3TS5eYrtEef7gg4k+Qme7T7SDXDHbE/tCfb/XCuopjQKNULpA6Gopkf3/8f7+rRTqQ8pvun1wSSVAdhCoN6D9uVX0cUh4n0dKVqbOeVnemCirSPai9GGxFPJOYRwm/hMy3RM9gbUmNS4s4qWVX7da4BEW9EgAK3UsQifQuc4M0TQ28yt3rjgM9WGg9uTBhEWIv+6h8M9O8EGNDDOIQph7doZgKCjWRh3UurkjMZLijBu8waQnGt61u6KYkvBcG4OL1Q== 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 DU2PR04MB8838.eurprd04.prod.outlook.com (2603:10a6:10:2e1::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Tue, 14 Mar 2023 03:01:05 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f6b0:27af:a96f:ab6e]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f6b0:27af:a96f:ab6e%4]) with mapi id 15.20.6178.026; Tue, 14 Mar 2023 03:01:05 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 5/7] mptcp: update userspace pm subflows Date: Tue, 14 Mar 2023 11:01:44 +0800 Message-Id: <1c7f66a91369bf0a17dbfcd487cb88c774aea42e.1678762832.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR01CA0030.apcprd01.prod.exchangelabs.com (2603:1096:4:192::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_|DU2PR04MB8838:EE_ X-MS-Office365-Filtering-Correlation-Id: 1bd5d50f-510b-490b-4e06-08db24385a3c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QvQeKjpY7Ozam+dhirVRJ8Gy12GeDnzEIlTsaJZ3OoD+/Qjjb+hn6+1esQzYNM6kgLt69m9AyIuHClPYM5Nk2pPbkuIyCxZtv7yRGW6alpUkTqQbXC2yV4pQzlUNq5WFqiOHt0d88otJYraQf8Ct4vNQ3LjN4/IB+Unh/rLn9e5MuF5ZLK/JDAGMuEoOxchefg6x8s1PAAaCDKnSSWlcJZCWpeERxYExn0EWZyvDmBt2ssEIcHOTz8DsbffeIL0bhRPprrzfVYjSNB6XTNx9yVU6hS2AEXGTsk2u8Mgt0Vakhu6EzyKMVJkAiyPagJNSTcmKVkrjDQoInNrMiDrLQPKw/631+/yKewKdkSCxBBDRDX2HirasmQpxHRmEcYL/nQv93oXDxo7ADsXmUV0mqTWKxiUvVQ+b9uIAQwPMS8GYuqm8nPLSYbZe4iURFRJsUnpEt9vggHNBtEkREsZW731bvh5E9WM0wisnJpp4NzWhySZs9FA1jZ872ckiv/bqOxvg4t20ZR2OdVk7v3akJBF2FLTlrxA9D2FQ7MZbNIes+5X4nwUqvFiv6yRsdWPiyEc+0B4ZNihcGgqiKjA5G+LS+wmmuS9TatbYW+DQ9uRE631UD6mjIUjaBr/+fA02py/09NqGwTt5lwQRoDX2c44xkjUYG+txS7ETQ8rmDwIttewFDbN/Ut1auR9DQQgD 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:(13230025)(366004)(136003)(346002)(376002)(39860400002)(396003)(451199018)(36756003)(44832011)(5660300002)(83380400001)(186003)(478600001)(6666004)(107886003)(6506007)(6486002)(6512007)(26005)(2616005)(6916009)(4326008)(66946007)(8936002)(8676002)(66556008)(66476007)(41300700001)(316002)(86362001)(38100700002)(15650500001)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ek3K+OoLFVYbgyR05IukgXsyp7EIYyzqpamduwBA9dgzy0iQXAGdb4HLYl/t?= =?us-ascii?Q?XZriqvoUNNAa4Bw4NkT2CpyimK85nluDZsuIzRJcPBugNxXhkSf51j7hWYZG?= =?us-ascii?Q?SjIWbZa7i1F+BkXwmaInzvURfeATFYijyFmqr6O7jxO2fJzrudtfcy5aApXL?= =?us-ascii?Q?ebofrgOvHutOB8FSwlU2hcsuUhl2BkAFrkzumY91/dvgYwTxQnWp+4D8VR3Q?= =?us-ascii?Q?E0Woubb9xDgxpJqM+uwu5jM2xWfAh9bhchpj+7aY2YJxfYUiyXlYZA+xtDdE?= =?us-ascii?Q?Vv1NgRTR19yClrrmlXthbKX3dEaWtXmFfDQLJfSQEbnrskosba3T6YU7JsVH?= =?us-ascii?Q?bQKdIOx4/puOzioeB2pomtpcVjUdW5IhIAXn3ZfopgpaRsr7QAwZyORxXRVR?= =?us-ascii?Q?XhgOAJroPmu9Pw+lFsD6aqTYXf229KoI3hJ28Dr4RGsRssmPLFcYbMUKE7EB?= =?us-ascii?Q?Uc7YpSwz3fUJ70gyjCjWaYoMboWr3En4Bz6ldyjvzosC0irrO1oMVtP5TSUz?= =?us-ascii?Q?CHfAfEBxCpcXmY/mRqPZnngo8zPTKkWOPqfXSLF4xRP84yQlZB+AEwQCf3BW?= =?us-ascii?Q?YbkmQKrWjF2Mq7ZZEzf9tcOrjY7ATpqfWEaWNITCo84rL5uB6TnlmdgeyOq2?= =?us-ascii?Q?YPnvG/UKMvGw0uAyd/ct4uMZ2pDqWOii9AxiE+YO2RmuQjNLep1XO+0cCU06?= =?us-ascii?Q?aJxdYP8Ko5zb38Yi5E2ZoMdTQS8+4zyldRdEb1XoPJjB7PHSiep7JpUgy/Nr?= =?us-ascii?Q?FwtA8pAMr4QlPC08pnEzXLELTiswQbHlpAg8ds4AUOyuy3cYJfOAliV/HYIJ?= =?us-ascii?Q?XWwFtfgkbbFXkOE0v4VRIYjqi7vBGSbmQEsBTaKYeunsr7v4JbX8YkH7nLD7?= =?us-ascii?Q?gh9vpIBq9rR6ttJPM4SaQmgsZAtJUwVeViGAEMTqiuqt0u8qF/P2o70BTI9K?= =?us-ascii?Q?FZgXlmjRXL6AwAfCrr3yBdBLXgP0McC+MC89Tjs5s1ScbfPiy+He+XNmBOKm?= =?us-ascii?Q?8C0xuUVFeuI4QBR2+ebPjtG9gx46Xo61jlgRN72qXbXTXH9vqUBH5kJlBkRY?= =?us-ascii?Q?41mQZNTPaKJk/iUr9++UxTfJvJ3doI1nFNsK+UT1m8oneOuz5FZfvuthnlW3?= =?us-ascii?Q?019HoII71+1I8VA9CHwl2vwpZ+t5eC5DNAdodkATy9xPHn5YdOGosqxNKmVA?= =?us-ascii?Q?PXezCrTUZE/RfXgdrqHWGwjhj3AhQCzs7iFjJRZTZ/F7GR0Si4SIM2LkzBjg?= =?us-ascii?Q?YfXYFAjWe/acxzIBXawY5W7bgTGvi2ZjNPO0G9jEsb0u3kMnesBiL5IaLyrS?= =?us-ascii?Q?+QuTgsYGpaVN2pPRIRLSJYS7TMrJI+EBZKK6bagKcvP1z5a0HFPNLBxB830o?= =?us-ascii?Q?HKUWI8YS/aFPFXNJObFOqMlNW2d9mm+Z45KhLCZYplFJU6IuE4c1gLax3Bzo?= =?us-ascii?Q?LLjYJaQjySXNYNwuAj0Mygc/vr4TMoEq7ZNxFI891InEiEMPkn+TEZaDjxhw?= =?us-ascii?Q?yvkxzCsuYK1b6D4/960SEoIqTBgTvOWs8rHLg6gFesgYlH6MRmsjcscwflBY?= =?us-ascii?Q?XXfdPQYkodxmYcjmG1B+AKK7vPek/LLBTMBqObtuKXksr1Y7WSnE/znJVeG1?= =?us-ascii?Q?Jg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1bd5d50f-510b-490b-4e06-08db24385a3c X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2023 03:01:05.7008 (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: 5pVkdRzUSzAoj5YCO+jGi9Fq7empOzMRv/8lWh32vnhyraRSv2b6lmkRKXiBuJ8ZzjfJExVLseFCPWFwnTIEnA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8838 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 1e5c2753c4ea..a2fce8486d60 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -310,6 +310,7 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct = genl_info *info) =20 spin_lock_bh(&msk->pm.lock); msk->pm.local_addr_used++; + msk->pm.subflows++; spin_unlock_bh(&msk->pm.lock); =20 lock_sock(sk); --=20 2.35.3 From nobody Sat Apr 20 16:08:01 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2047.outbound.protection.outlook.com [40.107.8.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 031FF17C6 for ; Tue, 14 Mar 2023 03:01:20 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AoZd/XvGD3OgYujRqH03mpD/028rUxeUtIHkLOEXug0bMjVC1fJHHsvI8D7ugIjjbtAU3wIiswWS2vUlYz4yQcZMVYUsHFUTGZIAmlBiy9NEytTsbsDWBotbmB5ZnhOyfv6kytXfpKW4un/bI3tsYds4xspInAS7jFHeA9d9hFFg4xkENapJwMU9zhHWxqtB2wFH9avcHw/mFRu+IPFv+4gv26vVarItqmMwZyx3iMZkysa9iUJZuG/NWx+N1AcnRUcnli/cSEsv//DlWQSpp4rK6iQK4yNWoTcXNlHrnHFdOs7x4JxWVE2wh2BUScfYYb+WZnPygz481LGSzDA/EA== 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=HGGFYhy8VOOMRsUCebVDEAe/po82kGWkSMgWViE7bMc=; b=Q8RdnoRvrpD4ThR2LTugbdGHeieBcPnt34KOUZ+2G8cWOwvsJ2kwAEVBNQ27+sInD8jDS84AXZFoTom+Ehlq8A3dlWUM0qsjG03iefrP1gggzUV8sbvvyVKhv5KSfHp2UzKRRHyc/oL6RGCMhFd2b5sLGaIu2RTkDNG2iID7X2oVVFKTHwdxMLepFTl6yVLXUeuJSZnigz49RaQ5doFT1kD+/pZ/xS5s0S0tqvdibdhc0jU3CMdv8HFBDF1MaR/XkjoHSCXoECAZDKLP9SNakwszBD0lwAL4ZTZAj4pY9EaqbIGnWp2QBRUYvgaF2hCp4TP7Sr55niohu8jnHBzq3w== 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=HGGFYhy8VOOMRsUCebVDEAe/po82kGWkSMgWViE7bMc=; b=tsc826DgvtBs0L2teyh1rYx50cWj0bbnvGm25twd2DT99llPO0gwVqiRt7uhqk6+/IM/AMDCpg24oIL+NaI71VKLrKGYZTFV9Vdwhlmd0Bj/1tqf4wj+ffil2yHIoJxj1UTiYzFzhiqWQr8vdY7xT1YBGOuE8VO/qVB6OPaBm9EJ40uG1JvQT/ImwzDbezP3EVY9J5IBxHJgpektaxQb/h6P+VB/UySdy5AlkDpNn2j49XOhMccnvleGIp7EI74/EGnsT5WVonVdoSQ64otsW6BuRUkJB2jdlURxA6/d+XFR5gZhtuYWA0Eo1UBqNLyKZXh19E+okErNiKFhpBvvEQ== 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 DU2PR04MB8838.eurprd04.prod.outlook.com (2603:10a6:10:2e1::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Tue, 14 Mar 2023 03:01:18 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f6b0:27af:a96f:ab6e]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f6b0:27af:a96f:ab6e%4]) with mapi id 15.20.6178.026; Tue, 14 Mar 2023 03:01:18 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 6/7] mptcp: make userspace_pm_append_new_local_addr static Date: Tue, 14 Mar 2023 11:01:45 +0800 Message-Id: <38533f0c6bfec11683e619593b6564b98da23221.1678762832.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYWPR01CA0033.jpnprd01.prod.outlook.com (2603:1096:400:aa::20) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DU2PR04MB8838:EE_ X-MS-Office365-Filtering-Correlation-Id: f7331fbe-5b00-4b6b-0945-08db243861d8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vwACTMH/C1e8PVdkjVfNu3GBvD9CukBMdGRkM5PL3lKZFqzMMRm8Uf4Ue+12rjby7kzGqT5MUMezKrWqr5LtHEEk2xd/a/z0nn5dNi3ZmivxeWtjD/s0IsP+wAAy/W7LC/PSfgRAR7py+5sgpVskelRD3bhaG4H8eKznuwBSScRNe6KPlatQ3gM49handgKsM20kzUG949bB6G63InXzQ+n3jIEZTvB3kRm9nwNaNu0hnPbnLFf5QnaHbwQVkzrET5e00tI8dT9T0MNNZgPFosHaMT2J+zLYpNMx98nz1J7M/+Y7QhFPggvP++oXVxXQAMmdHrGBGaL4EK7RNYdnpZcatF4ELv0eTuzRnnPk0DAM1fOrB3KqbXOMo1iUw4q6G5oRyApiaHf3Ui5MeOPWRHCz1eS7ezgWZBnPHr0pwh6O9/x+Xtqxp9YwOzy6p2H4DseYTPoXS7Fzyg0Q3GVg+k/ACda2FfhVoKb4Fs2bnps/lTNA5n3t52z7PYaIyPULjlgqAg4P6e3SxMjqfSl8aW1OO6WcaemSKAShgXp8VKjIYls8EYxNF+XACf28i6xaMbYtL3L6D+4oMf3OC7S2QvDpeU0yR0MEm64ySyyuUaqEQVE1AmfSrNRPxpfirI3EgMLkJjjbM5PcWuoz4rTA8nFO71fnRoQMxjTK2k8AS02V9otIbO65nPPm1wRdIgap 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:(13230025)(366004)(136003)(346002)(376002)(39860400002)(396003)(451199018)(36756003)(44832011)(5660300002)(83380400001)(186003)(478600001)(6666004)(107886003)(6506007)(6486002)(6512007)(26005)(2616005)(6916009)(4326008)(66946007)(8936002)(8676002)(66556008)(66476007)(41300700001)(316002)(86362001)(38100700002)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZWF1IDqFSn0+p+caWfOOsID00tch3ym7Q99INDUUPvsgV2TaL4lqFT3LRxUz?= =?us-ascii?Q?PVeMI/6dqmJt1NwrpeQbQ+j7BGrHnBecv/FXNjeRyryGowCR2oIyZORsCPJM?= =?us-ascii?Q?aefk7m1kGnwFXppMAJFQ5yiKOnLebGDq1zwUbS59wGVR8gakpPP2HAx8YFGx?= =?us-ascii?Q?zvS3XgjO33XdSm51Y609vuD+nNyRowTexIc9DA2tADm8ucuvZ2w+yId8kcmf?= =?us-ascii?Q?OnkIToK+437buLbl+nlv0nNXlqQpOIs0Z3cLESaG2Xnh3O30qGzUqtNVcG3Q?= =?us-ascii?Q?YPVU/f1/7xI4nBTuIOaMU1Z+wjpVSe3RxZEbvsqIwCQ98UA5fi9epKoKEjjB?= =?us-ascii?Q?D899UK6kxcOvQTed/ni3JaP0emkSiOFnVwuvd5OY1vySBEb8L1Y2Quzk9Mx2?= =?us-ascii?Q?79H7w1XcKBXZMSzhAUylRkkdzM4P1cv3YCu7HTefjXoFVqRyypq0QlvyVFOk?= =?us-ascii?Q?zf7+wgc2V2vEmh9iZ4g2HchLeNV4qdhkCdo/iVGntZMf+M9VlQeeH4xht5+q?= =?us-ascii?Q?ZUUml0MGynlG7NGK+u0Ms5/jerzfLj9y9JJxE5yPc3PeuipYjbsJQtUuFZXy?= =?us-ascii?Q?kMreci9jHFSyvMjkeuSKINIetLHOR6CafGQtD949N4M8YtaYZFwduw9HzK90?= =?us-ascii?Q?CyxAMiLTGFAlNwQgSBzQa7tNZLrUuI38H8i4Ep87sAWWgfo6tnXQgz84Rx91?= =?us-ascii?Q?IjcDS+Js7iqBBc+G3n1f+3J/Kl7qR1RGY+aK9QHgl6MHydlE25c31GpO+ckq?= =?us-ascii?Q?S1v5C8DcTzwqMMJW5dUxJ7LWPfNmt68AZWwmNiSPONlv+VnXR88o1xcsYGdS?= =?us-ascii?Q?I7SXQb08lKoxSEw8wGMroNVfxh5uZASvMK9/ailS/FNoTzdL2oXLTdUMC6Pw?= =?us-ascii?Q?wZRkZAa+Dxgco3l1mhGbn/1BYaeffTdvx4Ndx08ty31ogb7Kbn2o/isrMgQm?= =?us-ascii?Q?Mpt5hdkYg8+4jrNSe0/uQB0uMm0+q9aggqEGrCc1LdBW40JxiTa6VBMOL4na?= =?us-ascii?Q?HA4gThNN8xAUtSXJmuw5pKLYz95BvTzYbHLd8mvCc0bKsFE4CDI3gwGks+P8?= =?us-ascii?Q?8YQE9J8euYtg3gzTMKqm0A+KD1F6zSNNq/f7Camx5AiCfYsKVU34/e8hVg+s?= =?us-ascii?Q?Jq8hFYSIZ1ObDvvyVHRzGk/qsaNWK0++Um4yVT4BV6xRxctveDnfF2WAC6cN?= =?us-ascii?Q?2yGREQGES+jyZbUgBoaltYUUYGNZyu7kZ0tAGmIpXOgYGOM+KL7nJqxXvmkk?= =?us-ascii?Q?pqEA3v3BySRG4PgJgYXwavpjBav55ubDzP+iUry9G0ZjnyK7merkaUCPILS0?= =?us-ascii?Q?WbKIyhCD487Ly0KvYqgmqmEXnEh2P86HDi4e2FquyJC6FeyY6MjnLFeLmmOr?= =?us-ascii?Q?9n175AMCw2lMuJQSOP7CnTMkjCd3oaJCf8F2s/SCn9pNDLd8+XOdYhH5a8uN?= =?us-ascii?Q?P9Y2ra7ZCPC/8PbxaaQI46SVhqH8jsZ4+Dl42EBfGAxMtW5o5JebMDR5M+tK?= =?us-ascii?Q?5pukfB1XL+wfEJrlqQmum4ZIr1uuVyVp1AgjqVYLeJtzUDm225X8Dc5La8BT?= =?us-ascii?Q?3wTYob3blCB7UCytS5W+qcIp3/hZ7FPbQSt1wYdfsVsBRwxY+0FjSAAjXwqs?= =?us-ascii?Q?OA=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f7331fbe-5b00-4b6b-0945-08db243861d8 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2023 03:01:18.3248 (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: I/mByewWSUPItIdV+9LG1yaSNO7gAthEiFhkcNT2RsXt/Sg6BVFDibSaUhSaSDY16siM6t8zxb1hMLGCcYChBA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8838 Content-Type: text/plain; charset="utf-8" mptcp_userspace_pm_append_new_local_addr is only used in pm_userspace.c, so make it static. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 4 ++-- net/mptcp/protocol.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index a2fce8486d60..d2749225f391 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -25,8 +25,8 @@ void mptcp_free_local_addr_list(struct mptcp_sock *msk) } } =20 -int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk, - struct mptcp_pm_addr_entry *entry) +static int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk, + struct mptcp_pm_addr_entry *entry) { DECLARE_BITMAP(id_bitmap, MPTCP_PM_MAX_ADDR_ID + 1); struct mptcp_pm_addr_entry *match =3D NULL; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 46962a2581b4..421e587a4d62 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -849,8 +849,6 @@ int mptcp_pm_remove_subflow(struct mptcp_sock *msk, con= st struct mptcp_rm_list * void mptcp_pm_remove_addrs_and_subflows(struct mptcp_sock *msk, struct list_head *rm_list); =20 -int mptcp_userspace_pm_append_new_local_addr(struct mptcp_sock *msk, - struct mptcp_pm_addr_entry *entry); void mptcp_free_local_addr_list(struct mptcp_sock *msk); int mptcp_nl_cmd_announce(struct sk_buff *skb, struct genl_info *info); int mptcp_nl_cmd_remove(struct sk_buff *skb, struct genl_info *info); --=20 2.35.3 From nobody Sat Apr 20 16:08:01 2024 Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2058.outbound.protection.outlook.com [40.107.22.58]) (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 266A817C6 for ; Tue, 14 Mar 2023 03:01:35 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VV9L30SZGKc/hkofa7HeTrgaMarleZXTLHHztlFhrirUIF3XBgYbq3G3s9cmM5CIyDvRIRUgLh49/B8BNrG3L8Gd2MjZfGyNWE7LWMyo5bpGjrNtJ+Aow0osEAYhNyJU0q9zQFBbAmoXjPQRoLbxpLkzLlrxGZ3bAOuCa2iIKfARUfuY+RkeyD/5kKKB0g4QKkrAum2Akc0HWsbfWZ1wYsWxngt2+MRexj9bvNSA9+fJTWZC5FwtkCXbuzSlR76onsGjAsDt11mX1u3ijWjmP3Ki8KGYh6kagH5FOjVghOmFlwHpaGTevZCGkQ3DaIzE9JWGUwzpiw35++2I2QZKtw== 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=R9EDmkzVY7PMLEdzT06DnvBOZz93FVwrHgPXWGNZioY=; b=c9l/PhOO8HNFozhpz35wdEUfk5xdIah0eIKR51IoNpuhyf5EXosK83Po2sBB7pfzY9wjFia1spCNPSmbDpCGlqzwguazvx/HYgqcofUW4k7Vo2H70qqBm0bKThpVPubefW9+G0oq7zRfWnugcUjvKKDypo4R3xkh1kjeLi00gOQBloVN96oElvQL02oFnW8yOp5B1CXKpwUbGRBHq+yQlVovLLYOns7hzki3SK2OtzoJFMgFOwpC9Ul7kqp7OHjyr6tjBb/6sRtHhjJdKLedx1tN9eaMgzIZMf+O6xUi10nRhNK+nyqY5U4LMkUDNbuKFA+ly4zRy7QjCTpQA/wXDA== 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=R9EDmkzVY7PMLEdzT06DnvBOZz93FVwrHgPXWGNZioY=; b=VKuJUcTDgxDQVKcZeSWlC9mnast9ge6z/nFqdo3Aov3HbBlbtiaV2WFXK6mVYREfUHNPwukqv4OzKBrcBsczaZeBwA8TlXiaV6qS8zwQp1WxuXJKECtGzDUTpChBRVPfR/JSod2uJ2ychRGJdNXGdk9bxL76L+xBjDbfBnvUW9m7OH8dsuoSB6C0ZoWe195p1Pw8oKOE9Hw2OuSKzQlD2cmSNCjc9K/wuRl3cH5WqNZb8HTasjvrSnZcuwvObZE2z42T3C+81U6nMAzz8lq3h13BEqt1aakP8IDKUlBi5hgnQYPQgmyja5/e56/S5q3nOLfxqaS9rEZ0hfWtr7ek8A== 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 DU2PR04MB8838.eurprd04.prod.outlook.com (2603:10a6:10:2e1::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Tue, 14 Mar 2023 03:01:32 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f6b0:27af:a96f:ab6e]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::f6b0:27af:a96f:ab6e%4]) with mapi id 15.20.6178.026; Tue, 14 Mar 2023 03:01:32 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next v4 7/7] selftests: mptcp: check userspace mptcp_info Date: Tue, 14 Mar 2023 11:01:46 +0800 Message-Id: <35fc5e7f22966c370c932f134170b0ec5f8aceae.1678762832.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: TYWPR01CA0027.jpnprd01.prod.outlook.com (2603:1096:400:aa::14) 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_|DU2PR04MB8838:EE_ X-MS-Office365-Filtering-Correlation-Id: 80e6b6b0-9ee7-47ca-df49-08db24386a34 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SXUYUDPwKvjU4UQbEqnqYntU8VkI44ksrY8NUPF98ANzaRf87CFD4LmZoOjCE6pqD7n8Pb90BRbzt7gvZNgWxQwy4WNrjEyJs0fB2k1vLkodN2/lirYJhxyt1tCKY/723CkFL1eRXen4y/UKiP8mPwXCM65MHvcX0ppAxWMhKf7IzD45uw4PyNYbETYiXG86i9p2swH2sPv5y5B0uJo2w4FfNEtn5wQlhNd79ex7nNOsFliHEsNdUB0mHjFzHpl2IheVajRFF3ytZ4raF/tKi86sKLKGdehMbaaffMtjX1JQWHAKAQ15s4XyTu4Op8sE0LaHtq5WuTiFzN+WwjvNN2bCsHPm8fsyO4/w0jhhYZR/eHQKwWeEk/fPVfzF4OvnXiCWbQUaCkrwG7tQOLgmCVTyupk0R+L6HTHqUJFAi9alz8lqq1GzSxSgDH1Ph0wO2k/O7FaWRGxZ2FpNINtkPI+/pHt+g0jiK+N6mMUew6dmnVwkbN6CyYSgigbpPZtt4X8m320SZdE6X+hdPipwjaaU69utMqUE6bCEhf+ILaot6gAh39Se8ZFXM9UGrmLiBz8WlDLtL/AbhB7q0DCG6nkbB+dBw0Uy/nsa7DZpD5ZYCGsboeRB5YPSozL8pSPqTvZgmLz30awztiEm/8LIGTUpLgxbH8VJWSVYRIgU1SwRxXWjiKPSoV9y0Z720O7v 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:(13230025)(366004)(136003)(346002)(376002)(39860400002)(396003)(451199018)(36756003)(44832011)(5660300002)(186003)(478600001)(6666004)(107886003)(6506007)(6486002)(6512007)(26005)(2616005)(6916009)(4326008)(66946007)(8936002)(8676002)(66556008)(66476007)(41300700001)(316002)(86362001)(38100700002)(2906002)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9jT+z4KlLguC+yGE572crsE6dE9sKiwSUKehCh8tBauQt9MRYJrAZ5r902C3?= =?us-ascii?Q?9wlAqWEYl6LPC+Kmzdx7I0lUiHsMOPGuegRpzK4WwMQoY9KcskEKbfMIOQAa?= =?us-ascii?Q?WgItKAJ7NJmy0alNEjFsgX4zBSQWw/i/jfQYpPOZACvEtd957XFxC+V55Npu?= =?us-ascii?Q?IUzZDBeer4N98/meXZS1gafpAL7DqWDjjMsZjQ5Vq2fX7FAK99uXYUxp08Ax?= =?us-ascii?Q?HBWu/qNg6Jzce2X8YeBZAn6fWmj/HKitblKGZ524y3aMLVJG+NwfXSEl1bn8?= =?us-ascii?Q?Fvj++Advzh+cx/k/BWbP5vLtXPuZ0vwMU0qNBd2EHvD3pGo2Yewfs1TIGOeg?= =?us-ascii?Q?IN4ktAg7Ey2Xx7qj2tsyTZZnWcmQmgSK1Unlt9hNNVq5ZZ4k27kY/LA/5IbL?= =?us-ascii?Q?mDw/TzRZMT7JEFvvxINJbqj6zZpi4j+su4+lq9BImqc53Zik3EUysVsYmReQ?= =?us-ascii?Q?KPrOVC1wD9dkSbtw8rNp4PMCVhYdaoV2Y49fOIpcTVweOY272cqOmFpiFWYV?= =?us-ascii?Q?R46itxwnEC708rzEqCMmJua5T8MOobhQad1R3Xa6LafrbvpSKGueFn0NbUbP?= =?us-ascii?Q?5f1Qm2y8PzTGUuX06MhXnemfloWUhiJpQ6TEWSqqvh0k4NHJM47dS7MoywRe?= =?us-ascii?Q?cdni7rIxJZEjVc26cuyR1E+QKqZ5kKuJvzrzi3q9pq9NumD5ij/UEPd6Uqbv?= =?us-ascii?Q?OaBy+8jAo4EC5h3/rB4avByRUZOphvc4fNM+sheRthHI7c2VCQeLqiVDxVkJ?= =?us-ascii?Q?cz8g+6VfOlLxBXOoBde67jMpkpxpyb5nzHS6BUS6VF4fBk1wsp9sJcDsUD6k?= =?us-ascii?Q?72OezCWgzlFLt3rfOCxCX4hBUp7mvvHxJAC+MxJR0Y7QwYQ2YHhPZVKMZFOJ?= =?us-ascii?Q?IXA+ZcMIWN3QXTgL/vaHmGxav1TEbU1bMBF9FMu5yHGbNzDgR5fDHVEr89G4?= =?us-ascii?Q?jxmP9N+rMZdh1TuGRnFACWCKbTchS2vpHVvblC8r0c7eYpKywYx6Er31rXe1?= =?us-ascii?Q?uI57WwEUJQqV1RdbSxc6n/ZaudfJcOL+9YCNTnGZcoOemwfwJqqCY0/6X/Vk?= =?us-ascii?Q?uvpVTlbtWKH2gkW3jnUSYLudisD1A8kuxg8Oxic2oVAWmEMZiEKt0T9kUhjx?= =?us-ascii?Q?7kqBi49ccT81hn0iHXV4GN58dJ9mQyYXKRjUvJ9f4yVI9oyo4urHrZ9Ov9u4?= =?us-ascii?Q?rAsMIIVKLpRgEipxrT+00sfzJOST2FPR97aif8IWIJvAXw8DdZI8w8Jc/cZe?= =?us-ascii?Q?CHk22H4z3ZFvBqLNyAVfl/ux5ow4UiM0XNmOV5YntKQOBPUWg9P1JwXhVDA6?= =?us-ascii?Q?iT+ZsuIf1zDb7WJmm/TRWo9gt2/ObzgHP3OmzaaoytDfLyOyCFBQmHaAGOgb?= =?us-ascii?Q?KcK/MfBcPdudDHfTdyw5UOlvwU8dSkSVn/bQzpSBLXLsovnsY+2YyiFw/+7y?= =?us-ascii?Q?RFcTxYfOoewknWa/bhWlePoVVMdxx0iSKLeefoAaU5jgPCjkIZLN2+Thg6Ug?= =?us-ascii?Q?mREavu4MZFDY7Pxl3thifLgQrWL+zl3ZagBFP6KTpoZx/gO4aGN/5IyLKoFR?= =?us-ascii?Q?LaCe9tIXh/LQSwUcGxwaVoxKVUb0dAxm0XXywSaGgj6hi+zoz6wofVLa3Q1h?= =?us-ascii?Q?lg=3D=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 80e6b6b0-9ee7-47ca-df49-08db24386a34 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 14 Mar 2023 03:01:32.3081 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: jbTdER/I//LFxzt1PaGnKsSFLOwokTozy77+GQk/nQ6t0GbfQlwCi7gWLTLfKl34rz8AT/o6yuGWjDFwzKsEoA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR04MB8838 Content-Type: text/plain; charset="utf-8" This patch invokes chk_mptcp_info to check userspace PM mptcp_info. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_join.sh b/tools/testin= g/selftests/net/mptcp/mptcp_join.sh index 506120401abe..63ceaa613bdc 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -842,8 +842,10 @@ 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 + chk_mptcp_info subflows_0 fi =20 counter=3D$((counter + 1)) @@ -906,11 +908,13 @@ 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 dsf lip $addr lport $sp \ rip $da rport $dp token $tk + chk_mptcp_info subflows_0 fi counter=3D$((counter + 1)) add_nr_ns2=3D$((add_nr_ns2 - 1)) @@ -3148,6 +3152,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