diff --git a/Dockerfile b/Dockerfile index 892181e3d..5e1546414 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,6 +50,7 @@ RUN mkdir -p /root/loxilb-io/loxilb/ # Install loxilb RUN 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 api/certification/* /opt/loxilb/cert/ && cd - +RUN cp /root/loxilb-io/loxilb/loxilb-ebpf/kernel/loxilb_dp_debug /usr/local/sbin/loxilb_dp_debug RUN cp /root/loxilb-io/loxilb/loxilb /usr/local/sbin/loxilb RUN rm -fr /root/loxilb-io/loxilb/* RUN rm -fr /root/loxilb-io/loxilb/.git diff --git a/Makefile b/Makefile index 8e3d79bc9..81ea9e8c3 100644 --- a/Makefile +++ b/Makefile @@ -29,6 +29,7 @@ docker-cp: build docker cp loxilb $(loxilbid):/root/loxilb-io/loxilb/loxilb docker cp /opt/loxilb/llb_ebpf_main.o $(loxilbid):/opt/loxilb/llb_ebpf_main.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-ebpf: build docker cp /opt/loxilb/llb_ebpf_main.o $(loxilbid):/opt/loxilb/llb_ebpf_main.o diff --git a/loxilb-ebpf b/loxilb-ebpf index 4b19090b6..c7ebc0fbd 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit 4b19090b66832d10b3dd4db4d8b5943dcd2407b4 +Subproject commit c7ebc0fbdab631451a390a895a382dac4f988d6a diff --git a/loxinet/dpebpf_linux.go b/loxinet/dpebpf_linux.go index c1a815c37..d64676d5d 100644 --- a/loxinet/dpebpf_linux.go +++ b/loxinet/dpebpf_linux.go @@ -243,6 +243,7 @@ func DpEbpfInit(clusterEn bool, nodeNum int, rssEn bool, logLevel tk.LogLevelT) } cfg.nodenum = C.int(nodeNum) cfg.loglevel = 1 + cfg.no_loader = 0 DpEbpfDPLogLevel(&cfg, logLevel) @@ -406,19 +407,19 @@ func (e *DpEbpfH) DpPortPropMod(w *PortDpWorkQ) int { tk.LogIt(tk.LogError, "ebpf load - %d error\n", w.PortNum) return EbpfErrEbpfLoad } - + ethHandle, err := ethtool.NewEthtool() if err != nil { tk.LogIt(tk.LogError, "ethtoo handle create - %d(%s) error %s\n", w.PortNum, w.LoadEbpf, err.Error()) } defer ethHandle.Close() - + /* We need to enable tx sctp checksumming offload */ features := map[string]bool{ - "tx-checksum-sctp" : true, + "tx-checksum-sctp": true, } err = ethHandle.Change(w.LoadEbpf, features) - + if err != nil { tk.LogIt(tk.LogError, "Intf %s unable to change Tx offload: %s\n", w.LoadEbpf, err.Error()) }