Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Packet tracing helpers and RSS optimizations (#345) and (#337) #346

Merged
merged 4 commits into from
Jul 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions loxinet/dpebpf_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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())
}
Expand Down
Loading