| Message ID | 20250218-mptcp-dss-drop-mpj-v2-2-0c6caa10ec52@kernel.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 1e4711c4b02c53b18e23c4ac4ca8542e61b43c47 |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | mptcp: reset when MPTCP opts are dropped after MPJ | expand |
| Context | Check | Description |
|---|---|---|
| matttbe/build | success | Build and static analysis OK |
| matttbe/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| matttbe/shellcheck | success | MPTCP selftests files have not been modified |
| matttbe/KVM_Validation__normal | success | Success! ✅ |
| matttbe/KVM_Validation__debug | success | Success! ✅ |
| matttbe/KVM_Validation__btf-normal__only_bpftest_all_ | success | Success! ✅ |
| matttbe/KVM_Validation__btf-debug__only_bpftest_all_ | success | Success! ✅ |
diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index bac5c925a72f6637e33ada9869984c5902bd6a43..3d72ca1553227cb41ba8c205f42d1f01cc264a7e 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -1198,6 +1198,8 @@ static inline void __mptcp_do_fallback(struct mptcp_sock *msk) pr_debug("TCP fallback already done (msk=%p)\n", msk); return; } + if (WARN_ON_ONCE(!READ_ONCE(msk->allow_infinite_fallback))) + return; set_bit(MPTCP_FALLBACK_DONE, &msk->flags); }
Recently, some fallback have been initiated, while the connection was not supposed to fallback. Add a safety check with a warning to detect when an wrong attempt to fallback is being done. This should help detecting any future issues quicker. Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org> --- Notes: - I guess this patch could be sent to -net as well. - We could also squash this in one of the previous commit, but because the two are needed to avoid the warning, maybe better with a dedicated commit? --- net/mptcp/protocol.h | 2 ++ 1 file changed, 2 insertions(+)