MPTCP upstreaming, week of 26-Sept-2022

[Mat Martineau <mathew.j.martineau@linux.intel.com>]

[-- Attachment #1: Type: text/plain, Size: 1632 bytes --]


Matthieu and Paolo -

I upstreamed the fastopen changes for net-next today, so those are in the 
patchwork queue for the netdev maintainers:

https://patchwork.kernel.org/project/netdevbpf/list/?series=680767


The other patch sets we discussed upstreaming in the meeting last week 
were:

     - Fixes for -net:

         - [6e827151a607] mptcp: factor out __mptcp_close() without socket lock (Menglong Dong)
         - [62b5536f77f6] mptcp: fix unreleased socket in accept queue (Menglong Dong):
             - can wait a bit more and can be sent next week


     - Features for net-next:

         - [ef4a93571133] mptcp: propagate fastclose error (Paolo Abeni)
         - [885cab8b5203] mptcp: use fastclose on more edge scenarios (Paolo Abeni)
         - [13c82c8b0d9f] selftests: mptcp: update and extend fastclose test-cases (Paolo Abeni):
             - can wait a bit, Paolo would like to have a look at the modification on packetdrill side


I'm planning to upstream the two -net patches on Tuesday unless someone 
objects.


The net-next patches are slightly more complicated:

  * They were updated with a squash-to patch today
  * Need to wait until fastopen patches are merged
  * There is a minor conflict with the -net patches (just diff context)
    in "mptcp: use fastclose on more edge scenarios".


Regarding the conflict, I could wait until Friday for a likely 
net/net-next sync.

Another option is to modify the patch slightly by moving 
mptcp_check_readable() before __mptcp_check_send_data_fin(), it doesn't 
make the diff any larger and avoids the -net conflict. What do you think?

--
Mat Martineau
Intel