sockets-map.h: remove most defines from socket enricher header #2846
Conversation
This file contains 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
alban
force-pushed
the
alban_socketenricher_header
branch
from
c8f0e3a
to
218e602
Compare
There was a problem hiding this comment.
Some comments about missing things.
I'm wondering what a gadget that uses both (networking and tracing) functions will look like. Will it #include <vmlinux.h> and manually define all networking "#defines" as you did on https://github.com/alban/trace-udns/blob/84e3c5f144e5141464134a57a7d6896f94d5f162/program.bpf.c?
include/gadget/sockets-map.h
Outdated
| err = bpf_skb_load_bytes( | ||
| skb, ETH_HLEN + offsetof(struct ipv6hdr, nexthdr), | ||
| skb, ETH_HLEN + SE_IPV6_NEXTHDR_OFFSET, |
There was a problem hiding this comment.
SE_ETH_LEN? Same in other places.
include/gadget/sockets-map.h
Outdated
| // Redefine the constants we need but namespaced (SE_) so we don't pollute gadgets. | ||
|
|
||
| #define SE_PACKET_HOST 0 | ||
| #define SE_PACKET_OUTGOING 4 |
include/gadget/sockets-map.h
Outdated
| @@ -110,7 +82,7 @@ gadget_socket_lookup(const struct __sk_buff *skb) | |||
|
|
|||
| switch (h_proto) { | |||
| case bpf_htons(ETH_P_IP): | |||
include/gadget/sockets-map.h
Outdated
| @@ -131,13 +103,13 @@ gadget_socket_lookup(const struct __sk_buff *skb) | |||
| break; | |||
|
|
|||
| case bpf_htons(ETH_P_IPV6): | |||
There was a problem hiding this comment.
missing namespaced version of this one.
sockets-map.h can be included in both tracer gadgets (kprobes, etc.) and network gadgets (packet capture). Move most #define to avoid polluting the 'define' namespace of gadgets. This is a first step to enable gadgets containing both tracers and network programs. Signed-off-by: Alban Crequy <albancrequy@linux.microsoft.com>
alban
force-pushed
the
alban_socketenricher_header
branch
from
218e602
to
68b0a43
Compare
mauriciovasquezbernal
approved these changes
May 16, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
sockets-map.h can be included in both tracer gadgets (kprobes, etc.) and network gadgets (packet capture). Move most #define to avoid polluting the 'define' namespace of gadgets.
This is a first step to enable gadgets containing both tracers and network programs.
See #2371
This is to avoid the manual copy of sockets-map.h as it was done in the PoC alban/trace-udns#1