Commit e9801430 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

mptcp: move pm netlink work into pm_netlink 



Allows to make some functions static and avoids acquire of the pm
spinlock in protocol.c.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0a82c37e

net/mptcp/pm_netlink.c

+40 −5
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ struct pm_nl_pernet { 
#define MPTCP_PM_ADDR_MAX	8

#define ADD_ADDR_RETRANS_MAX	3



static void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk);



static bool addresses_equal(const struct mptcp_addr_info *a,

			    struct mptcp_addr_info *b, bool use_port)

{
@@ -448,17 +450,17 @@ static void mptcp_pm_create_subflow_or_signal_addr(struct mptcp_sock *msk) 
	}

}



void mptcp_pm_nl_fully_established(struct mptcp_sock *msk)

static void mptcp_pm_nl_fully_established(struct mptcp_sock *msk)

{

	mptcp_pm_create_subflow_or_signal_addr(msk);

}



void mptcp_pm_nl_subflow_established(struct mptcp_sock *msk)

static void mptcp_pm_nl_subflow_established(struct mptcp_sock *msk)

{

	mptcp_pm_create_subflow_or_signal_addr(msk);

}



void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)

static void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk)

{

	struct sock *sk = (struct sock *)msk;

	unsigned int add_addr_accept_max;
@@ -498,7 +500,7 @@ void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk) 
	mptcp_pm_nl_add_addr_send_ack(msk);

}



void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk)

static void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk)

{

	struct mptcp_subflow_context *subflow;
@@ -568,7 +570,7 @@ int mptcp_pm_nl_mp_prio_send_ack(struct mptcp_sock *msk, 
	return -EINVAL;

}



void mptcp_pm_nl_rm_addr_received(struct mptcp_sock *msk)

static void mptcp_pm_nl_rm_addr_received(struct mptcp_sock *msk)

{

	struct mptcp_subflow_context *subflow, *tmp;

	struct sock *sk = (struct sock *)msk;
@@ -605,6 +607,39 @@ void mptcp_pm_nl_rm_addr_received(struct mptcp_sock *msk) 
	}

}



void mptcp_pm_nl_work(struct mptcp_sock *msk)

{

	struct mptcp_pm_data *pm = &msk->pm;



	msk_owned_by_me(msk);



	spin_lock_bh(&msk->pm.lock);



	pr_debug("msk=%p status=%x", msk, pm->status);

	if (pm->status & BIT(MPTCP_PM_ADD_ADDR_RECEIVED)) {

		pm->status &= ~BIT(MPTCP_PM_ADD_ADDR_RECEIVED);

		mptcp_pm_nl_add_addr_received(msk);

	}

	if (pm->status & BIT(MPTCP_PM_ADD_ADDR_SEND_ACK)) {

		pm->status &= ~BIT(MPTCP_PM_ADD_ADDR_SEND_ACK);

		mptcp_pm_nl_add_addr_send_ack(msk);

	}

	if (pm->status & BIT(MPTCP_PM_RM_ADDR_RECEIVED)) {

		pm->status &= ~BIT(MPTCP_PM_RM_ADDR_RECEIVED);

		mptcp_pm_nl_rm_addr_received(msk);

	}

	if (pm->status & BIT(MPTCP_PM_ESTABLISHED)) {

		pm->status &= ~BIT(MPTCP_PM_ESTABLISHED);

		mptcp_pm_nl_fully_established(msk);

	}

	if (pm->status & BIT(MPTCP_PM_SUBFLOW_ESTABLISHED)) {

		pm->status &= ~BIT(MPTCP_PM_SUBFLOW_ESTABLISHED);

		mptcp_pm_nl_subflow_established(msk);

	}



	spin_unlock_bh(&msk->pm.lock);

}



void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, u8 rm_id)

{

	struct mptcp_subflow_context *subflow, *tmp;

net/mptcp/protocol.c

+1 −32
Original line number Diff line number Diff line
@@ -2152,37 +2152,6 @@ static unsigned int mptcp_sync_mss(struct sock *sk, u32 pmtu) 
	return 0;

}



static void pm_work(struct mptcp_sock *msk)

{

	struct mptcp_pm_data *pm = &msk->pm;



	spin_lock_bh(&msk->pm.lock);



	pr_debug("msk=%p status=%x", msk, pm->status);

	if (pm->status & BIT(MPTCP_PM_ADD_ADDR_RECEIVED)) {

		pm->status &= ~BIT(MPTCP_PM_ADD_ADDR_RECEIVED);

		mptcp_pm_nl_add_addr_received(msk);

	}

	if (pm->status & BIT(MPTCP_PM_ADD_ADDR_SEND_ACK)) {

		pm->status &= ~BIT(MPTCP_PM_ADD_ADDR_SEND_ACK);

		mptcp_pm_nl_add_addr_send_ack(msk);

	}

	if (pm->status & BIT(MPTCP_PM_RM_ADDR_RECEIVED)) {

		pm->status &= ~BIT(MPTCP_PM_RM_ADDR_RECEIVED);

		mptcp_pm_nl_rm_addr_received(msk);

	}

	if (pm->status & BIT(MPTCP_PM_ESTABLISHED)) {

		pm->status &= ~BIT(MPTCP_PM_ESTABLISHED);

		mptcp_pm_nl_fully_established(msk);

	}

	if (pm->status & BIT(MPTCP_PM_SUBFLOW_ESTABLISHED)) {

		pm->status &= ~BIT(MPTCP_PM_SUBFLOW_ESTABLISHED);

		mptcp_pm_nl_subflow_established(msk);

	}



	spin_unlock_bh(&msk->pm.lock);

}



static void __mptcp_close_subflow(struct mptcp_sock *msk)

{

	struct mptcp_subflow_context *subflow, *tmp;
@@ -2271,7 +2240,7 @@ static void mptcp_worker(struct work_struct *work) 
		__mptcp_close_subflow(msk);



	if (msk->pm.status)

		pm_work(msk);

		mptcp_pm_nl_work(msk);



	if (test_and_clear_bit(MPTCP_WORK_EOF, &msk->flags))

		mptcp_check_for_eof(msk);

net/mptcp/protocol.h

+1 −5
Original line number Diff line number Diff line
@@ -713,11 +713,7 @@ 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_fully_established(struct mptcp_sock *msk);

void mptcp_pm_nl_subflow_established(struct mptcp_sock *msk);

void mptcp_pm_nl_add_addr_received(struct mptcp_sock *msk);

void mptcp_pm_nl_add_addr_send_ack(struct mptcp_sock *msk);

void mptcp_pm_nl_rm_addr_received(struct mptcp_sock *msk);

void mptcp_pm_nl_work(struct mptcp_sock *msk);

void mptcp_pm_nl_rm_subflow_received(struct mptcp_sock *msk, u8 rm_id);

int mptcp_pm_nl_get_local_id(struct mptcp_sock *msk, struct sock_common *skc);

unsigned int mptcp_pm_get_add_addr_signal_max(struct mptcp_sock *msk);