From nobody Mon Feb 9 16:51:38 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:cbb9:0:0:0:0:0 with SMTP id v25csp1060438jap; Wed, 17 Nov 2021 17:30:19 -0800 (PST) X-Google-Smtp-Source: ABdhPJyub5f4F+lomJC44BkulvRBk75UhgB35c5PlIgX7zt4nAh0sgR8NxXuumF+Xf9ZrhgsOgG7 X-Received: by 2002:a05:6122:920:: with SMTP id j32mr96375874vka.20.1637199019670; Wed, 17 Nov 2021 17:30:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1637199019; cv=none; d=google.com; s=arc-20160816; b=Id7BjPolPC6bl+DGbu/WTDOZR8MA3V3rsYIdIMPY8cLsUXMXfJeaaZ26VV63zY+rDh u36O8PWneh0Z0Q1bAZ80KTJ2Ky0RbJzM+UsQke45lZhRk37k0W1IP+VVwryaxswmMd5H STNFSiC13AJfkPayXpvxBErhjzwgKazP6jlzqUh/U0Gtd+Xmq4h8FGp+OWM7A8R2xaJ/ Rz3VULJy9Gz0U+QB4s41pyRkD2//OG+6txiHrltZDSI4f/Reij6vTxJzl1A1a34Xd63Z 1u5+knGfEcHq4JxHPudrUeuDgBEr0wM4LW5/SE8FebowyFYj+InAUvLZSyyqPD6sK1dn BQkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=fw9mhjQV60AmP7IhT56VSUaNeKbt11yItLAuMESh/78=; b=exzjlE671YP5aM4Vb2asAbkNMUU2OqqQIK2PeWSdBcTMTBND1Ts03dpzujWvLcHNnI 3SoEoCdUCWKp902MslRVqYVECTXeZcLrwRE9t3vFvgyY+cgkYn4DFivJg8fAOLBs7EVj N5lciyRzwepzoA2RHjmF/ta2jxFEkWZcJATzWWcQwocbrU+vbSwYpBv7QmWZQ3fiWEGS pq8bmkHj7bGHM1anJDLqiQvlmqY7DSXoMEdL3wa3gEjJwOAwCZfnCwPRYgrlvmZ4ZOC+ +1gSRymF1FDtYlAmxIu9cTOmNmvWsS++HG00ZTF/IPjtU2xvqImb5JL2CDCpD571i9Ba LVdw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2459-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2459-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [147.75.197.195]) by mx.google.com with ESMTPS id u22si3336199vsi.427.2021.11.17.17.30.19 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Nov 2021 17:30:19 -0800 (PST) Received-SPF: pass (google.com: domain of mptcp+bounces-2459-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) client-ip=147.75.197.195; Authentication-Results: mx.google.com; spf=pass (google.com: domain of mptcp+bounces-2459-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.197.195 as permitted sender) smtp.mailfrom="mptcp+bounces-2459-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.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 ewr.edge.kernel.org (Postfix) with ESMTPS id 0EAC61C0D2D for ; Thu, 18 Nov 2021 01:30:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C1FCC2C97; Thu, 18 Nov 2021 01:30:16 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (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 86B5B2C89 for ; Thu, 18 Nov 2021 01:30:15 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10171"; a="231577911" X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="231577911" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2021 17:30:14 -0800 X-IronPort-AV: E=Sophos;i="5.87,243,1631602800"; d="scan'208";a="568294740" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.251.27.251]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Nov 2021 17:30:14 -0800 From: Mat Martineau To: mptcp@lists.linux.dev Cc: Mat Martineau Subject: [PATCH mptcp-next 1/6] mptcp: Remove redundant assignments in path manager init Date: Wed, 17 Nov 2021 17:30:00 -0800 Message-Id: <20211118013005.263660-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211118013005.263660-1-mathew.j.martineau@linux.intel.com> References: <20211118013005.263660-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A few members of the mptcp_pm_data struct were assigned to hard-coded values in mptcp_pm_data_init(), and then immediately changed in mptcp_pm_nl_data_init(). Instead, flatten all the initialization in to mptcp_pm_data_init(). Signed-off-by: Mat Martineau --- net/mptcp/pm.c | 38 +++++++++++++++++++++----------------- net/mptcp/pm_netlink.c | 12 ------------ net/mptcp/protocol.h | 1 - 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 86b38a830b4c..467fbb2a4eba 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -364,23 +364,27 @@ void mptcp_pm_subflow_chk_stale(const struct mptcp_so= ck *msk, struct sock *ssk) =20 void mptcp_pm_data_init(struct mptcp_sock *msk) { - msk->pm.add_addr_signaled =3D 0; - msk->pm.add_addr_accepted =3D 0; - msk->pm.local_addr_used =3D 0; - msk->pm.subflows =3D 0; - msk->pm.rm_list_tx.nr =3D 0; - msk->pm.rm_list_rx.nr =3D 0; - WRITE_ONCE(msk->pm.work_pending, false); - WRITE_ONCE(msk->pm.addr_signal, 0); - WRITE_ONCE(msk->pm.accept_addr, false); - WRITE_ONCE(msk->pm.accept_subflow, false); - WRITE_ONCE(msk->pm.remote_deny_join_id0, false); - msk->pm.status =3D 0; - - spin_lock_init(&msk->pm.lock); - INIT_LIST_HEAD(&msk->pm.anno_list); - - mptcp_pm_nl_data_init(msk); + bool subflows_allowed =3D !!mptcp_pm_get_subflows_max(msk); + struct mptcp_pm_data *pm =3D &msk->pm; + + pm->add_addr_signaled =3D 0; + pm->add_addr_accepted =3D 0; + pm->local_addr_used =3D 0; + pm->subflows =3D 0; + pm->rm_list_tx.nr =3D 0; + pm->rm_list_rx.nr =3D 0; + WRITE_ONCE(pm->work_pending, + (!!mptcp_pm_get_local_addr_max(msk) && subflows_allowed) || + !!mptcp_pm_get_add_addr_signal_max(msk)); + WRITE_ONCE(pm->addr_signal, 0); + WRITE_ONCE(pm->accept_addr, + !!mptcp_pm_get_add_addr_accept_max(msk) && subflows_allowed); + WRITE_ONCE(pm->accept_subflow, subflows_allowed); + WRITE_ONCE(pm->remote_deny_join_id0, false); + pm->status =3D 0; + + spin_lock_init(&pm->lock); + INIT_LIST_HEAD(&pm->anno_list); } =20 void __init mptcp_pm_init(void) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index 7b96be1e9f14..bab78e2f5299 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -954,18 +954,6 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, s= truct sock_common *skc) return ret; } =20 -void mptcp_pm_nl_data_init(struct mptcp_sock *msk) -{ - struct mptcp_pm_data *pm =3D &msk->pm; - bool subflows; - - subflows =3D !!mptcp_pm_get_subflows_max(msk); - WRITE_ONCE(pm->work_pending, (!!mptcp_pm_get_local_addr_max(msk) && subfl= ows) || - !!mptcp_pm_get_add_addr_signal_max(msk)); - WRITE_ONCE(pm->accept_addr, !!mptcp_pm_get_add_addr_accept_max(msk) && su= bflows); - WRITE_ONCE(pm->accept_subflow, subflows); -} - #define MPTCP_PM_CMD_GRP_OFFSET 0 #define MPTCP_PM_EV_GRP_OFFSET 1 =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 906509c6cde5..092cb77a64d8 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -803,7 +803,6 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, un= signed int remaining, int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc); =20 void __init mptcp_pm_nl_init(void); -void mptcp_pm_nl_data_init(struct mptcp_sock *msk); void mptcp_pm_nl_work(struct mptcp_sock *msk); void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, const struct mptcp_rm_list *rm_list); --=20 2.34.0