Skip to content

Revert "bpf: conntrack: don't report SYN-ACK as 'observed SYN'" - #47594

Merged
julianwiedmann merged 1 commit into
mainfrom
pr/jwi/main/dsr-revert
Jul 30, 2026
Merged

Revert "bpf: conntrack: don't report SYN-ACK as 'observed SYN'"#47594
julianwiedmann merged 1 commit into
mainfrom
pr/jwi/main/dsr-revert

Conversation

@julianwiedmann

@julianwiedmann julianwiedmann commented Jul 30, 2026

Copy link
Copy Markdown
Member

This reverts commit 82d2d51.

The change itself is correct. But it also needs a fix in the ingress path on the remote node, so that
nodeport_extract_dsr_v*() doesn't expect DSR-info in the SYN-ACK packet. This will need to go out first for upgrade compatibility reasons.

Also update the generated SYN-ACK packet in a few tests that have been added in the meantime.

@maintainer-s-little-helper maintainer-s-little-helper Bot added the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Jul 30, 2026
@julianwiedmann julianwiedmann added area/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. release-note/misc This PR makes changes that have no direct user impact. feature/dsr Relates to Cilium's Direct-Server-Return feature for KPR. area/kpr Anything related to our kube-proxy replacement. labels Jul 30, 2026
@maintainer-s-little-helper maintainer-s-little-helper Bot removed the dont-merge/needs-release-note-label The author needs to describe the release impact of these changes. label Jul 30, 2026
Comment thread bpf/tests/scapy/kpr_dsr_pkt_defs.py Fixed
@julianwiedmann
julianwiedmann force-pushed the pr/jwi/main/dsr-revert branch from bcdb071 to 36f6136 Compare July 30, 2026 08:38
@julianwiedmann

Copy link
Copy Markdown
Member Author

The change itself is correct. But it also needs a fix in the ingress path on the remote node, so that
nodeport_extract_dsr_v*() doesn't expect DSR-info in the SYN-ACK packet.

This becomes a problem once #47593 gets applied and fixes the ingress path (see the test failure there).

@julianwiedmann

Copy link
Copy Markdown
Member Author

(fyi, I'm tracking the whole pending DSR series in #47592)

@julianwiedmann
julianwiedmann force-pushed the pr/jwi/main/dsr-revert branch from 36f6136 to 94952bb Compare July 30, 2026 09:08
This reverts commit 82d2d51.

The change itself is correct. But it also needs a fix in
the ingress path on the remote node, so that
nodeport_extract_dsr_v*() doesn't expect DSR-info in the
SYN-ACK packet. This will need to go out first for upgrade
compatibility reasons.

Also update the generated SYN-ACK packet in a few tests
that have been added in the meantime.

Signed-off-by: Julian Wiedmann <[email protected]>
@julianwiedmann
julianwiedmann force-pushed the pr/jwi/main/dsr-revert branch from 94952bb to 4a63123 Compare July 30, 2026 09:25
@julianwiedmann

Copy link
Copy Markdown
Member Author

/test

@julianwiedmann julianwiedmann self-assigned this Jul 30, 2026
@cilium-ariane

cilium-ariane Bot commented Jul 30, 2026

Copy link
Copy Markdown

/test

@julianwiedmann
julianwiedmann marked this pull request as ready for review July 30, 2026 10:32
@julianwiedmann
julianwiedmann requested a review from a team as a code owner July 30, 2026 10:32
@julianwiedmann
julianwiedmann enabled auto-merge July 30, 2026 10:32
@julianwiedmann
julianwiedmann added this pull request to the merge queue Jul 30, 2026
@maintainer-s-little-helper maintainer-s-little-helper Bot added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jul 30, 2026
Merged via the queue into main with commit 2ae686d Jul 30, 2026
456 of 459 checks passed
@julianwiedmann
julianwiedmann deleted the pr/jwi/main/dsr-revert branch July 30, 2026 13:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/datapath Impacts bpf/ or low-level forwarding details, including map management and monitor messages. area/kpr Anything related to our kube-proxy replacement. feature/dsr Relates to Cilium's Direct-Server-Return feature for KPR. ready-to-merge This PR has passed all tests and received consensus from code owners to merge. release-note/misc This PR makes changes that have no direct user impact.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants