Skip to contentSkip to conversation

mptcp: split mptcp_clean_una function

PATCH In review Florian Westphal 3 participants 3 messages Sep 10, 2020 – Sep 18, 2020

Subsystems (2)
lore
Share & tools
lore

Florian Westphal

author
#0 lore raw

PATCH 1/1 mptcp: split mptcp_clean_una function

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(a)strlen.de>
---
 net/mptcp/protocol.c | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

Sending this ahead of the rebase on top of paolos patchset, I think this can be integrated stand-alone as it has no dependency on sendmsg refactor or poll rework.

net/mptcp/protocol.c +17 -11
index 7469e89b3d7a..3c2476baae2d 100644
@@ -831,19 +831,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);
 	}
 }
 
@@ -1724,7 +1730,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);
 	__mptcp_move_skbs(msk);
Signature · 1 line
2.26.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Florian Westphal

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.

Quoted 9 lines
Signed-off-by Florian Westphal <fw(a)strlen.de>

---
net/mptcp/protocol.c | 28 +++++++++++++++++-----------

1 file changed, 17 insertions(+), 11 deletions(-)

Sending this ahead of the rebase on top of paolos patchset, I think this can be integrated stand-alone as it has no dependency on sendmsg refactor or poll rework.

Looks good to me, thanks Florian. It still applies cleanly to the export branch too.

Reviewed-by Mat Martineau <mathew.j.martineau(a)linux.intel.com>

--
Mat Martineau
Intel

#2 lore raw

Hi Florian, Mat,

Quoted 18 lines · Mat Martineau
Quoted 5 lines · Florian Westphal

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.

Quoted 9 lines
Signed-off-by Florian Westphal <fw(a)strlen.de>

---
net/mptcp/protocol.c | 28 +++++++++++++++++-----------

1 file changed, 17 insertions(+), 11 deletions(-)

Sending this ahead of the rebase on top of paolos patchset, I think this can be integrated stand-alone as it has no dependency on sendmsg refactor or poll rework.

Quoted 4 lines

Looks good to me, thanks Florian. It still applies cleanly to the export branch too.

Reviewed-by Mat Martineau <mathew.j.martineau(a)linux.intel.com>

Thank you for the patch and the review!

- 0032722d977f: mptcp: split mptcp_clean_una function
- a0e1e786f7d2..dcdf6c22dc6f: result

Tests + export are in progress!

Cheers,
Matt

Signature · 2 lines
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net