[PATCH] UBUNTU: SAUCE: vxlan: correctly handle ipv6.disabler module parameter

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] UBUNTU: SAUCE: vxlan: correctly handle ipv6.disabler module parameter

Matt Rae
When ipv6 is disabled in xenial, vxlan tunnels fail to be created. this patch taken from RHEL bug allows tunnels to be set up successfully

https://bugzilla.redhat.com/show_bug.cgi?id=1445054

Matt


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH] UBUNTU: SAUCE: vxlan: correctly handle ipv6.disable module parameter

Matt Rae
From: Jiri Benc <[hidden email]>

OriginalAuthor: Jiri Benc <[hidden email]>
BugLink: http://bugs.launchpad.net/bugs/1771301

When IPv6 is compiled but disabled at runtime, __vxlan_sock_add returns
-EAFNOSUPPORT. For metadata based tunnels, this causes failure of the whole
operation of bringing up the tunnel.

Ignore failure of IPv6 socket creation for metadata based tunnels caused by
IPv6 not being available.

Fixes: b1be00a6c39f ("vxlan: support both IPv4 and IPv6 sockets in a single vxlan device")
Signed-off-by: Jiri Benc <[hidden email]>
Signed-off-by: David S. Miller <[hidden email]>
(backported from RHEL https://bugzilla.redhat.com/show_bug.cgi?id=1445054)
Signed-off-by: Matt Rae <[hidden email]>
---
 drivers/net/vxlan.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index ca91ef9..6b3e66e 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -2947,17 +2947,21 @@ static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)
 
 static int vxlan_sock_add(struct vxlan_dev *vxlan)
 {
- bool ipv6 = vxlan->flags & VXLAN_F_IPV6;
  bool metadata = vxlan->flags & VXLAN_F_COLLECT_METADATA;
+ bool ipv6 = vxlan->flags & VXLAN_F_IPV6 || metadata;
+ bool ipv4 = !ipv6 || metadata;
  int ret = 0;
 
  vxlan->vn4_sock = NULL;
 #if IS_ENABLED(CONFIG_IPV6)
- vxlan->vn6_sock = NULL;
- if (ipv6 || metadata)
+ RCU_INIT_POINTER(vxlan->vn6_sock, NULL);
+ if (ipv6) {
  ret = __vxlan_sock_add(vxlan, true);
+ if (ret < 0 && ret != -EAFNOSUPPORT)
+ ipv4 = false;
+ }
 #endif
- if (!ret && (!ipv6 || metadata))
+ if (ipv4)
  ret = __vxlan_sock_add(vxlan, false);
  if (ret < 0)
  vxlan_sock_release(vxlan);
--
2.7.4


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] UBUNTU: SAUCE: vxlan: correctly handle ipv6.disable module parameter

Jay Vosburgh
Matt Rae <[hidden email]> wrote:

>From: Jiri Benc <[hidden email]>
>
>OriginalAuthor: Jiri Benc <[hidden email]>
>BugLink: http://bugs.launchpad.net/bugs/1771301
>
>When IPv6 is compiled but disabled at runtime, __vxlan_sock_add returns
>-EAFNOSUPPORT. For metadata based tunnels, this causes failure of the whole
>operation of bringing up the tunnel.
>
>Ignore failure of IPv6 socket creation for metadata based tunnels caused by
>IPv6 not being available.
>
>Fixes: b1be00a6c39f ("vxlan: support both IPv4 and IPv6 sockets in a single vxlan device")
>Signed-off-by: Jiri Benc <[hidden email]>
>Signed-off-by: David S. Miller <[hidden email]>
>(backported from RHEL https://bugzilla.redhat.com/show_bug.cgi?id=1445054)
>Signed-off-by: Matt Rae <[hidden email]>

        I believe this should come from the actual mainline commit:

commit d074bf9600443403aa24fbc12c1f18eadc90f5aa
Author: Jiri Benc <[hidden email]>
Date:   Thu Apr 27 21:24:35 2017 +0200

    vxlan: correctly handle ipv6.disable module parameter

        -J

>---
> drivers/net/vxlan.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
>index ca91ef9..6b3e66e 100644
>--- a/drivers/net/vxlan.c
>+++ b/drivers/net/vxlan.c
>@@ -2947,17 +2947,21 @@ static int __vxlan_sock_add(struct vxlan_dev *vxlan, bool ipv6)
>
> static int vxlan_sock_add(struct vxlan_dev *vxlan)
> {
>- bool ipv6 = vxlan->flags & VXLAN_F_IPV6;
> bool metadata = vxlan->flags & VXLAN_F_COLLECT_METADATA;
>+ bool ipv6 = vxlan->flags & VXLAN_F_IPV6 || metadata;
>+ bool ipv4 = !ipv6 || metadata;
> int ret = 0;
>
> vxlan->vn4_sock = NULL;
> #if IS_ENABLED(CONFIG_IPV6)
>- vxlan->vn6_sock = NULL;
>- if (ipv6 || metadata)
>+ RCU_INIT_POINTER(vxlan->vn6_sock, NULL);
>+ if (ipv6) {
> ret = __vxlan_sock_add(vxlan, true);
>+ if (ret < 0 && ret != -EAFNOSUPPORT)
>+ ipv4 = false;
>+ }
> #endif
>- if (!ret && (!ipv6 || metadata))
>+ if (ipv4)
> ret = __vxlan_sock_add(vxlan, false);
> if (ret < 0)
> vxlan_sock_release(vxlan);
>--
>2.7.4
>
>
>--
>kernel-team mailing list
>[hidden email]
>https://lists.ubuntu.com/mailman/listinfo/kernel-team

---
        -Jay Vosburgh, [hidden email]

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] UBUNTU: SAUCE: vxlan: correctly handle ipv6.disabler module parameter

Kleber Souza
In reply to this post by Matt Rae
On 05/15/18 13:51, Matt Rae wrote:
> When ipv6 is disabled in xenial, vxlan tunnels fail to be created. this patch taken from RHEL bug allows tunnels to be set up successfully
>
> https://bugzilla.redhat.com/show_bug.cgi?id=1445054
>
> Matt
>
>

Hi,

What's the target series for this patch?


Thanks,
Kleber

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team