include/net/mptcp.h | 7 ++++--- net/ipv4/tcp_output.c | 10 +++++++--- net/mptcp/ctrl.c | 18 +++++++++--------- net/mptcp/options.c | 13 ++++++------- 4 files changed, 26 insertions(+), 22 deletions(-)
This address Eric's comments from [1].
Note that the CI will complain that not each patch can be built
individually. That's normal: the fix from patch 2 has to be split in
patch 3, to be applied in the right commit.
Link: https://lore.kernel.org/mptcp/20260601-net-next-mptcp-add-addr6-port-ts-v1-0-4fc25dfef62e@kernel.org/T/#u [1]
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
---
Matthieu Baerts (NGI0) (4):
Squash to: "mptcp: introduce add_addr_v6_port_drop_ts sysctl knob"
Squash to "tcp: allow mptcp to drop TS for some packets"
Squash to "mptcp: pm: drop TCP TS with ADD_ADDRv6 + port"
mptcp: use READ_ONCE() over sysctls
include/net/mptcp.h | 7 ++++---
net/ipv4/tcp_output.c | 10 +++++++---
net/mptcp/ctrl.c | 18 +++++++++---------
net/mptcp/options.c | 13 ++++++-------
4 files changed, 26 insertions(+), 22 deletions(-)
---
base-commit: 7676d254f320f9cce3ca42d8347334fe334dfe58
change-id: 20260601-mptcp-add-addr6-port-ts-fixes-v2-b49a2a862c47
Best regards,
--
Matthieu Baerts (NGI0) <matttbe@kernel.org>
Hi Matthieu,
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): Success! ✅
- KVM Validation: normal (only selftest_mptcp_join): Success! ✅
- KVM Validation: debug (except selftest_mptcp_join): Unstable: 2 failed test(s): selftest_mptcp_connect selftest_mptcp_connect_checksum ⚠️
- 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/26744856498
Initiator: Patchew Applier
Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/1e1fdfa4d98f
Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=1103837
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)
Hi Matthieu, Thank you for your modifications, that's great! But sadly, our CI spotted some issues with it when trying to build it. You can find more details there: https://github.com/multipath-tcp/mptcp_net-next/actions/runs/26744856471 Status: failure Initiator: Patchew Applier Commits: https://github.com/multipath-tcp/mptcp_net-next/commits/1e1fdfa4d98f Patchwork: https://patchwork.kernel.org/project/mptcp/list/?series=1103837 Feel free to reply to this email if you cannot access logs, if you need some support to fix the error, if this doesn't seem to be caused by your modifications or if the error is a false positive one. Cheers, MPTCP GH Action bot Bot operated by Matthieu Baerts (NGI0 Core)
Hello, On 01/06/2026 18:27, Matthieu Baerts (NGI0) wrote: > This address Eric's comments from [1]. > > Note that the CI will complain that not each patch can be built > individually. That's normal: the fix from patch 2 has to be split in > patch 3, to be applied in the right commit. I'm going to apply patches 1-3, because they have been requested by Eric, I guess that's fine. After that, I will apply Eric's patch [1] with the small fix in our tree, resolve conflicts, and send an extra fix. [1] https://lore.kernel.org/20260601091816.444738-1-edumazet@google.com Cheers, Matt -- Sponsored by the NGI0 Core fund.
On 02/06/2026 16:31, Matthieu Baerts wrote: > Hello, > > On 01/06/2026 18:27, Matthieu Baerts (NGI0) wrote: >> This address Eric's comments from [1]. >> >> Note that the CI will complain that not each patch can be built >> individually. That's normal: the fix from patch 2 has to be split in >> patch 3, to be applied in the right commit. > > I'm going to apply patches 1-3, because they have been requested by > Eric, I guess that's fine. After that, I will apply Eric's patch [1] > with the small fix in our tree, resolve conflicts, and send an extra fix. *Eric's patch* New patches for t/upstream: - ab84e16ad93d: mptcp: change mptcp_established_options() to return opt_size - 1ac623cbe9db: conflict in t/mptcp-options-suboptions-sizes-can-be-negative - 5876b14f5c8a: conflict in t/tcp-allow-mptcp-to-drop-TS-for-some-packets - 3dfc91dff1d0: conflict in t/mptcp-pm-drop-TCP-TS-with-ADD_ADDRv6-port - Results: 7676d254f320..00d928af360b (export) Tests are now in progress: - export: https://github.com/multipath-tcp/mptcp_net-next/commit/c7e8a9cddd2beb5eae02e8af51de83483f6b25aa/checks *Squash-to patches* New patches for t/upstream: - 2889b65f2e3a: "squashed" patch 1/4 in "mptcp: introduce add_addr_v6_port_drop_ts sysctl knob" - 8d5986a8c346: "squashed" (with conflicts) in "tcp: allow mptcp to drop TS for some packets" - f1a8e699dcb7: "squashed" (with conflicts) in "mptcp: pm: drop TCP TS with ADD_ADDRv6 + port" - Results: 00d928af360b..39cfd0474a57 (export) Tests are now in progress: - export: https://github.com/multipath-tcp/mptcp_net-next/commit/3c61701c6140a3b53e64a488ba135da8470d5de4/checks Cheers, Matt -- Sponsored by the NGI0 Core fund.
© 2016 - 2026 Red Hat, Inc.