Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 5517931

Browse files
committedAug 4, 2024
[xdp] refactor xdp with vpxdp and csum offload
1 parent 14c2ceb commit 5517931

File tree

41 files changed

+374
-3715
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+374
-3715
lines changed
 

‎.gitmodules‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,8 @@
1212
path = submodules/libae
1313
url = https://github.com/vproxy-tools/libae-valkey.git
1414
branch = vproxy
15+
16+
[submodule "submodules/vpxdp"]
17+
path = submodules/vpxdp
18+
url = https://github.com/vproxy-tools/vpxdp
19+
branch = master

‎Makefile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ clean: clean-jar
4141
rm -f ./base/src/main/c/*.dylib
4242
rm -f ./base/src/main/c/*.so
4343
rm -f ./base/src/main/c/*.dll
44-
cd ./base/src/main/c/xdp && make clean
44+
cd ./submodules/vpxdp && make clean
4545
rm -f ./vproxy
4646
rm -f ./vproxy-*
4747
rm -f ./docker/vproxy.jar
@@ -85,8 +85,8 @@ jar: generate-module-info
8585
_add_linux_so_to_zip:
8686
mkdir -p ./io/vproxy/
8787
cp ./base/src/main/c/libvfdposix.so ./io/vproxy/libvfdposix-$(LINUX_ARCH).so
88-
cp ./base/src/main/c/libvpxdp.so ./io/vproxy/libvpxdp-$(LINUX_ARCH).so
89-
cp ./base/src/main/c/xdp/libbpf/src/libbpf.so.0.6.0 ./io/vproxy/libbpf-$(LINUX_ARCH).so
88+
cp ./submodules/vpxdp/libvpxdp.so ./io/vproxy/libvpxdp-$(LINUX_ARCH).so
89+
cp ./submodules/xdp-tools/lib/libxdp/libxdp.1.4.0 ./io/vproxy/libxdp-$(LINUX_ARCH).so
9090
cp ./libmsquic.so ./io/vproxy/libmsquic-$(LINUX_ARCH).so
9191
cp ./base/src/main/c/libmsquic-java.so ./io/vproxy/libmsquic-java-$(LINUX_ARCH).so
9292
cp ./submodules/fubuki/target/release/libfubukil.so ./io/vproxy/libfubuki-$(LINUX_ARCH).so
@@ -95,7 +95,7 @@ _add_linux_so_to_zip:
9595
zip build/libs/vproxy.jar \
9696
./io/vproxy/libvfdposix-$(LINUX_ARCH).so \
9797
./io/vproxy/libvpxdp-$(LINUX_ARCH).so \
98-
./io/vproxy/libbpf-$(LINUX_ARCH).so \
98+
./io/vproxy/libxdp-$(LINUX_ARCH).so \
9999
./io/vproxy/libmsquic-$(LINUX_ARCH).so \
100100
./io/vproxy/libmsquic-java-$(LINUX_ARCH).so \
101101
./io/vproxy/libfubuki-$(LINUX_ARCH).so \
@@ -170,12 +170,12 @@ vfdposix: libpni
170170
cd ./base/src/main/c && /usr/bin/env bash ./make-general.sh
171171

172172
.PHONY: vpxdp
173+
ifeq ($(OS),Linux)
173174
vpxdp: vfdposix
174-
cd ./base/src/main/c && /usr/bin/env bash ./make-xdp.sh
175-
176-
.PHONY: xdp-sample-kern
177-
xdp-sample-kern:
178-
cd ./base/src/main/c/xdp && make kern
175+
cd ./submodules/vpxdp && make so sample_kern
176+
else
177+
vpxdp: vpxdp-linux
178+
endif
179179

180180
.PHONY: msquic-java
181181
ifeq (0,$(IS_WIN))

‎all/src/main/java/io/vproxy/all/GraalFeature.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void duringSetup(DuringSetupAccess access) {
3636
"vpfubuki",
3737
"msquic",
3838
"msquic-java",
39-
"bpf",
39+
"xdp",
4040
"vpxdp",
4141
"vfdposix",
4242
"vfdwindows"

‎base/src/main/c-generated-graal/io_vproxy_xdp_XDPNative.h‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)
Please sign in to comment.