[PATCH 5.10 096/157] mptcp: split mptcp_clean_una function

[Greg Kroah-Hartman]

From: Florian Westphal <f...@strlen.de>

[ Upstream commit 95ed690ebc72ad6c89068f08197b51fe4d3c3b48 ]

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 <f...@strlen.de>
Signed-off-by: Mat Martineau <mathew.j.martin...@linux.intel.com>
Signed-off-by: Jakub Kicinski <k...@kernel.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 net/mptcp/protocol.c | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c
index f56b2e331bb6..0504a5f13c2a 100644
--- a/net/mptcp/protocol.c
+++ b/net/mptcp/protocol.c
@@ -833,19 +833,25 @@ static void mptcp_clean_una(struct sock *sk)
        }
 
 out:
-       if (cleaned) {
+       if (cleaned)
                sk_mem_reclaim_partial(sk);
+}
 
-               /* Only wake up writers if a subflow is ready */
-               if (mptcp_is_writeable(msk)) {
-                       set_bit(MPTCP_SEND_SPACE, &mptcp_sk(sk)->flags);
-                       smp_mb__after_atomic();
+static void mptcp_clean_una_wakeup(struct sock *sk)
+{
+       struct mptcp_sock *msk = mptcp_sk(sk);
 
-                       /* set SEND_SPACE before sk_stream_write_space clears
-                        * NOSPACE
-                        */
-                       sk_stream_write_space(sk);
-               }
+       mptcp_clean_una(sk);
+
+       /* Only wake up writers if a subflow is ready */
+       if (mptcp_is_writeable(msk)) {
+               set_bit(MPTCP_SEND_SPACE, &msk->flags);
+               smp_mb__after_atomic();
+
+               /* set SEND_SPACE before sk_stream_write_space clears
+                * NOSPACE
+                */
+               sk_stream_write_space(sk);
        }
 }
 
@@ -1751,7 +1757,7 @@ static void mptcp_worker(struct work_struct *work)
        long timeo = 0;
 
        lock_sock(sk);
-       mptcp_clean_una(sk);
+       mptcp_clean_una_wakeup(sk);
        mptcp_check_data_fin_ack(sk);
        __mptcp_flush_join_list(msk);
        if (test_and_clear_bit(MPTCP_WORK_CLOSE_SUBFLOW, &msk->flags))
-- 
2.30.1