tools/tcpaccept: Fix tcpaccept on recent kernel #5405
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jeromemarchand
requested review from
brendangregg,
chenhengqi,
ekyooo and
yonghong-song
as code owners
ekyooo
reviewed
Oct 15, 2025
| bpf_text = bpf_text.replace('##FILTER_FAMILY##', | ||
| 'if (family != AF_INET6) { return 0; }') | ||
|
|
||
| if BPF.kernel_struct_has_field("sock", "sk_protocol") == 1: |
There was a problem hiding this comment.
Is the existing offset == 2 fallback still necessary for cases where the sk_protocol field exists, but the absence of BTF information causes the kernel_struct_has_field() check to fail?
There was a problem hiding this comment.
Good point. I didn't think of that.
The tcpaccept use the relative offset of gso_max_segs and sk_lingertime_offset to check whether sk_protocol is its own field of part of a bitfield and find it's location. This is not very robust. Use BPF.kernel_struct_has_field() to find out whether it's its own field and revert to the old workaround if it's part of a bitfield or BTF is unavailable. Closes: iovisor#5316 Signed-off-by: Jerome Marchand <[email protected]>
jeromemarchand
force-pushed
the
tcpaccept-sk_protocol
branch
from
6ea2da4 to
cccbbb4
Compare
|
Thanks for the fix. But I think at some point we may retire all python-based tools. |
ekyooo
approved these changes
Nov 4, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The tcpaccept use the relative offset of gso_max_segs and sk_lingertime_offset to check whether sk_protocol is its own field of part of a bitfield and find it's location. This is not very robust.
Use BPF.kernel_struct_has_field() to find out whether it's its own field and revert to the old workaround if it's part of a bitfield.
Closes: #5316