mbox

[0/4] four small cleanups and fixes

Message ID 20191105170531.30407-1-fw@strlen.de
State Accepted, archived
Delegated to: Matthieu Baerts
Headers show

Pull-request

git://git.breakpoint.cc/fw/mptcp-next.git mptcp_fixes_04

Message

Florian Westphal Nov. 5, 2019, 5:05 p.m. UTC
1. cleanup: mptcp_subflow_get_map_offset arg can be const.
2. fix: don't advance snd_una past the write sequence.
3. cleanup: use existing helper rather than open-coding it
4. fix: avoid blocking kworker forever when polling mptcp socket.

All paches can be squashed, I've added squashto hints.

The following changes since commit 512f0321ae8a2679c15915b68f8a5cd98f190288:

  subflow: wake parent mptcp socket on subflow state change (2019-11-05 02:27:34 +0000)

are available in the Git repository at:

  git://git.breakpoint.cc/fw/mptcp-next.git mptcp_fixes_04

for you to fetch changes up to 50a570bb03f61cb5e2344e1d3f8d959c40d7b520:

  poll: release lock before waiting (2019-11-05 17:58:28 +0100)

----------------------------------------------------------------
Florian Westphal (4):
      protocol.h: mptcp_subflow_get_map_offset arg can be const
      options: ignore mptcp-level ack that is ahead of write_seq
      protocol: use sk_wait_event helper
      poll: release lock before waiting

 net/mptcp/options.c  |  6 ++++++
 net/mptcp/protocol.c | 16 ++++------------
 net/mptcp/protocol.h |  4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

Comments

Matthieu Baerts Nov. 8, 2019, 3:17 p.m. UTC | #1
Hi Florian, Paolo,

On 05/11/2019 18:05, Florian Westphal wrote:
> 1. cleanup: mptcp_subflow_get_map_offset arg can be const.
> 2. fix: don't advance snd_una past the write sequence.
> 3. cleanup: use existing helper rather than open-coding it
> 4. fix: avoid blocking kworker forever when polling mptcp socket.
> 
> All paches can be squashed, I've added squashto hints.
> 
> The following changes since commit 512f0321ae8a2679c15915b68f8a5cd98f190288:
> 
>    subflow: wake parent mptcp socket on subflow state change (2019-11-05 02:27:34 +0000)
> 
> are available in the Git repository at:
> 
>    git://git.breakpoint.cc/fw/mptcp-next.git mptcp_fixes_04
> 
> for you to fetch changes up to 50a570bb03f61cb5e2344e1d3f8d959c40d7b520:
> 
>    poll: release lock before waiting (2019-11-05 17:58:28 +0100)
> 
> ----------------------------------------------------------------
> Florian Westphal (4):
>        protocol.h: mptcp_subflow_get_map_offset arg can be const
>        options: ignore mptcp-level ack that is ahead of write_seq
>        protocol: use sk_wait_event helper
>        poll: release lock before waiting
Thank you for the patches and the reviews!
And sorry for the delay!

- 1bf1608f7df8: "squashed" patch 1/4 in "mptcp: Implement MPTCP receive 
path"
- signed-off already there
- 127eee209f8e: "squashed" patch 2/4 in "mptcp: update per unacked 
sequence on pkt reception"
- ede08521c3e3: "Signed-off-by" + "Co-developed-by"
- a6260f7b8cab..ece8d606ffaf: result
- 8f7fc74888c8: "squashed" patch 3/4 in "mptcp: recvmsg() can drain data 
from multiple subflows"
- d8bfdd33c229: "Signed-off-by" + "Co-developed-by"
- ece8d606ffaf..4c99cd06d954: result
- 230846c72398: "squashed" patch 4/4 in "mptcp: add mptcp_poll"
- signed-off already there
- 4c99cd06d954..6b3052b58e78: result

Tests are in progress. The export of the branch will be done in max ~10 
minutes.
(Note that some intermediate commits don't compile but I will check that!)

Cheers,
Matt