From 142d9653c3ae18882eca9e5766eebfb4a7f8fc20 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Tue, 26 Dec 2023 22:26:36 +0900 Subject: [PATCH 1/2] Workaround for virtio buffer issue with sctp --- Dockerfile | 1 + Makefile | 2 ++ loxilb-ebpf | 2 +- main.go | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9414416b6..754ca0d2a 100644 --- 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 index 51bee0b4c..bf070e80c 100644 --- 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 index 9137e240d..a06beb2a6 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit 9137e240dccf00ee41c7c8ab3b20b479e1989735 +Subproject commit a06beb2a6aa48a8f1a957abbebee2fd9ca25d158 diff --git a/main.go b/main.go index dc116c708..d7e98c850 100644 --- 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() { From 95144a4df979699c3a818f08364dccd89e31fc5e Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Tue, 26 Dec 2023 22:38:04 +0900 Subject: [PATCH 2/2] Workaround for virtio buffer issue with sctp --- loxilb-ebpf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loxilb-ebpf b/loxilb-ebpf index a06beb2a6..083b53b51 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit a06beb2a6aa48a8f1a957abbebee2fd9ca25d158 +Subproject commit 083b53b51a53a0dd0436a28ba720372dc4e40e29