From 3d79c20479e786e968eddfc933888115d74bdd1d Mon Sep 17 00:00:00 2001
From: Christian Deacon <christian@moddingcommunity.com>
Date: Tue, 6 Jun 2023 21:20:41 +0000
Subject: [PATCH] Use LibXDP to build the projects instead.

---
 Makefile | 66 ++++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 52 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 8c5465d..ff482b2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,35 @@
 CC = clang
+LLC = llc
+
 ARCH := $(shell uname -m | sed 's/x86_64/x86/')
 
+# Main directories.
 BUILDDIR = build
 SRCDIR = src
+MODULEDIR = modules
 
-LIBBPFSRC = libbpf/src
-LIBBPFOBJS = $(LIBBPFSRC)/staticobjs/bpf_prog_linfo.o $(LIBBPFSRC)/staticobjs/bpf.o $(LIBBPFSRC)/staticobjs/btf_dump.o
-LIBBPFOBJS += $(LIBBPFSRC)/staticobjs/btf.o $(LIBBPFSRC)/staticobjs/hashmap.o $(LIBBPFSRC)/staticobjs/libbpf_errno.o
-LIBBPFOBJS += $(LIBBPFSRC)/staticobjs/libbpf_probes.o $(LIBBPFSRC)/staticobjs/libbpf.o $(LIBBPFSRC)/staticobjs/netlink.o
-LIBBPFOBJS += $(LIBBPFSRC)/staticobjs/nlattr.o $(LIBBPFSRC)/staticobjs/str_error.o  $(LIBBPFSRC)/staticobjs/xsk.o
+# XDP Tools directory.
+XDPTOOLSDIR = $(MODULEDIR)/xdp-tools
+XDPTOOLSHEADERS = $(XDPTOOLSDIR)/headers
 
+# LibXDP and LibBPF directories.
+LIBXDPDIR = $(XDPTOOLSDIR)/lib/libxdp
+
+LIBBPFDIR = $(XDPTOOLSDIR)/lib/libbpf
+LIBBPFSRC = $(LIBBPFDIR)/src
+
+# LibBPF objects.
+LIBBPFOBJS = $(LIBBPFSRC)/staticobjs/bpf_prog_linfo.o $(LIBBPFSRC)/staticobjs/bpf.o
+LIBBPFOBJS += $(LIBBPFSRC)/staticobjs/btf_dump.o $(LIBBPFSRC)/staticobjs/btf.o $(LIBBPFSRC)/staticobjs/gen_loader.o  
+LIBBPFOBJS += $(LIBBPFSRC)/staticobjs/hashmap.o $(LIBBPFSRC)/staticobjs/libbpf_errno.o $(LIBBPFSRC)/staticobjs/libbpf_probes.o 
+LIBBPFOBJS += $(LIBBPFSRC)/staticobjs/libbpf.o $(LIBBPFSRC)/staticobjs/linker.o $(LIBBPFSRC)/staticobjs/netlink.o 
+LIBBPFOBJS += $(LIBBPFSRC)/staticobjs/nlattr.o $(LIBBPFSRC)/staticobjs/relo_core.o $(LIBBPFSRC)/staticobjs/ringbuf.o
+LIBBPFOBJS += $(LIBBPFSRC)/staticobjs/str_error.o $(LIBBPFSRC)/staticobjs/strset.o $(LIBBPFSRC)/staticobjs/usdt.o
+
+# LibXDP objects.
+LIBXDPOBJS = $(LIBXDPDIR)/sharedobjs/xsk.o $(LIBXDPDIR)/sharedobjs/libxdp.o
+
+# Main program's objects.
 CONFIGSRC = config.c
 CONFIGOBJ = config.o
 CMDLINESRC = cmdline.c
@@ -19,37 +39,55 @@ XDPFWSRC = xdpfw.c
 XDPFWOUT = xdpfw
 
 XDPPROGSRC = xdpfw_kern.c
-XDPPROGBC = xdpfw_kern.bc
+XDPPROGLL = xdpfw_kern.ll
 XDPPROGOBJ = xdpfw_kern.o
 
 OBJS = $(BUILDDIR)/$(CONFIGOBJ) $(BUILDDIR)/$(CMDLINEOBJ)
 
+# LD flags and includes.
 LDFLAGS += -lconfig -lelf -lz
 INCS = -I $(LIBBPFSRC)
+INCS += -I /usr/include -I /usr/local/include
 
+# All chain.
 all: xdpfw xdpfw_filter utils
-xdpfw: utils libbpf $(OBJS)
+
+# User space application chain.
+xdpfw: utils libxdp $(OBJS)
 	mkdir -p $(BUILDDIR)/
-	$(CC) $(LDFLAGS) $(INCS) -o $(BUILDDIR)/$(XDPFWOUT) $(LIBBPFOBJS) $(OBJS) $(SRCDIR)/$(XDPFWSRC)
+	$(CC) $(LDFLAGS) $(INCS) -o $(BUILDDIR)/$(XDPFWOUT) $(LIBBPFOBJS) $(LIBXDPOBJS) $(OBJS) $(SRCDIR)/$(XDPFWSRC)
+
+# XDP program chain.
 xdpfw_filter:
 	mkdir -p $(BUILDDIR)/
-	$(CC) $(INCS) -D__BPF__ -O2 -emit-llvm -c -o $(BUILDDIR)/$(XDPPROGBC) $(SRCDIR)/$(XDPPROGSRC)
-	llc -march=bpf -filetype=obj -o $(BUILDDIR)/$(XDPPROGOBJ) $(BUILDDIR)/$(XDPPROGBC)
+	$(CC) $(INCS) -D__BPF__ -D __BPF_TRACING__ -Wno-unused-value -Wno-pointer-sign -Wno-compare-distinct-pointer-types -O2 -emit-llvm -c -g -o $(BUILDDIR)/$(XDPPROGLL) $(SRCDIR)/$(XDPPROGSRC)
+	$(LLC) -march=bpf -filetype=obj -o $(BUILDDIR)/$(XDPPROGOBJ) $(BUILDDIR)/$(XDPPROGLL)
+	
+# Utils chain.
 utils:
 	mkdir -p $(BUILDDIR)/
 	$(CC) -O2 -c -o $(BUILDDIR)/$(CONFIGOBJ) $(SRCDIR)/$(CONFIGSRC)
 	$(CC) -O2 -c -o $(BUILDDIR)/$(CMDLINEOBJ) $(SRCDIR)/$(CMDLINESRC)
-libbpf:
-	$(MAKE) -C libbpf/src
+
+# LibXDP chain.
+libxdp:
+	$(MAKE) -C $(XDPTOOLSDIR)
+	sudo $(MAKE) -C $(LIBBPFSRC) install
+	sudo $(MAKE) -C $(LIBXDPDIR) install
+
+# Clean chain.
 clean:
-	$(MAKE) -C libbpf/src clean
+	$(MAKE) -C $(LIBBPFSRC) clean
+	$(MAKE) -C $(XDPTOOLSDIR) clean
 	rm -f $(BUILDDIR)/*.o $(BUILDDIR)/*.bc
 	rm -f $(BUILDDIR)/$(XDPFWOUT)
+
+# Install chain.
 install:
 	mkdir -p /etc/xdpfw/
 	cp -n xdpfw.conf.example /etc/xdpfw/xdpfw.conf
 	cp $(BUILDDIR)/$(XDPPROGOBJ) /etc/xdpfw/$(XDPPROGOBJ)
 	cp $(BUILDDIR)/$(XDPFWOUT) /usr/bin/$(XDPFWOUT)
 	cp -n other/xdpfw.service /etc/systemd/system/
-.PHONY: libbpf all
+.PHONY: libxdp all
 .DEFAULT: all
\ No newline at end of file