Commit 9d829596 authored by Paolo Abeni's avatar Paolo Abeni Committed by Jakub Kicinski
Browse files

mptcp: make mptcp_destroy_common() static 



Such function is only used inside protocol.c, there is no need
to expose it to the whole stack.

Note that the function definition most be moved earlier to avoid
forward declaration.

Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Reviewed-by: default avatarGeliang Tang <geliang@kernel.org>
Tested-by: default avatarGeliang Tang <geliang@kernel.org>
Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarMatthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://patch.msgid.link/20251121-net-next-mptcp-memcg-backlog-imp-v1-9-1f34b6c1e0b1@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 48a39560

net/mptcp/protocol.c

+21 −21
Original line number Diff line number Diff line
@@ -3222,6 +3222,27 @@ static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk) 
	inet_sk(msk)->inet_rcv_saddr = inet_sk(ssk)->inet_rcv_saddr;

}



static void mptcp_destroy_common(struct mptcp_sock *msk)

{

	struct mptcp_subflow_context *subflow, *tmp;

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



	__mptcp_clear_xmit(sk);



	/* join list will be eventually flushed (with rst) at sock lock release time */

	mptcp_for_each_subflow_safe(msk, subflow, tmp)

		__mptcp_close_ssk(sk, mptcp_subflow_tcp_sock(subflow), subflow, 0);



	__skb_queue_purge(&sk->sk_receive_queue);

	skb_rbtree_purge(&msk->out_of_order_queue);



	/* move all the rx fwd alloc into the sk_mem_reclaim_final in

	 * inet_sock_destruct() will dispose it

	 */

	mptcp_token_destroy(msk);

	mptcp_pm_destroy(msk);

}



static int mptcp_disconnect(struct sock *sk, int flags)

{

	struct mptcp_sock *msk = mptcp_sk(sk);
@@ -3427,27 +3448,6 @@ void mptcp_rcv_space_init(struct mptcp_sock *msk, const struct sock *ssk) 
		msk->rcvq_space.space = TCP_INIT_CWND * TCP_MSS_DEFAULT;

}



void mptcp_destroy_common(struct mptcp_sock *msk)

{

	struct mptcp_subflow_context *subflow, *tmp;

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



	__mptcp_clear_xmit(sk);



	/* join list will be eventually flushed (with rst) at sock lock release time */

	mptcp_for_each_subflow_safe(msk, subflow, tmp)

		__mptcp_close_ssk(sk, mptcp_subflow_tcp_sock(subflow), subflow, 0);



	__skb_queue_purge(&sk->sk_receive_queue);

	skb_rbtree_purge(&msk->out_of_order_queue);



	/* move all the rx fwd alloc into the sk_mem_reclaim_final in

	 * inet_sock_destruct() will dispose it

	 */

	mptcp_token_destroy(msk);

	mptcp_pm_destroy(msk);

}



static void mptcp_destroy(struct sock *sk)

{

	struct mptcp_sock *msk = mptcp_sk(sk);

net/mptcp/protocol.h

+0 −2
Original line number Diff line number Diff line
@@ -980,8 +980,6 @@ static inline void mptcp_propagate_sndbuf(struct sock *sk, struct sock *ssk) 
	local_bh_enable();

}



void mptcp_destroy_common(struct mptcp_sock *msk);



#define MPTCP_TOKEN_MAX_RETRIES	4



void __init mptcp_token_init(void);