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.

Sign up for GitHub

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

refactor/optimize(bpf): rework bpf route with bpf_loop #580

Merged
merged 14 commits into from
Oct 29, 2024
+561 −495
Merged

refactor/optimize(bpf): rework bpf route with bpf_loop #580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
f5018a9
refactor/optimize: rework route with bpf_loop
mzz2017 Jul 17, 2024
6d4dabc
chore: add kernel requirement log
mzz2017 Jul 17, 2024
b8ee780
feat: extend match set len limit from 64 to 1024
mzz2017 Jul 17, 2024
85ab665
chore: clean code
mzz2017 Jul 17, 2024
7b77a9a
chore: fix lint and kernel test
mzz2017 Jul 17, 2024
f6dcf5c
optimize: reduce copy route_params
mzz2017 Jul 17, 2024
9fdf9b5
bpf: Fix CO-RE issue regarding bpf_lpm_trie_key
jschwinger233 Jul 18, 2024
9b2baed
control: Probe bpf_loop rather than check kernel version
jschwinger233 Jul 20, 2024
66a1f43
fix: port rule caused direct
mzz2017 Sep 24, 2024
bc9fa5a
refactor get_pid_pname by bpf_loop
mzz2017 Sep 24, 2024
da2b876
fix typo
mzz2017 Sep 24, 2024
840d97d
fix: lint
mzz2017 Sep 24, 2024
2b3ac19
fix: .gitignore
mzz2017 Oct 29, 2024
a993420
bpf: fix bpf test for new route()
jschwinger233 Oct 29, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/kernel-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
strategy:
fail-fast: false
matrix:
kernel: [ '5.15-20240305.092417', '6.1-20240305.092417', '6.6-20240305.092417' ]
kernel: [ '6.1-20240305.092417', '6.6-20240305.092417' ]
timeout-minutes: 10
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ STRIP ?= llvm-strip
CFLAGS := -O2 -Wall -Werror $(CFLAGS)
TARGET ?= bpfel,bpfeb
OUTPUT ?= dae
MAX_MATCH_SET_LEN ?= 64
MAX_MATCH_SET_LEN ?= 1024
CFLAGS := -DMAX_MATCH_SET_LEN=$(MAX_MATCH_SET_LEN) $(CFLAGS)
NOSTRIP ?= n
STRIP_PATH := $(shell command -v $(STRIP) 2>/dev/null)
Expand Down
3 changes: 2 additions & 1 deletion common/consts/ebpf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ func (i OutboundIndex) IsReserved() bool {

var (
MaxMatchSetLen_ = ""
MaxMatchSetLen = 32 * 2
MaxMatchSetLen = 32 * 32
)

func init() {
Expand Down Expand Up @@ -157,6 +157,7 @@ var (
UserspaceBatchUpdateLpmTrieFeatureVersion = internal.Version{5, 13, 0}
BpfTimerFeatureVersion = internal.Version{5, 15, 0}
HelperBpfGetFuncIpVersionFeatureVersion = internal.Version{5, 15, 0}
BpfLoopFeatureVersion = internal.Version{5, 17, 0}
)

const (
Expand Down
8 changes: 8 additions & 0 deletions control/control_plane.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import (

"github.com/bits-and-blooms/bloom/v3"
"github.com/cilium/ebpf"
"github.com/cilium/ebpf/asm"
"github.com/cilium/ebpf/features"
"github.com/cilium/ebpf/rlimit"
"github.com/daeuniverse/dae/common"
"github.com/daeuniverse/dae/common/assets"
Expand Down Expand Up @@ -101,6 +103,12 @@ func NewControlPlane(
}
/// Check linux kernel requirements.
// Check version from high to low to reduce the number of user upgrading kernel.
if err := features.HaveProgramHelper(ebpf.SchedCLS, asm.FnLoop); err != nil {
return nil, fmt.Errorf("%w: your kernel version %v does not support bpf_loop (needed by routing); expect >=%v; upgrade your kernel and try again",
err,
kernelVersion.String(),
consts.BpfLoopFeatureVersion.String())
}
if requirement := consts.ChecksumFeatureVersion; kernelVersion.Less(requirement) {
return nil, fmt.Errorf("your kernel version %v does not support checksum related features; expect >=%v; upgrade your kernel and try again",
kernelVersion.String(),
Expand Down
Loading
Loading