From 208bb7f8a14efd540138fe3a9e7fb2a97ab1c547 Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Fri, 1 Mar 2024 17:52:01 +0900 Subject: [PATCH 1/5] gh-123 - Support for 6.x kernel --- .github/workflows/advanced-lb-sanity-ubuntu-22.yml | 2 +- .github/workflows/advanced-lb-sanity.yml | 2 +- .github/workflows/basic-sanity-ubuntu-22.yml | 2 +- .github/workflows/basic-sanity.yml | 2 +- .github/workflows/cluster-sanity-ubuntu-22.yml | 2 +- .github/workflows/cluster-sanity.yml | 2 +- .github/workflows/data-store-CI.yml | 2 +- .github/workflows/ipsec-sanity-ubuntu-22.yml | 2 +- .github/workflows/ipsec-sanity.yml | 2 +- .github/workflows/liveness-sanity-ubuntu-22.yml | 2 +- .github/workflows/liveness-sanity.yml | 2 +- .github/workflows/nat66-sanity-ubuntu-22.yml | 2 +- .github/workflows/nat66-sanity.yml | 2 +- .github/workflows/perf.yml | 2 +- .github/workflows/scale-sanity-ubuntu-22.yml | 2 +- .github/workflows/scale-sanity.yml | 2 +- .github/workflows/sctp-sanity-ubuntu-22.yml | 2 +- .github/workflows/sctp-sanity.yml | 2 +- .github/workflows/tcp-sanity-ubuntu-22.yml | 2 +- .github/workflows/tcp-sanity.yml | 2 +- .github/workflows/test-scenario.yml | 2 +- .github/workflows/udp-sanity-ubuntu-22.yml | 2 +- .github/workflows/udp-sanity.yml | 2 +- Dockerfile | 9 +++++---- Makefile | 4 ++-- loxilb-ebpf | 2 +- 26 files changed, 31 insertions(+), 30 deletions(-) diff --git a/.github/workflows/advanced-lb-sanity-ubuntu-22.yml b/.github/workflows/advanced-lb-sanity-ubuntu-22.yml index 8a2b195c..ec3a5089 100644 --- a/.github/workflows/advanced-lb-sanity-ubuntu-22.yml +++ b/.github/workflows/advanced-lb-sanity-ubuntu-22.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool lksctp-tools - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/advanced-lb-sanity.yml b/.github/workflows/advanced-lb-sanity.yml index 02669868..88327fdd 100644 --- a/.github/workflows/advanced-lb-sanity.yml +++ b/.github/workflows/advanced-lb-sanity.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/basic-sanity-ubuntu-22.yml b/.github/workflows/basic-sanity-ubuntu-22.yml index 6dddd674..8caa72ff 100644 --- a/.github/workflows/basic-sanity-ubuntu-22.yml +++ b/.github/workflows/basic-sanity-ubuntu-22.yml @@ -34,7 +34,7 @@ jobs: sudo ip netns add test sudo ip netns del test - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/basic-sanity.yml b/.github/workflows/basic-sanity.yml index 741c80a3..a4d1f266 100644 --- a/.github/workflows/basic-sanity.yml +++ b/.github/workflows/basic-sanity.yml @@ -22,7 +22,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev elfutils dwarves git linux-tools-$(uname -r) libbsd-dev bridge-utils unzip build-essential bison flex iproute2 - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/cluster-sanity-ubuntu-22.yml b/.github/workflows/cluster-sanity-ubuntu-22.yml index c82eece1..000313f4 100644 --- a/.github/workflows/cluster-sanity-ubuntu-22.yml +++ b/.github/workflows/cluster-sanity-ubuntu-22.yml @@ -25,7 +25,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat lksctp-tools - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/cluster-sanity.yml b/.github/workflows/cluster-sanity.yml index adeafb10..4c9a9d6d 100644 --- a/.github/workflows/cluster-sanity.yml +++ b/.github/workflows/cluster-sanity.yml @@ -25,7 +25,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/data-store-CI.yml b/.github/workflows/data-store-CI.yml index 6f75a8a0..77f156bb 100644 --- a/.github/workflows/data-store-CI.yml +++ b/.github/workflows/data-store-CI.yml @@ -40,7 +40,7 @@ jobs: - run: if [[ ${{ github.event.inputs.runsOn }} == 'ubuntu-22.04' ]]; then sudo apt-get -y install clang-13 lksctp-tools; else sudo apt-get -y install clang-10; fi - run: sudo apt-get -y install llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/ipsec-sanity-ubuntu-22.yml b/.github/workflows/ipsec-sanity-ubuntu-22.yml index 409dbd93..0ebe9d03 100644 --- a/.github/workflows/ipsec-sanity-ubuntu-22.yml +++ b/.github/workflows/ipsec-sanity-ubuntu-22.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/ipsec-sanity.yml b/.github/workflows/ipsec-sanity.yml index 4350af60..db8d3b8c 100644 --- a/.github/workflows/ipsec-sanity.yml +++ b/.github/workflows/ipsec-sanity.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/liveness-sanity-ubuntu-22.yml b/.github/workflows/liveness-sanity-ubuntu-22.yml index 1edb53c9..9af75809 100644 --- a/.github/workflows/liveness-sanity-ubuntu-22.yml +++ b/.github/workflows/liveness-sanity-ubuntu-22.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool lksctp-tools - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/liveness-sanity.yml b/.github/workflows/liveness-sanity.yml index 47c00a36..d0042839 100644 --- a/.github/workflows/liveness-sanity.yml +++ b/.github/workflows/liveness-sanity.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submdules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/nat66-sanity-ubuntu-22.yml b/.github/workflows/nat66-sanity-ubuntu-22.yml index 0bafc76c..dafec3f6 100644 --- a/.github/workflows/nat66-sanity-ubuntu-22.yml +++ b/.github/workflows/nat66-sanity-ubuntu-22.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/nat66-sanity.yml b/.github/workflows/nat66-sanity.yml index d6dacc17..aef1dcb7 100644 --- a/.github/workflows/nat66-sanity.yml +++ b/.github/workflows/nat66-sanity.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index 9171ab5f..f6f69805 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -36,7 +36,7 @@ jobs: - run: if [[ ${{ matrix.os }} == 'ubuntu-22.04' ]]; then sudo apt-get -y install clang-13 lksctp-tools; else sudo apt-get -y install clang-10; fi - run: sudo apt-get -y install llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat iperf3 - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/scale-sanity-ubuntu-22.yml b/.github/workflows/scale-sanity-ubuntu-22.yml index 1d54b23f..de6a60f7 100644 --- a/.github/workflows/scale-sanity-ubuntu-22.yml +++ b/.github/workflows/scale-sanity-ubuntu-22.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat lksctp-tools - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/scale-sanity.yml b/.github/workflows/scale-sanity.yml index 97473df4..c8436ee6 100644 --- a/.github/workflows/scale-sanity.yml +++ b/.github/workflows/scale-sanity.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/sctp-sanity-ubuntu-22.yml b/.github/workflows/sctp-sanity-ubuntu-22.yml index 0ca706a7..ef0ae8e3 100644 --- a/.github/workflows/sctp-sanity-ubuntu-22.yml +++ b/.github/workflows/sctp-sanity-ubuntu-22.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool lksctp-tools - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/sctp-sanity.yml b/.github/workflows/sctp-sanity.yml index 94d6f109..c7c76dde 100644 --- a/.github/workflows/sctp-sanity.yml +++ b/.github/workflows/sctp-sanity.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/tcp-sanity-ubuntu-22.yml b/.github/workflows/tcp-sanity-ubuntu-22.yml index 2cb4ad73..37445d23 100644 --- a/.github/workflows/tcp-sanity-ubuntu-22.yml +++ b/.github/workflows/tcp-sanity-ubuntu-22.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/tcp-sanity.yml b/.github/workflows/tcp-sanity.yml index 905af16f..b5381d91 100644 --- a/.github/workflows/tcp-sanity.yml +++ b/.github/workflows/tcp-sanity.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/test-scenario.yml b/.github/workflows/test-scenario.yml index 1b0933f0..ac864c2a 100644 --- a/.github/workflows/test-scenario.yml +++ b/.github/workflows/test-scenario.yml @@ -32,7 +32,7 @@ jobs: - run: if [[ ${{ github.event.inputs.runsOn }} == 'ubuntu-22.04' ]]; then sudo apt-get -y install clang-13 lksctp-tools; else sudo apt-get -y install clang-10; fi - run: sudo apt-get -y install llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/udp-sanity-ubuntu-22.yml b/.github/workflows/udp-sanity-ubuntu-22.yml index 304d7393..b303bcd1 100644 --- a/.github/workflows/udp-sanity-ubuntu-22.yml +++ b/.github/workflows/udp-sanity-ubuntu-22.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-13 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/.github/workflows/udp-sanity.yml b/.github/workflows/udp-sanity.yml index 7da71a04..d3aab36d 100644 --- a/.github/workflows/udp-sanity.yml +++ b/.github/workflows/udp-sanity.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build diff --git a/Dockerfile b/Dockerfile index 2cce358b..5fd163c5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,18 +19,19 @@ RUN mkdir -p /opt/loxilb && \ apt-get update && apt-get install -y wget && \ arch=$(arch | sed s/aarch64/arm64/ | sed s/x86_64/amd64/) && echo $arch && if [ "$arch" = "arm64" ] ; then apt-get install -y gcc-multilib-arm-linux-gnueabihf; else apt-get update && apt-get install -y gcc-multilib;fi && \ # Arch specific packages - GoLang - wget https://go.dev/dl/go1.21.5.linux-${arch}.tar.gz && tar -xzf go1.21.5.linux-${arch}.tar.gz --directory /usr/local/ && rm go1.21.5.linux-${arch}.tar.gz && \ + wget https://go.dev/dl/go1.22.0.linux-${arch}.tar.gz && tar -xzf go1.22.0.linux-${arch}.tar.gz --directory /usr/local/ && rm go1.22.0.linux-${arch}.tar.gz && \ # Dev and util packages apt-get install -y clang llvm libelf-dev libpcap-dev vim net-tools \ elfutils dwarves git libbsd-dev bridge-utils wget unzip build-essential \ bison flex sudo iproute2 pkg-config tcpdump iputils-ping curl bash-completion && \ # Install loxilb's custom ntc tool wget https://github.com/loxilb-io/iproute2/archive/refs/heads/main.zip && \ - unzip main.zip && cd iproute2-main/libbpf/src/ && mkdir build && \ - DESTDIR=build make install && cd - && cd iproute2-main/ && \ + unzip main.zip && cd iproute2-main/ && rm -fr libbpf && wget https://github.com/loxilb-io/libbpf/archive/refs/heads/main.zip && \ + unzip main.zip && mv libbpf-main libbpf && cd libbpf/src/ && mkdir build && \ + DESTDIR=build make install && cd - && \ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && \ LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && \ - cp -f tc/tc /usr/local/sbin/ntc && cd - && cd iproute2-main/libbpf/src/ && \ + cp -f tc/tc /usr/local/sbin/ntc && cd .. && cd iproute2-main/libbpf/src/ && \ make install && cd - && rm -fr main.zip iproute2-main && \ # Install bpftool git clone --recurse-submodules https://github.com/libbpf/bpftool.git && cd bpftool/src/ && \ diff --git a/Makefile b/Makefile index bf070e80..793592c2 100644 --- a/Makefile +++ b/Makefile @@ -31,7 +31,7 @@ docker-cp: build docker cp /opt/loxilb/llb_ebpf_emain.o $(loxilbid):/opt/loxilb/llb_ebpf_emain.o 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/libbpf/src/libbpf.so.0.8.1 $(loxilbid):/usr/lib64/ docker cp loxilb-ebpf/utils/loxilb_dp_tool $(loxilbid):/usr/local/sbin/ docker-cp-ebpf: build @@ -39,7 +39,7 @@ docker-cp-ebpf: build docker cp /opt/loxilb/llb_ebpf_emain.o $(loxilbid):/opt/loxilb/llb_ebpf_emain.o 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/libbpf/src/libbpf.so.0.8.1 $(loxilbid):/usr/lib64/ docker-run: @docker stop $(dock) 2>&1 >> /dev/null || true diff --git a/loxilb-ebpf b/loxilb-ebpf index 2c1db4ce..e410804f 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit 2c1db4ce4698b9106e9f93d06518fe386329b2b7 +Subproject commit e410804f2e3d46f55cd6eebfcb8bfd7b00027ac0 From faa8c5739b23b7dcae8605279c75e92dc86b501d Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Fri, 1 Mar 2024 20:08:30 +0900 Subject: [PATCH 2/5] gh-123 - Support for 6.x kernel --- .github/workflows/advanced-lb-sanity-ubuntu-22.yml | 2 +- .github/workflows/advanced-lb-sanity.yml | 2 +- .github/workflows/basic-sanity-ubuntu-22.yml | 2 +- .github/workflows/basic-sanity.yml | 2 +- .github/workflows/cluster-sanity-ubuntu-22.yml | 2 +- .github/workflows/cluster-sanity.yml | 2 +- .github/workflows/data-store-CI.yml | 2 +- .github/workflows/ipsec-sanity-ubuntu-22.yml | 2 +- .github/workflows/ipsec-sanity.yml | 2 +- .github/workflows/liveness-sanity-ubuntu-22.yml | 2 +- .github/workflows/liveness-sanity.yml | 2 +- .github/workflows/nat66-sanity-ubuntu-22.yml | 2 +- .github/workflows/nat66-sanity.yml | 2 +- .github/workflows/perf.yml | 2 +- .github/workflows/scale-sanity-ubuntu-22.yml | 2 +- .github/workflows/scale-sanity.yml | 2 +- .github/workflows/sctp-sanity-ubuntu-22.yml | 2 +- .github/workflows/sctp-sanity.yml | 2 +- .github/workflows/tcp-sanity-ubuntu-22.yml | 2 +- .github/workflows/tcp-sanity.yml | 2 +- .github/workflows/test-scenario.yml | 2 +- .github/workflows/udp-sanity-ubuntu-22.yml | 2 +- .github/workflows/udp-sanity.yml | 2 +- Dockerfile | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/advanced-lb-sanity-ubuntu-22.yml b/.github/workflows/advanced-lb-sanity-ubuntu-22.yml index ec3a5089..4b77bbdd 100644 --- a/.github/workflows/advanced-lb-sanity-ubuntu-22.yml +++ b/.github/workflows/advanced-lb-sanity-ubuntu-22.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/advanced-lb-sanity.yml b/.github/workflows/advanced-lb-sanity.yml index 88327fdd..48e5e38a 100644 --- a/.github/workflows/advanced-lb-sanity.yml +++ b/.github/workflows/advanced-lb-sanity.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/basic-sanity-ubuntu-22.yml b/.github/workflows/basic-sanity-ubuntu-22.yml index 8caa72ff..64c9d6b7 100644 --- a/.github/workflows/basic-sanity-ubuntu-22.yml +++ b/.github/workflows/basic-sanity-ubuntu-22.yml @@ -38,7 +38,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/basic-sanity.yml b/.github/workflows/basic-sanity.yml index a4d1f266..f4afa8ab 100644 --- a/.github/workflows/basic-sanity.yml +++ b/.github/workflows/basic-sanity.yml @@ -26,7 +26,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/cluster-sanity-ubuntu-22.yml b/.github/workflows/cluster-sanity-ubuntu-22.yml index 000313f4..95eca4ad 100644 --- a/.github/workflows/cluster-sanity-ubuntu-22.yml +++ b/.github/workflows/cluster-sanity-ubuntu-22.yml @@ -29,7 +29,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/cluster-sanity.yml b/.github/workflows/cluster-sanity.yml index 4c9a9d6d..89d15b88 100644 --- a/.github/workflows/cluster-sanity.yml +++ b/.github/workflows/cluster-sanity.yml @@ -29,7 +29,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/data-store-CI.yml b/.github/workflows/data-store-CI.yml index 77f156bb..9f562437 100644 --- a/.github/workflows/data-store-CI.yml +++ b/.github/workflows/data-store-CI.yml @@ -44,7 +44,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/ipsec-sanity-ubuntu-22.yml b/.github/workflows/ipsec-sanity-ubuntu-22.yml index 0ebe9d03..da816bf9 100644 --- a/.github/workflows/ipsec-sanity-ubuntu-22.yml +++ b/.github/workflows/ipsec-sanity-ubuntu-22.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/ipsec-sanity.yml b/.github/workflows/ipsec-sanity.yml index db8d3b8c..7a34488d 100644 --- a/.github/workflows/ipsec-sanity.yml +++ b/.github/workflows/ipsec-sanity.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/liveness-sanity-ubuntu-22.yml b/.github/workflows/liveness-sanity-ubuntu-22.yml index 9af75809..d5983ab8 100644 --- a/.github/workflows/liveness-sanity-ubuntu-22.yml +++ b/.github/workflows/liveness-sanity-ubuntu-22.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/liveness-sanity.yml b/.github/workflows/liveness-sanity.yml index d0042839..0076fe22 100644 --- a/.github/workflows/liveness-sanity.yml +++ b/.github/workflows/liveness-sanity.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/nat66-sanity-ubuntu-22.yml b/.github/workflows/nat66-sanity-ubuntu-22.yml index dafec3f6..870dd3aa 100644 --- a/.github/workflows/nat66-sanity-ubuntu-22.yml +++ b/.github/workflows/nat66-sanity-ubuntu-22.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/nat66-sanity.yml b/.github/workflows/nat66-sanity.yml index aef1dcb7..4938899c 100644 --- a/.github/workflows/nat66-sanity.yml +++ b/.github/workflows/nat66-sanity.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/perf.yml b/.github/workflows/perf.yml index f6f69805..a14baaa9 100644 --- a/.github/workflows/perf.yml +++ b/.github/workflows/perf.yml @@ -40,7 +40,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/scale-sanity-ubuntu-22.yml b/.github/workflows/scale-sanity-ubuntu-22.yml index de6a60f7..50eb2c07 100644 --- a/.github/workflows/scale-sanity-ubuntu-22.yml +++ b/.github/workflows/scale-sanity-ubuntu-22.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/scale-sanity.yml b/.github/workflows/scale-sanity.yml index c8436ee6..ca4d8807 100644 --- a/.github/workflows/scale-sanity.yml +++ b/.github/workflows/scale-sanity.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/sctp-sanity-ubuntu-22.yml b/.github/workflows/sctp-sanity-ubuntu-22.yml index ef0ae8e3..92b3e3cb 100644 --- a/.github/workflows/sctp-sanity-ubuntu-22.yml +++ b/.github/workflows/sctp-sanity-ubuntu-22.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/sctp-sanity.yml b/.github/workflows/sctp-sanity.yml index c7c76dde..07f9cf45 100644 --- a/.github/workflows/sctp-sanity.yml +++ b/.github/workflows/sctp-sanity.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/tcp-sanity-ubuntu-22.yml b/.github/workflows/tcp-sanity-ubuntu-22.yml index 37445d23..0f01a8de 100644 --- a/.github/workflows/tcp-sanity-ubuntu-22.yml +++ b/.github/workflows/tcp-sanity-ubuntu-22.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/tcp-sanity.yml b/.github/workflows/tcp-sanity.yml index b5381d91..7090a78d 100644 --- a/.github/workflows/tcp-sanity.yml +++ b/.github/workflows/tcp-sanity.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/test-scenario.yml b/.github/workflows/test-scenario.yml index ac864c2a..e1488dfa 100644 --- a/.github/workflows/test-scenario.yml +++ b/.github/workflows/test-scenario.yml @@ -36,7 +36,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/udp-sanity-ubuntu-22.yml b/.github/workflows/udp-sanity-ubuntu-22.yml index b303bcd1..8ac6ab24 100644 --- a/.github/workflows/udp-sanity-ubuntu-22.yml +++ b/.github/workflows/udp-sanity-ubuntu-22.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/.github/workflows/udp-sanity.yml b/.github/workflows/udp-sanity.yml index d3aab36d..3bcd88b2 100644 --- a/.github/workflows/udp-sanity.yml +++ b/.github/workflows/udp-sanity.yml @@ -34,7 +34,7 @@ jobs: cd iproute2-main/libbpf/src/ sudo make install mkdir build - DESTDIR=build make install + DESTDIR=build OBJDIR=build make install cd - cd iproute2-main/ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && sudo cp -f tc/tc /usr/local/sbin/ntc && cd - diff --git a/Dockerfile b/Dockerfile index 5fd163c5..28f1ed3d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p /opt/loxilb && \ wget https://github.com/loxilb-io/iproute2/archive/refs/heads/main.zip && \ unzip main.zip && cd iproute2-main/ && rm -fr libbpf && wget https://github.com/loxilb-io/libbpf/archive/refs/heads/main.zip && \ unzip main.zip && mv libbpf-main libbpf && cd libbpf/src/ && mkdir build && \ - DESTDIR=build make install && cd - && \ + DESTDIR=build OBJDIR=build make install && cd - && \ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && \ LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && \ cp -f tc/tc /usr/local/sbin/ntc && cd .. && cd iproute2-main/libbpf/src/ && \ From 6bbd9d777d460a65ce84643fec50507e987efc4f Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Fri, 1 Mar 2024 20:10:35 +0900 Subject: [PATCH 3/5] gh-123 - Support for 6.x kernel : fixed typos --- .github/workflows/liveness-sanity.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/liveness-sanity.yml b/.github/workflows/liveness-sanity.yml index 0076fe22..ddeadc1d 100644 --- a/.github/workflows/liveness-sanity.yml +++ b/.github/workflows/liveness-sanity.yml @@ -30,7 +30,7 @@ jobs: - run: sudo apt-get update - run: sudo apt-get -y install clang-10 llvm libelf-dev gcc-multilib libpcap-dev linux-tools-$(uname -r) elfutils dwarves git libbsd-dev bridge-utils unzip build-essential bison flex iperf iproute2 nodejs socat ethtool - run: | - git clone --recurse-submdules https://github.com/loxilb-io/iproute2 iproute2-main + git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main cd iproute2-main/libbpf/src/ sudo make install mkdir build From 1afe4f7a0c255c234ba3171223d383e9ee56765c Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Fri, 1 Mar 2024 21:35:53 +0900 Subject: [PATCH 4/5] gh-123 - Support for 6.x kernel : fixed build --- Dockerfile | 5 ++--- loxilb-ebpf | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 28f1ed3d..f3960713 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,11 +28,10 @@ RUN mkdir -p /opt/loxilb && \ wget https://github.com/loxilb-io/iproute2/archive/refs/heads/main.zip && \ unzip main.zip && cd iproute2-main/ && rm -fr libbpf && wget https://github.com/loxilb-io/libbpf/archive/refs/heads/main.zip && \ unzip main.zip && mv libbpf-main libbpf && cd libbpf/src/ && mkdir build && \ - DESTDIR=build OBJDIR=build make install && cd - && \ + make install && DESTDIR=build OBJDIR=build make install && cd - && \ export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:`pwd`/libbpf/src/ && \ LIBBPF_FORCE=on LIBBPF_DIR=`pwd`/libbpf/src/build ./configure && make && \ - cp -f tc/tc /usr/local/sbin/ntc && cd .. && cd iproute2-main/libbpf/src/ && \ - make install && cd - && rm -fr main.zip iproute2-main && \ + cp -f tc/tc /usr/local/sbin/ntc && cd .. && rm -fr main.zip iproute2-main && \ # Install bpftool git clone --recurse-submodules https://github.com/libbpf/bpftool.git && cd bpftool/src/ && \ git switch --detach v7.2.0 && \ diff --git a/loxilb-ebpf b/loxilb-ebpf index e410804f..d60da96e 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit e410804f2e3d46f55cd6eebfcb8bfd7b00027ac0 +Subproject commit d60da96e058a4462bb1085e424935df4f33c210d From 977d9cf2775d45dc5648533b23f83b59403a659d Mon Sep 17 00:00:00 2001 From: Trekkie Coder Date: Fri, 1 Mar 2024 23:50:43 +0900 Subject: [PATCH 5/5] gh-123 - Support for 6.x kernel : fixed apis --- loxilb-ebpf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loxilb-ebpf b/loxilb-ebpf index d60da96e..b79d22ec 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit d60da96e058a4462bb1085e424935df4f33c210d +Subproject commit b79d22ecd52e2a0fd77f6dfb298cd3f166f4d41b