Merge pull request #469 from TrekkieCoder/main

PR - Workaround for virtio buffer issue with sctp
loxilb-io · Dec 26, 2023 · 15eed72 · 15eed72
2 parents 3c569b6 + 95144a4
commit 15eed72
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -48,6 +48,7 @@ RUN arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && echo $arch && i
     git clone --recurse-submodules https://github.com/loxilb-io/loxilb  /root/loxilb-io/loxilb/ && \
     cd /root/loxilb-io/loxilb/ && go get . && make && \
     cp loxilb-ebpf/utils/mkllb_bpffs.sh /usr/local/sbin/mkllb_bpffs && \
+    cp loxilb-ebpf/utils/loxilb_dp_tool /usr/local/sbin/loxilb_dp_tool && \
     cp api/certification/* /opt/loxilb/cert/ && cd - && \
     cp /root/loxilb-io/loxilb/loxilb-ebpf/kernel/loxilb_dp_debug  /usr/local/sbin/loxilb_dp_debug && \
     cp /root/loxilb-io/loxilb/loxilb /usr/local/sbin/loxilb && \

diff --git a/Makefile b/Makefile
@@ -32,6 +32,7 @@ docker-cp: build
 	docker cp /opt/loxilb/llb_xdp_main.o $(loxilbid):/opt/loxilb/llb_xdp_main.o
 	docker cp loxilb-ebpf/kernel/loxilb_dp_debug  $(loxilbid):/usr/local/sbin/
 	docker cp loxilb-ebpf/libbpf/src/libbpf.so.0.4.0 $(loxilbid):/usr/lib64/
+	docker cp loxilb-ebpf/utils/loxilb_dp_tool $(loxilbid):/usr/local/sbin/
 
 docker-cp-ebpf: build
 	docker cp /opt/loxilb/llb_ebpf_main.o $(loxilbid):/opt/loxilb/llb_ebpf_main.o
@@ -46,6 +47,7 @@ docker-run:
 	docker run -u root --cap-add SYS_ADMIN   --restart unless-stopped --privileged -dt --entrypoint /bin/bash  --name $(dock) ghcr.io/loxilb-io/loxilb:latest
 
 docker-rp: docker-run docker-cp
+	@docker exec -it $(dock) mkllb_bpffs 2>&1 >> /dev/null || true
 	docker commit ${loxilbid} ghcr.io/loxilb-io/loxilb:latest
 	@docker stop $(dock) 2>&1 >> /dev/null || true
 	@docker rm $(dock) 2>&1 >> /dev/null || true

diff --git a/loxilb-ebpf b/loxilb-ebpf
diff --git a/main.go b/main.go
@@ -25,7 +25,7 @@ import (
 	"time"
 )
 
-var version string = "0.9.0"
+var version string = "0.9.1"
 var buildInfo string = ""
 
 func main() {
+1 −1		common/common.mk
+2 −0		common/llb_dpapi.h
+35 −0		kernel/llb_kern_cdefs.h
+67 −2		kernel/llb_kern_devif.c
+2 −0		kernel/llb_kern_entry.c
+5 −2		kernel/llb_kern_fcfwd.c
+4 −0		kernel/loxilb_libdp.c
+74 −0		utils/loxilb_dp_tool