From nobody Fri May 17 05:26:29 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2050.outbound.protection.outlook.com [40.107.8.50]) (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 988D31107 for ; Sat, 16 Sep 2023 11:38:07 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZvBbBZjzal2V1B1KMsRYXD2apVtDk2VqLdvEo6n6Z1+vplRxm9u/KBAiwo0HPTJy63TD6JYlLBcS+KTALu0w1/saJoYLV2C5VH2ZjEXsS8sFrWyGexR8hlQdO0RWBcGT0NOdiF1e6igmR3f51j+Lzharcmwt1Uct5xwwo9EHeZZDpgYsyiJ+zbCrn0o9DHgS0jP3ksfQMP/EULeYiYk7AOBlJ29QF4wtQJMbkndJDXMDKdmrca/CpBJVC4E+IO2MmPFwsFAspYVOLtZIK01cCWdsKJIWfMfVK3lnEwmyQfJC0iyeH5cN5elefJbdSpOZC9ulNTuBte4ASBjetbBVyA== 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=ldM+zhg3ZRaNH60oexri0cN4gapaj9rWMRpDBoFltN0=; b=W5KDoLJiABDey99mos4lCmEVcYiTd8vFQce6k0sig/Exky/HbJ1VqV39c0OGanXyaHU4VB880HnmAFVBgLJPvjBNLU3wxfn/NdooyJ6HgvpbJzpB1CWOBpQwhG7vcJ5pT+/Nf1bu10X+u20epfXP6cSxIlYBYYCtTi8JXCzGYY+PN5Fjyvba3vUkstQ9aAA1587RWSgwQ9BuAJPF+mID+QjD0yTi0iQo8AIcKscCW3EUKbxSDqV0wYMIcoV4gppGh9hgGTZS4HTGtWaEaeXAJlXdBFUCR1WPZtJ4GbKm2NobNT3ZFH62GLelv4ZvNAFkTLWoYxmMunn3RXFSuZfpBA== 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=ldM+zhg3ZRaNH60oexri0cN4gapaj9rWMRpDBoFltN0=; b=MX7VkZqyx7nLpcLifj8pn0GhGk3+Lj491rtuTfPCFUoBy12y8xkYNeXeEV2m90u6c9gEqZUFfMQHZ7BIseD6UVgCmTIr5bfsDyRJMQPxSs5hr6NiOWHx7veKdefLBi3N4f+ZWRp9+xBDP+vMkUd08Nl5iOPbFXyj1yvRAgk0sBM2bEC6kt+xS1zmq8hZwOTwXqJAJnAvZkjpW076c+a/EtykSk6h+p0mYm0Mk62B4bQfZdskuBadROwhg35jByyaXgoXDzipKw0xK/S7Ot+GZAXB47UGjV9OEpGDT29TpYh7nDAUnbIzCNysN6LqYoyPyPQaN6YnFRqw5mgKwwOWVQ== 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 DU0PR04MB9371.eurprd04.prod.outlook.com (2603:10a6:10:35a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19; Sat, 16 Sep 2023 11:38:04 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.021; Sat, 16 Sep 2023 11:38:04 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 1/7] mptcp: drop useless ssk in pm_subflow_check_next Date: Sat, 16 Sep 2023 19:38:35 +0800 Message-Id: <4482c81cd226e1670b399ca24a2262024665a402.1694864093.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0016.apcprd02.prod.outlook.com (2603:1096:4:194::9) 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_|DU0PR04MB9371:EE_ X-MS-Office365-Filtering-Correlation-Id: d09c8b08-f6a1-4f06-e06c-08dbb6a963bb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qm7uUtiCOaLdiKFGkhJnTvEq12YJfZBJavCecfohjwoJwRLCWbbar5OVrHlI7JRqsvRRDwkC3+JKvfyMxtSuAhZ92sy7ndlz+9B3SM7QYzaGypZQOnXeu8B8rKFlVTsIg2Ijrj/hbaejbTX1A7gsW0MNaJhZNFZhp3o0ilD7C4VAEEty506JvU5wM7TxSU3X8CxJMl+IF6fJTXLQZmY5VfUsZoK54ns5STvmuhMLlvSdLDdwPElQ5ur1nmh9IdSfQU4gz7hnqLwgE7k6Wf2Y0879V8hiT8dOqHCX9SagUNyt5qWYQ9QUN/DkDIjt35rJX7ZDNwnvtyvUoCrV9kw3050+4Ema8hZtP1kvw2msZCaJlAnJxvBaSW1HNs2UzHmoo7nCKow19aqC6MIszG7suzns8aHuTp/1BcsEIdN4Yxq3UJtlZSsR9jJsWxlmcPgMGOT9HuoM7sKYTtQ5Tc2uYfP5ad9TLPpJQDvI/7e6E4EIebRzUyQTRQrADTNhDvKsOHBLGJ80wzB50zwPS7F/eVlgAGgM6da29ZXvLAAkicfs5hCEw4C7B2JRIMH0an/opqCapYtIXWz9f6LgrhlE4EmBwW6kKBz81fvY6bEZoxI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(396003)(39860400002)(346002)(1800799009)(451199024)(186009)(36756003)(41300700001)(38100700002)(6486002)(6666004)(86362001)(2906002)(2616005)(478600001)(83380400001)(107886003)(6506007)(6512007)(26005)(66476007)(66556008)(6916009)(316002)(66946007)(4326008)(8676002)(8936002)(5660300002)(44832011)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DUPSERYNU7bUrAcBXhUfdggT7iA5LV8IA1/pKtFwoAWeFALOmx37oNFL03ss?= =?us-ascii?Q?FCLhPdUlHky7xYI6oPQpMBxgEIvKMIYBngW+sANyUFMXEfoHxp1rMOZ1CbdX?= =?us-ascii?Q?CfyaSd3HKuMTvGOoqHRgFreAuw8+uyjiNS3WKT1a7+LRz5UWm5eCC2n9HB1O?= =?us-ascii?Q?zKKQjwqvDy/u5GYSWLpQFGw+0CynwRp/Qa/kcpGeA/YPAL7RxT9hieEvC5Qj?= =?us-ascii?Q?VFSwetxJG7gU5tc+gnKd+WROL5FkiNJNWLecJ08QISvxs+frAEwwRNbMjKfJ?= =?us-ascii?Q?ZRKYMazSUoE/GiI+QaAkRA62Da5JpIo+7nmiZspYO6BaMzG/AT9ux7C5Lcfr?= =?us-ascii?Q?+foYDdazf7s66FgtVlthJKFvtOYjt0ln9pr2GPhJTPRkUwgFyYksAnqwYbrr?= =?us-ascii?Q?MprJmTVA7guuZpj9z54NcSZQlbGk9ePz56PY/5BT3Se5Rk/G4t/OF+K9z1nn?= =?us-ascii?Q?dwAXPICupeIINXfsp5DldgbjOAh19U2VPMdixIfeSUD5elgwv101aWyhpCUw?= =?us-ascii?Q?8XvA2Un1sXKLh54PXm9aQwUkVhBhd22u9P80GrEa8P3MJX8YdojgcoZdWhLp?= =?us-ascii?Q?GvNXsZKnqkM6LETRb8gXRh7Tj8uQQcwjSqiCQaWk+6ihvlstWyxjlYfUup7X?= =?us-ascii?Q?tqMmlepkwwamH7tVzaDqGzhdQHfoVOshAAXh1q80ypMTRHb4wdE/r0QNGJqQ?= =?us-ascii?Q?B0qsndMSuPPcJyb/SltKBznGZs/WKnvSFi/rUgU/+wqZOj3v8GzREbN4p2ia?= =?us-ascii?Q?FZ2l0hIfivQJSWNzUOpkI0b5t+dc9wfd+NF9GfxWF9PrlkUaFoPQAoA54f1k?= =?us-ascii?Q?TaywEeYffISpf6rNLrs4dS0YOnPkQ0Azkz0ocXo2CeCmCaquLJG8Fkl/NH76?= =?us-ascii?Q?IPC4YKMNvjm3tdAKhDGEbCK2tjP0nWSWkS7HLPN+qrqyramcLkGY+7lLEwRS?= =?us-ascii?Q?rKmeVsGsxjv1CSUN7GoaSVDp5Odn3h2Ph+N7CHKwbyt3zVYQSXIho5iQhRfP?= =?us-ascii?Q?jSK3G0aq+B9XJrXTQOTeZQ+DXFb3h0Ighxi/SyVYrNYM571+t75iwpcZBwA7?= =?us-ascii?Q?Q4ZBIueDntAO+kYH9tpEb+NrEqlcMUI0LaNX3k16UqljOd+TiBUXceHfMmrT?= =?us-ascii?Q?dMk+qjomgysJKY1HOyjnCimZSuN9/U9bxaRfUIWMi9sQ5sMc9k7/LluCq5vp?= =?us-ascii?Q?WJE+IcTO1HVpomUo6f5EpXkj7dZE6TzzuLZ1SkeI6KFMeDETCBstkNGX9Vrt?= =?us-ascii?Q?5LoXkfN14NIZSUMvbZk7t63Apl0598rWr7Qi3QZNersRG8PriiAYV39Xdafk?= =?us-ascii?Q?Rl2t7rh0eTk7hMgLK3AgSipqhaP508H86rT85jeE4U67QhKJQmVAQfQezcmt?= =?us-ascii?Q?FUgaeo9ET6B04hSTHkjqN6O4OSw29etV/Ve8V7rebD9Z5qwGHeLHVb+YDDfi?= =?us-ascii?Q?RXtszaUvbkIDR9aDHlzWLpsY2pH2uDSNqtHBzKPcvhQoybjLienm0pEkbYp+?= =?us-ascii?Q?0gcY60J/pXPdrcSQzdRkUWJSXCO4qPy3hDunhscGv33sr594Gc6JV951HkEG?= =?us-ascii?Q?J1MX/MCI+keJ1DZ8+kEYolL5wt7NYYyO1Ju7CF3h?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: d09c8b08-f6a1-4f06-e06c-08dbb6a963bb X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2023 11:38:04.4959 (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: HQ+14iptvEJa1e6eIw+VL1haoG4EdAyXEtSy0RvEdXlGQ7N8ujebAE0birK/1YvpMrVecykM/PxyO6jPpSh0Hg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9371 Content-Type: text/plain; charset="utf-8" The code using 'ssk' parameter of mptcp_pm_subflow_check_next() has been dropped in commit "95d686517884 (mptcp: fix subflow accounting on close)". So drop this useless parameter ssk. Signed-off-by: Geliang Tang --- net/mptcp/pm.c | 2 +- net/mptcp/protocol.c | 2 +- net/mptcp/protocol.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index d8da5374d9e1..4ae19113b8eb 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -184,7 +184,7 @@ void mptcp_pm_subflow_established(struct mptcp_sock *ms= k) spin_unlock_bh(&pm->lock); } =20 -void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock= *ssk, +void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct mptcp_subflow_context *subflow) { struct mptcp_pm_data *pm =3D &msk->pm; diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 1a0b463f8c97..15cdcc0f03bd 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2467,7 +2467,7 @@ void mptcp_close_ssk(struct sock *sk, struct sock *ss= k, /* subflow aborted before reaching the fully_established status * attempt the creation of the next subflow */ - mptcp_pm_subflow_check_next(mptcp_sk(sk), ssk, subflow); + mptcp_pm_subflow_check_next(mptcp_sk(sk), subflow); =20 __mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_PUSH); } diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 3c938e3560e4..f67cb5596e41 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -843,7 +843,7 @@ bool mptcp_pm_allow_new_subflow(struct mptcp_sock *msk); void mptcp_pm_connection_closed(struct mptcp_sock *msk); void mptcp_pm_subflow_established(struct mptcp_sock *msk); bool mptcp_pm_nl_check_work_pending(struct mptcp_sock *msk); -void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct sock= *ssk, +void mptcp_pm_subflow_check_next(struct mptcp_sock *msk, const struct mptcp_subflow_context *subflow); void mptcp_pm_add_addr_received(const struct sock *ssk, const struct mptcp_addr_info *addr); --=20 2.35.3 From nobody Fri May 17 05:26:29 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2054.outbound.protection.outlook.com [40.107.8.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 74CAA1107 for ; Sat, 16 Sep 2023 11:38:15 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LzvnxgT5Dv4grJb9zDQzuEqM/muBsyeeognqvqclzc6LNWvaXbhSio5/dE2++VUrtXY1WBbCuLIeBwsinJTSQoGhhlNDmBgHW/VrhC6+04mM6NxCxo5h13059kmMGJdkw0ShxO0VZqiiMXOB2mo6hP0RB+zfb/8VNtMqptd0GgrwEAbZO8nxxGpBpInwzmJzDMOi7UY/g2H3nBlr28eiRw//cvSe8ANjuxJNXQHNSBf8mwj7ZVKL8rt7bqM8DA8uf34QV02++HEhGm/xWjcHEAXTWWMqfdA+NitBclnPgzqqTRhd+42C2XTFEStaXuFpo5AdVTztK6kq6KXCmkqSCA== 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=bc/gPL1cFO2KN2cjntnDk1m/Vfm4dXxUgLhH44IWpic=; b=j57DVKJUUgMFJxW+n+jqlat67RRDQ03TpuTJoc4W9UFnIv5TA2Lf4uotQbC4x+kD8A1BayAf+veMtSfMPcUaaVVJ0zdw4YHzC9fxYmFl2bETXL/NVxpn8TsUX6Ch06swsQC4Qv2PctChNps5uygkHvKjxDRUcliRLnjlqrBwVylZ9Xw3CdC7TU+0Y/xkAkNGtDtUsEteVqoECCaWdTd/ATqBH1hNJ7cVbpISWCFiYzbqmA6WhaLbeRfCJj/xAbQDmYaGX3BwRemq8zxYvmHWpyZr6fglcq767a1HfTv/E+u2/0o0+q0g/GhCiEsQ3JJwotNSi++OGM6cDxRXjOkKFw== 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=bc/gPL1cFO2KN2cjntnDk1m/Vfm4dXxUgLhH44IWpic=; b=XZn4sRh/puAkIvq2/3Nu33QuPJO/UXO0y+6RVEo6IpcpX9sevHAYLhBLOr8dSEC8kcm0aGhCAatK7+qDs1wgBWbNjP7uGJ1CQP32jPWoMZAtfbKm8WCo83Gdci8wVoh1opz9ZmmrKsGtpf/mAfqySfvXA+NFn64tn1VOxQj3KN8VRAVOPSSkhFHsXEt9VnnHPI5qmoovAN5oQrBV9vTtT1RKLUGyfsybnAZ061a3CQbdk/nrGlvoJn2yfewBiDY7VWSTcklfAuNhvV/kOtGmcn+aNzea0xAOymScUhceYW3pwMEra2UJoAEGlJw4GCCyJDcAcZ3c/LG8Z2dfpsItjA== 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 DU0PR04MB9371.eurprd04.prod.outlook.com (2603:10a6:10:35a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19; Sat, 16 Sep 2023 11:38:12 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.021; Sat, 16 Sep 2023 11:38:12 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 2/7] mptcp: use mptcp_check_fallback helper Date: Sat, 16 Sep 2023 19:38:36 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0018.apcprd02.prod.outlook.com (2603:1096:4:194::18) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DU0PR04MB9371:EE_ X-MS-Office365-Filtering-Correlation-Id: 16cb9d71-de0d-43d3-52e0-08dbb6a96898 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nOPIJydVwPwdSUDkkifsGmMr/6TL4uMiTl8XhX1BqkBGs5ohNrHUkRfTQGemOS9SwODdioq2+yGPFHIAAZJG++hHhVpRrBn4vhiParTHtAe19gqc8cR6lxRok39flYjCD/kGLQz4hj6cF3JHCuFA3m2VfJLppnvQXBU6VSuXnAymuxEzVKDU5B1kDGwgSLvUNFwOdYqr3qguIyk8CEUBy4rA+7A9yxrA50XY/4l9U7BN0O0QrWDdShAWRJlf9MPWxOurMMYrK9WA6KzDnHPNCaLjgzQlNef4SdeXir4gq2H4LZ3r8XcXOEcI2kgGxrS8mnugxgozOpic+eL8Xs5XEQA69B/a+Fisif9sJLEgV2XWG8rI71YpecPmZELXKd55kb1gnC+AKq4K7vFYE/PITLw1Q8saA6MyVsCcLfCFDpDyNqItP1f8sDWGLwC/UY/P6YS6X19Kt4n2Fbm7qoeoIbYuRt7KMS0CS4+WuM1KdSKUcyDOpqAJpKEkUkRLYrTotljLaoVu163aqhWMT9OVkMgtfG0z9opntUfBQx1cmoTTeMP1PUzPQ1wdH+4XvBYByITNINELdlbSgd1ElIzSJeYn4JQrSCv/hcBduUZb3W0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(396003)(39860400002)(346002)(1800799009)(451199024)(186009)(36756003)(41300700001)(38100700002)(6486002)(6666004)(86362001)(2906002)(2616005)(478600001)(83380400001)(107886003)(6506007)(6512007)(26005)(66476007)(66556008)(6916009)(316002)(66946007)(4326008)(8676002)(8936002)(5660300002)(44832011)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?S/Pa3hwQ3HfyuWSvb86ZJddiwtMYEEJphgFcJmP/SYpIqNKYmYWL/v+6sq3f?= =?us-ascii?Q?WQ3lawgNd4wJK0IpTHvjXDrX3NTmJC+vUd02eQ0toY5BrJkx5szZ+rnZJ3KY?= =?us-ascii?Q?u7Tv9QgvOhR6YypfONBkpycgidsoVgPKmKcehM77GZUJZ5HL6jCH+hKHmsao?= =?us-ascii?Q?S6yBuHWv2iCC76IgxI8fkfugpFMcLuCQ0bFJZPzdolADiqrWAMZrUmfKZeCh?= =?us-ascii?Q?Rb6G9zjbneP6L/XrDjY8BSk7j8aq/PqasMSLoW4pXHDEcW6sYFEyIJ89owiG?= =?us-ascii?Q?8Uokk8DV7iJwkGqnpV/kLq9T2ZsJT4f8ps75vhGn2bCVBGjWASpCtTYklOYL?= =?us-ascii?Q?3KXlFZ6Jt2LXW5x4VluKnhpARlwUJ+GVUP3UaoBX0m3Wvao9vY0OiF6a2vNJ?= =?us-ascii?Q?iKG1rUyA71OI4NREdrTO5li7Ovg5usT9hv1+m0OS9bwt4aadFGpr6U+9kp9e?= =?us-ascii?Q?Dqj6RydWOC1veSKQmvi96Gzt4mbskdSM6XP1wb5XcPbEdurmTThJQLPl1uxI?= =?us-ascii?Q?xqb7nmOCPpja/WieO9yccYJ92iOG9L03uQYHGNplKn79IoILTGm/ADLmapis?= =?us-ascii?Q?bvR4wh530wxFCWN9QLFQ/SL2YsixEnzZssGAW/Pux0m4u8OqJftO7/G3yceA?= =?us-ascii?Q?XtsGuuXzR7NyBQsQuy3JXoCqZD4b9+Ba9FILzRfEMKWbECGOX/+ikrf2kt0r?= =?us-ascii?Q?jPHveoL2UeOW2Ytgh23yTxEYeGyWtqFD43QWzwYUCkAvnhsGlbawedTgssZd?= =?us-ascii?Q?GqI6KNvgzbQX90DVd09Di+B6D+N9QAeTYCrmy7UxHAdS2oOBfQA23OkYRa9E?= =?us-ascii?Q?NmniuviQvgNfXacmu459CahZqJhOska+uxxHtLfM6FxpDqHK8ImclDeRR28u?= =?us-ascii?Q?qt//MkDgjVmbsz12Yar7WZ8EFaR0fPIZD5xU0yspRiPUbUxabSReuxLcbNMG?= =?us-ascii?Q?QWTHF80Z+iQ+UqpqbZ1a6BUYCn4LyPGVtz6g6v6Wso+Im6GpZ0/XqFiDow4k?= =?us-ascii?Q?yp8sXE+htOzeP1er1AQJEFBSY1UU3uIm6/i3yPWYuzviWZ4OVEB/nyqj4eFQ?= =?us-ascii?Q?BWtRe3L30afbmoDkpNrKgAhq2kpeeuxPxgCulZA/dqDMQYfq6Etl+zymIXmZ?= =?us-ascii?Q?gURTNQskFSciJsnDxnaq4gccVv1TRhhWFP7ZK/3AZmkmWIeLDmbYXn2oOCiA?= =?us-ascii?Q?1q4BrEtSwK0tU/aOOQmHIo+ZsG1UFgmgLe8fapGdVc9w66SMovyxb3o1329E?= =?us-ascii?Q?aq1rvBDHAiVMrSsfjy46Zz9ZLSaDKgrbg/+rV62MYPvYHqIw7IRiYBnA6a0R?= =?us-ascii?Q?sokIiJTRyweyehgEVWZKWvRaCRT6dzsAfYLCbqZrgOEfVDEA0NzVdNcVIJWT?= =?us-ascii?Q?WDL2Na4jO7PAskMqdNlo4k41sWO6DSForjQ7oHcXs8cdumvgrVgitNynyNQO?= =?us-ascii?Q?svp20RxH5nVtSONzYbxPogabiG687fy8sDXj02xcIK+IuBc42HJXvhb4R7/L?= =?us-ascii?Q?2BlUld6/o+td/26OXClukjROh4sh+JRpu1xnkRQl70yKEEvrF/+baPsXf1gX?= =?us-ascii?Q?Q9tTNJHNtjzYeeZRFGa6iyv1kOXC0CuhjYnCwIJV?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 16cb9d71-de0d-43d3-52e0-08dbb6a96898 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2023 11:38:12.5973 (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: L6TjEAT3n7BUSiqWrDQYKjuWyIj9lh8gcmr0/byJKNLjBn+46HqHJfbbdKkOyKEnqBXhOnIgh4rNzI86Cckmsw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9371 Content-Type: text/plain; charset="utf-8" Use __mptcp_check_fallback() helper defined in net/mptcp/protocol.h, instead of open-coding it in both __mptcp_do_fallback() and mptcp_diag_fill_info(). Signed-off-by: Geliang Tang --- net/mptcp/protocol.h | 2 +- net/mptcp/sockopt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index f67cb5596e41..fc041763dcb0 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1024,7 +1024,7 @@ static inline bool mptcp_check_fallback(const struct = sock *sk) =20 static inline void __mptcp_do_fallback(struct mptcp_sock *msk) { - if (test_bit(MPTCP_FALLBACK_DONE, &msk->flags)) { + if (__mptcp_check_fallback(msk)) { pr_debug("TCP fallback already done (msk=3D%p)", msk); return; } diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index 8260202c0066..1ae9fb6fabf1 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -915,7 +915,7 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, struc= t mptcp_info *info) mptcp_pm_get_local_addr_max(msk); } =20 - if (test_bit(MPTCP_FALLBACK_DONE, &msk->flags)) + if (__mptcp_check_fallback(msk)) flags |=3D MPTCP_INFO_FLAG_FALLBACK; if (READ_ONCE(msk->can_ack)) flags |=3D MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED; --=20 2.35.3 From nobody Fri May 17 05:26:29 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2042.outbound.protection.outlook.com [40.107.8.42]) (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 820901107 for ; Sat, 16 Sep 2023 11:38:23 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S0RP4qUqe3/TOM8E9lNQzuSMgYfWlU7t2pKpqMB5YUemNERSILAJy7/smBVHjl+dZeRCjq2956zrX5RPVmowNTkb5qPYG2MVQBhd8ts7Lp1QVIyNQ3Pe6PIEPBX9N98w0pcgshKU4lOxlyFEW+wZKveT1AUe9HDhNaX+4zCFF3o4/YyUPIDzkoNUNgeWxXu1aKkmcLpoPyVT41LILwaKkpEkaAEeRaV6Lz97RSIE8iUqh2bo2JMGZWoKtHDFbpWIGO1Jn/WaM4xlvrekQ+jag8iboSdtCpILpTTQ/Fh8OEdbha8k627uOV1KomCQ1YJWnrTScdJYw/EU99LiIVZnQA== 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=lxJoP65w/SR8UJ8c/cl5Nvzh7Nzpvhdk7YlZORSm580=; b=LX1kjjVBLuNHqtwtd8fgH0W880htGNpYpPMrhB3UM4trK2mpg4T7048+jBo1J3Bs8tlb//OezvyrPYTtMXagmNDkjXgW+G/EcVOWr0L0cfsMoQkqr6ZauxJe9j7QmkUWfLJCPcrENQK8dAodCqB9aVlK9MFN3SGg2tQsr7MoiNUR0Su90NdFCl8vvDPoHqoWZ1XOypKv060E5CROH4dO5iwfXWynw2VkUUxum9IV6jBvwH55Kz6E2sxcvDCLCalgOThi4HSw0lbCXtskfZlAW/+zGSufWOmbgcPYFvgJ0zjISEMb5FQaIYCg9j8R9yJZ8FaPy57qpXB4KOIzXmMEFA== 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=lxJoP65w/SR8UJ8c/cl5Nvzh7Nzpvhdk7YlZORSm580=; b=O+rhZU1HXTgUc8Bos5RsZzhjvz7Gq3tnoi44KVSqLTPvVZz0thfqchqg1I44+FCVIJd+q4F5Twd3HZ3nx6/8h8Ck0IxMzDKrSSDkrdhqVVphD+OHFjOMKJmUwVVkpeBYons3pSROXozSXCRh3PEVFW51QZiy74R55U4M4hc4qmgUJZO9UA88x/CEALIvie/V66A/PxCfvPgmfDYrN1aRylP4l4Dqke2ENdshbaJ3nW9hSkUaDgND7iBvw/AASYc/YdGTDkqLWBHfxR9VXcDiyRp9PqpjImDf5yAyqTghMmCC0EI92w2iLnL2Vgs/pQcIeTvnvUw2+QIygzkIEYD6lg== 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 DU0PR04MB9371.eurprd04.prod.outlook.com (2603:10a6:10:35a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19; Sat, 16 Sep 2023 11:38:20 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.021; Sat, 16 Sep 2023 11:38:20 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 3/7] mptcp: use mptcp_wnd_end helper Date: Sat, 16 Sep 2023 19:38:37 +0800 Message-Id: <9a9bc35139dcb51c7dd8c8c32ffdfa44cf722b6f.1694864093.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0010.apcprd02.prod.outlook.com (2603:1096:4:1f7::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_|DU0PR04MB9371:EE_ X-MS-Office365-Filtering-Correlation-Id: f6c8763c-f546-4395-60e4-08dbb6a96d91 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Du+FtIeaaapJ/+CleOQW3UlLKS090EEGd1C+itP/06NnqepVdlQyt4MNbmXw+/7GHbsTw25ilAkad9xIUs+xnlClkq+rwbBD8Q5rW0DGj+OfDC6JH62I/JFjB9P+oMGQGPjJu90xZNJNy+YcLIkakOWs9Gx6y5wpGgBUKCZUv69WhQ0NZX6I17joJzP2MaKvLMen4P5ZNQ6xgeuZ7+KAMCj9J+B9iKSbQly/U14ZuH4I0JxVFcPEn5zCgR3q+mMSLW391F3rk9MY6SbfWV+AXHwP5Q+ga46f69piUTj/Wub8Oz2eQy39Jg4/vwCsTLS+VPfqXDLrSSGaPrZaE1XMJtroNiFmCvoEoHDSFM7TH4H+Ha/ZLgygCeLC/kJT22mfh4ywc89LCyc6I5TUORlknXutiF4pEn3a5XyxHEZa/Hujc9GG/dfYkY7nonjiEGG02P2XXXsG0XlLWIIsV3GSwKkUnaXocoEjrBiOClIeK8q5+Sz3TkLBhE7gW2u1hKSPozVDOA1s55gnXEwD7yjcGp3dgxsvAASaRLjqtekUjhGvtHdclRMyNfM2zZQyrdkgY1LBUlFuZSBt+KAUYYv5pYsEn0e54FD2u2SVSl6YEGs= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(396003)(39860400002)(346002)(1800799009)(451199024)(186009)(36756003)(41300700001)(38100700002)(6486002)(6666004)(86362001)(2906002)(2616005)(478600001)(83380400001)(107886003)(6506007)(6512007)(26005)(66476007)(4744005)(66556008)(6916009)(316002)(66946007)(4326008)(8676002)(8936002)(5660300002)(44832011)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?b+deS60xc7FL3R2RXgrk9Mo2EUNNngUvR0x16xaiWyNx7GXIto977QpP9Oi1?= =?us-ascii?Q?7QtB7Cjy+T8vuXauQz7ENSSyCju3rxBE2DB1FeqQrudoZ944XTN6TXjVmbvn?= =?us-ascii?Q?G30kD0j07bE0Cy0lW170M8Qra1rTLu8cmpXA1cIgrpTsPUPSuPaszWB6P7XN?= =?us-ascii?Q?hy8lxtcEQvTkfNXM/OxQaihVcRgCzcCwjdt3RARK2OKaY3bPGQTNeahcT3vP?= =?us-ascii?Q?83ZZd609Wk7JS2OceR63gGMh9gNDULlqN1ZT+yCOIhhX2wbUziRT0SWAZCso?= =?us-ascii?Q?PYO22Di4cgHEzppOpU+/QlDe6n4Nx8oLT8aVKp+xa3+PgiPKQmaPmZZl/m25?= =?us-ascii?Q?tX1fGRxsrGYC3XWvVD5IXKekbPhtzvqJglstjM0jXdrjYBQiInD49d1hHhw5?= =?us-ascii?Q?PT+FKx8Jf3xMVwfxQ7Sl/fbIvBJy3WiyMcDQQUQSnkvxCGMgusc5jlEXXT3P?= =?us-ascii?Q?Ur3g0oFoZ2WqNZ+6j8H5SE+PNloIvL8c2rQw31v0CAjgtQ2tEbioibP74iXf?= =?us-ascii?Q?r5enVvnL/zd962UrsXC132dK1Uz7n9KdNOo0DXr/nS+9hWe/+5QQ7++yhxm0?= =?us-ascii?Q?xV2q1OWcBJa+Jks4nqqAk9P2/mBx+0kDEWVslbbmsLDdiJY5m8ZEYJHk9ixD?= =?us-ascii?Q?Al6OMEPJCj3k7PmOOXVwyYegetPZ27s0poqZuZSeAVi4CBsxoBDQyYUDUo6d?= =?us-ascii?Q?iz0fq2/Gv07jjuaraMEjB4SFFqoZFO+bezMX482uyaf5zOiuIy4kfOvPpKb2?= =?us-ascii?Q?qFgFgzzjLDQ+1eQ88HA2LNU//C3LY2RCNdk+qIAhJDWGEBOm28UeJcBS4Eco?= =?us-ascii?Q?WQ9pvzbEbPyYlhMiChXSsy7/Ni2jDPiwFHgNrq0gyUXnI6serd6CrOHtqHof?= =?us-ascii?Q?FDAgoc/CzIhM/QedUpiuaLfTUnm3SHn1QoP8mzmjLie/tHj+gUtF4A92RJxm?= =?us-ascii?Q?dzbI2KvPacC4tU0xFoEagO6k4DSEClrDe8JK6T4WBjki/wYT91kft1qeNQ47?= =?us-ascii?Q?bDZ2cuF1Ir8D2FUxNFF92zcJqCzMNm1IS2q9mVc+Oivlh6V/e8KeO6def53C?= =?us-ascii?Q?JYwNY9hN3s29qvMO5HhUPyBzml4fD54XojvQdGAdFjfaQMF8Rw1mKvcZDesg?= =?us-ascii?Q?m5abhw2Nf05CGrcQyJvxDd8mez2VhBvjYc8HmekT7Q+kCKI9vDY6SaUYu9mG?= =?us-ascii?Q?XKJCrUL4lnS1JP1wSODQlHXkmy5680QiDs8LgCfndutWcE2Yry6wRTpyiG1q?= =?us-ascii?Q?D59a1RtiM3Dz1iz7ktTNzLyP7agMLxZi9Sa+ptgeJ2NVKuHwvLA4xMNXzuRt?= =?us-ascii?Q?gYEcYE42QS4+2fzCnEz+O7ukvud8fFIzQmz0lPxEXrSYJ92G2BH8mkpNlCOA?= =?us-ascii?Q?bvWMcuxQB8UBgmj6dczq+DV1UFblByqMzxJqNAMEVtKjRK+Ij8Lly2WchI7c?= =?us-ascii?Q?/ZUOX2nE5/GfY+cTWtXcaEby0y4fH/zKaaAs7yFx4cvxpuWnuVGAdTqsQdFk?= =?us-ascii?Q?3nPf0ahP72BHt6sjmMq/V1giOxPWJj0eI7WIqgYl3eqDAMHSLuKm7rhvQFoY?= =?us-ascii?Q?J1hWireb9ytjV/cpoVFt7PQCKbLrCD3vHSU96fPH?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f6c8763c-f546-4395-60e4-08dbb6a96d91 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2023 11:38:20.8087 (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: Zru/9WMdAg7CMCmd6603LxgCTzUKXjmD85SHde5ot2zEotUySLn+8Z/vLvSYib7wa4UM9Gs0l4eTpkHRAaR0wA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9371 Content-Type: text/plain; charset="utf-8" Use mptcp_wnd_end() helper defined in net/mptcp/protocol.c, instead of open-coding it in ack_update_msk(). Signed-off-by: Geliang Tang --- net/mptcp/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index cd15ec73073e..f40381557788 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1059,7 +1059,7 @@ static void ack_update_msk(struct mptcp_sock *msk, msk->wnd_end =3D new_wnd_end; =20 /* this assumes mptcp_incoming_options() is invoked after tcp_ack() */ - if (after64(msk->wnd_end, READ_ONCE(msk->snd_nxt))) + if (after64(mptcp_wnd_end(msk), READ_ONCE(msk->snd_nxt))) __mptcp_check_push(sk, ssk); =20 if (after64(new_snd_una, old_snd_una)) { --=20 2.35.3 From nobody Fri May 17 05:26:29 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2041.outbound.protection.outlook.com [40.107.8.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 521BB1107 for ; Sat, 16 Sep 2023 11:38:32 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UG25JUZheedBe4hAm1UvTtF+htUgIheS6T9JIF8neulepA2VvFMmcF/s4FNFC+y+m7iN3TVgnKiUcxXn24WnixYtLRCN9w7g+8KNCzTt7cv60LqfGfEfp/P5YkgP33H5MtArXFLedyOw9wX2bj+0zeyHUsPMfOk2f1KlZHPaBOcd6OCSxiIzTMgERP6WldWjaLt+rJvOXGhUEDxuHg9dJIrYv8uPK5LzJocT4QjVZ10VxguB/l0IdPxaHQgMbMt7lcn9sUDmqXCdMssBGrF/r5MSawxNT0SXh1oJw6O5JeYLcmf8hmGwNdOuXthHFnbXvuwh4avV625eT0gz41nU7w== 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=zdapZy3VHL8/rSV9ddO6iLmmZB/ipwSsYOncBeSeRu0=; b=V7BOVIPUKSgFhqySNs46t/O5As7ABuecwRMEbiGU/DBv1Qy5qzuS2ixOMQ4pnLHq4USzNb8OgEUV/1CZoSn4tVanjN5MXc+QILKINIAQEKxVp/ww6QoSb8JqQ6IEe2gFnBcf5Hm9nSzXenyuyiZhCymYMAHd24bEQZZ3Bm0LzlYV1Cretha4ZuNQbDPBpMp3Vmz6+zIFAj1gsbRwxcVHpElrCOeP0D9UU+Bx2BVGJDSPq697DYKAIwUxQnwOCUIQBKO6D9ybkWdZjmSqDAee8F92N3Miwb4h3U1TSYJPqyokrBp5/r9leo83dSL7uhNwK3igdTCSvvH+QW7AUkU9+g== 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=zdapZy3VHL8/rSV9ddO6iLmmZB/ipwSsYOncBeSeRu0=; b=UWOwAW8qSTZ5DUPnqAwzgvPvGFZahCP9ZbiFAizlP+8cyO9bugo6KzfcU0qCkqYFZCFya2E/60EQ4XZ6ly/wdoMyg0ziUO4fRKck7f//nrOA1PvtSDt6uGog1RKqRK7BGWWbuRlc3orxBN+xUZoBeaNe96I0dEhPbHLIELcSgtszYSNzSCPCzrHT2UUa2R7GThw4IEI0faWdaoXRPIMzsLnoZekI329tlAtik7vIQkU7GDKau0CfjYUANpcQlbe77hWHcT1OgE6WPIiXSDRe6+Wp5guHw+Sn2w4I7qoSwhjYgpwZR84Hhq7jjffj0UCqCoDGiuUfJ2G3JpMzYm8cyg== 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 DU0PR04MB9371.eurprd04.prod.outlook.com (2603:10a6:10:35a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19; Sat, 16 Sep 2023 11:38:29 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.021; Sat, 16 Sep 2023 11:38:29 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 4/7] mptcp: move sk assignment statement ahead Date: Sat, 16 Sep 2023 19:38:38 +0800 Message-Id: <4310287afd86c7c2b2f18664bec6a094e7fee292.1694864093.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI1PR02CA0008.apcprd02.prod.outlook.com (2603:1096:4:1f7::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_|DU0PR04MB9371:EE_ X-MS-Office365-Filtering-Correlation-Id: 19738ff0-588f-4794-3178-08dbb6a972ae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: elWlIpmnWbqZ73M8BnrkGnpKk2xX3A16ksSlTjsASgFCN3vcPb/gMh9/9ijjvePWSYGZxwf8LEqk+E5qoxCUH0ch208Al0/jJXHqZmqqMm5XtfeIFv3STxNIrEbh+RKdMHQTKEvYKVvUbOwkJVl1gAYtZFvPNszFxlKPom6/ec4adzZpLC3kpnhpZeA73zjl3IyfvQxgEvfkbeRKaqB1GSxT6JhKi7Ha035j0haeoYDInEGJErYJlcU5VTe66pU7Z9Bsq1qrKghcYgiJja3utXOA6dLK8U8PBUAWevBa3eA0DifaG5oFL5omsDP96vy4xATyp//9OQRHEaPO6YdnCLziMftcUTIUCNAxYjTKFsB+dPkoGR2f0jprBAZFkh7O+r2IKCoYJas93bSGl8+Q7VlyhQmhXS9qqADsMUHaC+YAKnId1rhP/WHh7XhCPUtABYh4E5ogqHDmiikkdKglSPxlFROUzdFRTSGuPBJ8T07WLgvTLsfnMamJUfxyIk+ibmNYqSzktRQceQdm2unbCiq6ShgO57x5BLhD8ohv7E3Raf95ZkMmKcYHFzg6t+xGHyl8THFrVshNA5VoGOQM8zwVichyfA/gNGPVWcZ2oAo= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(396003)(39860400002)(346002)(1800799009)(451199024)(186009)(36756003)(41300700001)(38100700002)(6486002)(6666004)(86362001)(2906002)(2616005)(478600001)(83380400001)(107886003)(6506007)(6512007)(26005)(66476007)(66556008)(6916009)(316002)(66946007)(4326008)(8676002)(8936002)(5660300002)(44832011)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?q7iW64W5Ozk+3cpU+ggG6UURxsxg8W3Z1yW4ZKhVLERH4Edx+uPPazu3cImd?= =?us-ascii?Q?zdtrdBOasTlnaI8U5c+HBhkY5y9Hk4V366huMB+nfyROLd0A8Bi/JulHQIhc?= =?us-ascii?Q?wpfHCpB4Sh3U+gSJDn3jIM36qvHpSucKIN+pDW/+Q7/2eJo2GCQapVryQU6v?= =?us-ascii?Q?Zb35zdfQlaLWYmsU3ZwnzNzpiDoWpHvP5AsKU5abqcMxLWWwg4sZ3515/uBD?= =?us-ascii?Q?nVWMbAj97NYy7eeuSPbaPF22fScD94chc8cj0I6khn0bHytIw2fz2ntVHb13?= =?us-ascii?Q?TDNI/FEC6IXN/VM0wj6Mri/ctLJ+mKlC6fUqNLJLddI1epY4oz/26Zb2pLwK?= =?us-ascii?Q?yO1IhTON1VkS9zcQ0CUVpVAfQxTd27+koRVeKQtCcq/PqRlj2pRTrMzDiHKP?= =?us-ascii?Q?g3l4SCLCtXmYXkr/MZv5tsGPvM7KLHmT9xzkUYrDMELK2UDrhwAg6aZqEnYN?= =?us-ascii?Q?JWxPZNLpvjXlD2a9mS4mA+Oe2Hi06yaGaJqD4fEN4s7NKM/nDbXYpv2rqWOG?= =?us-ascii?Q?11Kg2lU3q/ZSBiuFx1IqH105xzKm9eGNYT7UBudPwLC38jgB/D9SfPGRGkOD?= =?us-ascii?Q?pFuHcN8nXtEF7WbThLZMPS/gnstStFuKFhxUfaJskoKBti+yNL+3I+avQac3?= =?us-ascii?Q?K/sWRddsRKE9RSzQ3kqs5Xotcd22VmZZlOfsO7fMbYF8SjU7HKuSlEWiBZia?= =?us-ascii?Q?3ghq+8pJIQY8E6AMT9SJbA3SAPiezckZbtfJD0Zx7D4Q9fa3CEX8z12SgPUw?= =?us-ascii?Q?3K34H3bbKddEpCgz2zq2GuZbgc4p7Lfeer4puJC7glReqI88m92e9+l8T1Db?= =?us-ascii?Q?PNNhty3baRFTYVGheKP5BGIkcPqTFj4wGyN0cQT1McFL6Z8WO3q3KNRrhVqi?= =?us-ascii?Q?mSxdadVeNxk1js8hOUrhLD7KGpSLlkJa+PkzOEBPXKyrcJEROFvdVjeYduEf?= =?us-ascii?Q?P7VRZIXXi2qpC32g5Llw5nJy+ctSQdHc52wdJRfbjnq9a/dDcbw7uGJe+7fd?= =?us-ascii?Q?DCcGUIWw5tqss/TdFlopslSErbkGftvG/M3AU2Fnx3JyQt4bqExugEq/aqsW?= =?us-ascii?Q?eT37FoPQ6KO2HLkg9iIFfAVZHTsvLxjLzlJUH1oS0E++asTEf5q6q7zRcNgH?= =?us-ascii?Q?SePq5+F1v+bYyzDwqtYkgaHBLV1fE50fKrimX9hAc/JTl3b3YbAJNhloFiGt?= =?us-ascii?Q?x8M00JuTkYWK/Iaw7x4nr8oGAZFWmrlGQfzzaTsn6OGvlz4855/a/308L4rt?= =?us-ascii?Q?xz48J3b+hwXRPaXSSHOCRjTP5IrMQQCud+0AcsCrgNzqTCLQfNx8tT1+5es0?= =?us-ascii?Q?Zz/664MDzqjIj/Q/aig3fvAX65zIqY+Bh1s/B5Lp+ySIi+BpY2+4KKlnRp9i?= =?us-ascii?Q?ZyTFBNHTA/ukVKx9OFLBAanogs4x9ms+nhEIOxWNmnZZv1ifnCn/JAr3Desr?= =?us-ascii?Q?VrnjAOseFDq8tZScuyJLAJR0xmf08bso682xmbTvDpbcT+fW1ZB0R9nSI5KA?= =?us-ascii?Q?HX74ZpwK+f/RZQOHkeo2/qDODgKA7Fc18xApA0D6Gkxx2gzbGvp4mfxq6Bsh?= =?us-ascii?Q?ZemABHQXAfqQ3WCPfm9ZN7x+2LhDDg4oMlnNuqTo?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 19738ff0-588f-4794-3178-08dbb6a972ae X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2023 11:38:29.5698 (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: ir0OWalnncucQGiJiKbq4RwyVXVpyikUgLpktQxSxo5j4zOKAohv0n6yKBF4xZfeYAkogbEuvWZ8unH5p19UXA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9371 Content-Type: text/plain; charset="utf-8" If we move the sk assignment statement ahead in mptcp_nl_cmd_sf_create() or mptcp_nl_cmd_sf_destroy(), right after the msk null-check statements, sk can be used after the create_err or destroy_err labels instead of open-coding it again. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index b5a8aa4c1ebd..78b935ab7d3b 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -296,6 +296,8 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct = genl_info *info) return err; } =20 + sk =3D (struct sock *)msk; + if (!mptcp_pm_is_userspace(msk)) { GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); goto create_err; @@ -319,8 +321,6 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct = genl_info *info) goto create_err; } =20 - sk =3D (struct sock *)msk; - if (!mptcp_pm_addr_families_match(sk, &addr_l, &addr_r)) { GENL_SET_ERR_MSG(info, "families mismatch"); err =3D -EINVAL; @@ -348,7 +348,7 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct = genl_info *info) spin_unlock_bh(&msk->pm.lock); =20 create_err: - sock_put((struct sock *)msk); + sock_put(sk); return err; } =20 @@ -425,6 +425,8 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct= genl_info *info) return err; } =20 + sk =3D (struct sock *)msk; + if (!mptcp_pm_is_userspace(msk)) { GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); goto destroy_err; @@ -454,7 +456,6 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct= genl_info *info) goto destroy_err; } =20 - sk =3D (struct sock *)msk; lock_sock(sk); ssk =3D mptcp_nl_find_ssk(msk, &addr_l, &addr_r); if (ssk) { @@ -474,7 +475,7 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct= genl_info *info) release_sock(sk); =20 destroy_err: - sock_put((struct sock *)msk); + sock_put(sk); return err; } =20 --=20 2.35.3 From nobody Fri May 17 05:26:29 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2052.outbound.protection.outlook.com [40.107.8.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BEA871107 for ; Sat, 16 Sep 2023 11:38:40 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YeHqwPx/UwOPuZERdC2vhXncZWiE8zC+GOz+YoCc23ffjVml/7FW+jsQMCR7XY9iMGalIzQAGW9+IkCQ4IYVI+bpXgGrL872qqrvXikVUrv6yze/CGqw3ZBY2sdg4SZL2Fso40WwpTu7qX7E6spTARS3Uqvx34C5UshaBS+a18LRObIf74kCzxnjPnCTQtrK/FS6OZhOZj0K63DzE8J0AcRjiy9SWLmBksiH9N2UHWgnFLma8UT/bAzaOz/jFC2XNEX2QGu4CJ25MTt6Y71vWehhO4THBk9vTTAEYy4BOoOVC9bXxkVPqzk6HJY/IspSNLcweHzBzJ9i0hfntMkJxQ== 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=WZWnKfmbeJi30V+/EU50X13bO4wOjIfw0jiMcfX/c4U=; b=K3u66OLdf4XBySTKBtT3fRAw1au8c3KDF9HYIxG1rdUKfswo719ctdoGUyRf7pxbceH5O4TwL+ZffeE4cb9UGwIxGdCyFM60ELN7gLArnxNdWfyLHwj+ESoZ9Sxz8RxgNMmoXTc5jtINehvCT+Zykx3G+5806E5DX4kLN8T1yUZv8F2iM0BURQ0S9PdPBTXw5A0lZqOuOgZXz1ruz97kEw0CoKOXL68CiaLpCv5uj3UUbCSIxbGx0CpPu+5G1yRXAHx4HwPIOI+xI22zp4mgVhIMNIWDnwOpgDtSJvIV0p6rYvGVq/AASUHtTdAnbqAv+PvirkGt+PuCxCiI371EzA== 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=WZWnKfmbeJi30V+/EU50X13bO4wOjIfw0jiMcfX/c4U=; b=SOTd1IH3H5QlZ4O5O2EVWFKuhGqYQrGRH2dxcDAPHoRUeywohvczA5O2mikCPHB6e4JnNFErDfzTwEWBWegG8BMIcawSauSwEBcKEpQOInk3kLVA1eKQOWGGzGCSGn/g5Hb+WC73pK7J+hoZ7JJ4BuDoYofq51/tlpeUFep1OyzynY9DcHFtkO3rPs/74EXQTK6LZ/N0dMFQmyNmjtVT/cnnwcZ5WDBvtp3+rWzVJdVcOw+quODv6oE6wvziOkAjNzJllfRBVJ2N4PDs08uTzklj5TVlT8R1zi/c2up0LuRH1k5s5jxvndWa/nqDTdapvVPI4AZHN73Yx7Ws250mhg== 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 DU0PR04MB9371.eurprd04.prod.outlook.com (2603:10a6:10:35a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19; Sat, 16 Sep 2023 11:38:37 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.021; Sat, 16 Sep 2023 11:38:37 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 5/7] mptcp: define more local variables sk Date: Sat, 16 Sep 2023 19:38:39 +0800 Message-Id: X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SI2PR02CA0029.apcprd02.prod.outlook.com (2603:1096:4:195::6) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: HE1PR0402MB3497:EE_|DU0PR04MB9371:EE_ X-MS-Office365-Filtering-Correlation-Id: 96326b63-6cd7-4cd8-cad9-08dbb6a97791 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PmWyWghPfGdy1HEwwAtWpXJWrsHC2RdvcElcvoNgdrqdnOOizGLSrl16/XMlhMaVoxTRnaAFsE7zC1r6imc9gr2kyKrYMKiReu9Eyz9h95OVV/T8ef5WUsYHM3RTaQu6MAv3fTfCJT6/K502VlDgVH0rJA2rglu1K4Bk+iaSBewQ1usc2zXtQ0P8X/Q1bboVwtEn2m+lRAWL5wWX1PTy2bYeRUVmQK9xeXDllAcNU7PGaHERA/Wg4nHGWBz1UCBDZEhohi0J1a66gknKlGoTHCvbgvfKy3HJXbs5z+XqqL0FI6sU7KSnoFD8xNC8xkRI8NfSpC+/wrwqvqqSVUVvnKnTBfCfl04Hym3dJjuL9NfhHxjukh++swpvG0q3llY/G22PMLZQwvaqWrV2St4hilFDzUYi4A4+P1eV4HrjcmTbxgMoE+fSvwnh0cqBsqEQfXCXBQ4vEh5YRnI7GcK83MwM/Iv9gZogP9xkcvRfTyGkVxNOFWzIzlB1umAX7dqK4YZr+gYivSUj4jW3ibkU+r6SG1M9GQAhsmINWC80S+XlIClXC5Rhk8GmwLBRyLhgbJsBxcOj6CrXbfW8jtpH/QGVHqdqXgxGuGXfBlqHzVU= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(396003)(39860400002)(346002)(1800799009)(451199024)(186009)(36756003)(41300700001)(38100700002)(6486002)(86362001)(2906002)(2616005)(478600001)(83380400001)(107886003)(6506007)(6512007)(26005)(66476007)(66556008)(6916009)(316002)(66946007)(4326008)(8676002)(8936002)(5660300002)(44832011)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?QQysCjo0X/p/nlCsHj2k7zOdaKdNVD9XJxIYmFqQw5op6MPEGN9waUDNM3LJ?= =?us-ascii?Q?j8X2DoD81nx33gC69uDu2AY2PrQiFOGzbin5TLOk/a1EbAP0h3eRh3Aejtjb?= =?us-ascii?Q?hAeaQtMugyy0vEpynBkZhFU0IT8rNu81j1uWpHwKfz+L/E4aJsqhB75R6LRx?= =?us-ascii?Q?wl54AnLoxIcDV8RsXhSYYzCBwA5PoDghfr6aHpinekpcev8xNFAcHpNyPWky?= =?us-ascii?Q?cWBOEMtHMEpxSSac2cw61UY3WSwQGAJs6ohiP1QgCxPhvLE9UDtqDxcIEwmk?= =?us-ascii?Q?NSq2SnGamdBk2R7lRDxt61F1pCXM3eTk9TSupH8zPaEaHK5vXP5yH2O8XXRF?= =?us-ascii?Q?cBXJy+z9AS96oywd507bQOGc67uTJm/g8koULgRFXDrYj1CZOKXqjp0H7+Sq?= =?us-ascii?Q?aWrnJ/nv8gAjRI0cGZCcFJjSdDC1Gz60EIjDxGuFT5vRmwiGrwWtb6ANbSwO?= =?us-ascii?Q?jRNX6xQwfPfS2P55ahsA8oBa//ctt/pXUPaRyOlQrs9fvPK9g+1trwKWUiZJ?= =?us-ascii?Q?2FxYuJWEsZ6NfFlfAHuWUaIoK1HcO4Wepg026GX6Rg5NF6vLzcK7xnO3123N?= =?us-ascii?Q?rlYulHinvva2bEGz497Nf7ATyp8gNwxzxg5fuqzH8ykx4sMhFC5A14GRUD3T?= =?us-ascii?Q?DFvijY+WZzhSeR6XhnekmWBO/fg2CgvLKZr1RhYEygknWdjFg8Rml75izDsL?= =?us-ascii?Q?sxA/piv3N1vC5K3DDhM4+ePIIdclltopmO8D27b3y2MGXP7quWU5jRWFMa5c?= =?us-ascii?Q?AoyehLHE+/L+QKTLD4Tq6Yl6xG1hkt46Pif50+c15hx+5frqrtSjEux5hRDj?= =?us-ascii?Q?r3jEz5dHPknyTzc1sNABgvX+j/Wyebe4RoEtzq6D8mQNMoSI3K6bF3ZESIaq?= =?us-ascii?Q?wqVW/VWRFSzRQSkxqgHT/DeW8SFunurVlhF/SgUm3gfH4rSIydbn272r3JhE?= =?us-ascii?Q?CuXB3zIVwQpNZqhoFHtV9EqE+qCcRkWav96Ax6e+0b3MKVOpVTPhbHAwwIgk?= =?us-ascii?Q?+68y2Rr2Vm//Rn641jyQURfYvgjUgwWI2qqRNJiw1BL+EwyVNl8EouokqEsA?= =?us-ascii?Q?lPgz/QndkOyhItsPh7etY69xCv2vEcZOm1RG2IlQecl+1OjzBzvjZukTvcd5?= =?us-ascii?Q?QdTSQx9zHQhPUlDm4alpTo+2ePeWjN7CPbnLzyqrfy2nLWVyKQQy4br9P5iR?= =?us-ascii?Q?jeO4b3gonpho/oIen52HnhG9+sdgXLxz+qfStTlHnHc6g7AgTAnAMZjPnZ4m?= =?us-ascii?Q?0BSomtfL9VuHzt3zYsmBN6hSA3AuqY1XPsPi2lrMesroaMW2UWh6cjAAl7VO?= =?us-ascii?Q?ai8vzMQ0LjmDMip6C6edA3uTeIOkNZZliyH3vpc2pRR9vIWzovYkF3j4ryvG?= =?us-ascii?Q?tbumBq9Fvg/iRnZMSV26xxbl0mHnXshiqr/xm7PCjWY8t+lg16L3RlOjb8M6?= =?us-ascii?Q?f6r4wARaZc1wQVDk+1frL0BJ8Z6OrNWXa/XwJ9N8l9YpUFfKNSLU03iUATnt?= =?us-ascii?Q?FJs1hY6Htr9DtbleypRAC2bneI6mR4MRAIBeUlR1yAztf/dMlO/qvPKaeVzM?= =?us-ascii?Q?zKv1So42VJRlVCJhsbwmwgRVhxmV3X2bXn70H1W4?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 96326b63-6cd7-4cd8-cad9-08dbb6a97791 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2023 11:38:37.8016 (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: nV08R3D6kH0jPbaUoSEXk8eeb/7YBCFQ0kXWAj6SMeYQ39CCADrI5l6ljac58FU/Xy91VRKopmG43+3krrchCQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9371 Content-Type: text/plain; charset="utf-8" '(struct sock *)msk' is used several times in mptcp_nl_cmd_announce(), mptcp_nl_cmd_remove() or mptcp_userspace_pm_set_flags() in pm_userspace.c, it's worth adding a local variable sk to point it. Signed-off-by: Geliang Tang --- net/mptcp/pm_userspace.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 78b935ab7d3b..9429cf91a9e9 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -152,6 +152,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct g= enl_info *info) struct mptcp_pm_addr_entry addr_val; struct mptcp_sock *msk; int err =3D -EINVAL; + struct sock *sk; u32 token_val; =20 if (!addr || !token) { @@ -167,6 +168,8 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct g= enl_info *info) return err; } =20 + sk =3D (struct sock *)msk; + if (!mptcp_pm_is_userspace(msk)) { GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); goto announce_err; @@ -190,7 +193,7 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct g= enl_info *info) goto announce_err; } =20 - lock_sock((struct sock *)msk); + lock_sock(sk); spin_lock_bh(&msk->pm.lock); =20 if (mptcp_pm_alloc_anno_list(msk, &addr_val.addr)) { @@ -200,11 +203,11 @@ int mptcp_nl_cmd_announce(struct sk_buff *skb, struct= genl_info *info) } =20 spin_unlock_bh(&msk->pm.lock); - release_sock((struct sock *)msk); + release_sock(sk); =20 err =3D 0; announce_err: - sock_put((struct sock *)msk); + sock_put(sk); return err; } =20 @@ -217,6 +220,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct gen= l_info *info) struct mptcp_sock *msk; LIST_HEAD(free_list); int err =3D -EINVAL; + struct sock *sk; u32 token_val; u8 id_val; =20 @@ -234,12 +238,14 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct g= enl_info *info) return err; } =20 + sk =3D (struct sock *)msk; + if (!mptcp_pm_is_userspace(msk)) { GENL_SET_ERR_MSG(info, "invalid request; userspace PM not selected"); goto remove_err; } =20 - lock_sock((struct sock *)msk); + lock_sock(sk); =20 list_for_each_entry(entry, &msk->pm.userspace_pm_local_addr_list, list) { if (entry->addr.id =3D=3D id_val) { @@ -250,7 +256,7 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct gen= l_info *info) =20 if (!match) { GENL_SET_ERR_MSG(info, "address with specified id not found"); - release_sock((struct sock *)msk); + release_sock(sk); goto remove_err; } =20 @@ -258,15 +264,15 @@ int mptcp_nl_cmd_remove(struct sk_buff *skb, struct g= enl_info *info) =20 mptcp_pm_remove_addrs(msk, &free_list); =20 - release_sock((struct sock *)msk); + release_sock(sk); =20 list_for_each_entry_safe(match, entry, &free_list, list) { - sock_kfree_s((struct sock *)msk, match, sizeof(*match)); + sock_kfree_s(sk, match, sizeof(*match)); } =20 err =3D 0; remove_err: - sock_put((struct sock *)msk); + sock_put(sk); return err; } =20 @@ -485,6 +491,7 @@ int mptcp_userspace_pm_set_flags(struct net *net, struc= t nlattr *token, { struct mptcp_sock *msk; int ret =3D -EINVAL; + struct sock *sk; u32 token_val; =20 token_val =3D nla_get_u32(token); @@ -493,6 +500,8 @@ int mptcp_userspace_pm_set_flags(struct net *net, struc= t nlattr *token, if (!msk) return ret; =20 + sk =3D (struct sock *)msk; + if (!mptcp_pm_is_userspace(msk)) goto set_flags_err; =20 @@ -500,11 +509,11 @@ int mptcp_userspace_pm_set_flags(struct net *net, str= uct nlattr *token, rem->addr.family =3D=3D AF_UNSPEC) goto set_flags_err; =20 - lock_sock((struct sock *)msk); + lock_sock(sk); ret =3D mptcp_pm_nl_mp_prio_send_ack(msk, &loc->addr, &rem->addr, bkup); - release_sock((struct sock *)msk); + release_sock(sk); =20 set_flags_err: - sock_put((struct sock *)msk); + sock_put(sk); return ret; } --=20 2.35.3 From nobody Fri May 17 05:26:29 2024 Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04on2085.outbound.protection.outlook.com [40.107.8.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1DA111107 for ; Sat, 16 Sep 2023 11:38:48 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ARo5yjm+a8ihK4hFPX0HlYDl44yD5TWCsbe21XtWD2LhDwr4Zm/oHjimhWDu5xCEBQP0NoIX3KqXBLTe5LmSEP5ld7zALZmvtVX/c7Avv5Gw+4a0Cdh9SYqCTATOPq1BSzZ6e0nYnMoh/bGUaGwBG4MUViTmNmm8pk4JHlpJLhxGrkMl1l6rUw9hcuYkzhG2VuAYjWcQcZdIktnBLYBUnXQ8IzTpYtp4ghWKWXr1gFIHUDFIFwv9sajIzeGKK1/l8Sh5zCFfh8RS7g41nVurXwC8VSgkpy2wm4iYqX8u/T5pVAJ+MqW51WVE8bwxVfOYEGU8Itr4zk5OCcbkiM/foQ== 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=dInZIUajdHuxJUDgJG14Kc+DE02JYSEOr7Mb77Eg9HQ=; b=hCFWMHRuZ0igxYSg+nlVS74BhMpIQDAZ+/aff0VyI+eL/oM/fVZIowhm6uPN+GxXYxKcSbxQFouNt/4wCPtlpG8sW+WC1G6onVNeYrzaklEn9HhlZLo/1vGFimbdepVlE9L5LFsLb/Wd2ZytozQMA7PhpAualFJpzUhBQ8216k0W3+wXEDFz6vPf4dJjBC5Q5sjdGvM8TkVsSH9qmnCk4+H9NzZl9Z30WIXc7chWj2XcN+yoUfHByfoJa+cwe46GdJEQA9U9UN7C5ksrOhBUS17XUxNganzFaCPGBcfm6F2zopEs4j37JbL4SKeGPGT0p0KZXtHK+12m+tCBtoCWhQ== 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=dInZIUajdHuxJUDgJG14Kc+DE02JYSEOr7Mb77Eg9HQ=; b=QH2WB7gWXqiM5jHixHd33F97faZ/2TtM3dadfaU+il85IIsxeiWnZmQ3G9XUwNqvSJfxHHpg6oWkG3aMUCRGqpVQQ1sEMDzOjbunDFeIzb0DpRc9S/pCcMxeOBRpXB61pTXd86JvBTrIgP/sUD0U15kFgPtg92brYc1o3nds0kwYcG2CqipHKl3um7vDXM3p99gqf2P7qMxikO6qToc4bSULsN6i66pewfixV4Tj2YnH/Ttj5Xd9yMk5VNJbT/62xvtVbAl6kM6lOwenO/7Jy9e2NvnSzaQUv74DC8rosG57uYnU1nhBrMQG2Kcc13QrwZi85gHa3KXbMxhvYz9whg== 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 DU0PR04MB9371.eurprd04.prod.outlook.com (2603:10a6:10:35a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19; Sat, 16 Sep 2023 11:38:46 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.021; Sat, 16 Sep 2023 11:38:46 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 6/7] selftests: mptcp: sockopt: drop mptcp_connect var Date: Sat, 16 Sep 2023 19:38:40 +0800 Message-Id: <24aca2da0236cc55fe3d771964f5bb2aa6fe7dcf.1694864093.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG3P274CA0004.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::16) 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_|DU0PR04MB9371:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f941e6c-e403-4cb8-6217-08dbb6a97c94 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Yb3gnnw0RcmnFQCbnY/C6fVWisfdxn3qQKLfGUs3pbHcjhIelbuTyEeeZMICAFptP0tGtu4zJK2fUiVVu6f3w+KcxbCiipvSfvq9RtlGZ0zdhkZq9z1TIZhb4HQj0Q6BjZSA2HQgrUbpjdTEOe2iT3u3M64AjO89dkwjafZ8JhCGroywoPc2RiwGjV3dk37ctmuo+ovyuYbS3SDRFCMaGbUATRF4XcdHcad9mEwcY+ap4lSH4t/+NAAtvLdt61TC6UOc5JjFY+Gt1AkMncqdfYLSc4spSPwp29ReDYz+oT+YwJYtos386NZxDvTn/3dtCgEnVL5/WAs47QnVCv87B0qU4QUNib1julsAwljXPtr7Y/6DaVNZRm4T31IWjB3gWkyJ3PUgrh+XjzGf2y2Zef4cMN4VgxueDDeI/Pju9Sj4LEkEg8C9dEGcAUO0cd6aVfZGw160zgfsQ+2TIY1dH+ubfDd6spoViyG/Mg1zxigeNbwZI9HkYriq3vCiTRa6JXA/FJ3/6d7ClJzoEdFX59xX75Fcm3Mtuwpk3RfKMnv6t9KFkYw3ialLtSjP+bv94rKgISAS53xJh1QgHrnVaDpSzgyt31tljppdHYpQeWQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(396003)(39860400002)(346002)(1800799009)(451199024)(186009)(36756003)(41300700001)(38100700002)(6486002)(6666004)(86362001)(2906002)(2616005)(478600001)(83380400001)(107886003)(6506007)(6512007)(26005)(66476007)(4744005)(66556008)(6916009)(316002)(66946007)(4326008)(8676002)(8936002)(5660300002)(44832011)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?dOh9+vd/MEBzX/bqq8qcZji+hBBHefos/Cs5OK0NSxjm1BMYW5pc4wMrhqgu?= =?us-ascii?Q?PcM471kBK9JoNpt1NuuDbGFEXDFByAW6G7yQA5eTPjfQz30YjMlENEdLdnFl?= =?us-ascii?Q?qzaWKyOfNU4Dvpi0ufZII1VDb+88icpLOFNz4ObJByzYp2m0ko3ly/LaRp4N?= =?us-ascii?Q?EKisYkJOWzkj1PPVK6bPpYVYkh8DYIL+tj1LDQcRclInj5wiB3rbU7MMoXk9?= =?us-ascii?Q?uTIvb1w58h6JoQEQkUU3GAgg7dIji9FwXrDBgAaNyu33RfJ5JD4msmesHHpW?= =?us-ascii?Q?44TZ5vInvt4C/8Rvk6bmRw2tUbmb8SDJlP/NYLfRwQ9lYvcZMwyBgLc5jsNt?= =?us-ascii?Q?8byOHjeo29ODQKWEdjzndTyiPRf4dd9gahrTPEaGwPRSU9vH9rP8Nd5Jzqfv?= =?us-ascii?Q?uCziyvXAZKrinV6vI5Z2FDQCbstY0UzUTL5D5sIxNWksvSDpNVUf3RgrAWTP?= =?us-ascii?Q?/g5XavHPoy9P+XDCs5KhhZWgMC3EzgBz8AnNCrJyG+KhuFPO03sIom+xoIaD?= =?us-ascii?Q?kfQBeNx/qQT0JWzCwMBIG+nDQLDZEvnvEue1+3IXTLvCF9KFvIFn2cDwCZAn?= =?us-ascii?Q?4liItuFAPoLrNxZ20txLf3t18oi2KaU0SA6TRstMZqzG50rkbX6NfjLpezPC?= =?us-ascii?Q?z5/zzj6GIQGnJ7yAwos24D2Xc49uvZAO5bYvKq45NDCoeABU0Z0Kr042D0e2?= =?us-ascii?Q?njXNOjZbDzX6mHiCCGQFHHGfpWC6TTmRFNOpGDOohCEAyD/vDUCW3iRMAk5Z?= =?us-ascii?Q?TJw48Gb0j9B8qaaGshmcLSm11AA+vR7MT0qKwSaCCTUJ7m0ckv3qkAvlMOp0?= =?us-ascii?Q?TD5XD8fP1Ovk171vm4eh6ExzCgI6+70sYHbjLxHfHYH6luCrvCguJB5WGFLm?= =?us-ascii?Q?elBBshbYdACN3HT2dIha77YKPMz6KbNnbqOXTRHAg1xgI/J0MGwBQU6RmMGc?= =?us-ascii?Q?RQzpq9cMdASJKlfbCFq8vRptOz+oYK68KWVD3MOTKbZUIS9lk4BnTSIN65di?= =?us-ascii?Q?p6BJryh+tOMdelT+tyv7hEq/9zloZfdPTEPfqv30bfjpXAlYXJPu3KJ0Fkum?= =?us-ascii?Q?7ctQu8TQMRk/HpFlXLDqdkaK+i9I5OOPA2kJVnUNC/Fw+Mau7FQdyCRAYOkl?= =?us-ascii?Q?LAUGU4O3EyG/mdOFRncu5JPvHhLqQeAbfK8j2XXK68Ps2MQ9PPZe624hbjfz?= =?us-ascii?Q?d2KBaJCbLjyMRLipSRwWMbqHY+IzczrNhKD0rxTXdZRdTflTWbJtiv1SovWw?= =?us-ascii?Q?kQrseQINxyog++fXdkU6Uy2+xwNdLhzjCV24GgI4knskWupptZG4sT4NQj7m?= =?us-ascii?Q?s50LnpmuOTVXAnjfaTlxJX3fDPaAe3C65wnfLWkQRGNTdXMXkl0qNDNwV0rs?= =?us-ascii?Q?mZKIlHVbWTdXCwjTf1F+Vhu/pEXkDsDw/eAyWprn6obEfFtLSgb0EcINX8g4?= =?us-ascii?Q?NCQY5MkDVL5nZ95zjGaYNE2VDRMnttnnDhhP3fltzJi9bm2kSbZv3pJG9UQm?= =?us-ascii?Q?02UuACFbHAZeqPHl0dA+N4dTEOIF6kGJB7P+sEC7HYWj+tP48Jc7Cj+KI126?= =?us-ascii?Q?I+hw/RN3ptbclZcbenEOxx3iVfoS2WivcWPiS83Y?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3f941e6c-e403-4cb8-6217-08dbb6a97c94 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2023 11:38:46.1261 (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: Vif18hBaWrvAbjraQiPt2kBlUzHYGVEKfGzWOKJxWRrI96UU0TFk0BHFgtiO3ZsRWtZHN0kgtWhpX8uhytcE6w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9371 Content-Type: text/plain; charset="utf-8" Global var mptcp_connect defined at the front of mptcp_sockopt.sh is duplicate with local var mptcp_connect defined in do_transfer(), drop this useless global one. Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh b/tools/tes= ting/selftests/net/mptcp/mptcp_sockopt.sh index 8c8694f21e7d..a817af6616ec 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.sh @@ -11,7 +11,6 @@ cout=3D"" ksft_skip=3D4 timeout_poll=3D30 timeout_test=3D$((timeout_poll * 2 + 1)) -mptcp_connect=3D"" iptables=3D"iptables" ip6tables=3D"ip6tables" =20 --=20 2.35.3 From nobody Fri May 17 05:26:29 2024 Received: from EUR02-VI1-obe.outbound.protection.outlook.com (mail-vi1eur02on2048.outbound.protection.outlook.com [40.107.241.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 86E7D1107 for ; Sat, 16 Sep 2023 11:38:57 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cYpqQgQ1Z2IIXNBT+3CBmxExgn78df33MfJbN44cEhXRWuK1V3npnELRgG2P7bsoMHmjzwkWjpJs0g41NrOenEezUnxdJU9QjH/EICIxC2JyR/humRohgVQX7irKH6WbKhBrBIsO1VjUKHY6CEp9J0xilCQE0r3n5PygGEeAvwgb71sZPnFZW1WejIkO9w83YMazyV7zpu8/jmcYoV23ErzQdd9B+ukmxiRaFkyMADoYOxSH9nw97uApDv/SAwSVIDPeW/M2rI7xNIVYEs28HcABt+FvCU0pkPX6d1u0j1e9f2ef6ub87HUA7gYG/hhWWdhYGkS+/P3nfkSF6U7qsw== 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=sNw0zsb4wZAmD9AaThDWqiAvjV6ZxsfKpG3uZIV1Nrg=; b=fn3mZtMl3EJEYDXo432CFlhtykrB129o9i3Ifbs+MF593w1/bB1pxTcvlQLEYX8gkFUIAep8SX70nnjc5ibpmA/WRKDx22oGESsapnZu1pRlUM2sIvporl+5y8THMA19q5XoilVZVprpgrE77we/igHF91btV5vbowZfK/toXxhuge1xpDW5tGY6zI6ubiWmndz0s8KXxFgHD/cqz12y+pegfxmYLKEfk2zgm3aesE2l35Cn7kBTFsGEfK7Nrl1p8w8+adXDqcR82znAeNHeYpEcybtVvsvDiI1r1bZC44LGxhRub5xW9rD1QRD4F5vOTJ/IfM2yIphodVMXnhvg0Q== 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=sNw0zsb4wZAmD9AaThDWqiAvjV6ZxsfKpG3uZIV1Nrg=; b=J1M5pQDAN2NMktuF6T5bl9dw4xHqSE0AO9b1DkC8lZ3ihULDidRrKsoc7gIxgaVaiU4zENEzanJI0QQ20Ab4HZzkeUYhiO2Gzn3CLQQHmhdjdK2uMmLER8iFNm47N9dnpQkQaZljrMKWGGTotsKhUFJWeWN782faRfv1pmYM8pDbKn9vrE3Tp26mn6UbcWWD98MRZhyvqc45aiAy6yVu34z718yVTCXZGAuwggpN5ktCYCCLFcu5KZ2CE6WMkzGGzFhCVKKEzuMpaoAxN54Fi8FqekDeUxoq5WJTtPb+yBJcOC+1o/zzyvNmfTsGFGEUPuYPWF+fDMKollNFBeZ6hg== 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 DU0PR04MB9371.eurprd04.prod.outlook.com (2603:10a6:10:35a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6792.19; Sat, 16 Sep 2023 11:38:54 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::2867:7a72:20ac:5f71%3]) with mapi id 15.20.6792.021; Sat, 16 Sep 2023 11:38:54 +0000 From: Geliang Tang To: mptcp@lists.linux.dev Cc: Geliang Tang Subject: [PATCH mptcp-next 7/7] selftests: mptcp: display simult in extra_msg Date: Sat, 16 Sep 2023 19:38:41 +0800 Message-Id: <90054f25d522c7252a511eca430ebe326b22d346.1694864093.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.35.3 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SG3P274CA0005.SGPP274.PROD.OUTLOOK.COM (2603:1096:4:be::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_|DU0PR04MB9371:EE_ X-MS-Office365-Filtering-Correlation-Id: aea5c8c1-63f0-4c92-d073-08dbb6a981ae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aY8U7k1BIZWIPc/Jo8IHmNmu2A4DlKulOoSslmbDhPGFWyL0GyuQcYKi6TisyHzTUUU8+ywQaC5MtLIi9bgNeJ5S4B6z20XvMFPjCusXd2leJ+OJs6b1tRy/kF5E7Le3zAZR8J8NEc9gemV8KEc6qiU/EFFKArfkkBMzPD63XdkifbD2Ay0CjjN6EosZrNhJTj0qYyoxuMG4xU44PBToHn9/USITD8VGwuij2pHnaM1mR3A3XwjRkFYxLzm13tOMl8QCagNV3dA66Gpwaj4FmzvyGRJPQhsrQl+lash3OTgLev/3K/FIQi+3nbQA1RcPvCybfTKNUWaXyCPXeO0d11JRYdj5WOYZrjJfrxnULxJC0aCDlVTOvK+EaG3P5hUzdeCkn9l2uCxQ/4ajhtgz23A0GSAuv7zxYuZJvHslPiTGipkKG/sN17K3YNec2JP0WqrP7vDceMybS5QVCuQADyyO8bKPxukIshD9kFhRBVAO5mxRCJKDa/zAFoFA9lPcusqjJh4omDZFViNvcgVQ1u8Y2+dEMqFpJgMoESILrJIioEV3tCxpc3rbG2nBYgqst0AYJQMKiM7gkizXsQcIUczg/595aeDJ6Bi4lJ3jQuw= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:HE1PR0402MB3497.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230031)(376002)(136003)(366004)(396003)(39860400002)(346002)(1800799009)(451199024)(186009)(36756003)(41300700001)(38100700002)(6486002)(6666004)(86362001)(2906002)(2616005)(478600001)(83380400001)(107886003)(6506007)(6512007)(26005)(66476007)(66556008)(6916009)(316002)(66946007)(4326008)(8676002)(8936002)(5660300002)(44832011)(13296009);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?uZWYCrkfsEpVFgsspCrVputT85oNtHcJY4ebg5Gp80tzK+0K72ONI9n+WgkO?= =?us-ascii?Q?M4sTIv4qxxQwzUDVqS2vcS5xZyi7aIhJ4Eo/4ZQKxqs9Sd7KRzLlFG8srZTA?= =?us-ascii?Q?3VxNmLwPEvvdCyy1pZMUiXMth7EQxXxtlsU22fG0tNAwOPtXiwwgL0Rb2oHU?= =?us-ascii?Q?Vg0VxKIwVjn18EIKsPIsLzP6Ebha7jZHT4FI3TQTNxnJK+wH0OOmsidNEmZW?= =?us-ascii?Q?aEOxfU3B6eiAihEtR+gBNfRLVd7b9m8GoYP19EyKxJwzWagIF43JQxB5ORLc?= =?us-ascii?Q?TB2CN2hf5mxmo9R4cKdJepUDxacmVk1LLiUnZsIZdx3x+A4iu9PofJ9emdeN?= =?us-ascii?Q?loWqU4cve5kT4+63y5deQhtdgUlkuPAtrITllK3VWKh2AbNVDPCY0/kLz6sS?= =?us-ascii?Q?wEEMyU7i81aaG+GprU8HFF6m2mdjlrvqoDsDgljYjzcKRSOzgJJ+ukxDdUiR?= =?us-ascii?Q?VTpJrfU8wblm1VB7XPfdh0prDlImSneJWA4/x6hSM74X7ijVROVZnAS4BVfi?= =?us-ascii?Q?qo/tUmQ3upM9zZzBle5QPvkDDC5SnMdiBaIT4TN3baj4uPfD55exg71R9q6b?= =?us-ascii?Q?Q5wXJOsmaQ5tuMYS8YUl0jnsIcxAcOJRCli6Fh/OQGoKJMasZgKuThstidKy?= =?us-ascii?Q?tr8D6xZsfDWpR3DkqHzhN0VDYyr106pgCwZVGoOwDefOxATijPLWvZvzCxCZ?= =?us-ascii?Q?Zhx6SWrZh27iiegy6xElB/2x1jw9GUZFPRkOVPDu97KocudopYZAm+71MJc3?= =?us-ascii?Q?rFxSqNpMthxi1C09Js5rd+F/V4Xw8cRCyom0l8159AFxcHKr2PaOZFO9/t/G?= =?us-ascii?Q?pIkf2EF81YLyecb4fw9BmZboUR1fQgO361t5lni/crkllwmhcjHInS3QwzGK?= =?us-ascii?Q?pZjcUqdXnz5HNEClZQs2uFJLrah/z5i8mnCypzZgRXIbKAebNFRwm4Rc+WJo?= =?us-ascii?Q?ioJryasxBN8Zz/VdZwueQZQq/SnyrXaTmdRX9a3tHjenqIaKcxlNp54VZNuk?= =?us-ascii?Q?RyaP1ok/csRaDZ8jNitzOFhil6yvzP9/jeaBMZ1Fo+hvhJYXtWa0xMu+4XNa?= =?us-ascii?Q?/ishIVtmmwjkusW/EfUPZg/wR0tgY7xdi5oe1ypb8rGj+D90GXLfHqnWDwpI?= =?us-ascii?Q?El/rLjuuOx5oz+n7KJb2hUUJPYEeEOGWrvAHVpEhNpYHJNSMge62cDiuHG0k?= =?us-ascii?Q?6ONB+tqTTn+3mdIOkMndCwXPxwNzYLjfr2WmGDavCdQLzJd1ZHoV0RjIUiXq?= =?us-ascii?Q?32uCoQ2u0l8ihQVHYk+UCaoG74lUkGIngkAdBa6ffQ0tT6hqkRT9RIfZwBJV?= =?us-ascii?Q?vFcjQnJFXOt+Ea+W88PL1RXmc0r+kk0GDLDpIKicmzhRt7Zdi3g5/hSljwEW?= =?us-ascii?Q?ESc1q3rgLDo5fAe0Odo88wF0xHq3VHelJnLBtjceuqfwAB8AW41e9x3RuLun?= =?us-ascii?Q?BwpHQe2NrKMXz8l+nnnyM8i7TgNfjfOL0ImxdePsqVC9mhGJqHJ9WmX8WH00?= =?us-ascii?Q?+3nFjdM4hxXiBlDV0YsRGEw4W9fVMbTmImVT1I3V4oO3uIAU+bhLGW57hxPm?= =?us-ascii?Q?HGTjQh+mnMYrKonxwGCgRvkXjPieERjAAU/44+pB?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: aea5c8c1-63f0-4c92-d073-08dbb6a981ae X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2023 11:38:54.6145 (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: tyP2uOllcw/Uypj6DrWcsrZHJH9cFLlDOBBu2IYF20H2i9MkJmQsUp/aUQcd5uDO0JNtnJAiQ0KFkrePcG041Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR04MB9371 Content-Type: text/plain; charset="utf-8" Just like displaying "invert" after "Info: ", "simult" should be displayed too when rm_subflow_nr dosen't match the expect value in chk_rm_nr(): syn [ ok ] synack [ ok ] ack [ ok ] add [ ok ] echo [ ok ] rm [ ok ] rmsf [ ok ] 3 in [2:4] Info: invert simult syn [ ok ] synack [ ok ] ack [ ok ] add [ ok ] echo [ ok ] rm [ ok ] rmsf [ ok ] Info: invert Signed-off-by: Geliang Tang --- tools/testing/selftests/net/mptcp/mptcp_join.sh | 4 +++- 1 file changed, 3 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 ee1f89a872b3..d02e53be8b31 100755 --- a/tools/testing/selftests/net/mptcp/mptcp_join.sh +++ b/tools/testing/selftests/net/mptcp/mptcp_join.sh @@ -1766,7 +1766,9 @@ chk_rm_nr() # in case of simult flush, the subflow removal count on each side is # unreliable count=3D$((count + cnt)) - [ "$count" !=3D "$rm_subflow_nr" ] && suffix=3D"$count in [$rm_subflow_n= r:$((rm_subflow_nr*2))]" + [ "$count" !=3D "$rm_subflow_nr" ] && \ + suffix=3D"$count in [$rm_subflow_nr:$((rm_subflow_nr*2))]" && \ + extra_msg=3D"$extra_msg simult" if [ $count -ge "$rm_subflow_nr" ] && \ [ "$count" -le "$((rm_subflow_nr *2 ))" ]; then print_ok "$suffix" --=20 2.35.3