net/mptcp/options.c | 4 ++-- net/mptcp/protocol.c | 29 +++++++++++++++++------------ net/mptcp/protocol.h | 1 + 3 files changed, 20 insertions(+), 14 deletions(-)
This is mostly a follow-up to the recent OoO queue pruning series. Explicitly targeting net as we have already a lot of patches pending for net-next, and no need to rush IMHO. First 2 patches addresses explicit comments from sashiko, 3rd one is a somewhat unrelated cleanup I stumbled upon while implementing patch 4. The last patch fixes another thing implided by sashiko while reviewing the mentioned series. --- resent to hopefully trigger sashiko Paolo Abeni (4): mptcp: being below memory limit is a likely() condition mptcp: avoid pruning for OoW data mptcp: remove unneeded READ_ONCE() annotation mptcp: do not reschedule the RTX timer for fallback sockets net/mptcp/options.c | 4 ++-- net/mptcp/protocol.c | 29 +++++++++++++++++------------ net/mptcp/protocol.h | 1 + 3 files changed, 20 insertions(+), 14 deletions(-) -- 2.55.0
Hi Paolo, Geliang, On 14/08/2026 15:38, Paolo Abeni wrote: > This is mostly a follow-up to the recent OoO queue pruning series. > Explicitly targeting net as we have already a lot of patches pending for > net-next, and no need to rush IMHO. > > First 2 patches addresses explicit comments from sashiko, 3rd one is a > somewhat unrelated cleanup I stumbled upon while implementing patch 4. > > The last patch fixes another thing implided by sashiko while reviewing > the mentioned series. Now in our tree: New patches for t/upstream-net and t/upstream: - 6280287c0ef2: mptcp: being below memory limit is a likely() condition - e66f97348c99: mptcp: avoid pruning for OoW data - cdd6976ab76f: mptcp: remove unneeded READ_ONCE() annotation - 285d84ee4b60: mptcp: do not reschedule the RTX timer for fallback sockets - Results: 6bb246941708..70d6bffa3696 (export-net) - Results: 2f5abecdd265..0afd98c500bf (export) Tests are now in progress: - export-net: https://github.com/multipath-tcp/mptcp_net-next/commit/71a020c17359779f858419627d7933171dafee9a/checks - export: https://github.com/multipath-tcp/mptcp_net-next/commit/8ff26825a673fb98ff86413940a0254088cf0bd3/checks Cheers, Matt -- Sponsored by the NGI0 Core fund.
Hi Paolo, On 14/08/2026 15:38, Paolo Abeni wrote: > This is mostly a follow-up to the recent OoO queue pruning series. > Explicitly targeting net as we have already a lot of patches pending for > net-next, and no need to rush IMHO. > > First 2 patches addresses explicit comments from sashiko, 3rd one is a > somewhat unrelated cleanup I stumbled upon while implementing patch 4. > > The last patch fixes another thing implided by sashiko while reviewing > the mentioned series. Thank you for this series, it looks good to me: Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> I will wait for the net-next → net merge to apply them to export-net. Cheers, Matt -- Sponsored by the NGI0 Core fund.
Hi Matt, On Sat, 2026-08-15 at 19:19 +0200, Matthieu Baerts wrote: > Hi Paolo, > > On 14/08/2026 15:38, Paolo Abeni wrote: > > This is mostly a follow-up to the recent OoO queue pruning series. > > Explicitly targeting net as we have already a lot of patches > > pending for > > net-next, and no need to rush IMHO. > > > > First 2 patches addresses explicit comments from sashiko, 3rd one > > is a > > somewhat unrelated cleanup I stumbled upon while implementing patch > > 4. > > > > The last patch fixes another thing implided by sashiko while > > reviewing > > the mentioned series. > > Thank you for this series, it looks good to me: > > Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> > > I will wait for the net-next → net merge to apply them to export-net. If you have time, could you please merge this series into the export branch at your earliest convenience? My ongoing series, "Reduce the differences between TCP and MPTCP for TLS usage", conflicts with this one. Thanks, -Geliang > > Cheers, > Matt
Hi Geliang, On 18/08/2026 09:52, Geliang Tang wrote: > Hi Matt, > > On Sat, 2026-08-15 at 19:19 +0200, Matthieu Baerts wrote: >> Hi Paolo, >> >> On 14/08/2026 15:38, Paolo Abeni wrote: >>> This is mostly a follow-up to the recent OoO queue pruning series. >>> Explicitly targeting net as we have already a lot of patches >>> pending for >>> net-next, and no need to rush IMHO. >>> >>> First 2 patches addresses explicit comments from sashiko, 3rd one >>> is a >>> somewhat unrelated cleanup I stumbled upon while implementing patch >>> 4. >>> >>> The last patch fixes another thing implided by sashiko while >>> reviewing >>> the mentioned series. >> >> Thank you for this series, it looks good to me: >> >> Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> >> >> I will wait for the net-next → net merge to apply them to export-net. > > If you have time, could you please merge this series into the export > branch at your earliest convenience? My ongoing series, "Reduce the > differences between TCP and MPTCP for TLS usage", conflicts with this > one. If that's OK, I will wait for the Net maintainers to send their PR to Linus, which should be done in a day or two I suppose. Is that OK? Cheers, Matt -- Sponsored by the NGI0 Core fund.
Hi Matt, On Tue, 2026-08-18 at 18:26 +0200, Matthieu Baerts wrote: > Hi Geliang, > > On 18/08/2026 09:52, Geliang Tang wrote: > > Hi Matt, > > > > On Sat, 2026-08-15 at 19:19 +0200, Matthieu Baerts wrote: > > > Hi Paolo, > > > > > > On 14/08/2026 15:38, Paolo Abeni wrote: > > > > This is mostly a follow-up to the recent OoO queue pruning > > > > series. > > > > Explicitly targeting net as we have already a lot of patches > > > > pending for > > > > net-next, and no need to rush IMHO. > > > > > > > > First 2 patches addresses explicit comments from sashiko, 3rd > > > > one > > > > is a > > > > somewhat unrelated cleanup I stumbled upon while implementing > > > > patch > > > > 4. > > > > > > > > The last patch fixes another thing implided by sashiko while > > > > reviewing > > > > the mentioned series. > > > > > > Thank you for this series, it looks good to me: > > > > > > Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> > > > > > > I will wait for the net-next → net merge to apply them to export- > > > net. > > > > If you have time, could you please merge this series into the > > export > > branch at your earliest convenience? My ongoing series, "Reduce the > > differences between TCP and MPTCP for TLS usage", conflicts with > > this > > one. > If that's OK, I will wait for the Net maintainers to send their PR to > Linus, which should be done in a day or two I suppose. Is that OK? Yes, absolutely - that works for me. Please take your time. Thanks, -Geliang > > Cheers, > Matt
Hi Paolo,
Thank you for your modifications, that's great!
Our CI did some validations and here is its report:
- KVM Validation: normal (except selftest_mptcp_join): Unstable: 1 failed test(s): selftest_simult_flows ⚠️
- KVM Validation: normal (only selftest_mptcp_join): Success! ✅
- KVM Validation: debug (except selftest_mptcp_join): Success! ✅
- KVM Validation: debug (only selftest_mptcp_join): Success! ✅
- KVM Validation: btf-normal (only bpftest_all): Success! ✅
- KVM Validation: btf-debug (only bpftest_all): Success! ✅
- Task: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/31806665824
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/e3dde9e93b29
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=1146084
If there are some issues, you can reproduce them using the same environment as
the one used by the CI thanks to a docker image, e.g.:
$ cd [kernel source code]
$ docker run -v "${PWD}:${PWD}:rw" -w "${PWD}" --privileged --rm -it \
--pull always mptcp/mptcp-upstream-virtme-docker:latest \
auto-normal
For more details:
https://github.com/multipath-tcp/mptcp-upstream-virtme-docker
Please note that despite all the efforts that have been already done to have a
stable tests suite when executed on a public CI like here, it is possible some
reported issues are not due to your modifications. Still, do not hesitate to
help us improve that ;-)
Cheers,
MPTCP GH Action bot
Bot operated by Matthieu Baerts (NGI0 Core)
© 2016 - 2026 Red Hat, Inc.