From nobody Wed May 8 22:20:06 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp981216jam; Tue, 8 Feb 2022 03:16:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJwxjL9pTM1coJGV62XkDJQUVJPGySThmX5Jaesj18kbcLKx8Eikg2qP8LcoEOtEvZGjK8Gt X-Received: by 2002:a17:902:c942:: with SMTP id i2mr3758818pla.137.1644318984850; Tue, 08 Feb 2022 03:16:24 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [147.75.69.165]) by mx.google.com with ESMTPS id i12si11955877plg.206.2022.02.08.03.16.24 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Feb 2022 03:16:24 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3516-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) client-ip=147.75.69.165; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=gBAGniJL; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3516-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.69.165 as permitted sender) smtp.mailfrom="mptcp+bounces-3516-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 673953E0F04 for ; Tue, 8 Feb 2022 11:16:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 864E32C9D; Tue, 8 Feb 2022 11:16:23 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 25BD22C9C for ; Tue, 8 Feb 2022 11:16:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644318980; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=91OKDAyXdL5jehb8cYgDCVCTG9iLXM1RPm9Dv30CYUU=; b=gBAGniJLnHQ0yHpL1nsBZW+MfhwDxpYvsUneCtnJv7S8tuPT2y4Ch9HT4HmegXWdFOk4+9 ncv2J3BdMA3tmSKkhN7lbpLxBKWsqKV3SMMCboYMK+ai9/KDGoVSlkTSvB9ab4dyToaCyk W4Mg3sbhdR/al6JHtvuafeJ7ikl8zoA= Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05lp2109.outbound.protection.outlook.com [104.47.17.109]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-11-hkxzvQqzMmKafl6D4od7_w-1; Tue, 08 Feb 2022 12:16:19 +0100 X-MC-Unique: hkxzvQqzMmKafl6D4od7_w-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Teef9oX3macXW/+TkrAqY1fUfKINtqZNS/zKqgrAaH8fNrbsg1AQsTxuZilUruVrZyBuhbiTrmeyRoTq370zuacwRevdcGNqD29NamY5B+PigGoZgklTEOVFDqgjdKgIAvx3zAC5iLqWT6JbSRrtW8nNowGtywDVeFNEVznfeGBn45d9e4EGXX2iDzCriBnWSq/RFm/iJLD4uhlYvuQzMsE390f71muyZzq3Q1l/GZoSdDEfe7hhnNpyB3U81XNg2/QKHW0p/dvA60RH83Mjd9C7Rv8zwv4suIMRUvX/Z4pz5wqvd/yugPRGZYijYY1AfghHV+BQDi1u4HfIvJifVQ== 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=4kpyTirRczD+rLyX7/K1jZ6za+90k0nrCbtfPwN5LZ4=; b=XpVRRhbox9mdL1QRhUwqMavzQvity3005wD5g0ERoaugktwGCTFT4o1b8LdLfGiD4P61m0GbJK7tL0uSzU3TqowsNJyhQNLnEXwcp0oJ/88GB0szdlMJREFrgS3y4/nz8VpnM/fNv8UdCt+QIg6uH0+sAtReCjjV8K+4y0shBhr4VTleov5DePh63ZX1wJHIje9TkhJbQL8ZyOElBZLzJHfhC0EU4WqK7BQ4YHN79NvQge7UF6OXXtEmvnuaGQDTIjtyiqpeu39NJYYH+yRlGvOO2JHeb7+AKiDr3EEy+4kT6Rwe4LCw2X2LuVn59frH2+v41YcJy70ejKD6UuCxbw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none 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 PAXPR04MB9005.eurprd04.prod.outlook.com (2603:10a6:102:210::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.19; Tue, 8 Feb 2022 11:16:18 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Tue, 8 Feb 2022 11:16:18 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 1/4] mptcp: drop port parameter of mptcp_pm_add_addr_signal Date: Tue, 8 Feb 2022 19:16:05 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0075.apcprd04.prod.outlook.com (2603:1096:202:15::19) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8b4567e4-c144-4c96-224d-08d9eaf46d98 X-MS-TrafficTypeDiagnostic: PAXPR04MB9005:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2512; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jfAH9eyEOz+JNI+RRq2z8Tj7iFrSiSeTYoqKQvxYWEUJk2CEWY2xLt3UwsMDP0ZVWGc1q7L7jMFNczV6v8wWaoAiUISS5EjOHAt/wxIEULNBfBY5LmU/7ODC1PZzZu+4T/BGmlFsAOxYeWFOMQD2/RPTEIkK7zSrUPQePAy04LJbjGoszj0eLg4YKyDbQNbHjVLT54GoEVl7KVx/GkELAQrn5pos30Wmq5bSewE5F90UMQIyqf53Ml0EAnqlhz8YmJBCXq9kR0z7F3xk6iDxhUBXSL9aT7/bo1itYfcuCzRwI9EeFKd/1O6cj24Oo7uRq/+eU5YTirc1px93dXf59LCw4W7jHZ1vsSguf0x+X5hs9EpPdHK70yMEa5PFo1w8+/ALVbzuCt2SZshd3RsRNuzMHcWE0qe9jM0UWEgUXQOKi6Su2rXA2hSvhUkmm64aefGC9NS1wdp60ak3CG3HjX2rK8gc5EA9wEHWku50aZM+Xs++UFAxlWUtkh8lwD/x4Li4q3DJ8EzOdJotwYD2I/6wuAriGjdWgr1MPG2Qiqz/yYPkp+ECoDJrmXf1VtLS7bpTAim7YIBWVggSUzjuOq629r1KoOrKCT6EI83/xhhSM0hENBejuGA2E2PBBb5Bsvdwc0TA2Dsr6fhP3aPBtlMUoa9cVVJrgl8NeK125P3G+BsVzNPjVMjpr50cTNoL6WhsX55X7xOszY+4K3L76g== 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:(13230001)(366004)(55236004)(6666004)(66556008)(66946007)(508600001)(6506007)(6486002)(6916009)(66476007)(316002)(26005)(36756003)(8936002)(4326008)(83380400001)(8676002)(6512007)(2616005)(186003)(107886003)(5660300002)(38100700002)(2906002)(44832011)(86362001)(309714004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bkIHyRTU21Ct2f5O68+0tIoWYB+0vSIou5ZZ7KQvtWczsajx7p8A4464VIUH?= =?us-ascii?Q?4N1iQ1TPu7nANL7LY+5eW42u7YazgGh08o/4YIL29z7iinGTWNZWwxqsXxll?= =?us-ascii?Q?RG2EhYB5jjrDFaF84JlnqAoigIKJTmRCZCfWuCMmqKGCmMvGpJkOy8krPom6?= =?us-ascii?Q?FG0p9e/bX0uHM+LOxiMgBab5/NBCksVqkgLQOQQXJUE+Yxv2bHxjQCovrenW?= =?us-ascii?Q?n7Fo1RS7Z9dUBAKiF+B5Vo5/KRnbkoqAVlZyjHnrmCyTAFCAI6qvQf0r6OBJ?= =?us-ascii?Q?47j76ja/OKJ96YKWX6Xse6pJn3NPPpTfzKEOeZeAdNP6BhoIQRmYyntsSjzI?= =?us-ascii?Q?iAXmGjRFcuAYF/aEinC1/ueDFZP5FWulRDxfkdpdVAOHNr6AIoYHieFxtVJW?= =?us-ascii?Q?YUG1LmLh+JudZaCUhyFOqTRadLP56KnHeYYmvrbSrLgsA//z6nsTJJBXyKHI?= =?us-ascii?Q?JDaeiMMXiD+FgNNx8yiIIlvTFGbJQzyJHOti2KcUApHwVPnkWNv08Kw3An6f?= =?us-ascii?Q?DffdxoNDUEEwmHclYB/0g9E6fb4KeJ9ea7waP5qGfbn6bzHNCLLGR/smWWbf?= =?us-ascii?Q?TAM81zhPUSHwa5etO9ox+aV5M85gx7S40cu3E0FO7skruU5qwsa8r14GdyYT?= =?us-ascii?Q?uOEmcJJA3J8CgkRROBYdOrktuUhMKSUWuiPbdcxUKx6oG5nLEffFAyRB9VE/?= =?us-ascii?Q?IAJ5rSiGEdSn3St8hiwE9ESrh/V9LbK2sGeCjvwMTlQl+OCGYC9XIVI69BGZ?= =?us-ascii?Q?bqcf/ya7WNivztSVJqlySjbI9XucnEmooGiaGzDRwcKJgYgbrPYYpwHA5Tqf?= =?us-ascii?Q?/k10NF5+0pWuIH63/Zff0S3UYdsoHiNNmyoTy4LWf7hEK+ewDjzc1A06QCa0?= =?us-ascii?Q?AoPOf2mf1+92T1Wa+DaWHrkqS/myopyWNH6jiVPu2P45GgVDWgcrolhd5c5w?= =?us-ascii?Q?O4edJeoqPPIgLWNyejfkdipZVPe8u5Y9K6AyIOrNefcTbT1oYrWpM2/YEW3l?= =?us-ascii?Q?wcJiLQTkW/uwoaBCo5psMmpvuJzNPPH0oyhY+Lz8E9YV+F+bHBSNVZbC2b6S?= =?us-ascii?Q?pcYPT3BWP5/fxjj/U8J5Ey7jMu43ioEZi34TXs50L2udmCpFsm4wPcKyZeeW?= =?us-ascii?Q?M62B1PotYZAXDEOQL6ra06vhhKQAWo+3nr+SXUjVLeKM720PDQOoo3gHhkwZ?= =?us-ascii?Q?tk4aub4iPcOAS6re6CIaRN/hOIHHz42IaGCry5HAjR7iGtcJI06gogBODLr/?= =?us-ascii?Q?OOrHwHKjv4FOnwcj5CgecYlIbawIfqHbBvSs+KbpdvEkVvSs6dsljt5cYHMW?= =?us-ascii?Q?rVGjv+GWhH5VXOwbUY10LlyoVSp5pX+SfIdojlxAKiH/mR/EAosf9gOu9w8u?= =?us-ascii?Q?foKiwO6Yy5MuTey1OOxbJwDoXCwAP9ZxP4W1BCy1yiM/7YVAI0NWFnTvFh/a?= =?us-ascii?Q?+LlL5mCVnVeDr47RyKccVz2lYanE4LGqH5hqtCH/EEcpFQSSZAiU+33nspsO?= =?us-ascii?Q?xg+20/lJ5To/RM4J/A69ceSFYHo6ZUImTXU2uj6leH4EFXSiQsSfMVf4MSaK?= =?us-ascii?Q?2PfSGuPgTL0gI9JKA4zeNy6MdOtVK5Ygxf42VC9SdFVH3fm+wzwrzo0ddmfM?= =?us-ascii?Q?EtH6cZrZ9OrcwaLhUXq2Rds=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8b4567e4-c144-4c96-224d-08d9eaf46d98 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 11:16:18.3742 (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: 0a7IfiiuSsy0BLEBLAw2ClYUPZ5FwBEutP7fPKmc+fAQhSc82Ar8RX0cZS6DWo5xBbvN0o5qyud9D3L3ylFsSg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB9005 Content-Type: text/plain; charset="utf-8" Drop the port parameter of mptcp_pm_add_addr_signal() and reflect it to avoid passing too many parameters. Signed-off-by: Geliang Tang Reviewed-by: Mat Martineau --- net/mptcp/options.c | 5 ++--- net/mptcp/pm.c | 7 ++++--- net/mptcp/protocol.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 7b615dc10897..4e516e88ab88 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -652,7 +652,6 @@ static bool mptcp_established_options_add_addr(struct s= ock *sk, struct sk_buff * bool drop_other_suboptions =3D false; unsigned int opt_size =3D *size; bool echo; - bool port; int len; =20 /* add addr will strip the existing options, be sure to avoid breaking @@ -661,12 +660,12 @@ static bool mptcp_established_options_add_addr(struct= sock *sk, struct sk_buff * if (!mptcp_pm_should_add_signal(msk) || (opts->suboptions & (OPTION_MPTCP_MPJ_ACK | OPTION_MPTCP_MPC_ACK)) || !mptcp_pm_add_addr_signal(msk, skb, opt_size, remaining, &opts->addr, - &echo, &port, &drop_other_suboptions)) + &echo, &drop_other_suboptions)) return false; =20 if (drop_other_suboptions) remaining +=3D opt_size; - len =3D mptcp_add_addr_len(opts->addr.family, echo, port); + len =3D mptcp_add_addr_len(opts->addr.family, echo, !!opts->addr.port); if (remaining < len) return false; =20 diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 1f8878cc29e3..99db7270e461 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -284,11 +284,12 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 f= ail_seq) bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb, unsigned int opt_size, unsigned int remaining, struct mptcp_addr_info *addr, bool *echo, - bool *port, bool *drop_other_suboptions) + bool *drop_other_suboptions) { int ret =3D false; u8 add_addr; u8 family; + bool port; =20 spin_lock_bh(&msk->pm.lock); =20 @@ -306,10 +307,10 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk,= struct sk_buff *skb, } =20 *echo =3D mptcp_pm_should_add_signal_echo(msk); - *port =3D !!(*echo ? msk->pm.remote.port : msk->pm.local.port); + port =3D !!(*echo ? msk->pm.remote.port : msk->pm.local.port); =20 family =3D *echo ? msk->pm.remote.family : msk->pm.local.family; - if (remaining < mptcp_add_addr_len(family, *echo, *port)) + if (remaining < mptcp_add_addr_len(family, *echo, port)) goto out_unlock; =20 if (*echo) { diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index f37f087caab3..0eebfc9f39bc 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -835,7 +835,7 @@ static inline int mptcp_rm_addr_len(const struct mptcp_= rm_list *rm_list) bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb, unsigned int opt_size, unsigned int remaining, struct mptcp_addr_info *addr, bool *echo, - bool *port, bool *drop_other_suboptions); + bool *drop_other_suboptions); bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remainin= g, struct mptcp_rm_list *rm_list); int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc); --=20 2.34.1 From nobody Wed May 8 22:20:06 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp981309jam; Tue, 8 Feb 2022 03:16:32 -0800 (PST) X-Google-Smtp-Source: ABdhPJxgVIB3uTG3jKSgYCRt8hZn2fvuB3S2WnBTVdNQV5n8iLnLay7pWEHUCiQ1pZNHBQuzIASe X-Received: by 2002:aa7:8490:: with SMTP id u16mr3958081pfn.1.1644318992165; Tue, 08 Feb 2022 03:16:32 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id bg8si11646582plb.586.2022.02.08.03.16.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Feb 2022 03:16:32 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3517-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=RiLZTx7o; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3517-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3517-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id A2E413E0F31 for ; Tue, 8 Feb 2022 11:16:31 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BFB482C9D; Tue, 8 Feb 2022 11:16:30 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.111.102]) (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 53C392C9C for ; Tue, 8 Feb 2022 11:16:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644318987; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4vMfaXzonIWPJebAmGRZvS0uXy3nyg6f/m+LkAtP1rI=; b=RiLZTx7oLKfOYQ7pvDaYZzj74D0ByeoKcPTo8tS4ljyTEb4gsLJqR9DK2uMOr6UpWoLt5B 7fXFdWkjCQVDKAFfnheuV7CbR5yBuJcHxlyiMffeuguHfJCi8BnGjtLL5ycvRL1G65Bgoi 3Z3NZ9OXJUxA9/2PaObtajnAIobRCDw= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2171.outbound.protection.outlook.com [104.47.17.171]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-16-5VlTHI5YP8OUNsSBaak_pA-1; Tue, 08 Feb 2022 12:16:26 +0100 X-MC-Unique: 5VlTHI5YP8OUNsSBaak_pA-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G4bAIWVp7xA+5K6TRuAi5ywP0c6Z6mdu7YVSzwHQEkmbZMnb3LZ8gg8wrd+pR5s0J18a1eRk8PKtrdqQiEAEbDKloS9YCARgjIpLDx51Nn+pstRQle9L5vOUOxSgtDvqZQ0rhDOfOqmmdUBAkHugOpjNwQriKQ5Ri5fDHbYiSJyZRlLJH+kK8TpV8YFb/cgL9USIHvbl93DGaGD1Xup1AW78c7R9vPidHZMHfTWe8QPl6Uj1LHp9Ru3qj6ElMPRmEuKU4UsgRNq4zG84n49kJveCW9GzZn6SLQHZlNDRuvgxLrtjOdNQRS2ekqjneMV3tminnCnvjBrsJp3xTpbFjw== 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=0mqcXfg9RkCMsblTnazRDULSbtxwLkOtWC5hGBe1pbw=; b=Qw89xTNuHwHdIHEDDQr7iQ+bksyshf914PoNNDaxEBMWo8MvRVv2DXgAQUpQLausVXtzzFxvzrW0L28nnZRV0KjNwVcrTPV54aAsBtX5ZPJBFTA7JaesEhuLXGTRjU+qwQAex+vYcPHVdhHKbJHcwbnbJmKe9q/xru8SrBXdTA1BjdOU884ESdwFaUrs9ZuerjJkr2jEZ5ILArsC/RwqwSUfo0vjzV87k/GLcstr9XhxG2odLo7jrURJm6KiJhRPe8tTqw4c0wvWr+kkx3RycR/PtFp+murr/I3Voo0ZgDDJNd35RuivQKSGoadMv+CIb1wTvfUOEZjk8on2s03Ktw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none 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 GV1PR04MB9103.eurprd04.prod.outlook.com (2603:10a6:150:22::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.18; Tue, 8 Feb 2022 11:16:25 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Tue, 8 Feb 2022 11:16:25 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 2/4] mptcp: add echo bit in mptcp_addr_info Date: Tue, 8 Feb 2022 19:16:06 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK0PR01CA0070.apcprd01.prod.exchangelabs.com (2603:1096:203:a6::34) To HE1PR0402MB3497.eurprd04.prod.outlook.com (2603:10a6:7:83::14) Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 10d17f01-e008-4050-636c-08d9eaf471de X-MS-TrafficTypeDiagnostic: GV1PR04MB9103:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8273; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NKud4VDY3Q/JjnFrnK7FHzHtaRJ61mrl4Dyj75+KsufbWFnwVDgn3Id9nOMGnakF7LWfdEDUGS+l7gZtrB+PjBzmpOkCdqwgdPD/rdrmFo3MGoZwv9hIH2sld+VJ5JbPH/CYUkfq8F5SLXZOKnnwgJX2CC8fLI7FVOaCEVzU/ERKXXFr0+ItwzZPsXX0KV92ns39uwXa09SZTZi25TrHeno4rFnK744FMw2IPCFVSEYpNWBTZr94t5eY5sgdYq3TMfF4YbN6eSF1I5U26sp9/sGFP7DjrRgPKgH3GmNgc+GgBOwiiRyM1krX2khxTid5dKExZtf09/4g8e7L4CZ4XlK39cdGpSvimbbkRhNAYqU0mtlkyPOrrXFtqxlsSof68bGSkDQJYJobo2NdZzwDTLS22eMvxhrYDcirG6dpgAnoqJ26GFrx296c/++EaxysiH/3I2zSXVvBQ81jbOKogCZP3EU3UJjkeAJtJb40np3q+/eZuBe9NhVleGdUuKlpCPL5iwDVJn/slPGBi0ZboXS5SyX+DR0CQCMSVMrqAsrXzOCpeMv20tyMCYzksUFT7DCxHIL0RlWC4wR9tQW2mHpzHqf9TZ4msWdNuQIsqHMy7uKNkBoX3KFaVtXWkE+4AzRwMDjygrAzqY7e28lR2g== 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:(13230001)(366004)(44832011)(66946007)(316002)(186003)(4326008)(86362001)(8936002)(66476007)(2906002)(508600001)(5660300002)(83380400001)(8676002)(38100700002)(6486002)(6916009)(36756003)(26005)(6666004)(6512007)(2616005)(6506007)(55236004)(107886003)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?bPJSkwHgO2fyL74kspghBxN9LogG5gn8O41xVri/r42gIqiWLVDMey00ZnnG?= =?us-ascii?Q?SU+j91NNW9fSIm31dDoFgSSGaTYtVkgCnSaqRDovBnfZ5JCssVOV7HXLV3Y0?= =?us-ascii?Q?+zIIGlIz9GTkk+vCJJGh28eFpBvGFfRg/zb+Cbp3g5JoCNVc3o0w/F9W0wYW?= =?us-ascii?Q?hy5Bxci3c1J5jCz5GFTXHanWY7DobOmw/0e+o/Sv/3YITLg+1ux8d0PlVlXW?= =?us-ascii?Q?u6K/IN6HjsftvU5MeBOZ+vuwnBCyZ/zLDt0Z/WVAhSDnhWUrTdtuBI7N8dxT?= =?us-ascii?Q?u9iRsVSh/7TREEx/jvQU7g6lk0jbPHSW8vGrhaVIfSd8cYaL3sV8A0f210Z8?= =?us-ascii?Q?8z0chSTCUYEeBb+MHHRPRzMTC8F9PclNJdtEcMnFcyQmmLucEmi0aoGn46Gf?= =?us-ascii?Q?zL5rBnXr31w5kcyk3eRQO9+YpeZbyJbpCVd3p00ij2E/llPlxkfhF4JBZ1hq?= =?us-ascii?Q?SZI32rZQavYXDkCfWE47xp2k8FpBMYrCezyoH1feXDoI1oq7BRB+Pg7FN0ju?= =?us-ascii?Q?YLy5FUehSVR+hgm3jpYnqTLo6ghSFjJMhYCJ0b84esQw1l0JEZdfQUkMA5jS?= =?us-ascii?Q?NY0Yzb79g7XDHCB/1eED2Rvsq8AfjRSKerwGaqn8sL50Ei2D6uZSOXvDcgbM?= =?us-ascii?Q?QAQuZbdALHD/UgvxJDCFGU4tg9VMqSFRFusEEM3JM9RPiSZDHnk6/fhhTPgn?= =?us-ascii?Q?ls9jPGDpOAUUKOhgOuEvB+9zGsN5kDpwrQ5ClSGzpvccD8f67A2U2QywLYVa?= =?us-ascii?Q?AgIK4HjA87+o+bkJfqc4izM9hvwfce59zquIU1yrO86T069rBVV+DemnpFfs?= =?us-ascii?Q?3vfbwH2cjsLehUo5iDkGO4/Ux4jmAynkJ3BRfxyYrvZdfdWT8xgHo62xOern?= =?us-ascii?Q?8tKr70V3CuiwuRcOHhFbfjWAZ1jpNtP1WTJFEZc0feYLlT345oqtjLiGdATA?= =?us-ascii?Q?M9nMtwrbXPvwW52w3pFyPMIvXQRC6d05fdWMqFcKWRm0etFJvs+g6QUOk8Pv?= =?us-ascii?Q?ASF0x0NuuEgU90WFjeq0wdhxQVUhEPrrfvxdcsJrPdYwm8axEfA8sq268FbP?= =?us-ascii?Q?FtfvWlFTKsIh1/7LCoqCUCQyHimLfRs1nglynqC6S8jXkmItvMTSzJVAJIUR?= =?us-ascii?Q?U5zA963GOsZ4D/nc/4vMbY/eHWxQq+8W5gtnkqqdrkhKQiZsaNx1GwPC8xz9?= =?us-ascii?Q?F6nM2EAdJ989Yaoooyg1Qa79/2Dxt39F5usc+PYm0AxgIIxPT6nGRmM9rvtC?= =?us-ascii?Q?NXf8l7ReebdVrmNTRpIlzCQmKEbZV1W7OtzBvRqJPFEVxGOK3nS1FOsSVlR2?= =?us-ascii?Q?jBOgehV0zyspJmz18ARUd9ONbf7g5SuC12lTDk5nZPFmayJiaGoYsmovQGTK?= =?us-ascii?Q?Au6LBm+Gf5ydfNrubyPfti/FR/xfG6M6TuPi/PQclQzaPatoZq1lqJtmK1cA?= =?us-ascii?Q?iWvrecNXc1Hk8G+Mq2YEuTYCJGZycKV8GvDkQkZ3GD3Z14Kmx4R3ToGNZ8wh?= =?us-ascii?Q?k0KOG7eRspQPg8XUieFEu7dWE/PjmQ7mvuTDcjQ8jnvYuzJagSuK+PSTQu8Y?= =?us-ascii?Q?2IwPIvMqgx33xsViuE5IOsrGvWSN3wD+OuGahyuaPIGKOAHsRYkITHrFBZA2?= =?us-ascii?Q?DrE232/OyVIl/zUdvY0Izag=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: 10d17f01-e008-4050-636c-08d9eaf471de X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 11:16:25.5611 (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: 5aDccB4aP1/ZnWjSXJ8s+feGNcaAi/7H+av0p3m2TVE5GyzFU6W84XWg9HaGa1pL/04rd5xbu07xiI34cEMHug== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9103 Content-Type: text/plain; charset="utf-8" The echo bit is one of the important properties of a MPTCP address. It makes sense to put it into struct mptcp_addr_info with others properties like the address family, the id number and the port number too. This patch added the echo bit in struct mptcp_addr_info. Use this instead of using the struct member echo in struct mptcp_options_received. Signed-off-by: Geliang Tang --- include/net/mptcp.h | 3 ++- net/mptcp/options.c | 16 +++++++++------- net/mptcp/protocol.h | 1 - 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 8b1afd6f5cc4..53f66e1ca4fc 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -48,7 +48,8 @@ struct mptcp_rm_list { =20 struct mptcp_addr_info { u8 id; - sa_family_t family; + u8 echo:1, + family:4; __be16 port; union { struct in_addr addr; diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 4e516e88ab88..4070a9104386 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -234,8 +234,8 @@ static void mptcp_parse_option(const struct sk_buff *sk= b, break; =20 case MPTCPOPT_ADD_ADDR: - mp_opt->echo =3D (*ptr++) & MPTCP_ADDR_ECHO; - if (!mp_opt->echo) { + mp_opt->addr.echo =3D (*ptr++) & MPTCP_ADDR_ECHO; + if (!mp_opt->addr.echo) { if (opsize =3D=3D TCPOLEN_MPTCP_ADD_ADDR || opsize =3D=3D TCPOLEN_MPTCP_ADD_ADDR_PORT) mp_opt->addr.family =3D AF_INET; @@ -283,13 +283,14 @@ static void mptcp_parse_option(const struct sk_buff *= skb, } } #endif - if (!mp_opt->echo) { + if (!mp_opt->addr.echo) { mp_opt->ahmac =3D get_unaligned_be64(ptr); ptr +=3D 8; } pr_debug("ADD_ADDR%s: id=3D%d, ahmac=3D%llu, echo=3D%d, port=3D%d", (mp_opt->addr.family =3D=3D AF_INET6) ? "6" : "", - mp_opt->addr.id, mp_opt->ahmac, mp_opt->echo, ntohs(mp_opt->addr.port)= ); + mp_opt->addr.id, mp_opt->ahmac, + mp_opt->addr.echo, ntohs(mp_opt->addr.port)); break; =20 case MPTCPOPT_RM_ADDR: @@ -945,7 +946,7 @@ static bool check_fully_established(struct mptcp_sock *= msk, struct sock *ssk, } =20 if (((mp_opt->suboptions & OPTION_MPTCP_DSS) && mp_opt->use_ack) || - ((mp_opt->suboptions & OPTION_MPTCP_ADD_ADDR) && !mp_opt->echo)) { + ((mp_opt->suboptions & OPTION_MPTCP_ADD_ADDR) && !mp_opt->addr.echo))= { /* subflows are fully established as soon as we get any * additional ack, including ADD_ADDR. */ @@ -1076,7 +1077,7 @@ static bool add_addr_hmac_valid(struct mptcp_sock *ms= k, { u64 hmac =3D 0; =20 - if (mp_opt->echo) + if (mp_opt->addr.echo) return true; =20 hmac =3D add_addr_generate_hmac(msk->remote_key, @@ -1129,7 +1130,8 @@ bool mptcp_incoming_options(struct sock *sk, struct s= k_buff *skb) =20 if ((mp_opt.suboptions & OPTION_MPTCP_ADD_ADDR) && add_addr_hmac_valid(msk, &mp_opt)) { - if (!mp_opt.echo) { + if (!mp_opt.addr.echo) { + mp_opt.addr.echo =3D 1; mptcp_pm_add_addr_received(msk, &mp_opt.addr); MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_ADDADDR); } else { diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 0eebfc9f39bc..4becac89a4a6 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -151,7 +151,6 @@ struct mptcp_options_received { mpc_map:1, reset_reason:4, reset_transient:1, - echo:1, backup:1, deny_join_id0:1, __unused:2; --=20 2.34.1 From nobody Wed May 8 22:20:06 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp981392jam; Tue, 8 Feb 2022 03:16:38 -0800 (PST) X-Google-Smtp-Source: ABdhPJyY3yM6o6BjmJVbyFXhXeN5b/ILflwJ5Qz84IvACl42II3f5hWzGoKgC7+Ykw488GqiPr7t X-Received: by 2002:a63:5c1f:: with SMTP id q31mr3152755pgb.176.1644318998175; Tue, 08 Feb 2022 03:16:38 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id q13si3486906plx.233.2022.02.08.03.16.38 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Feb 2022 03:16:38 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3518-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=IjNb1Rf7; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3518-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3518-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id CA5F53E0F38 for ; Tue, 8 Feb 2022 11:16:37 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EB6452C9D; Tue, 8 Feb 2022 11:16:36 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 AD0202C9C for ; Tue, 8 Feb 2022 11:16:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644318994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=avijuwv4MHhBO/kdomxL/T1ROgeN2qBmsBupAil1A/g=; b=IjNb1Rf7REmi5Qg0FyjPalICfMRcBI4rldrXEn1qcS+BWS2c/VEOdAnqy6QjF8Z7/+rwOS oavdxvj3aM0s/AJhOjseTQPx4ICCYbFPN5X5WqdkO/ICmzunyB7awWwIqKtfTC81n527Uh 1i0vv2bb90qeYvZuTpQTo5VU8HLFhHs= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2168.outbound.protection.outlook.com [104.47.17.168]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-5-dbF9xo2tPQKp61Ct_LcS5Q-1; Tue, 08 Feb 2022 12:16:33 +0100 X-MC-Unique: dbF9xo2tPQKp61Ct_LcS5Q-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jpg3K3yEpU3hEM7f8wFV87fiJtHLDL5wCsSGuVd1mjRVQ6+/+aZBhpRp/yQc5jXgFIVMwWFFccXGXB/hzKId1VMEJTdgrig5Mvbz4PYnKSBTtGU/KuRkz9tjld/hoH32PNxtQwKThCSQ5mO6c0hh1tbkSdXzAAy7Zl9E4JMCqQAWRYnbupb+chOZFkqwZ9N08e2ZVizj24TMx8xPsnkIsLeK0VwFzdUDWYBsEYg+4Jvpactw8gr2SitMnE5C7aLkOM6OgYZG5FdKOt/bCgF/Ku88Vz4+AVUNCVl2bdm6/HiHxjQjdKkFeU+pefO6BdNWbM+RmrpNZqda+D7yYMQbbA== 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=5cdY0pshSrxE4NM7U2au9CEgOzsggCw92fZKlwl/9iU=; b=il3C2hKKXuMOlLn5KBa0lLVaeN8QKgt4BwZ3hPwRIxoIPP40aFSFGr0Jb9ybkDAqT1UTC4h2KJBdzn63uzg4tCzylE9kXb3K4Wuu+ioTjSD3LX9/CVifIsjBNTT+w3koPn7PkIfC7u53Q7Z2gv/PJs8Ikn3NsadBg4gfgxDwuvRIXUaTjnEudf62SeVF6Ms3W96hN8xJDTSmEgS2tSgbELoaidMgLC41xo8q62Mc2G6OS+pGfkU+j83qF8UDZXop8s8xaCiiw/HY2okEBdx47Ftbx8Q2oEE+Ct1vedd0M9JlCVNqtTEISXRXy05rOIXDq5nXr2jFhFXUA3Ic1xI90Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none 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 GV1PR04MB9103.eurprd04.prod.outlook.com (2603:10a6:150:22::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.18; Tue, 8 Feb 2022 11:16:32 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Tue, 8 Feb 2022 11:16:32 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 3/4] mptcp: drop echo parameter of mptcp_pm_add_addr_signal Date: Tue, 8 Feb 2022 19:16:07 +0800 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR04CA0046.apcprd04.prod.outlook.com (2603:1096:202:14::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-Office365-Filtering-Correlation-Id: dc4391d7-b9ae-4098-f67d-08d9eaf475f4 X-MS-TrafficTypeDiagnostic: GV1PR04MB9103:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2512; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: k8yjWqS6jYzxGx/mponsZFG0BujBkBCzKDf27O3WD9zj2uMkqwqYuGCfwKkpAG8GusRDObmw0bOy1d0QSDXFKAscPGLhskrxYCuNFwN2bwdoMQbZ/pEdOqiuxsvQtr81qSwJ+mA4KwyRbkz39Gn7IyPkpSiswHNZXl4LLL6rWn3f8QEI0o/jr9MsRBD4qj0sRI0guftddepVg6T9yLtYQ5gNBscyUsAPPDa8BebzzWIwjLQMoTNVeYzCqX0k78brHL9ec3A80QHRiwc30IxLl25PHpJCx6MghceYgWUQCmeCD80iyBgNpYaPC1+G44QZXxVkJmHTVKKWxUkSseWUG7824RzWBlVvxxV7BTfu8bZWWIdH4ysQqWqL70nl3L5tWavEIwAS8gGzRQuW3VyLOkrXfFFPfuOvBI7gi6sAHMQjwem3jXFeXz1wHl86bCXmBdYDK+/o27lO8zonKNQTxSL+N+39c3wZXqw5OLLKDwSSLm1p9Dm9xyUNtDfogyFRh4OpLtj5E1oD/vzv7d5kniHY7/ZVdOClUXOKqvXRKmw5tFODY3YIrZTkWRV29606iffVdA4iOwy1CaNDUtT2TyFCmNLsLzjTbSbDUcG0ula5nyEeAD+/WUOCDvgJfmMDqrQTPB2JqzoQLnJakxrY8mafwAQB0Z0ZSNXeq0iGnymWH805qROuxgkxX+sZQlPSL07ZgFw6VKXF71DAu58vZg== 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:(13230001)(366004)(44832011)(66946007)(316002)(186003)(4326008)(86362001)(8936002)(66476007)(2906002)(508600001)(5660300002)(83380400001)(8676002)(38100700002)(6486002)(6916009)(36756003)(26005)(6666004)(6512007)(2616005)(6506007)(55236004)(107886003)(66556008)(309714004);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9qt16R6CIJ6dx5PaZRCcTYz8DEvkeqkb7UMEYuR/3rwLCGTBRtBgeWDAnXoA?= =?us-ascii?Q?jVPWFXfR2RI7+nOxJv/fsD65oBPFAanq5euhSfs2w2eQCZvB9Z9GrZ3n+ZEC?= =?us-ascii?Q?iq5QIzqAwNHAg6bR0Hgd6n8OAN8z6Air7nh+ULRrDk9pkbNjjyZm61pWEaBp?= =?us-ascii?Q?AZENDkGftVmtyqPJFhJHqyeIYFvknf0kcXsLxFrMu7vyd0gb/CeVer6J0HVj?= =?us-ascii?Q?aWJZf1G+Ml0ceokusYin/QpEhEX4slLPBGeELkL+Xlym70nv6mU+x/X3KM/t?= =?us-ascii?Q?Ag1UtOmh0+j+KVeXwLi5yt0dbsq6JdvwwFJU/HrDzZZ9kimVFC1IbWNOZH/A?= =?us-ascii?Q?Z/Zelm/6lINdVmK0npnhnVjJwkI8EPwN5YR2EPy5YHUESmWeOokVthgXFWXV?= =?us-ascii?Q?MJJPcnZfAkcait20lmJZdp7KcU2UB6T6ptZJfHfiDM5gWsT3RHihYTtnzeTE?= =?us-ascii?Q?6kfjg0u3wqcUNndutrpLV+NtCTTxxnxGTHMYGlOiOIKwx78GibmFI7Qoooz9?= =?us-ascii?Q?IaEwGBd7CF7Iy5r7cVhYnLfbzEIjTgBKW6nyy8W8bPxRlPwg40bcj4qOuETj?= =?us-ascii?Q?t2/8vDIqnxRv1a094OKokt6zGA+PjOggd9gD8L6VLuxdPHWd73avMKNdobsE?= =?us-ascii?Q?onLocNpfX4XGikGsJlXcIaOA1px8HJE7622PXBd4K9kud36KGjLkR+vgwwlf?= =?us-ascii?Q?1pzGSoY5+m2EmE4cBmgTUEF7O29whXk//A/n2EAqVwrQj4APZ4aFsICpSCCz?= =?us-ascii?Q?+7Ey5ansCCWSpIFVZw7qn2ogSlD80kWOIqIiO8yrldf2SeMOkHgokdOCO0Bm?= =?us-ascii?Q?/yd4L65SqgczWuqaBWKCddzB61cM39aiRxLcU3mNiyMlIcx3fk9WYOm6Y8ki?= =?us-ascii?Q?zIPjRVE3I9CFf9xR5N/OAEmnp2f3FRa7PH0yqdUGnr0hC3FmGTfaesEnrH96?= =?us-ascii?Q?h1UTXk20ywGRGPkfi064a644vzZb3lgEBqYBJABgw7Is8yNGY1DUpZXnHtz6?= =?us-ascii?Q?rKsSu8GDQL4ZugCwvRzJWNoueYJbgzJ9cm74p7IoRyVo1Hy/nj/Y7Vzv1Jn4?= =?us-ascii?Q?Z9KuCzZ5FQFsW4UqBgmIkBuBZi1wi4tP6A/UOfPCDfEftEvSdlMP0FiIaS22?= =?us-ascii?Q?svM9KGvrduF+rE5+6G/feztnY3IbKVcxM9eMR/6j7/Tg+UuFkUDFzk8ovm7u?= =?us-ascii?Q?2O5L9I7z0XXYev4wMd9ZnujTq3VeF9CNDD2IRaZZ+zLsvzkSEwVy3rZvB98H?= =?us-ascii?Q?bdFS0CfA1JvA0Tv+PCS2est4IkoQxt5o5AZa2g1D4/ea+iI9wCxQ5MbxbPK6?= =?us-ascii?Q?v0yAqmUgQ0x3q7XxFB20xg1LeJiNT2Gu3CypiAq44+CQ4a1DTY6KDa6+sYHJ?= =?us-ascii?Q?BoOsC3AqN49GDGXByxdoE+jNHvTTkdXNAy9UgTH7N6lrSPWjO52WYMoxmEEL?= =?us-ascii?Q?iDLvFynch2BQkbYW0kUlcb6RnnRzqUv2w9PguWbqrE4H4kpJPkJAPuDbo+QV?= =?us-ascii?Q?aOX3t1NR3g/op9vyUcT/Yg4glabiY1WWJzGlxuOOYZeJFdDeb4muZSB1C0NX?= =?us-ascii?Q?TRktiChKW3KY7xm3hkR0YTtYDAzyHbs8VeR4bAoLbx4ivKd6rxokXtbM0iUH?= =?us-ascii?Q?WVUxll94Pt3RL9GMz1jInUo=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc4391d7-b9ae-4098-f67d-08d9eaf475f4 X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 11:16:32.4356 (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: zWMO0haLsIhaO72n3vz1KoLVDSlBfWEyBirA1OjKQrrBdDfw0O+Bb4GdiFYwaYelbT6bRsdVglwXN1Bsbid6VQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9103 Content-Type: text/plain; charset="utf-8" Drop the echo parameter of mptcp_pm_add_addr_signal() and reflect it to avoid passing too many parameters. Signed-off-by: Geliang Tang --- net/mptcp/options.c | 9 ++++----- net/mptcp/pm.c | 13 +++++++------ net/mptcp/protocol.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 4070a9104386..9d7228f12473 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -652,7 +652,6 @@ static bool mptcp_established_options_add_addr(struct s= ock *sk, struct sk_buff * struct mptcp_sock *msk =3D mptcp_sk(subflow->conn); bool drop_other_suboptions =3D false; unsigned int opt_size =3D *size; - bool echo; int len; =20 /* add addr will strip the existing options, be sure to avoid breaking @@ -661,12 +660,12 @@ static bool mptcp_established_options_add_addr(struct= sock *sk, struct sk_buff * if (!mptcp_pm_should_add_signal(msk) || (opts->suboptions & (OPTION_MPTCP_MPJ_ACK | OPTION_MPTCP_MPC_ACK)) || !mptcp_pm_add_addr_signal(msk, skb, opt_size, remaining, &opts->addr, - &echo, &drop_other_suboptions)) + &drop_other_suboptions)) return false; =20 if (drop_other_suboptions) remaining +=3D opt_size; - len =3D mptcp_add_addr_len(opts->addr.family, echo, !!opts->addr.port); + len =3D mptcp_add_addr_len(opts->addr.family, opts->addr.echo, !!opts->ad= dr.port); if (remaining < len) return false; =20 @@ -684,13 +683,13 @@ static bool mptcp_established_options_add_addr(struct= sock *sk, struct sk_buff * *size -=3D opt_size; } opts->suboptions |=3D OPTION_MPTCP_ADD_ADDR; - if (!echo) { + if (!opts->addr.echo) { opts->ahmac =3D add_addr_generate_hmac(msk->local_key, msk->remote_key, &opts->addr); } pr_debug("addr_id=3D%d, ahmac=3D%llu, echo=3D%d, port=3D%d", - opts->addr.id, opts->ahmac, echo, ntohs(opts->addr.port)); + opts->addr.id, opts->ahmac, opts->addr.echo, ntohs(opts->addr.port)); =20 return true; } diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 99db7270e461..8dd78424f86e 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -283,13 +283,14 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 f= ail_seq) =20 bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb, unsigned int opt_size, unsigned int remaining, - struct mptcp_addr_info *addr, bool *echo, + struct mptcp_addr_info *addr, bool *drop_other_suboptions) { int ret =3D false; u8 add_addr; u8 family; bool port; + bool echo; =20 spin_lock_bh(&msk->pm.lock); =20 @@ -306,14 +307,14 @@ bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk,= struct sk_buff *skb, *drop_other_suboptions =3D true; } =20 - *echo =3D mptcp_pm_should_add_signal_echo(msk); - port =3D !!(*echo ? msk->pm.remote.port : msk->pm.local.port); + echo =3D mptcp_pm_should_add_signal_echo(msk); + port =3D !!(echo ? msk->pm.remote.port : msk->pm.local.port); =20 - family =3D *echo ? msk->pm.remote.family : msk->pm.local.family; - if (remaining < mptcp_add_addr_len(family, *echo, port)) + family =3D echo ? msk->pm.remote.family : msk->pm.local.family; + if (remaining < mptcp_add_addr_len(family, echo, port)) goto out_unlock; =20 - if (*echo) { + if (echo) { *addr =3D msk->pm.remote; add_addr =3D msk->pm.addr_signal & ~BIT(MPTCP_ADD_ADDR_ECHO); } else { diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 4becac89a4a6..7ee6a39a7ff9 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -833,7 +833,7 @@ static inline int mptcp_rm_addr_len(const struct mptcp_= rm_list *rm_list) =20 bool mptcp_pm_add_addr_signal(struct mptcp_sock *msk, struct sk_buff *skb, unsigned int opt_size, unsigned int remaining, - struct mptcp_addr_info *addr, bool *echo, + struct mptcp_addr_info *addr, bool *drop_other_suboptions); bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remainin= g, struct mptcp_rm_list *rm_list); --=20 2.34.1 From nobody Wed May 8 22:20:06 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:9f92:0:0:0:0:0 with SMTP id a18csp981477jam; Tue, 8 Feb 2022 03:16:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJyAplVO3ZOHelsKt5/mMMR51DtzjICLIM56Le9zkKvvcQD3DWA1/Df0I0YRMoUlAeka+Tp+ X-Received: by 2002:a17:902:e744:: with SMTP id p4mr4048201plf.61.1644319005260; Tue, 08 Feb 2022 03:16:45 -0800 (PST) Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id w3si12160171ply.342.2022.02.08.03.16.45 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 08 Feb 2022 03:16:45 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-3519-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.com header.s=mimecast20200619 header.b=IQYsxxEg; arc=fail (body hash mismatch); spf=pass (google.com: domain of mptcp+bounces-3519-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-3519-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=suse.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id 99AAD3E0F83 for ; Tue, 8 Feb 2022 11:16:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C13652C9D; Tue, 8 Feb 2022 11:16:43 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from de-smtp-delivery-102.mimecast.com (de-smtp-delivery-102.mimecast.com [194.104.109.102]) (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 93B7F2C9C for ; Tue, 8 Feb 2022 11:16:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=mimecast20200619; t=1644319001; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3asp1jeUjrDPeIEbN/1CCDI7h+O0weVURBxO7Aue4xk=; b=IQYsxxEgL9777aGwKwHTI6LgKTr1BIoNkZd3BdLGFTpk46CIA+8CXWjBaw+SUAb0p/ghj3 ykHV3QAZQLwEd9d2VlSnnsyVq3C0v0hQyNYCVd3cKj5q+UqJoi4nUGE4JMN/BGqAdjD+Q7 YV7cBu0gYT7bdHY6XyBPXVPv9QEsDkw= Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05lp2168.outbound.protection.outlook.com [104.47.17.168]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id de-mta-25-9CqYKqpSO4Sc2oLeChL2vg-1; Tue, 08 Feb 2022 12:16:40 +0100 X-MC-Unique: 9CqYKqpSO4Sc2oLeChL2vg-1 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YuJMxRZhuhebkI/wKsaI3xqQQxg1yoqFalTfqs187ZqJ+bMIUAUIELqazTc+MIabn3PPur/jsc0HHvi34bYowMtnfakygFzC1DkJvpfKFF4u8Lp3eXMv7WOfM0WmM1gRiWrAauotzFMivaimkem2T+7U/Hk8oOfRtcsXYzF4/W7BwU5m95QFKnB0Xsm5Axz2uUSyf18ePmL+3LVEjwCbnaZ+0ZqPEVk6f1wX09pBDEiLQOR2ERG8PfVBO3Qll+cSuHiBwTulFWkZ77L8WdnZdNxSAO41d1ITCrGCR4sTe2vguuqXbGLy2Seq1EHxrOjLnP/exVGR3PC4AU1A8KcSPg== 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=r5bENp63WciYUz0sZtk+b01FxrFd6nMY/RZ1msOtMaM=; b=dt+rfgeABwxfdqhOIPtohFIoE9v05Fdmjx841MKaAZ/FJQRfBuTC8J2DwTCnc1nnj0bjEc0s7wGW773cCLTP4AD8LeXBx1gvAiK/5OWQNkgzzO36F4Jm1xHB28us+TEGSe2z+DTi8wk2k2CaQrkqoEbfvvfD42K/3pyYOFVcUolKPhS0cxtzYdebQQXgVpYctyKDKQwEc4Bnah4o7BFQBYi5WbDzzL3ROsARE7KlWL3VEIQi3hiHd0ETJYuMazXSpmr5/L4xNovNp2CkvNLdAiG2CSKVY8CCEyd7UCeatMpd8nV2DLx83ZRYbsXj1TXw1eXt6lEJCKx5NABZRFiueA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none 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 GV1PR04MB9103.eurprd04.prod.outlook.com (2603:10a6:150:22::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.18; Tue, 8 Feb 2022 11:16:39 +0000 Received: from HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5]) by HE1PR0402MB3497.eurprd04.prod.outlook.com ([fe80::60de:f804:3830:f7c5%4]) with mapi id 15.20.4951.019; Tue, 8 Feb 2022 11:16:39 +0000 From: Geliang Tang To: mptcp@lists.linux.dev CC: Geliang Tang Subject: [PATCH mptcp-next 4/4] mptcp: drop echo parameter of mptcp_pm_announce_addr Date: Tue, 8 Feb 2022 19:16:08 +0800 Message-ID: <3f4443708de96d22560a552c83538b5fa84a357f.1644318561.git.geliang.tang@suse.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: HK2PR03CA0059.apcprd03.prod.outlook.com (2603:1096:202:17::29) 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-Office365-Filtering-Correlation-Id: f16198c5-2549-4177-8b9e-08d9eaf479ec X-MS-TrafficTypeDiagnostic: GV1PR04MB9103:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aqCX33Kcqqb/wCFG0549voG+WYJBlqkzcgd0NpkZWREmpF/iTiFffG31iV6I8j1Wd4Ugc29nZv4ff/w6jqybyo+piIAclQPMX1OeXfPdB7J3dtgR3HdOaEx2lhpEKcS4FTen58hnz/rXnHBXCdPH9bSMTg24jAHpWoegXWuKg4DAwu93+KTo9rnua+7ZBiOP25EP9yDUIlwhtNOnzKKOxV+Hr1lWQ2XVkCWWWUwJjGYpvszwN5XGI/+G91wFL8IrMQWVKIQRknj7Kb6k7Rz7rBMp8HbUKV+ZCgFe3H5BtnrIEd2Qg9g37oJ+LtWiqhUODEOTcFjcXt43qZpcSQjoGcnz0I/P9qqRrF6Og1H4q1EwuNUYwK1+W2YK71+VxrTF/0nK+1IYukV0XJZSXYc4VLGLl0JH/Y3hlkTKqo8XR7B6d9X7io2dYIX68FMi4lPcnQbXKH9uY6j8x0vRB0RPp64KeA3FylcPmnVt83EFADCWtxZHMaP6leJZk16VEGILKv2QimLsthgp6gG259cmoEYD14kQvAWRQCsuWjboOoGBIctql5BNFP920W1MUsw3KC37mtHGir6W8OrUHYNX1XX3jn+nxnUENx2ULg9Fch4taGUbkiEw2kSkzN4edoCL9Wi64Upzi2Mkxye4lmbawg== 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:(13230001)(366004)(44832011)(66946007)(316002)(186003)(4326008)(86362001)(8936002)(66476007)(2906002)(508600001)(5660300002)(83380400001)(8676002)(38100700002)(6486002)(6916009)(36756003)(26005)(6666004)(6512007)(2616005)(6506007)(55236004)(107886003)(66556008);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?7KoFFkkQXa1NwRasl7TU3VuSvqZNArz43MyMRMJpH1V9MenbxLbaxPbYpdaP?= =?us-ascii?Q?6CANq2+Zx3CcSGCksjWhRBYVAu0VyGgrqITakE1o6mA4D+z4jXkGhTj9tBD2?= =?us-ascii?Q?amGcCysx5e9WcZVeXbgfAZkmQHI0FAYDUh9MAvWTIVGyw/sqoNepykm6nzzj?= =?us-ascii?Q?LzMy/3CqlQDBAuDxaQQnb24SRWcLPZQdRuWY16OKO7qNV905NfRiwta9GKVi?= =?us-ascii?Q?RRFZktGyyccaFciMqPWL7012jAOSr7afyE3Oafh72BkoCkU+rRnEslMHiA7Z?= =?us-ascii?Q?WGbI6BlVigqjo9U7+VT6IeMUlF14Hy/rg1y6zr5nKXO78x3FQYd8Lp55XRM1?= =?us-ascii?Q?kSJjgzW4UGAVlK10rwW5YeYmvhBGxewPObLh+savPrlocgYLKOxzBAFyoTFp?= =?us-ascii?Q?O7wZ8BEV98NhfEyyJGAaTaX/dYD7BisUUF9GSg9RcifScMXDgLakjN3tbixD?= =?us-ascii?Q?o2t6/Ex3UkGLhkgFVuEww5MVbzaMfXq1FwX1VL7vdGbq+3a/8wNaeb4xfZLJ?= =?us-ascii?Q?bPyUdoX4i01GIvHgYYlofJNWSsEyEaQ5ENCatH20xTlk7WU0mFgstVFRA5Yc?= =?us-ascii?Q?xLgoBw6vgbFCxGMghIRdEroq3f01R+7zn6sFFUhl4SV4fiPDSTLk9ggKIIn/?= =?us-ascii?Q?hlrubGjJzwV04uYezHEnXOZnCOj7cLvldcOlznlBsaOvxUbeQonpDcv5r96c?= =?us-ascii?Q?mHEFOExFDDkQ5bnfvsC9aXelhaQcobaFxekM15d7Qh1CXlxmy9qh3sNDm7I1?= =?us-ascii?Q?C9+NUCPV62ogxQuGih9j54y2kG4XTJfAlftF6ojykh/RBOhvZHT6bRfvIIGI?= =?us-ascii?Q?S7bMRUinZlTOq+sg+DnRtqOgdiYIWSFYID0bS0OsMPodM/gWR40qA5vnFXvg?= =?us-ascii?Q?rizkkTfUyh0SmCxY/fFjg54Y8wmGdnQRitJaK8iARq3/uCZpst780AekZvvZ?= =?us-ascii?Q?L6tYzIwXDq9Taq/8n8gLN0SXU2AsOJeNot+LW55VvEn2s3RRhdRIbI1ejKVS?= =?us-ascii?Q?HlEVjIcWf6NrPW7HxJe1k5g71/nx81DKISyn3B0txzqYxerLKQGYNj7QWw/K?= =?us-ascii?Q?Nbp/g/pkgATk6aghatY3DZKeM5VmxWXCP5VDBA3kG4oogDDYhoGEJnv5Rn8u?= =?us-ascii?Q?q2MHnxsHH647j4cJK23tf4P/0Lp24/Nqr6oKbaXYUglw+WXZraF4H/mUpBFU?= =?us-ascii?Q?0c879KH4hBh9UsvZpINqsNfgXa6JUv4APUGyRG49YFhxG8El84TkjOA4guHt?= =?us-ascii?Q?kd7Ta9JcROwuyK4n16E1k94MhC0QHSBLBriHiF6UeA3275pys6ZueBG8lAgw?= =?us-ascii?Q?Q3hELNpaAdij71y/YfTFiAWuY5a1snRzJwWt3qqTwTypVBWrczirSAQGDMJY?= =?us-ascii?Q?a3HZivb8hE78dqnOAXvcCQhdV/P+iA+cVs5aRm7QMrhFs3IdxgzOw0AscB4t?= =?us-ascii?Q?beMdeml5KHgyGLnbVvVm0+d6pMOQJEQoy0sL91EZleIEr7cfvELLMvwfkCtr?= =?us-ascii?Q?b9Q7etbpbdJp1cTWcmS+4qLcQGJbNwZzil/Qw2QCKb57twr8QPDTaNZt6wkW?= =?us-ascii?Q?1QN7cGJh6FAqheE82Swv1EyW9SHeyQ1LPAQvnfdUFGeCqCMWtAtCxi6yHo1+?= =?us-ascii?Q?WkHMDK6SJT9gs/GAnEAVnHE=3D?= X-OriginatorOrg: suse.com X-MS-Exchange-CrossTenant-Network-Message-Id: f16198c5-2549-4177-8b9e-08d9eaf479ec X-MS-Exchange-CrossTenant-AuthSource: HE1PR0402MB3497.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 11:16:39.0913 (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: 9OeKw7xIpy1je/sWNFT0d1YIqFMBIy6wKQpHIFK08MXlQiTPdnIfinjD/s0ktaC3yPlbMl0ixtKqfTweDfJdMg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV1PR04MB9103 Content-Type: text/plain; charset="utf-8" Since the echo bit is added in struct mptcp_addr_info, use it in mptcp_pm_announce_addr() instead of passing the echo parameter. Signed-off-by: Geliang Tang --- net/mptcp/pm.c | 13 ++++++------- net/mptcp/pm_netlink.c | 6 +++--- net/mptcp/protocol.h | 3 +-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 8dd78424f86e..0bd8af167d65 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -15,22 +15,21 @@ /* path manager command handlers */ =20 int mptcp_pm_announce_addr(struct mptcp_sock *msk, - const struct mptcp_addr_info *addr, - bool echo) + const struct mptcp_addr_info *addr) { u8 add_addr =3D READ_ONCE(msk->pm.addr_signal); =20 - pr_debug("msk=3D%p, local_id=3D%d, echo=3D%d", msk, addr->id, echo); + pr_debug("msk=3D%p, local_id=3D%d, echo=3D%d", msk, addr->id, addr->echo); =20 lockdep_assert_held(&msk->pm.lock); =20 if (add_addr & - (echo ? BIT(MPTCP_ADD_ADDR_ECHO) : BIT(MPTCP_ADD_ADDR_SIGNAL))) { - pr_warn("addr_signal error, add_addr=3D%d, echo=3D%d", add_addr, echo); + (addr->echo ? BIT(MPTCP_ADD_ADDR_ECHO) : BIT(MPTCP_ADD_ADDR_SIGNAL)))= { + pr_warn("addr_signal error, add_addr=3D%d, echo=3D%d", add_addr, addr->e= cho); return -EINVAL; } =20 - if (echo) { + if (addr->echo) { msk->pm.remote =3D *addr; add_addr |=3D BIT(MPTCP_ADD_ADDR_ECHO); } else { @@ -209,7 +208,7 @@ void mptcp_pm_add_addr_received(struct mptcp_sock *msk, spin_lock_bh(&pm->lock); =20 if (!READ_ONCE(pm->accept_addr) || mptcp_pm_is_userspace(msk)) { - mptcp_pm_announce_addr(msk, addr, true); + mptcp_pm_announce_addr(msk, addr); mptcp_pm_add_addr_send_ack(msk); } else if (mptcp_pm_schedule_work(msk, MPTCP_PM_ADD_ADDR_RECEIVED)) { pm->remote =3D *addr; diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 93800f32fcb6..8fcba8e92b5b 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -326,7 +326,7 @@ static void mptcp_pm_add_timer(struct timer_list *timer) =20 if (!mptcp_pm_should_add_signal_addr(msk)) { pr_debug("retransmit ADD_ADDR id=3D%d", entry->addr.id); - mptcp_pm_announce_addr(msk, &entry->addr, false); + mptcp_pm_announce_addr(msk, &entry->addr); mptcp_pm_add_addr_send_ack(msk); entry->retrans_times++; } @@ -550,7 +550,7 @@ static void mptcp_pm_create_subflow_or_signal_addr(stru= ct mptcp_sock *msk) if (mptcp_pm_alloc_anno_list(msk, local)) { __clear_bit(local->addr.id, msk->pm.id_avail_bitmap); msk->pm.add_addr_signaled++; - mptcp_pm_announce_addr(msk, &local->addr, false); + mptcp_pm_announce_addr(msk, &local->addr); mptcp_pm_nl_addr_send_ack(msk); } } @@ -681,7 +681,7 @@ static void mptcp_pm_nl_add_addr_received(struct mptcp_= sock *msk) spin_lock_bh(&msk->pm.lock); =20 add_addr_echo: - mptcp_pm_announce_addr(msk, &msk->pm.remote, true); + mptcp_pm_announce_addr(msk, &msk->pm.remote); mptcp_pm_nl_addr_send_ack(msk); } =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 7ee6a39a7ff9..29a8a0b2512b 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -772,8 +772,7 @@ int mptcp_pm_get_flags_and_ifindex_by_id(struct net *ne= t, unsigned int id, u8 *flags, int *ifindex); =20 int mptcp_pm_announce_addr(struct mptcp_sock *msk, - const struct mptcp_addr_info *addr, - bool echo); + const struct mptcp_addr_info *addr); int mptcp_pm_remove_addr(struct mptcp_sock *msk, const struct mptcp_rm_lis= t *rm_list); int mptcp_pm_remove_subflow(struct mptcp_sock *msk, const struct mptcp_rm_= list *rm_list); =20 --=20 2.34.1