Merge pull request #790 from TrekkieCoder/main

gh-787 better egress hook support for in-cluster mode
loxilb-io · Sep 5, 2024 · 1c2cd20 · 1c2cd20
2 parents 79dd427 + 9244e2b
commit 1c2cd20
Show file tree

Hide file tree

Showing 20 changed files with 7 additions and 164 deletions.
diff --git a/.github/workflows/advanced-lb-sanity.yml b/.github/workflows/advanced-lb-sanity.yml
@@ -29,15 +29,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/basic-sanity-ubuntu-22.yml b/.github/workflows/basic-sanity-ubuntu-22.yml
@@ -39,15 +39,6 @@ jobs:
       - run: | 
             sudo ip netns add test
             sudo ip netns del test
-      - run: |
-            git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/basic-sanity.yml b/.github/workflows/basic-sanity.yml
@@ -21,15 +21,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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 --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/cluster-sanity.yml b/.github/workflows/cluster-sanity.yml
@@ -24,15 +24,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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 --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/ipsec-sanity-ubuntu-22.yml b/.github/workflows/ipsec-sanity-ubuntu-22.yml
@@ -29,15 +29,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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 --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/ipsec-sanity.yml b/.github/workflows/ipsec-sanity.yml
@@ -29,15 +29,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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 --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/liveness-sanity.yml b/.github/workflows/liveness-sanity.yml
@@ -29,15 +29,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/nat66-sanity-ubuntu-22.yml b/.github/workflows/nat66-sanity-ubuntu-22.yml
@@ -29,15 +29,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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 --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/nat66-sanity.yml b/.github/workflows/nat66-sanity.yml
@@ -29,15 +29,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/scale-sanity-ubuntu-22.yml b/.github/workflows/scale-sanity-ubuntu-22.yml
@@ -29,15 +29,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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 --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/scale-sanity.yml b/.github/workflows/scale-sanity.yml
@@ -29,15 +29,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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 --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/sctp-sanity-ubuntu-22.yml b/.github/workflows/sctp-sanity-ubuntu-22.yml
@@ -29,15 +29,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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 --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/sctp-sanity.yml b/.github/workflows/sctp-sanity.yml
@@ -29,15 +29,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/sctpmh-sanity.yml b/.github/workflows/sctpmh-sanity.yml
@@ -29,15 +29,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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 curl lksctp-tools
-      - run: |
-            git clone --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/tcp-sanity-ubuntu-22.yml b/.github/workflows/tcp-sanity-ubuntu-22.yml
@@ -29,15 +29,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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 --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/tcp-sanity.yml b/.github/workflows/tcp-sanity.yml
@@ -29,15 +29,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/udp-sanity-ubuntu-22.yml b/.github/workflows/udp-sanity-ubuntu-22.yml
@@ -29,15 +29,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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 --recurse-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/.github/workflows/udp-sanity.yml b/.github/workflows/udp-sanity.yml
@@ -29,15 +29,6 @@ jobs:
              go-version: '>=1.18.0'
       - 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-submodules https://github.com/loxilb-io/iproute2 iproute2-main
-            cd iproute2-main/libbpf/src/
-            sudo make install
-            mkdir build
-            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 -
       - run: loxilb-ebpf/utils/mkllb_bpffs.sh
       - run: sudo -E env "PATH=$PATH" make
       - run: sudo -E env "PATH=$PATH" make test

diff --git a/loxilb-ebpf b/loxilb-ebpf
diff --git a/pkg/loxinet/dpebpf_linux.go b/pkg/loxinet/dpebpf_linux.go
@@ -905,7 +905,12 @@ func DpRouteMod(w *RouteDpWorkQ) int {
 				}
 			}
 		} else {
-			dat.ca.act_type = C.DP_SET_TOCP
+			mLen, _ := w.Dst.Mask.Size()
+			if mLen == 32 || mLen == 128 {
+				dat.ca.act_type = C.DP_SET_TOCP
+			} else {
+				dat.ca.act_type = C.DP_SET_NOP
+			}
 		}
 
 		if w.RtMark > 0 {
+5 −1		kernel/llb_kern_compose.c
+6 −1		kernel/llb_kern_devif.c
+1 −1		kernel/llb_kern_fcfwd.c
+6 −0		kernel/llb_kern_l3fwd.c