geneve: correctly handle ipv6.disable module parameter [Linux 5.0]

geneve: correctly handle ipv6.disable module parameter [Linux 5.0]

This Linux kernel change "geneve: correctly handle ipv6.disable module parameter" is included in the Linux 5.0 release. This change is authored by Jiri Benc <jbenc [at] redhat.com> on Thu Feb 28 14:56:04 2019 +0100. The commit for this change in Linux stable tree is cf1c9cc (patch).

geneve: correctly handle ipv6.disable module parameter

When IPv6 is compiled but disabled at runtime, geneve_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.

This is the same fix as what commit d074bf960044 ("vxlan: correctly handle
ipv6.disable module parameter") is doing for vxlan.

Note there's also commit c0a47e44c098 ("geneve: should not call rt6_lookup()
when ipv6 was disabled") which fixes a similar issue but for regular
tunnels, while this patch is needed for metadata based tunnels.

Signed-off-by: Jiri Benc <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

There are 11 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/net/geneve.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c
index 3377ac6..5583d99 100644
--- a/drivers/net/geneve.c
+++ b/drivers/net/geneve.c
@@ -692,15 +692,20 @@ static int geneve_sock_add(struct geneve_dev *geneve, bool ipv6)
 static int geneve_open(struct net_device *dev)
 {
    struct geneve_dev *geneve = netdev_priv(dev);
-   bool ipv6 = !!(geneve->info.mode & IP_TUNNEL_INFO_IPV6);
    bool metadata = geneve->collect_md;
+   bool ipv4, ipv6;
    int ret = 0;

+   ipv6 = geneve->info.mode & IP_TUNNEL_INFO_IPV6 || metadata;
+   ipv4 = !ipv6 || metadata;
 #if IS_ENABLED(CONFIG_IPV6)
-   if (ipv6 || metadata)
+   if (ipv6) {
        ret = geneve_sock_add(geneve, true);
+       if (ret < 0 && ret != -EAFNOSUPPORT)
+           ipv4 = false;
+   }
 #endif
-   if (!ret && (!ipv6 || metadata))
+   if (ipv4)
        ret = geneve_sock_add(geneve, false);
    if (ret < 0)
        geneve_sock_release(geneve);

Leave a Reply

Your email address will not be published. Required fields are marked *