From nobody Thu Sep 18 08:14:48 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp1319152pis; Wed, 27 Apr 2022 15:50:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxjfEngmgTuAcd/xZKrKoOesAoNHFHZs9vm8Mdo/+jR8wam2B7tKJINRumSTyFlWelWDMrc X-Received: by 2002:a05:6808:1c9:b0:322:3901:9ce1 with SMTP id x9-20020a05680801c900b0032239019ce1mr18466527oic.160.1651099816844; Wed, 27 Apr 2022 15:50:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651099816; cv=none; d=google.com; s=arc-20160816; b=extcwnTSYqMzkdyDcYyVuE7Ker6LHTM7V62UFDvHrw8S4jjjFyqtUHik+vib40vny8 5wkRd7q0yD+3zJokZB0yq4vruY5ifhorys8nockr+2NnsZf8jqq+pTy+TI7gAoC4nhYp SnVsmZo0fdvd4b3Ja8z9sao27SIuXSs0tmWJRWVUWsnr+rMuei7RaWFoWpuSWDGJ8TsE r7hVOYjPs6Y75Kkhi5sVUNtnPNNGJZEIj8jhSzqo+VoeFII8FthelISV/GVYco9kLnWg UYwz17dQqOFgDZMfVHGYRlQkvBfXh+r6LcVxVHGU3Xpc/qyUTbYN4coTIKBWP5kG576L E3dg== 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:dkim-signature; bh=vgNe65xI6iYoQLmYR7nHM5Tu/W8fFzfiOmNJ/iUNn40=; b=DYG6m+JCNpTB+6zNJFV8BOPEQeGtt6kUXOW4ypNc5fkzRWrIoD9f7MwdfKkAdAHMNM uNwwjfsiaEGeWazkYMFXNscqLPS5n/lX10mPc7vlorFJqmB/7NXl69UrGtS6uCoRQ8QF HmgXlV5kXn6NRF4A8x0/F7ytzJdO7A0p+ZrcB/eezPRC5YGNkFx/Dwtywv6CTyGK69HS PMAxkcxr+ZCHwzWII6x3mMhK69ciWJ4wWacU37MjL8ZRYkQyBo+PlfCyfz5b5kNlrXYn ueu3oiNCVbmNK5dTS8Vouq4Zx1Rs9M3yvvUVto3B3VRIZfgNqCwvbYufCTT98h2fjMex AvQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ObvsByK0; spf=pass (google.com: domain of mptcp+bounces-4935-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4935-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [2604:1380:4040:4f00::1]) by mx.google.com with ESMTPS id k14-20020a056870350e00b000e672e8b23fsi1827800oah.39.2022.04.27.15.50.16 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 27 Apr 2022 15:50:16 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4935-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) client-ip=2604:1380:4040:4f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ObvsByK0; spf=pass (google.com: domain of mptcp+bounces-4935-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:4040:4f00::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4935-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (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 da.mirrors.kernel.org (Postfix) with ESMTPS id 8A4492E09F0 for ; Wed, 27 Apr 2022 22:50:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A2D62801; Wed, 27 Apr 2022 22:50:14 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (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 53CD37B for ; Wed, 27 Apr 2022 22:50:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651099813; x=1682635813; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=ritax1ucyi7/s2oghgHR+QF0LFx3Zqi4UHvJPq/tudU=; b=ObvsByK0ExZHGl/qfwtMfHugLyQ0fbkcgYrCICag9PO51ivRv3+d3MtG GP/UAbCAEZZMeQ7iRrVUSl7FdZzlZCHUSHUnwcqokJQ9R8pddMZTSP7FD Dj88hJeO3jcFVXS1EYPtpZ6dw5BEN0Svf/cpoSdeWxf2eGlE1GCZV8Ae3 gKEXpuOXNXIWajhlESbx56XAHNKNK5FV5e3b4GWSFNbDm8aTOLGNiofBl A3834c869Lycc9NJnBPhWnUnXP7nM0UKP0HQPWfla27JEvqzbVaJnts2D KFNpvbAhdjv3xDvXI9see9BgIJ62QjqH1wjywIotu689vzFrwRJhUKNTD Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10330"; a="291252889" X-IronPort-AV: E=Sophos;i="5.90,294,1643702400"; d="scan'208";a="291252889" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2022 15:50:10 -0700 X-IronPort-AV: E=Sophos;i="5.90,294,1643702400"; d="scan'208";a="731049115" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.233.139]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2022 15:50:10 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Mat Martineau , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev Subject: [PATCH net-next 1/6] mptcp: Remove redundant assignments in path manager init Date: Wed, 27 Apr 2022 15:49:57 -0700 Message-Id: <20220427225002.231996-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220427225002.231996-1-mathew.j.martineau@linux.intel.com> References: <20220427225002.231996-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_reset(), and then immediately changed in mptcp_pm_nl_data_init(). Instead, flatten all the assignments in to mptcp_pm_data_reset(). v2: Resolve conflicts due to rename of mptcp_pm_data_reset() v4: Resolve conflict in mptcp_pm_data_reset() Acked-by: Paolo Abeni Signed-off-by: Mat Martineau --- net/mptcp/pm.c | 32 ++++++++++++++++++-------------- net/mptcp/pm_netlink.c | 12 ------------ net/mptcp/protocol.h | 1 - 3 files changed, 18 insertions(+), 27 deletions(-) diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 14f448d82bb2..4de90e618be3 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -415,21 +415,25 @@ void mptcp_pm_subflow_chk_stale(const struct mptcp_so= ck *msk, struct sock *ssk) =20 void mptcp_pm_data_reset(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; - bitmap_fill(msk->pm.id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1); + bool subflows_allowed =3D !!mptcp_pm_get_subflows_max(msk); + struct mptcp_pm_data *pm =3D &msk->pm; =20 - mptcp_pm_nl_data_init(msk); + 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; + bitmap_fill(msk->pm.id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1); } =20 void mptcp_pm_data_init(struct mptcp_sock *msk) diff --git a/net/mptcp/pm_netlink.c b/net/mptcp/pm_netlink.c index c20261b612e9..bbbbfb421eec 100644 --- a/net/mptcp/pm_netlink.c +++ b/net/mptcp/pm_netlink.c @@ -1061,18 +1061,6 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk,= struct 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 3a8740fef918..0316605de559 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -828,7 +828,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.36.0