From 9f8e9cc91f083b9dee5b8cc8250df884619f1c1d Mon Sep 17 00:00:00 2001 From: "M. Mert Yildiran" Date: Sun, 12 Jun 2022 18:29:25 +0300 Subject: [PATCH] Define and use `BPF_CFLAGS` environment variable --- tap/tlstapper/bpf-builder/build.sh | 7 ++++++- tap/tlstapper/tls_tapper.go | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tap/tlstapper/bpf-builder/build.sh b/tap/tlstapper/bpf-builder/build.sh index 1a6b56ef3..1e71bb955 100755 --- a/tap/tlstapper/bpf-builder/build.sh +++ b/tap/tlstapper/bpf-builder/build.sh @@ -6,13 +6,18 @@ MIZU_HOME=$(realpath ../../../) docker build -t mizu-ebpf-builder . || exit 1 +BPF_CFLAGS="-O2 -g -D__TARGET_ARCH_x86" +if [[ $1 == "arm64" ]]; then + BPF_CFLAGS="-O2 -g -D__TARGET_ARCH_arm64" +fi + docker run --rm \ --name mizu-ebpf-builder \ -v $MIZU_HOME:/mizu \ -v $(go env GOPATH):/root/go \ -it mizu-ebpf-builder \ sh -c " - go generate tap/tlstapper/tls_tapper.go + BPF_CFLAGS=\"$BPF_CFLAGS\" go generate tap/tlstapper/tls_tapper.go chown $(id -u):$(id -g) tap/tlstapper/tlstapper_bpfeb.go chown $(id -u):$(id -g) tap/tlstapper/tlstapper_bpfeb.o chown $(id -u):$(id -g) tap/tlstapper/tlstapper_bpfel.go diff --git a/tap/tlstapper/tls_tapper.go b/tap/tlstapper/tls_tapper.go index 4e7229ab6..8c7b0bc67 100644 --- a/tap/tlstapper/tls_tapper.go +++ b/tap/tlstapper/tls_tapper.go @@ -12,7 +12,7 @@ import ( const GLOABL_TAP_PID = 0 -//go:generate go run github.com/cilium/ebpf/cmd/bpf2go@0d0727ef53e2f53b1731c73f4c61e0f58693083a -type tls_chunk tlsTapper bpf/tls_tapper.c -- -O2 -g -D__TARGET_ARCH_x86 +//go:generate go run github.com/cilium/ebpf/cmd/bpf2go@0d0727ef53e2f53b1731c73f4c61e0f58693083a -cflags $BPF_CFLAGS -type tls_chunk tlsTapper bpf/tls_tapper.c type TlsTapper struct { bpfObjects tlsTapperObjects