daemon: initialize datapath before compiling sockops programs #24140
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
jibi
added
kind/bug
|
/test |
joestringer
approved these changes
Mar 2, 2023
thorn3r
approved these changes
Mar 9, 2023
When egress gateway is enabled, we define the ENABLE_EGRESS_GATEWAY
macro in the datapath, which in lib/common.h causes HAVE_ENCAP to be
defined as well:
#if defined(ENCAP_IFINDEX) || defined(ENABLE_EGRESS_GATEWAY)
#define HAVE_ENCAP
//..
#endif
This doesn't work with sockops enabled, as bpf_sockops.c ends up
including lib/overloadable_skb.h with HAVE_ENCAP defined and
ENCAP_IFINDEX not defined.
This happens since in the daemon we currently:
- create the node_config.h header file with createNodeConfigHeaderfile()
- invoke the logic to compile the sockops programs with the
sockops.Sockmap*() methods
- initialize the datapath with Datapath().Loader().Reinitialize(), which
is responsible among other things of invoking bpf/init.sh, which in
turn is responsible for populating node_config.h with a few missing
constants, one of which is ENCAP_IFINDEX
To fix this, simply invoke Datapath().Loader().Reinitialize() before
compiling the sockops programs, in order to properly populate
node_config.h
Fixes: #24090
Signed-off-by: Gilberto Bertin <jibi@cilium.io>
jibi
force-pushed
the
pr/jibi/fix-egressgw-with-sockops
branch
from
d7ebdff
to
b7f1cd0
Compare
|
/test |
maintainer-s-little-helper
bot
added
the
ready-to-merge
29 tasks
NikAleksandrov
added
backport-pending/1.13
tklauser
added
affects/v1.11
jibi
added
backport-done/1.13
gentoo-root
moved this from Needs backport from master
to Backport done to v1.13
in 1.13.2
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.
When egress gateway is enabled, we define the ENABLE_EGRESS_GATEWAY macro in the datapath, which in lib/common.h causes HAVE_ENCAP to be defined as well:
This doesn't work with sockops enabled, as bpf_sockops.c ends up including lib/overloadable_skb.h with HAVE_ENCAP defined and ENCAP_IFINDEX not defined.
This happens since in the daemon we currently:
To fix this, simply invoke Datapath().Loader().Reinitialize() before compiling the sockops programs, in order to properly populate node_config.h
Fixes: #24090