separation bpf and binary in Makefile&provides bpf2go outputs files #971

lec-bit · 2024-10-19T09:02:46Z

What type of PR is this?
/kind enhancement

What this PR does / why we need it:
1.Separate compilation of data and control plane
2.Provide the bpf2go file to the code warehouse and adjust the directory so that subsequent open source packages can be imported.Since the directory has been adjusted, all files will have some changes.
Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

kmesh-bot · 2024-10-19T09:02:52Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign kevin-wangzefeng for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

hzxuzhonghu

I would like to separate workload bpf2go as well

hzxuzhonghu · 2024-10-21T02:31:51Z

bpf/kmesh/bpf2go/bpf2go.go

-//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 normal/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


/bpf2go seems redudant

Suggested change

//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -output-dir normal/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 -output-dir 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

If “/bpf2go“” does not exist, the package cannot be imported.

why? I couldnot quite understand

i dont know cleanly, but i delete /bpf2go ,it dosen't work, I guess "package bpf2go" in go files, so the file need to be same

nit: If i understand correctly package name bpf2go can be different from dir name

bpf2go tool provide flags to set different pkg names
https://github.com/cilium/ebpf/blob/main/cmd/bpf2go/main.go#L108-L109

lec-bit · 2024-10-21T08:03:25Z

ok, i will separate workload bpf2go

I would like to separate workload bpf2go as well

hzxuzhonghu · 2024-10-21T09:05:08Z

Makefile

+.PHONY: all data daemon
+all: data daemon
+
+data:


The name is confusing, this seems building bpf-prog, how about bpf-prog

not only bpf-prog, also deserialization.so kmesh.ko and bpf-prog

I think any name is better and concrete than data.

How about separating build ko and bpf

hzxuzhonghu · 2024-10-21T09:07:07Z

Makefile

+	$(call printlog, BUILD, "kernel")
+	$(QUIET) make -C kernel/ko_src
+
+daemon:


This is not only daemon, it also includes other I would still call this all.

what about call this controller?

Signed-off-by: lec-bit <[email protected]>

hzxuzhonghu · 2024-10-22T02:50:50Z

Makefile

+	$(call printlog, BUILD, "kernel")
+	$(QUIET) make -C kernel/ko_src
+
+controller:


not controller, we have cni, mda, etc

hzxuzhonghu

I think we can use gen-check to detect any generated file correctly generated

hzxuzhonghu · 2024-10-22T02:53:10Z

Please update the pr title as well

Signed-off-by: lec-bit <[email protected]>

lec-bit · 2024-10-24T06:30:49Z

I think we can use gen-check to detect any generated file correctly generated

The xxx.go file is fine, mainly because it needs to embed an .o file, but we didn't provide the .o file into the code repository.

kmesh-bot added the kind/enhancement New feature or request label Oct 19, 2024

kmesh-bot requested review from bitcoffeeiux, Okabe-Rintarou-0 and YaoZengzeng October 19, 2024 09:02

kmesh-bot added the size/XXL label Oct 19, 2024

hzxuzhonghu reviewed Oct 21, 2024

View reviewed changes

lec-bit force-pushed the separate branch from 8df0032 to b87c521 Compare October 21, 2024 09:03

hzxuzhonghu reviewed Oct 21, 2024

View reviewed changes

lec-bit force-pushed the separate branch 2 times, most recently from b781932 to 35472cd Compare October 21, 2024 09:14

separation

251726b

Signed-off-by: lec-bit <[email protected]>

lec-bit force-pushed the separate branch from 35472cd to 251726b Compare October 21, 2024 13:19

update

407abd2

Signed-off-by: lec-bit <[email protected]>

lec-bit force-pushed the separate branch from 913d7c0 to 407abd2 Compare October 21, 2024 13:56

hzxuzhonghu reviewed Oct 22, 2024

View reviewed changes

update

23fe7a8

Signed-off-by: lec-bit <[email protected]>

lec-bit changed the title ~~separation~~ separation bpf and binary in Makefile&provides bpf2go outputs files Oct 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

separation bpf and binary in Makefile&provides bpf2go outputs files #971

separation bpf and binary in Makefile&provides bpf2go outputs files #971

lec-bit commented Oct 19, 2024

kmesh-bot commented Oct 19, 2024

hzxuzhonghu left a comment

hzxuzhonghu Oct 21, 2024

lec-bit Oct 21, 2024

hzxuzhonghu Oct 21, 2024

lec-bit Oct 21, 2024

hzxuzhonghu Oct 21, 2024

lec-bit commented Oct 21, 2024

hzxuzhonghu Oct 21, 2024

lec-bit Oct 21, 2024

hzxuzhonghu Oct 22, 2024

hzxuzhonghu Oct 21, 2024

lec-bit Oct 21, 2024

hzxuzhonghu Oct 22, 2024

hzxuzhonghu left a comment

hzxuzhonghu commented Oct 22, 2024

lec-bit commented Oct 24, 2024

	//go:generate go run github.com/cilium/ebpf/cmd/bpf2go -output-dir normal/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 -output-dir 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

separation bpf and binary in Makefile&provides bpf2go outputs files #971

Are you sure you want to change the base?

separation bpf and binary in Makefile&provides bpf2go outputs files #971

Conversation

lec-bit commented Oct 19, 2024

kmesh-bot commented Oct 19, 2024

hzxuzhonghu left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lec-bit commented Oct 21, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hzxuzhonghu left a comment

Choose a reason for hiding this comment

hzxuzhonghu commented Oct 22, 2024

lec-bit commented Oct 24, 2024