public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-05-24 10:39:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mptcp: split mptcp_clean_una function

Browse source 
mptcp_clean_una() will wake writers in case memory could be reclaimed.
When called from mptcp_sendmsg the wakeup code isn't needed.

Move the wakeup to a new helper and then use that from the mptcp worker.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Florian Westphal 2020-11-03 11:05:06 -08:00 • committed by Jakub Kicinski
parent 5a369ca643
commit 95ed690ebc
1 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
net/mptcp/protocol.c
View file

@ -853,12 +853,19 @@ static void mptcp_clean_una(struct sock *sk)
} }
out: out:
if (cleaned) { if (cleaned)
sk_mem_reclaim_partial(sk); sk_mem_reclaim_partial(sk);
}
static void mptcp_clean_una_wakeup(struct sock *sk)
{
struct mptcp_sock *msk = mptcp_sk(sk);
mptcp_clean_una(sk);
/* Only wake up writers if a subflow is ready */ /* Only wake up writers if a subflow is ready */
if (mptcp_is_writeable(msk)) { if (mptcp_is_writeable(msk)) {
set_bit(MPTCP_SEND_SPACE, &mptcp_sk(sk)->flags); set_bit(MPTCP_SEND_SPACE, &msk->flags);
smp_mb__after_atomic(); smp_mb__after_atomic();
/* set SEND_SPACE before sk_stream_write_space clears /* set SEND_SPACE before sk_stream_write_space clears
@ -866,7 +873,6 @@ out:
*/ */
sk_stream_write_space(sk); sk_stream_write_space(sk);
} }
}
} }
/* ensure we get enough memory for the frag hdr, beyond some minimal amount of /* ensure we get enough memory for the frag hdr, beyond some minimal amount of
@ -1769,7 +1775,7 @@ static void mptcp_worker(struct work_struct *work)
long timeo = 0; long timeo = 0;
lock_sock(sk); lock_sock(sk);
mptcp_clean_una(sk); mptcp_clean_una_wakeup(sk);
mptcp_check_data_fin_ack(sk); mptcp_check_data_fin_ack(sk);
__mptcp_flush_join_list(msk); __mptcp_flush_join_list(msk);
if (test_and_clear_bit(MPTCP_WORK_CLOSE_SUBFLOW, &msk->flags)) if (test_and_clear_bit(MPTCP_WORK_CLOSE_SUBFLOW, &msk->flags))