Commit 9273b9d5 authored by Mat Martineau's avatar Mat Martineau Committed by Jakub Kicinski
Browse files

mptcp: Remove redundant assignments in path manager init 



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: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent a41c653d

net/mptcp/pm.c

+18 −14
Original line number Diff line number Diff line
@@ -415,21 +415,25 @@ void mptcp_pm_subflow_chk_stale(const struct mptcp_sock *msk, struct sock *ssk) 


void mptcp_pm_data_reset(struct mptcp_sock *msk)

{

	msk->pm.add_addr_signaled = 0;

	msk->pm.add_addr_accepted = 0;

	msk->pm.local_addr_used = 0;

	msk->pm.subflows = 0;

	msk->pm.rm_list_tx.nr = 0;

	msk->pm.rm_list_rx.nr = 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 = 0;

	bitmap_fill(msk->pm.id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);

	bool subflows_allowed = !!mptcp_pm_get_subflows_max(msk);

	struct mptcp_pm_data *pm = &msk->pm;



	mptcp_pm_nl_data_init(msk);

	pm->add_addr_signaled = 0;

	pm->add_addr_accepted = 0;

	pm->local_addr_used = 0;

	pm->subflows = 0;

	pm->rm_list_tx.nr = 0;

	pm->rm_list_rx.nr = 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 = 0;

	bitmap_fill(msk->pm.id_avail_bitmap, MPTCP_PM_MAX_ADDR_ID + 1);

}



void mptcp_pm_data_init(struct mptcp_sock *msk)

net/mptcp/pm_netlink.c

+0 −12
Original line number Diff line number Diff line
@@ -1061,18 +1061,6 @@ int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc) 
	return ret;

}



void mptcp_pm_nl_data_init(struct mptcp_sock *msk)

{

	struct mptcp_pm_data *pm = &msk->pm;

	bool subflows;



	subflows = !!mptcp_pm_get_subflows_max(msk);

	WRITE_ONCE(pm->work_pending, (!!mptcp_pm_get_local_addr_max(msk) && subflows) ||

		   !!mptcp_pm_get_add_addr_signal_max(msk));

	WRITE_ONCE(pm->accept_addr, !!mptcp_pm_get_add_addr_accept_max(msk) && subflows);

	WRITE_ONCE(pm->accept_subflow, subflows);

}



#define MPTCP_PM_CMD_GRP_OFFSET       0

#define MPTCP_PM_EV_GRP_OFFSET        1

net/mptcp/protocol.h

+0 −1
Original line number Diff line number Diff line
@@ -828,7 +828,6 @@ bool mptcp_pm_rm_addr_signal(struct mptcp_sock *msk, unsigned int remaining, 
int mptcp_pm_get_local_id(struct mptcp_sock *msk, struct sock_common *skc);



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);