Separate dev

.github/workflows/main.yml

@@ -45,11 +45,16 @@ jobs:
       run: |
         echo "PKG_CONFIG_PATH=$GITHUB_WORKSPACE/mk" >> $GITHUB_ENV
 
+    # Some files such as sockops_bpfel.go require some preprocessing
+    - name: golangci-lint prepare 
+      run: |
+        ./hack/golangci-lint-prepare.sh
+
     # Since requiring code generated by the Proto compilation, execute go lint after building.  
     - name: golangci-lint
-      uses: golangci/golangci-lint-action@v3.7.0
+      uses: golangci/golangci-lint-action@v6.0.0
       with:
-        args: "--config=common/config/.golangci.yaml --out-format colored-line-number"
+        args: "--config=common/config/.golangci.yaml --out-format colored-line-number --verbose"
         skip-pkg-cache: true
 
     - name: Go Test

.gitignore

@@ -40,31 +40,10 @@ coverage.out
 # build artifacts
 *.so
 *.o
-bpf/kmesh/bpf2go/kmeshcgroupsock_bpfeb.go
-bpf/kmesh/bpf2go/kmeshcgroupsock_bpfel.go
-bpf/kmesh/bpf2go/kmeshcgroupsockworkload_bpfeb.go
-bpf/kmesh/bpf2go/kmeshcgroupsockworkload_bpfel.go
-bpf/kmesh/bpf2go/kmeshsockopsworkload_bpfeb.go
-bpf/kmesh/bpf2go/kmeshsockopsworkload_bpfel.go
-bpf/kmesh/bpf2go/kmeshxdpauth_bpfeb.go
-bpf/kmesh/bpf2go/kmeshxdpauth_bpfel.go
-bpf/kmesh/bpf2go/kmeshsendmsg_bpfeb.go
-bpf/kmesh/bpf2go/kmeshsendmsg_bpfel.go
-bpf/kmesh/bpf2go/kmeshsockops_bpfeb.go    
-bpf/kmesh/bpf2go/kmeshsockops_bpfel.go
-bpf/kmesh/bpf2go/kmeshtracepoint_bpfeb.go
-bpf/kmesh/bpf2go/kmeshtracepoint_bpfel.go
 
-bpf/kmesh/bpf2go/kmeshcgroupsockcompat_bpfeb.go
-bpf/kmesh/bpf2go/kmeshcgroupsockcompat_bpfel.go
-bpf/kmesh/bpf2go/kmeshcgroupsockworkloadcompat_bpfeb.go
-bpf/kmesh/bpf2go/kmeshcgroupsockworkloadcompat_bpfel.go
-bpf/kmesh/bpf2go/kmeshsendmsgcompat_bpfeb.go
-bpf/kmesh/bpf2go/kmeshsendmsgcompat_bpfel.go
-bpf/kmesh/bpf2go/kmeshsockopsworkloadcompat_bpfeb.go
-bpf/kmesh/bpf2go/kmeshsockopsworkloadcompat_bpfel.go
-bpf/kmesh/bpf2go/kmeshxdpauthcompat_bpfeb.go
-bpf/kmesh/bpf2go/kmeshxdpauthcompat_bpfel.go
+bpf/kmesh/bpf2go/**
+config/**
+mk/*
 
 kernel/**/*.ko
 kernel/**/*.cmd

.golangci.yaml

@@ -0,0 +1,132 @@
+# This files contains all configuration options for analysis running.
+# More details please refer to: https://golangci-lint.run/usage/configuration/
+
+run:
+  # timeout for analysis, e.g. 30s, 5m, default is 1m
+  timeout: 30m
+
+  # which dirs to skip: issues from them won't be reported;
+  # can use regexp here: generated.*, regexp is applied on full path;
+  # default value is empty list, but default dirs are skipped independently
+  # from this option's value (see skip-dirs-use-default).
+  # "/" will be replaced by current OS file path separator to properly work
+  # on Windows.
+  skip-dirs: []
+
+  # default is true. Enables skipping of directories:
+  #   vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
+  skip-dirs-use-default: true
+
+  # One of 'readonly' and 'vendor'.
+  #  - readonly: the go command is disallowed from the implicit automatic updating of go.mod described above.
+  #              Instead, it fails when any changes to go.mod are needed. This setting is most useful to check
+  #              that go.mod does not need updates, such as in a continuous integration and testing system.
+  #  - vendor: the go command assumes that the vendor directory holds the correct copies of dependencies and ignores
+  #            the dependency descriptions in go.mod.
+  modules-download-mode: readonly
+linters:
+  disable-all: true
+  enable:
+    # linters maintained by golang.org
+    - gofmt
+    - goimports
+    - govet
+    - depguard
+    # linters default enabled by golangci-lint .
+    - errcheck
+    - gosimple
+    - ineffassign
+    - staticcheck
+    - typecheck
+    - unused
+    - misspell
+    - whitespace
+    #- gosec
+    #- revive
+
+linters-settings:
+  goimports:
+    local-prefixes: kmesh.net
+  gocyclo:
+    # minimal cyclomatic complexity to report
+    min-complexity: 15
+  depguard:
+    rules:
+      main:
+        deny:
+          - pkg: "github.com/golang/protobuf"
+            desc: "Please use google.golang.org/protobuf instead."
+          - pkg: 'gopkg.in/yaml.v3'
+            desc: "Please use sigs.k8s.io/yaml instead."
+          - pkg: "gopkg.in/yaml.v2"
+            desc: "Please use sigs.k8s.io/yaml instead."
+          - pkg: "github.com/ghodss/yaml"
+            desc: "Please use sigs.k8s.io/yaml instead."
+
+
+issues:
+  # List of regexps of issue texts to exclude, empty list by default.
+  # But independently from this option we use default exclude patterns,
+  # it can be disabled by `exclude-use-default: false`. To list all
+  # excluded by default patterns execute `golangci-lint run --help`
+  exclude:
+    - composite literal uses unkeyed fields
+  # Which files to exclude: they will be analyzed, but issues from them won't be reported.
+  # There is no need to include all autogenerated files,
+  # we confidently recognize autogenerated files.
+  # If it's not, please let us know.
+  # "/" will be replaced by current OS file path separator to properly work on Windows.
+  # Default: []
+  exclude-files:
+    - ".*\\.pb\\.go"
+    - ".*\\.gen\\.go"
+    - ".*_bpfeb\\.go"
+    - ".*_bpfel\\.go$"
+    - ".*bpfeb\\.go"
+    - ".*bpfel\\.go$"
+    - ".*/bpf/kmesh/bpf2go/kernelnative/enhanced/kmeshsockops_bpfel.go"
+  exclude-dirs:
+    - bpf/kmesh/bpf2go/dualengine
+    - bpf/kmesh/bpf2go/kernelnative
+  exclude-rules:
+    # Exclude some linters from running on test files.
+    - path: _test\.go$|^tests/|^samples/
+      linters:
+        - errcheck
+        - maligned
+    - path: _test\.go$
+      text: "dot-imports: should not use dot imports"
+    # We need to use the deprecated module since the jsonpb replacement is not backwards compatible.
+    - linters:
+        - staticcheck
+      text: "SA1019: package github.com/golang/protobuf/jsonpb"
+    - linters:
+        - staticcheck
+      text: 'SA1019: "github.com/golang/protobuf/jsonpb"'
+    # This is not helpful. The new function is not very usable and the current function will not be removed
+    - linters:
+        - staticcheck
+      text: 'SA1019: grpc.Dial is deprecated: use NewClient instead'
+    - linters:
+        - staticcheck
+      text: 'SA1019: grpc.DialContext is deprecated: use NewClient instead'
+    - linters:
+        - staticcheck
+      text: "SA1019: grpc.WithBlock is deprecated"
+    - linters:
+        - staticcheck
+      text: "SA1019: grpc.FailOnNonTempDialError"
+    - linters:
+        - staticcheck
+      text: "SA1019: grpc.WithReturnConnectionError"
+  # Independently from option `exclude` we use default exclude patterns,
+  # it can be disabled by this option. To list all
+  # excluded by default patterns execute `golangci-lint run --help`.
+  # Default value for this option is true.
+  exclude-use-default: true
+  # Maximum issues count per one linter.
+  # Set to 0 to disable.
+  # Default: 50
+  max-issues-per-linter: 0
+  # Maximum count of issues with the same text. Set to 0 to disable. Default is 3.
+  max-same-issues: 0

Makefile

@@ -79,22 +79,27 @@ TMP_FILES := bpf/kmesh/bpf2go/bpf2go.go \
 	bpf/kmesh/ads/include/config.h \
 	bpf/include/bpf_helper_defs_ext.h \
 
-.PHONY: all
-all:
+.PHONY: all kmesh-bpf kmesh-ko all-binary
+all: kmesh-bpf kmesh-ko all-binary
+
+kmesh-bpf:
 	$(QUIET) find $(ROOT_DIR)/mk -name "*.pc" | xargs sed -i "s#^prefix=.*#prefix=${ROOT_DIR}#g"
 
 	$(QUIET) make -C api/v2-c
 	$(QUIET) make -C bpf/deserialization_to_bpf_map
 
 	$(QUIET) $(GO) generate bpf/kmesh/bpf2go/bpf2go.go
-
+kmesh-ko:
+	$(QUIET) find $(ROOT_DIR)/mk -name "*.pc" | xargs sed -i "s#^prefix=.*#prefix=${ROOT_DIR}#g"
+	$(call printlog, BUILD, "kernel")
+	$(QUIET) make -C kernel/ko_src
+
+all-binary:
+	$(QUIET) find $(ROOT_DIR)/mk -name "*.pc" | xargs sed -i "s#^prefix=.*#prefix=${ROOT_DIR}#g"
 	$(call printlog, BUILD, $(APPS1))
 	$(QUIET) (export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(ROOT_DIR)mk; \
 		$(GO) build -ldflags $(LDFLAGS) -tags $(ENHANCED_KERNEL) -o $(APPS1) $(GOFLAGS) ./daemon/main.go)
 
-	$(call printlog, BUILD, "kernel")
-	$(QUIET) make -C kernel/ko_src
-
 	$(call printlog, BUILD, $(APPS2))
 	$(QUIET) cd oncn-mda && cmake . -B build && make -C build
 
@@ -117,13 +122,18 @@ kmeshctl:
 gen-proto:
 	$(QUIET) make -C api gen-proto
 
+.PHONY: gen-bpf2go
+gen-bpf2go:
+	hack/gen_bpf2go.sh
+
 .PHONY: tidy
 tidy:
 	go mod tidy
 
 .PHONY: gen
 gen: tidy\
 	gen-proto \
+	gen-bpf2go \
 	format
 
 .PHONY: gen-check

bpf/kmesh/bpf2go/bpf2go.go

@@ -18,18 +18,18 @@
 package bpf2go
 
 // go run github.com/cilium/ebpf/cmd/bpf2go --help
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshCgroupSock ../ads/cgroup_sock.c -- -I../ads/include -I../../include -I../../../api/v2-c -DCGROUP_SOCK_MANAGE -DKERNEL_VERSION_HIGHER_5_13_0=1
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshCgroupSockWorkload ../workload/cgroup_sock.c -- -I../workload/include -I../../include -I../probes -DKERNEL_VERSION_HIGHER_5_13_0=1
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshSockops ../ads/sockops.c -- -I../ads/include -I../../include -I../../../api/v2-c -DKERNEL_VERSION_HIGHER_5_13_0=1
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshTracePoint ../ads/tracepoint.c -- -I../ads/include -I../../include -DKERNEL_VERSION_HIGHER_5_13_0=1
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshSockopsWorkload ../workload/sockops.c -- -I../workload/include -I../../include -I../probes -DKERNEL_VERSION_HIGHER_5_13_0=1
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshXDPAuth ../workload/xdp.c -- -I../workload/include -I../../include -I../../../api/v2-c -DKERNEL_VERSION_HIGHER_5_13_0=1
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshSendmsg ../workload/sendmsg.c -- -I../workload/include -I../../include -DKERNEL_VERSION_HIGHER_5_13_0=1
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go --output-dir kernelnative/normal --go-package normal -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshCgroupSock ../ads/cgroup_sock.c -- -I../ads/include -I../../include -I../../../api/v2-c -DCGROUP_SOCK_MANAGE -DKERNEL_VERSION_HIGHER_5_13_0=1
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go --output-dir dualengine --go-package dualengine -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshCgroupSockWorkload ../workload/cgroup_sock.c -- -I../workload/include -I../../include -I../probes -DKERNEL_VERSION_HIGHER_5_13_0=1
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go --output-dir kernelnative/enhanced --go-package enhanced -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshSockops ../ads/sockops.c -- -I../ads/include -I../../include -I../../../api/v2-c -DKERNEL_VERSION_HIGHER_5_13_0=1
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go --output-dir kernelnative/enhanced --go-package enhanced -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshTracePoint ../ads/tracepoint.c -- -I../ads/include -I../../include -DKERNEL_VERSION_HIGHER_5_13_0=1
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go --output-dir dualengine --go-package dualengine -cc clang --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshSockopsWorkload ../workload/sockops.c -- -I../workload/include -I../../include -I../probes -DKERNEL_VERSION_HIGHER_5_13_0=1
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go --output-dir dualengine --go-package dualengine -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshXDPAuth ../workload/xdp.c -- -I../workload/include -I../../include -I../../../api/v2-c -DKERNEL_VERSION_HIGHER_5_13_0=1
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go --output-dir dualengine --go-package dualengine -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshSendmsg ../workload/sendmsg.c -- -I../workload/include -I../../include -DKERNEL_VERSION_HIGHER_5_13_0=1
 
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshCgroupSockCompat ../ads/cgroup_sock.c -- -I../ads/include -I../../include -I../../../api/v2-c -DCGROUP_SOCK_MANAGE -DKERNEL_VERSION_HIGHER_5_13_0=0
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshCgroupSockWorkloadCompat ../workload/cgroup_sock.c -- -I../workload/include -I../../include -I../probes -DKERNEL_VERSION_HIGHER_5_13_0=0
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshSockopsCompat ../ads/sockops.c -- -I../ads/include -I../../include -I../../../api/v2-c -DKERNEL_VERSION_HIGHER_5_13_0=0
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshTracePointCompat ../ads/tracepoint.c -- -I../ads/include -I../../include -DKERNEL_VERSION_HIGHER_5_13_0=0
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshSockopsWorkloadCompat ../workload/sockops.c -- -I../workload/include -I../../include -I../probes -DKERNEL_VERSION_HIGHER_5_13_0=0
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshXDPAuthCompat ../workload/xdp.c -- -I../workload/include -I../../include -I../../../api/v2-c -DKERNEL_VERSION_HIGHER_5_13_0=0
-//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshSendmsgCompat ../workload/sendmsg.c -- -I../workload/include -I../../include -DKERNEL_VERSION_HIGHER_5_13_0=0
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go --output-dir kernelnative/normal --go-package normal -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshCgroupSockCompat ../ads/cgroup_sock.c -- -I../ads/include -I../../include -I../../../api/v2-c -DCGROUP_SOCK_MANAGE -DKERNEL_VERSION_HIGHER_5_13_0=0
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go --output-dir dualengine --go-package dualengine -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshCgroupSockWorkloadCompat ../workload/cgroup_sock.c -- -I../workload/include -I../../include -I../probes -DKERNEL_VERSION_HIGHER_5_13_0=0
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go --output-dir kernelnative/enhanced --go-package enhanced -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshSockopsCompat ../ads/sockops.c -- -I../ads/include -I../../include -I../../../api/v2-c -DKERNEL_VERSION_HIGHER_5_13_0=0
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go --output-dir kernelnative/enhanced --go-package enhanced -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshTracePointCompat ../ads/tracepoint.c -- -I../ads/include -I../../include -DKERNEL_VERSION_HIGHER_5_13_0=0
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go --output-dir dualengine --go-package dualengine  -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshSockopsWorkloadCompat ../workload/sockops.c -- -I../workload/include -I../../include -I../probes -DKERNEL_VERSION_HIGHER_5_13_0=0
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go --output-dir dualengine --go-package dualengine -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshXDPAuthCompat ../workload/xdp.c -- -I../workload/include -I../../include -I../../../api/v2-c -DKERNEL_VERSION_HIGHER_5_13_0=0
+//go:generate go run github.com/cilium/ebpf/cmd/bpf2go --output-dir dualengine --go-package dualengine -cc clang  --cflags $EXTRA_CFLAGS --cflags $EXTRA_CDEFINE KmeshSendmsgCompat ../workload/sendmsg.c -- -I../workload/include -I../../include -DKERNEL_VERSION_HIGHER_5_13_0=0