Merge pull request #109 from Atul-source/build-without-kernel-clone

Build without kernel clone

Author: sanfern

.github/workflows/ci-build-ubuntu.yaml

@@ -17,8 +17,6 @@ jobs:
       - name: Set env variables
         run: |
           echo "REPO=eBPF-Package-Repository" >> $GITHUB_ENV
-          echo "BPF_PATH=samples/bpf" >> $GITHUB_ENV
-          echo "LINUX_SRC_PATH=$GITHUB_WORKSPACE/linux" >> $GITHUB_ENV
           echo "DEBIAN_FRONTEND=noninteractive" >> $GITHUB_ENV
           echo "TZ=Etc/UTC" >> $GITHUB_ENV
 
@@ -51,16 +49,9 @@ jobs:
           dwarves \
           zlib1g  \
           libelf1 \
-          pkg-config
-
-      - name: Clone dependencies
-        run: |
-          git clone --branch v6.8 --depth 1 https://github.com/torvalds/linux.git $LINUX_SRC_PATH
-          cd $LINUX_SRC_PATH
-          make olddefconfig
-          make prepare
-          yes | make -j$(nproc)
-          make headers_install
+          pkg-config \
+          libbpf-dev \
+          libzstd-dev
 
       - name: Install bpftool
         run: |
@@ -74,45 +65,45 @@ jobs:
       - name: Clone kernel function repository
         uses: actions/checkout@v4.2.2
         with:
-          path: linux/${{ env.BPF_PATH }}/${{ env.REPO }}/
+          path: ${{ env.REPO }}
 
       - name: Build eBPF Program and Upload artifacts
         run: |
-          cd $LINUX_SRC_PATH/$BPF_PATH/$REPO
+          cd $REPO
           bash buildscript.sh
 
       - name: Upload xdp-root
         uses: actions/upload-artifact@v4
         with:
           name: xdp-root-linux-artifact-${{ matrix.codename }}
-          path: ${{ env.LINUX_SRC_PATH }}/${{ env.BPF_PATH }}/${{ env.REPO }}/xdp-root/l3af_xdp_root/*
+          path: ${{ env.REPO }}/xdp-root/l3af_xdp_root/*
 
       - name: Upload ratelimiting
         uses: actions/upload-artifact@v4
         with:
           name: ratelimiting-linux-artifact-${{ matrix.codename }} 
-          path: ${{ env.LINUX_SRC_PATH }}/${{ env.BPF_PATH }}/${{ env.REPO }}/ratelimiting/l3af_ratelimiting/*
+          path: ${{ env.REPO }}/ratelimiting/l3af_ratelimiting/*
 
       - name: Upload connection-limit
         uses: actions/upload-artifact@v4
         with:
           name: connection-limit-linux-artifact-${{ matrix.codename }} 
-          path: ${{ env.LINUX_SRC_PATH }}/${{ env.BPF_PATH }}/${{ env.REPO }}/connection-limit/l3af_connection_limit/*
+          path: ${{ env.REPO }}/connection-limit/l3af_connection_limit/*
 
       - name: Upload tc-root
         uses: actions/upload-artifact@v4
         with:
           name: tc-root-linux-artifact-${{ matrix.codename }}
-          path: ${{ env.LINUX_SRC_PATH }}/${{ env.BPF_PATH }}/${{ env.REPO }}/tc-root/l3af_tc_root/*
+          path: ${{ env.REPO }}/tc-root/l3af_tc_root/*
 
       - name: Upload ipfix-flow-exporter
         uses: actions/upload-artifact@v4
         with:
           name: ipfix-flow-exporter-linux-artifact-${{ matrix.codename }}
-          path: ${{ env.LINUX_SRC_PATH }}/${{ env.BPF_PATH }}/${{ env.REPO }}/ipfix-flow-exporter/l3af_bpf_ipfix/*
+          path: ${{ env.REPO }}/ipfix-flow-exporter/l3af_bpf_ipfix/*
 
       - name: Upload traffic-mirroring
         uses: actions/upload-artifact@v4
         with:
           name: traffic-mirroring-linux-artifact-${{ matrix.codename }} 
-          path: ${{ env.LINUX_SRC_PATH }}/${{ env.BPF_PATH }}/${{ env.REPO }}/traffic-mirroring/l3af_traffic_mirroring/*
+          path: ${{ env.REPO }}/traffic-mirroring/l3af_traffic_mirroring/*

buildscript.sh

@@ -9,6 +9,6 @@ declare -a progs=("xdp-root" "ratelimiting" "connection-limit" "tc-root" "ipfix-
 for prog in "${progs[@]}"
 do
 	cd $prog
-	make
+	make $1
 	cd ../
 done

connection-limit/Makefile

@@ -1,222 +1,73 @@
+# Copyright Contributors to the L3AF Project.
 # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
-
-LINUX_SRC_PATH ?= /usr/src/linux
-BPF_SAMPLES_PATH := $(LINUX_SRC_PATH)/samples/bpf
-TOOLS_PATH := $(BPF_SAMPLES_PATH)/../../tools
+BPF_CLANG    ?= clang
+USER_PROG    := connection_limit_user.c
+USER_OBJ     := connection_limit
 L3AF_SRC_PATH := $(CURDIR)
-HEADERS := $(BPF_SAMPLES_PATH)/eBPF-Package-Repository/headers
-# List of programs to build
-tprogs-y := connection_limit
-
-# Libbpf dependencies
-LIBBPF = $(TOOLS_PATH)/lib/bpf/libbpf.a
-
-connection_limit-objs := connection_limit_user.o
-
-# Tell kbuild to always build the programs
-always-y := $(tprogs-y)
-always-y += connection_limit.bpf.o connection_limit_kern.o
-
-
-ifeq ($(ARCH), arm)
-# Strip all except -D__LINUX_ARM_ARCH__ option needed to handle linux
-# headers when arm instruction set identification is requested.
-ARM_ARCH_SELECTOR := $(filter -D__LINUX_ARM_ARCH__%, $(KBUILD_CFLAGS))
-BPF_EXTRA_CFLAGS := $(ARM_ARCH_SELECTOR)
-TPROGS_CFLAGS += $(ARM_ARCH_SELECTOR)
-endif
-
-ifeq ($(ARCH), mips)
-TPROGS_CFLAGS += -D__SANE_USERSPACE_TYPES__
-ifdef CONFIG_MACH_LOONGSON64
-BPF_EXTRA_CFLAGS += -I$(srctree)/arch/mips/include/asm/mach-loongson64
-BPF_EXTRA_CFLAGS += -I$(srctree)/arch/mips/include/asm/mach-generic
+KERNEL_RELEASE := $(shell uname -r)
+LIB_PATH     := /usr/src/linux-headers-$(KERNEL_RELEASE)
+BPF_OBJ := connection_limit.bpf.o
+# BPF FlAGS
+BPF_CFLAGS   := -g -O2 -target bpf  -I.
+BPF_CFLAGS += -I$(LIB_PATH)/tools/testing/selftests/bpf/
+BPF_CFLAGS += -I$(LIB_PATH)/tools/lib/
+BPF_CFLAGS += -I$(LIB_PATH)/tools/include
+BPF_CFLAGS += -I$(LIB_PATH)/tools/perf
+BPF_CFLAGS += -I$(LIB_PATH)/tools/
+BPF_CFLAGS += -I$(LIB_PATH)/tools/bpf/resolve_btfids/libbpf
+BPF_CFLAGS += -I$(LIB_PATH)/tools/bpf/resolve_btfids/libbpf/include
+BPF_CFLAGS += -emit-llvm
+ARCH := $(shell uname -m)
+
+ifeq ($(ARCH),x86_64)
+    BPF_CFLAGS += -D__TARGET_ARCH_x86
+else ifeq ($(ARCH),aarch64)
+    BPF_CFLAGS += -D__TARGET_ARCH_arm64
 endif
-endif
-
-TPROGS_CFLAGS += -Wall -O2
-TPROGS_CFLAGS += -Wmissing-prototypes
-TPROGS_CFLAGS += -Wstrict-prototypes
 
-TPROGS_CFLAGS += -I$(objtree)/usr/include
-TPROGS_CFLAGS += -I$(srctree)/tools/testing/selftests/bpf/
-TPROGS_CFLAGS += -I$(srctree)/tools/lib/
-TPROGS_CFLAGS += -I$(srctree)/tools/include
-TPROGS_CFLAGS += -I$(srctree)/tools/perf
-TPROGS_CFLAGS += -DHAVE_ATTR_TEST=0
-
-ifdef SYSROOT
-TPROGS_CFLAGS += --sysroot=$(SYSROOT)
-TPROGS_LDFLAGS := -L$(SYSROOT)/usr/lib
+ifeq ($(ARCH),aarch64)
+    BPF_CFLAGS += -D__LINUX_ARM_ARCH__=8
+else ifeq ($(ARCH),armv7l)
+    BPF_CFLAGS += -D__LINUX_ARM_ARCH__=7
+else
+    BPF_CFLAGS += 
 endif
 
-TPROGS_LDLIBS			+= $(LIBBPF) -lelf -lz
 
-# Allows pointing LLC/CLANG to a LLVM backend with bpf support, redefine on cmdline:
-# make M=samples/bpf LLC=~/git/llvm-project/llvm/build/bin/llc CLANG=~/git/llvm-project/llvm/build/bin/clang
-LLC ?= llc
-CLANG ?= clang
-OPT ?= opt
-LLVM_DIS ?= llvm-dis
-LLVM_OBJCOPY ?= llvm-objcopy
-BTF_PAHOLE ?= pahole
+# USER PROGRAM FLAGS
+USER_CFLAGS  := -g -O2 -Wall -I. -I/usr/include/bpf  -Wunused-but-set-variable  -Wno-pointer-sign -Wno-compare-distinct-pointer-types -Wno-gnu-variable-sized-type-not-at-end -Wno-address-of-packed-member -Wno-tautological-compare -fno-asynchronous-unwind-tables
+USER_CFLAGS += -I$(LIB_PATH)/tools/testing/selftests/bpf
+USER_CFLAGS += -I$(LIB_PATH)/tools/lib
+USER_CFLAGS += -I$(LIB_PATH)/tools/include
+USER_CFLAGS += -I$(LIB_PATH)/tools/perf 
+USER_LDFLAGS := -lbpf -lelf -lz
 
-# Detect that we're cross compiling and use the cross compiler
-ifdef CROSS_COMPILE
-CLANG_ARCH_ARGS = --target=$(notdir $(CROSS_COMPILE:%-=%))
-endif
 
-# Don't evaluate probes and warnings if we need to run make recursively
-ifneq ($(src),)
-HDR_PROBE := $(shell printf "\#include <linux/types.h>\n struct list_head { int a; }; int main() { return 0; }" | \
-	$(CC) $(TPROGS_CFLAGS) $(TPROGS_LDFLAGS) -x c - \
-	-o /dev/null 2>/dev/null && echo okay)
-
-ifeq ($(HDR_PROBE),)
-$(warning WARNING: Detected possible issues with include path.)
-$(warning WARNING: Please install kernel headers locally (make headers_install).)
-endif
+all: $(BPF_OBJ) $(USER_OBJ) tar.zip
 
-BTF_LLC_PROBE := $(shell $(LLC) -march=bpf -mattr=help 2>&1 | grep dwarfris)
-BTF_PAHOLE_PROBE := $(shell $(BTF_PAHOLE) --help 2>&1 | grep BTF)
-BTF_OBJCOPY_PROBE := $(shell $(LLVM_OBJCOPY) --help 2>&1 | grep -i 'usage.*llvm')
-BTF_LLVM_PROBE := $(shell echo "int main() { return 0; }" | \
-			  $(CLANG) -target bpf -O2 -g -c -x c - -o ./llvm_btf_verify.o; \
-			  readelf -S ./llvm_btf_verify.o | grep BTF; \
-			  /bin/rm -f ./llvm_btf_verify.o)
+$(LIB_PATH)/tools/vmlinux.h: 
+		@echo " Generating vmlinux.h" $@ 
+		bpftool btf dump file /sys/kernel/btf/vmlinux format c > $@;
 
-BPF_EXTRA_CFLAGS += -fno-stack-protector
-ifneq ($(BTF_LLVM_PROBE),)
-	BPF_EXTRA_CFLAGS += -g
-else
-ifneq ($(and $(BTF_LLC_PROBE),$(BTF_PAHOLE_PROBE),$(BTF_OBJCOPY_PROBE)),)
-	BPF_EXTRA_CFLAGS += -g
-	LLC_FLAGS += -mattr=dwarfris
-	DWARF2BTF = y
-endif
-endif
-endif
+%.bpf.o: %.bpf.c $(LIB_PATH)/tools/vmlinux.h
+	@echo "Compiling BPF program: $< -> $@"
+	$(BPF_CLANG) $(BPF_CFLAGS) -c $< -o - | llc -march=bpf -filetype=obj -o $@
 
-# Trick to allow make to be run from this directory
-all:build tar.zip
-build:
-	if [ ! -f $(L3AF_SRC_PATH)/vmlinux.h ]; then \
-		bpftool btf dump file /sys/kernel/btf/vmlinux format c > $(L3AF_SRC_PATH)/vmlinux.h; \
-        fi
-	$(MAKE) -C $(LINUX_SRC_PATH) M=$(L3AF_SRC_PATH)
+$(USER_OBJ): $(USER_PROG)
+		$(BPF_CLANG) $(USER_CFLAGS) $< -o $@ $(USER_LDFLAGS)
 
 tar.zip:
 	@rm -rf l3af_connection_limit 
 	@rm -f l3af_connection_limit.tar.gz
 	@mkdir l3af_connection_limit
 	@cp $(L3AF_SRC_PATH)/connection_limit.bpf.o l3af_connection_limit/
-	@cp $(L3AF_SRC_PATH)/connection_limit_kern.o l3af_connection_limit/
 	@cp $(L3AF_SRC_PATH)/connection_limit l3af_connection_limit/
 	@tar -cvf l3af_connection_limit.tar ./l3af_connection_limit
 	@gzip l3af_connection_limit.tar
 
 clean:
-	$(MAKE) -C $(LINUX_SRC_PATH) M=$(L3AF_SRC_PATH) clean
 	@find $(CURDIR) -type f -name '*~' -delete
 	@rm -f ./*.o
+	@rm -f connection_limit
 	@rm -f l3af_connection_limit.tar.gz
-	@rm -rf $(L3AF_SRC_PATH)/vmlinux.h
-
-$(LIBBPF): FORCE
-# Fix up variables inherited from Kbuild that tools/ build system won't like
-	$(MAKE) -C $(dir $@) RM='rm -rf' EXTRA_CFLAGS="$(TPROGS_CFLAGS)" \
-		LDFLAGS=$(TPROGS_LDFLAGS) srctree=$(BPF_SAMPLES_PATH)/../../ O=
-
-BPFTOOLDIR := $(TOOLS_PATH)/bpf/bpftool
-BPFTOOL := $(BPFTOOLDIR)/bpftool
-$(BPFTOOL): $(wildcard $(BPFTOOLDIR)/*.[ch] $(BPFTOOLDIR)/Makefile)
-	    $(MAKE) -C $(BPFTOOLDIR) srctree=$(BPF_SAMPLES_PATH)/../../
-
-$(obj)/syscall_nrs.h:	$(obj)/syscall_nrs.s FORCE
-	$(call filechk,offsets,__SYSCALL_NRS_H__)
-
-targets += syscall_nrs.s
-clean-files += syscall_nrs.h
-
-FORCE:
-
-
-# Verify LLVM compiler tools are available and bpf target is supported by llc
-.PHONY: verify_cmds verify_target_bpf $(CLANG) $(LLC)
-
-verify_cmds: $(CLANG) $(LLC)
-	@for TOOL in $^ ; do \
-		if ! (which -- "$${TOOL}" > /dev/null 2>&1); then \
-			echo "*** ERROR: Cannot find LLVM tool $${TOOL}" ;\
-			exit 1; \
-		else true; fi; \
-	done
-
-verify_target_bpf: verify_cmds
-	@if ! (${LLC} -march=bpf -mattr=help > /dev/null 2>&1); then \
-		echo "*** ERROR: LLVM (${LLC}) does not support 'bpf' target" ;\
-		echo "   NOTICE: LLVM version >= 3.7.1 required" ;\
-		exit 2; \
-	else true; fi
-
-$(BPF_SAMPLES_PATH)/*.c: verify_target_bpf $(LIBBPF)
-$(src)/*.c: verify_target_bpf $(LIBBPF)
-
-
--include $(BPF_SAMPLES_PATH)/Makefile.target
-
-VMLINUX_BTF_PATHS ?= $(abspath $(if $(O),$(O)/vmlinux))				\
-		     $(abspath $(if $(KBUILD_OUTPUT),$(KBUILD_OUTPUT)/vmlinux))	\
-		     $(abspath ./vmlinux)
-VMLINUX_BTF ?= $(abspath $(firstword $(wildcard $(VMLINUX_BTF_PATHS))))
-
-clean-files += vmlinux.h
-
-# Get Clang's default includes on this system, as opposed to those seen by
-# '-target bpf'. This fixes "missing" files on some architectures/distros,
-# such as asm/byteorder.h, asm/socket.h, asm/sockios.h, sys/cdefs.h etc.
-#
-# Use '-idirafter': Don't interfere with include mechanics except where the
-# build would have failed anyways.
-define get_sys_includes
-$(shell $(1) -v -E - </dev/null 2>&1 \
-        | sed -n '/<...> search starts here:/,/End of search list./{ s| \(/.*\)|-idirafter \1|p }') \
-$(shell $(1) -dM -E - </dev/null | grep '#define __riscv_xlen ' | sed 's/#define /-D/' | sed 's/ /=/')
-endef
-
-CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG))
-
-# 
-
-$(obj)/%.bpf.o: $(src)/%.bpf.c $(BPF_SAMPLES_PATH)/xdp_sample.bpf.h $(BPF_SAMPLES_PATH)/xdp_sample_shared.h 
-	@echo "  CLANG-BPF " $@
-	$(Q)$(CLANG) -g -O2 -target bpf -D__TARGET_ARCH_$(SRCARCH) \
-		-Wno-compare-distinct-pointer-types -I$(srctree)/include \
-		-I$(srctree)/samples/bpf -I$(srctree)/tools/include \
-		-I$(srctree)/tools/lib -I$(srctree)/tools/lib/bpf $(CLANG_SYS_INCLUDES) \
-		-c $(filter %.bpf.c,$^) -o $@
-
-# asm/sysreg.h - inline assembly used by it is incompatible with llvm.
-# But, there is no easy way to fix it, so just exclude it since it is
-# useless for BPF samples.
-# below we use long chain of commands, clang | opt | llvm-dis | llc,
-# to generate final object file. 'clang' compiles the source into IR
-# with native target, e.g., x64, arm64, etc. 'opt' does bpf CORE IR builtin
-# processing (llvm12) and IR optimizations. 'llvm-dis' converts
-# 'opt' output to IR, and finally 'llc' generates bpf byte code.
-
-$(obj)/%.o: $(src)/%.c
-	@echo "  CLANG-bpf " $@
-	$(Q)$(CLANG) $(NOSTDINC_FLAGS) $(LINUXINCLUDE) $(BPF_EXTRA_CFLAGS) \
-		-I$(obj) -I$(srctree)/tools/testing/selftests/bpf/ \
-		-I$(srctree)/tools/lib/ -I$(srctree)/tools/lib/bpf \
-		-D__KERNEL__ -D__BPF_TRACING__ -Wno-unused-value -Wno-pointer-sign \
-		-D__TARGET_ARCH_$(SRCARCH) -Wno-compare-distinct-pointer-types \
-		-Wno-gnu-variable-sized-type-not-at-end \
-		-Wno-address-of-packed-member -Wno-tautological-compare \
-                -Wno-unknown-warning-option $(CLANG_ARCH_ARGS) \
-                -fno-asynchronous-unwind-tables \
-                -I$(srctree)/samples/bpf/ -include asm_goto_workaround.h \
-                -O2 -emit-llvm -Xclang -disable-llvm-passes -c $< -o - | \
-                $(OPT) -O2 -mtriple=bpf-pc-linux | $(LLVM_DIS) | \
-                $(LLC) -march=bpf $(LLC_FLAGS) -filetype=obj -o $@
+	@rm -rf l3af_connection_limit