support ipv6 in workload mode #462

nlgwcy · 2024-06-25T03:12:09Z

What type of PR is this?

/kind feature

What this PR does / why we need it:

Which issue(s) this PR fixes:
#291

Special notes for your reviewer:
workload mode supports IPv6

Authentication process supports IPv6
Kmesh management supports IPv6
ipv4 mapped address

Does this PR introduce a user-facing change?:

Signed-off-by: wuchangye <[email protected]>

bpf/kmesh/workload/cgroup_sock.c

LiZhenCheng9527 · 2024-06-25T06:37:09Z

pkg/bpf/bpf_kmesh_workload.go

@@ -117,19 +130,26 @@ func (sc *BpfSockConnWorkload) close() error {
 }

 func (sc *BpfSockConnWorkload) Attach() error {
+	var err error


nit: You can use err directly without predefining

bpf/include/common.h

hzxuzhonghu · 2024-06-25T08:43:45Z

bpf/include/common.h

+        (v4_mapped)[3] = 0;                                                                                            \
+    } while (0)
+
+#define V4_MAPPED_IN_V6(ipv6)                                                                                          \


and what does this mean

hzxuzhonghu · 2024-06-25T08:50:36Z

bpf/kmesh/workload/cgroup_sock.c

+    IP6_COPY(kmesh_ctx.dnat_ip.ip6, kmesh_ctx.orig_dst_addr.ip6);
+    kmesh_ctx.dnat_port = ctx->user_port;
+
+    if (!is_kmesh_enabled(ctx) || is_bypass_enabled(ctx)) {


move before COPY

bpf/kmesh/workload/cgroup_sock.c

supercharge-xsy · 2024-06-26T03:07:29Z

bpf/include/common.h

@@ -78,6 +78,33 @@ static inline int kmesh_map_update_elem(void *map, const void *key, const void *
    return (int)bpf_map_update_elem(map, key, value, BPF_ANY);
 }

+static inline bool ipv4_mapped_addr(__u32 ip6[4])


Suggested change

static inline bool ipv4_mapped_addr(__u32 ip6[4])

static inline bool is_ipv4_mapped(__u32 ip6[4])

supercharge-xsy · 2024-06-26T03:29:25Z

bpf/kmesh/workload/cgroup_sock.c

+        kmesh_workload_tail_call(ctx, TAIL_CALL_CONNECT6_INDEX);
+
+        // if tail call failed will run this code
+        BPF_LOG(ERR, KMESH, "workload tail call failed, err is %d\n", ret);


Suggested change

BPF_LOG(ERR, KMESH, "workload tail call failed, err is %d\n", ret);

BPF_LOG(ERR, KMESH, "workload tail call in v6 failed, err is %d\n", ret);

supercharge-xsy · 2024-06-26T03:34:59Z

pkg/bpf/bpf_kmesh_workload.go

+	sc.Info6.AttachType = prog.AttachType
+
+	if err = sc.MapOfTailCallProg.Update(
+		uint32(1),


a const definition is required for tail_call index.

supercharge-xsy · 2024-06-26T03:40:11Z

pkg/cni/plugin/plugin.go

@@ -157,7 +157,7 @@ func disableKmeshControl(ns string) error {
 			return err
 		}
 		errno, ok := err.(syscall.Errno)
-		if ok && errno == 115 { // -EINPROGRESS, Operation now in progress
+		if ok && (errno == 115 || errno == 101) { // -EINPROGRESS, Operation now in progress | Network is unreachable


error code definition is required.

Signed-off-by: wuchangye <[email protected]>

nlgwcy · 2024-06-27T01:26:53Z

pkg/constants/constants.go

@@ -31,4 +31,13 @@ const (

 	BPF_LOG_ERR   = 0
 	BPF_LOG_DEBUG = 3
+
+	// Ip(0.0.0.2 | ::2) used for control command, e.g. KmeshControl | ByPass
+	ControlCommandIp4 = "0.0.0.2"


In the IPv6 environment, control commands such as management and bypass commands triggered by 0.0.0.1 return 101 (Network is unreachable), and sockops:BPF_SOCK_OPS_TCP_CONNECT_CB hook cannot be triggered. ::1 indicates that control commands can be triggered, but the obtained local_ip value is also ::1. The actual pod IP address cannot be obtained.
Solution:
0.0.0.2/::2 is used as the IP address of the control command.

Signed-off-by: wuchangye <[email protected]>

hzxuzhonghu · 2024-06-27T10:22:35Z

bpf/include/bpf_common.h

 {
-    // daemon sim connect 0.0.0.0:931(0x3a3)
+    // daemon sim connect 0.0.0.0:931 | ::1:931(0x3a3)


should change to 0.2

bpf/include/bpf_common.h

Signed-off-by: wuchangye <[email protected]>

hzxuzhonghu · 2024-06-28T07:24:05Z

/lgtm
/approve

kmesh-bot · 2024-06-28T07:24:12Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hzxuzhonghu

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [hzxuzhonghu]

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

nlgwcy added 5 commits June 22, 2024 15:43

add cgroup/connect6

c6c78b1

Signed-off-by: wuchangye <[email protected]>

ipv6 for sockops

9cc0148

Signed-off-by: wuchangye <[email protected]>

v4 mapped addr

696bb90

Signed-off-by: wuchangye <[email protected]>

adapt ip2str

b0a42b2

Signed-off-by: wuchangye <[email protected]>

adapt kmesh-plugin for ipv6

9337f2c

Signed-off-by: wuchangye <[email protected]>

kmesh-bot requested review from hzxuzhonghu and supercharge-xsy June 25, 2024 03:12

kmesh-bot added the size/L label Jun 25, 2024

LiZhenCheng9527 reviewed Jun 25, 2024

View reviewed changes

hzxuzhonghu reviewed Jun 25, 2024

View reviewed changes

supercharge-xsy reviewed Jun 26, 2024

View reviewed changes

nlgwcy added the do-not-merge/hold label Jun 26, 2024

nlgwcy added 2 commits June 27, 2024 00:53

auth for ipv6

7f48708

Signed-off-by: wuchangye <[email protected]>

fix sockops load failed

ee4fce3

Signed-off-by: wuchangye <[email protected]>

kmesh-bot added size/XL and removed size/L labels Jun 26, 2024

nlgwcy added 3 commits June 27, 2024 02:05

adapt ads/cgroup_sock.c

ea1dc66

Signed-off-by: wuchangye <[email protected]>

close sockfd after trigger control cmd

b0fb41e

Signed-off-by: wuchangye <[email protected]>

fix issue

f88ced0

Signed-off-by: wuchangye <[email protected]>

nlgwcy commented Jun 27, 2024

View reviewed changes

nlgwcy removed the do-not-merge/hold label Jun 27, 2024

fix issue

d5354b0

Signed-off-by: wuchangye <[email protected]>

hzxuzhonghu reviewed Jun 27, 2024

View reviewed changes

fix issue

a975a23

Signed-off-by: wuchangye <[email protected]>

nlgwcy force-pushed the ipv6-1 branch 2 times, most recently from 73c995d to a975a23 Compare June 28, 2024 04:47

kmesh-bot assigned hzxuzhonghu Jun 28, 2024

kmesh-bot added the lgtm label Jun 28, 2024

kmesh-bot added the approved label Jun 28, 2024

kmesh-bot merged commit 67c5295 into kmesh-net:main Jun 28, 2024
3 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

support ipv6 in workload mode #462

support ipv6 in workload mode #462

nlgwcy commented Jun 25, 2024 •

edited

Loading

LiZhenCheng9527 Jun 25, 2024

hzxuzhonghu Jun 25, 2024

hzxuzhonghu Jun 25, 2024

supercharge-xsy Jun 26, 2024

supercharge-xsy Jun 26, 2024

supercharge-xsy Jun 26, 2024

supercharge-xsy Jun 26, 2024

nlgwcy Jun 27, 2024

hzxuzhonghu Jun 27, 2024

hzxuzhonghu commented Jun 28, 2024

kmesh-bot commented Jun 28, 2024

	static inline bool ipv4_mapped_addr(__u32 ip6[4])
	static inline bool is_ipv4_mapped(__u32 ip6[4])

	BPF_LOG(ERR, KMESH, "workload tail call failed, err is %d\n", ret);
	BPF_LOG(ERR, KMESH, "workload tail call in v6 failed, err is %d\n", ret);

support ipv6 in workload mode #462

support ipv6 in workload mode #462

Conversation

nlgwcy commented Jun 25, 2024 • edited Loading

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

hzxuzhonghu commented Jun 28, 2024

kmesh-bot commented Jun 28, 2024

nlgwcy commented Jun 25, 2024 •

edited

Loading