Add support for ipv6 #114

dddddai · 2022-04-08T03:03:06Z

To enable ipv6 only, just add the following env in the daemon set:

env:
  - name: ENABLE_IPV4
    value: "false"
  - name: ENABLE_IPV6
    value: "true"

Note that ipv6 requires cni-mode enabled

mergify · 2022-04-08T03:03:41Z

Welcome to the Merbridge OpenSource Community!👏

We're delighted to have you onboard 💘

dddddai · 2022-04-08T03:06:43Z

bpf/mb_connect.c

-        struct origin_info origin = {.ip = ctx->user_ip4,
-                                     .port = ctx->user_port};
+        struct origin_info origin;
+        __builtin_memset(&origin, 0, sizeof(origin));


This pattern avoids padding issues, otherwise there would be a verifier error
See iovisor/bcc#2623 (comment)

kebe7jun

I think maybe we don't need the ENABLE_IPV4 macro, it's probably there by default.

bpf/headers/helpers.h

bpf/headers/maps.h

bpf/mb_connect.c

dddddai · 2022-04-09T08:01:40Z

I think maybe we don't need the ENABLE_IPV4 macro, it's probably there by default.

I'm not sure if we are gonna support dual stack, if yes, the v4 macro would be helpful

ipv4	ipv6
enabled	disabled
disabled	enabled
enabled	enabled

kebe7jun

lgtm

just some nits.

bpf/headers/helpers.h

kebe7jun · 2022-04-12T11:31:58Z

enable dual stack and run prog error:

clang -O2 -g  -Wall -target bpf -I/usr/include/x86_64-linux-gnu  -DMESH=1 -DENABLE_IPV4=1 -DENABLE_IPV6=1 -DDEBUG -DUSE_RECONNECT -c mb_connect.c -o mb_connect.o
clang -O2 -g  -Wall -target bpf -I/usr/include/x86_64-linux-gnu  -DMESH=1 -DENABLE_IPV4=1 -DENABLE_IPV6=1 -DDEBUG -DUSE_RECONNECT -c mb_get_sockopts.c -o mb_get_sockopts.o
mb_get_sockopts.c:76:29: error: redefinition of 'origin'
        struct origin_info *origin =
                            ^
mb_get_sockopts.c:49:29: note: previous definition is here
        struct origin_info *origin =
                            ^

dddddai · 2022-04-12T13:11:03Z

enable dual stack and run prog error:

Fixed, ~~BTW could you test this without iptables/ip6tables? I have some problems cleaning iptables...~~

kebe7jun · 2022-04-13T01:38:36Z

enable dual stack and run prog error:

Fixed, BTW could you test this without iptables/ip6tables? I have some problems cleaning iptables...

I am testing it.

dddddai

Hello @kebe7jun, it's ready for review now and I've tested it, PTAL when you get a chance

dddddai · 2022-08-12T07:58:21Z

bpf/mb_connect.c

+            printk("write cookie_original_dst failed");
+            return 0;
+        }
+        // TODO(dddddai): add support for annotations


ipv6 annotations are not supported yet, will follow up

kebe7jun · 2022-08-12T08:44:51Z

Hello @kebe7jun, it's ready for review now and I've tested it, PTAL when you get a chance

Great work!

kebe7jun · 2022-08-15T08:43:57Z

internal/cni-server/cni-plugin.go

-	conn4 := fmt.Sprintf("%s/%s/net/tcp", config.HostProc, pid)
-	return !findStr(conn4, []byte(fmt.Sprintf(": %0.8d:%0.4X %0.8d:%0.4X 0A", 0, 15001, 0, 0)))
+	if config.EnableIPV4 {
+		conn4 := fmt.Sprintf("%s/%s/net/tcp", config.HostProc, pid)


the listener should also consider ipv6?

bpf/mb_sockops.c

kebe7jun · 2022-08-15T08:59:36Z

internal/cni-server/cni-plugin.go

-	return !findStr(conn4, []byte(fmt.Sprintf(": %0.8d:%0.4X %0.8d:%0.4X 0A", 0, 15001, 0, 0)))
+	if config.EnableIPV4 {
+		conn4 := fmt.Sprintf("%s/%s/net/tcp", config.HostProc, pid)
+		return !findStr(conn4, []byte(fmt.Sprintf(": %0.8d:%0.4X %0.8d:%0.4X 0A", 0, 15001, 0, 0)))


Is it not supposed to use 15001 directly, in kuma or linkerd will not work.

Sorry I don't know much about kuma and linkerd...
Could we focus on istio in this pr and support others later?

Give me some time, I'll look at it

kebe7jun · 2022-08-15T09:01:30Z

config/vars.go

@@ -29,6 +33,8 @@ var (
 	UseReconnect = true
 	Debug        = false
 	EnableCNI    = false
+	EnableIPV4   = getEnvOrDefault("ENABLE_IPV4", "true") == "true"
+	EnableIPV6   = getEnvOrDefault("ENABLE_IPV6", "false") == "true"


Maybe using command line parameters will better?

I thought so but I'm a bit concerned about:

merbridge/deploy/all-in-one.yaml

Lines 73 to 79 in 1dcf48b

lifecycle:

preStop:

exec:

command:

- make

- -k

- clean

It can't get flags from the command params, so I use env variables instead, though merbridge will clean up eBPF stuff when it exits

merbridge/controller/localip/localip.go

Line 67 in 1dcf48b

if err = ebpfs.UnLoadMBProgs(); err != nil {

codecov-commenter · 2022-08-16T03:17:39Z

Codecov Report

Merging #114 (284cfa5) into main (ffc42b4) will increase coverage by 0.72%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##             main     #114      +/-   ##
==========================================
+ Coverage   41.10%   41.83%   +0.72%     
==========================================
  Files           6        6              
  Lines         399      404       +5     
==========================================
+ Hits          164      169       +5     
  Misses        221      221              
  Partials       14       14

Flag	Coverage Δ
unittests	`41.83% <100.00%> (+0.72%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
pkg/linux/ip.go	`100.00% <100.00%> (ø)`

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

dddddai requested review from a team as code owners April 8, 2022 03:03

dddddai added the needs-e2e-test label Apr 8, 2022

dddddai commented Apr 8, 2022

View reviewed changes

kebe7jun reviewed Apr 9, 2022

View reviewed changes

bpf/headers/helpers.h Outdated Show resolved Hide resolved

bpf/headers/maps.h Outdated Show resolved Hide resolved

bpf/mb_connect.c Outdated Show resolved Hide resolved

dddddai force-pushed the ipv6 branch 3 times, most recently from 6e80ef6 to 3a59641 Compare April 9, 2022 14:55

kebe7jun reviewed Apr 11, 2022

View reviewed changes

bpf/headers/helpers.h Outdated Show resolved Hide resolved

bpf/headers/helpers.h Outdated Show resolved Hide resolved

dddddai force-pushed the ipv6 branch 3 times, most recently from 96007c7 to c307a37 Compare April 12, 2022 07:37

dddddai force-pushed the ipv6 branch from c307a37 to 3eea587 Compare April 12, 2022 13:06

dddddai force-pushed the ipv6 branch from 3eea587 to bc62d06 Compare August 12, 2022 06:54

dddddai requested a review from a team as a code owner August 12, 2022 06:54

dddddai force-pushed the ipv6 branch from c031ed1 to d2164cc Compare August 12, 2022 07:25

dddddai commented Aug 12, 2022

View reviewed changes

kebe7jun reviewed Aug 15, 2022

View reviewed changes

dddddai added 4 commits August 15, 2022 17:23

add support for ipv6

d89355f

bump golangci-lint

1dbd9f2

lint

147b7a5

listen ipv6 addr

284cfa5

dddddai force-pushed the ipv6 branch from d2164cc to 284cfa5 Compare August 16, 2022 03:08

kebe7jun mentioned this pull request Aug 16, 2022

Check and repair support kuma and linkerd #201

Closed

kebe7jun approved these changes Aug 18, 2022

View reviewed changes

Merge branch 'main' into ipv6

967f1df

mergify bot merged commit 7fd1fdd into merbridge:main Aug 18, 2022

slonka mentioned this pull request May 30, 2023

v6 support for merbridge kumahq/kuma#6087

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for ipv6 #114

Add support for ipv6 #114

dddddai commented Apr 8, 2022 •

edited

mergify bot commented Apr 8, 2022

dddddai Apr 8, 2022

kebe7jun left a comment

dddddai commented Apr 9, 2022

kebe7jun left a comment

kebe7jun commented Apr 12, 2022 •

edited

dddddai commented Apr 12, 2022 •

edited

kebe7jun commented Apr 13, 2022

dddddai left a comment

dddddai Aug 12, 2022

kebe7jun commented Aug 12, 2022

kebe7jun Aug 15, 2022

kebe7jun Aug 15, 2022

dddddai Aug 15, 2022

kebe7jun Aug 15, 2022

bartsmykla Aug 19, 2022

kebe7jun Aug 15, 2022

dddddai Aug 15, 2022

codecov-commenter commented Aug 16, 2022

Add support for ipv6 #114

Add support for ipv6 #114

Conversation

dddddai commented Apr 8, 2022 • edited

mergify bot commented Apr 8, 2022

Choose a reason for hiding this comment

kebe7jun left a comment

Choose a reason for hiding this comment

dddddai commented Apr 9, 2022

kebe7jun left a comment

Choose a reason for hiding this comment

kebe7jun commented Apr 12, 2022 • edited

dddddai commented Apr 12, 2022 • edited

kebe7jun commented Apr 13, 2022

dddddai left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kebe7jun commented Aug 12, 2022

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

codecov-commenter commented Aug 16, 2022

Codecov Report

dddddai commented Apr 8, 2022 •

edited

kebe7jun commented Apr 12, 2022 •

edited

dddddai commented Apr 12, 2022 •

edited