chore(ebpf): update bpf header files

.github/workflows/golangci-lint.yaml

@@ -19,6 +19,7 @@ jobs:
       IS_NOT_MERGE_GROUP: ${{ github.event_name != 'merge_group' }}
       GOOS: ${{ matrix.goos }}
       GOARCH: ${{ matrix.goarch }}
+      CGO_ENABLED: 0
     steps:
       - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
         if: env.IS_NOT_MERGE_GROUP

Makefile

@@ -622,3 +622,28 @@ update-hubble:
         echo "  git push origin deps/update-hubble-to-$$latest_version"; \
         echo "Then create a pull request on GitHub."; \
     fi
+
+.PHONY: update-libbpf
+update-libbpf: ## Update libbpf headers and sources from upstream
+	@echo "Updating libbpf from upstream..."
+	@TMPDIR=$$(mktemp -d); \
+	echo "Cloning libbpf repository to $$TMPDIR..."; \
+	git clone --depth 1 https://github.com/libbpf/libbpf.git $$TMPDIR; \
+	echo "Copying libbpf source files..."; \
+	rm -rf $(REPO_ROOT)/pkg/plugin/lib/common/libbpf/_src/*; \
+	cp $$TMPDIR/src/*.c $(REPO_ROOT)/pkg/plugin/lib/common/libbpf/_src/ 2>/dev/null || true; \
+	cp $$TMPDIR/src/*.h $(REPO_ROOT)/pkg/plugin/lib/common/libbpf/_src/ 2>/dev/null || true; \
+	echo "Copying libbpf include files..."; \
+	rm -rf $(REPO_ROOT)/pkg/plugin/lib/common/libbpf/_include/linux/*; \
+	rm -rf $(REPO_ROOT)/pkg/plugin/lib/common/libbpf/_include/uapi/*; \
+	rm -rf $(REPO_ROOT)/pkg/plugin/lib/common/libbpf/_include/asm/*; \
+	cp -r $$TMPDIR/include/linux/* $(REPO_ROOT)/pkg/plugin/lib/common/libbpf/_include/linux/ 2>/dev/null || true; \
+	cp -r $$TMPDIR/include/uapi/* $(REPO_ROOT)/pkg/plugin/lib/common/libbpf/_include/uapi/ 2>/dev/null || true; \
+	cp -r $$TMPDIR/include/asm/* $(REPO_ROOT)/pkg/plugin/lib/common/libbpf/_include/asm/ 2>/dev/null || true; \
+	echo "Adding placeholder.go files..."; \
+	find $(REPO_ROOT)/pkg/plugin/lib/common/libbpf/_src -type d -exec sh -c 'echo "package placeholder" > {}/placeholder.go' \;; \
+	find $(REPO_ROOT)/pkg/plugin/lib/common/libbpf/_include -type d -exec sh -c 'echo "package placeholder" > {}/placeholder.go' \;; \
+	echo "Cleaning up temporary directory..."; \
+	rm -rf $$TMPDIR; \
+	echo ""; \
+	echo "libbpf files updated successfully!";

controller/Dockerfile

@@ -52,6 +52,7 @@ ARG GOOS=linux # default to linux
 ARG VERSION
 ENV GOARCH=${GOARCH}
 ENV GOOS=${GOOS}
+ENV CGO_ENABLED=0
 RUN --mount=type=cache,target="/root/.cache/go-build" go build -v -o /go/bin/retina/captureworkload -ldflags "-X github.com/microsoft/retina/internal/buildinfo.Version="$VERSION" -X github.com/microsoft/retina/internal/buildinfo.ApplicationInsightsID="$APP_INSIGHTS_ID"" captureworkload/main.go
 
 
@@ -63,6 +64,7 @@ ARG GOOS=linux # default to linux
 ARG VERSION
 ENV GOARCH=${GOARCH}
 ENV GOOS=${GOOS}
+ENV CGO_ENABLED=0
 RUN --mount=type=cache,target="/root/.cache/go-build" go build -x -v -o /go/bin/retina/controller -ldflags "-X github.com/microsoft/retina/internal/buildinfo.Version="$VERSION" -X github.com/microsoft/retina/internal/buildinfo.ApplicationInsightsID="$APP_INSIGHTS_ID"" controller/main.go 
 
 
@@ -74,6 +76,7 @@ ARG GOOS=linux # default to linux
 ARG VERSION
 ENV GOARCH=${GOARCH}
 ENV GOOS=${GOOS}
+ENV CGO_ENABLED=0
 RUN --mount=type=cache,target="/root/.cache/go-build" go build -v -o /go/bin/retina/initretina -ldflags "-X github.com/microsoft/retina/internal/buildinfo.Version="$VERSION" -X github.com/microsoft/retina/internal/buildinfo.ApplicationInsightsID="$APP_INSIGHTS_ID"" init/retina/main_linux.go
 
 

controller/Dockerfile.gogen

@@ -8,18 +8,8 @@ ENV GOOS=${GOOS}
 ARG GOARCH=amd64
 ENV GOARCH=${GOARCH}
 
-RUN apt-get update &&\
-    apt-get -y install lsb-release wget software-properties-common gnupg file git make
-
 # Install clang and llvm.
-RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-RUN add-apt-repository "deb http://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-14 main"
-RUN apt-get update
-
-RUN apt-get install -y clang-14 lldb-14 lld-14 clangd-14 man-db
-RUN apt-get install -y bpftool libbpf-dev
-
-RUN ln -s /usr/bin/clang-14 /usr/bin/clang
+RUN tdnf install -y clang lld bpftool libbpf-devel gnupg file git make lsb-release wget
 
 WORKDIR /app
 

pkg/hubble/common/decoder_linux.go

@@ -11,8 +11,6 @@ import (
 	"github.com/cilium/cilium/pkg/labels"
 )
 
-//go:generate go run github.com/golang/mock/[email protected] -source decoder.go -destination=mocks/mock_types.go -package=mocks
-
 type EpDecoder interface {
 	Decode(ip netip.Addr) *flow.Endpoint
 	IsEndpointOnLocalHost(ip string) bool

pkg/plugin/dropreason/_cprog/drop_reason.c

@@ -228,6 +228,8 @@ static void get_packet_from_skb(struct packet *p, struct sk_buff *skb)
 #endif
 }
 
+#ifdef ADVANCED_METRICS
+#if ADVANCED_METRICS == 1
 static void get_packet_from_sock(struct packet *p, struct sock *sk)
 {
     // extract 5 tuple from pid
@@ -256,6 +258,8 @@ static void get_packet_from_sock(struct packet *p, struct sock *sk)
     p->dst_port = bpf_ntohs(dport);
     p->src_port = bpf_ntohs(sport);
 }
+#endif
+#endif
 
 /*
     This function will be saving the PID and length of skb it is working on.
@@ -312,8 +316,7 @@ int BPF_KRETPROBE(nf_hook_slow_ret, int retVal)
 }
 
 SEC("fexit/nf_hook_slow")
-int BPF_PROG(nf_hook_slow_fexit, struct sk_buff *skb, struct nf_hook_state *state,
-    const struct nf_hook_entries *e, unsigned int s, int retVal)
+int BPF_PROG(nf_hook_slow_fexit, struct sk_buff *skb, struct nf_hook_state *state, int retVal)
 {
     if (retVal < 0) {
         __u32 skb_len = 0;

pkg/plugin/dropreason/types_linux.go

@@ -90,7 +90,7 @@ type (
 // Interface to https://pkg.go.dev/github.com/cilium/ebpf#Map.
 // Added for unit tests.
 //
-//go:generate go run go.uber.org/mock/[email protected] -source=types_linux.go -destination=mocks/mock_types.go -package=dropreason . IMap IMapIterator IPerfReader
+//go:generate go run go.uber.org/mock/[email protected] -source=types_linux.go -destination=mocks/mock_types_linux.go -package=dropreason . IMap IMapIterator IPerfReader
 type IMapIterator interface {
 	Next(keyOut interface{}, valueOut interface{}) bool
 	Err() error