From patchwork Fri Jan 27 02:59:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Winter X-Patchwork-Id: 13118145 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 47BB7C61DA4 for ; Fri, 27 Jan 2023 03:00:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232819AbjA0C76 (ORCPT ); Thu, 26 Jan 2023 21:59:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38528 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233469AbjA0C7z (ORCPT ); Thu, 26 Jan 2023 21:59:55 -0500 Received: from gate2.alliedtelesis.co.nz (gate2.alliedtelesis.co.nz [IPv6:2001:df5:b000:5::4]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C1E1D34330 for ; Thu, 26 Jan 2023 18:59:47 -0800 (PST) Received: from svr-chch-seg1.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id EE0972C05CA; Fri, 27 Jan 2023 15:59:45 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1674788385; bh=dqs/aj2Wrnf52oFRCm4+igmeUqKAnGU0v/qU+Km4ijo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JOBrz9W1GfPf4Le0U6WmqVqTbkvjgOu5REX8XApNvhIPQMSyU1BPuJnt+mzQ6FROd 6GNUHJTf9MPGo8ex5sV9cUvfKDuyuBwfDvwPb8gJSrGEJ1cV2KziOs8RBfC5Ib9vHr fhMFcOkr22Na+PKpByKrgevB5xb9+xZCMNNcJenDzrbcomRyZKaq8QGNTUQd7F3Em7 /2opLnpgyTbIbuFVZVH8MVUoydbtvzjnWvhEWD1NtWyIh4ApZZ8pyqecHv5L/xj2Dc THMQXSuI5vp5Rqb+FxZI+FR9Anpa+3Rx4HHPqTKrmAd948gAq6APazW2hfZn/TeiPY q0NX8fyzFU/WQ== Received: from pat.atlnz.lc (Not Verified[10.32.16.33]) by svr-chch-seg1.atlnz.lc with Trustwave SEG (v8,2,6,11305) id ; Fri, 27 Jan 2023 15:59:45 +1300 Received: from thomaswi-dl.ws.atlnz.lc (thomaswi-dl.ws.atlnz.lc [10.33.25.46]) by pat.atlnz.lc (Postfix) with ESMTP id AE4B313EE3F; Fri, 27 Jan 2023 15:59:45 +1300 (NZDT) Received: by thomaswi-dl.ws.atlnz.lc (Postfix, from userid 1719) id AD2853E08C2; Fri, 27 Jan 2023 15:59:45 +1300 (NZDT) From: Thomas Winter To: davem@davemloft.net, yoshfuji@linux-ipv6.org, dsahern@kernel.org, pabeni@redhat.com, edumazet@google.com, kuba@kernel.org, a@unstable.cc, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Thomas Winter Subject: [PATCH v4 1/2] ip/ip6_gre: Fix changing addr gen mode not generating IPv6 link local address Date: Fri, 27 Jan 2023 15:59:40 +1300 Message-Id: <20230127025941.2813766-2-Thomas.Winter@alliedtelesis.co.nz> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230127025941.2813766-1-Thomas.Winter@alliedtelesis.co.nz> References: <20230127025941.2813766-1-Thomas.Winter@alliedtelesis.co.nz> MIME-Version: 1.0 X-SEG-SpamProfiler-Analysis: v=2.3 cv=a6lOCnaF c=1 sm=1 tr=0 a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=RvmDmJFTN0MA:10 a=RPFMgMUpu3LH_QEMZcEA:9 X-SEG-SpamProfiler-Score: 0 x-atlnz-ls: pat Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org For our point-to-point GRE tunnels, they have IN6_ADDR_GEN_MODE_NONE when they are created then we set IN6_ADDR_GEN_MODE_EUI64 when they come up to generate the IPv6 link local address for the interface. Recently we found that they were no longer generating IPv6 addresses. This issue would also have affected SIT tunnels. Commit e5dd729460ca changed the code path so that GRE tunnels generate an IPv6 address based on the tunnel source address. It also changed the code path so GRE tunnels don't call addrconf_addr_gen in addrconf_dev_config which is called by addrconf_sysctl_addr_gen_mode when the IN6_ADDR_GEN_MODE is changed. This patch aims to fix this issue by moving the code in addrconf_notify which calls the addr gen for GRE and SIT into a separate function and calling it in the places that expect the IPv6 address to be generated. The previous addrconf_dev_config is renamed to addrconf_eth_config since it only expected eth type interfaces and follows the addrconf_gre/sit_config format. A part of this changes means that the loopback address will be attempted to be configured when changing addr_gen_mode for lo. This should not be a problem because the address should exist anyway and if does already exist then no error is produced. Fixes: e5dd729460ca ("ip/ip6_gre: use the same logic as SIT interfaces when computing v6LL address") Signed-off-by: Thomas Winter --- net/ipv6/addrconf.c | 51 +++++++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 23 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index f7a84a4acffc..0065b38fc85b 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -3355,7 +3355,7 @@ static void addrconf_addr_gen(struct inet6_dev *idev, bool prefix_route) } } -static void addrconf_dev_config(struct net_device *dev) +static void addrconf_eth_config(struct net_device *dev) { struct inet6_dev *idev; @@ -3447,6 +3447,30 @@ static void addrconf_gre_config(struct net_device *dev) } #endif +static void addrconfig_init_auto_addrs(struct net_device *dev) +{ + switch (dev->type) { +#if IS_ENABLED(CONFIG_IPV6_SIT) + case ARPHRD_SIT: + addrconf_sit_config(dev); + break; +#endif +#if IS_ENABLED(CONFIG_NET_IPGRE) || IS_ENABLED(CONFIG_IPV6_GRE) + case ARPHRD_IP6GRE: + case ARPHRD_IPGRE: + addrconf_gre_config(dev); + break; +#endif + case ARPHRD_LOOPBACK: + init_loopback(dev); + break; + + default: + addrconf_eth_config(dev); + break; + } +} + static int fixup_permanent_addr(struct net *net, struct inet6_dev *idev, struct inet6_ifaddr *ifp) @@ -3615,26 +3639,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, run_pending = 1; } - switch (dev->type) { -#if IS_ENABLED(CONFIG_IPV6_SIT) - case ARPHRD_SIT: - addrconf_sit_config(dev); - break; -#endif -#if IS_ENABLED(CONFIG_NET_IPGRE) || IS_ENABLED(CONFIG_IPV6_GRE) - case ARPHRD_IP6GRE: - case ARPHRD_IPGRE: - addrconf_gre_config(dev); - break; -#endif - case ARPHRD_LOOPBACK: - init_loopback(dev); - break; - - default: - addrconf_dev_config(dev); - break; - } + addrconfig_init_auto_addrs(dev); if (!IS_ERR_OR_NULL(idev)) { if (run_pending) @@ -6397,7 +6402,7 @@ static int addrconf_sysctl_addr_gen_mode(struct ctl_table *ctl, int write, if (idev->cnf.addr_gen_mode != new_val) { idev->cnf.addr_gen_mode = new_val; - addrconf_dev_config(idev->dev); + addrconfig_init_auto_addrs(idev->dev); } } else if (&net->ipv6.devconf_all->addr_gen_mode == ctl->data) { struct net_device *dev; @@ -6408,7 +6413,7 @@ static int addrconf_sysctl_addr_gen_mode(struct ctl_table *ctl, int write, if (idev && idev->cnf.addr_gen_mode != new_val) { idev->cnf.addr_gen_mode = new_val; - addrconf_dev_config(idev->dev); + addrconfig_init_auto_addrs(idev->dev); } } } From patchwork Fri Jan 27 02:59:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Winter X-Patchwork-Id: 13118144 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 567EDC54EAA for ; Fri, 27 Jan 2023 02:59:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232195AbjA0C76 (ORCPT ); Thu, 26 Jan 2023 21:59:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233439AbjA0C7y (ORCPT ); Thu, 26 Jan 2023 21:59:54 -0500 Received: from gate2.alliedtelesis.co.nz (gate2.alliedtelesis.co.nz [IPv6:2001:df5:b000:5::4]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A444F30B1A for ; Thu, 26 Jan 2023 18:59:47 -0800 (PST) Received: from svr-chch-seg1.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id 020402C05E7; Fri, 27 Jan 2023 15:59:46 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1674788386; bh=lVeEjVPSPkVnvqc1QcgA7aId2lOVAdhwT8wI+6QZI9c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2PTvNyiSasd78aqxRdBCDsLzVFJbt1WBpZ9RsqDusTW2Nk6hVTQigYeoP9hsoM5Ma 9U1IbqLYPbV0edzOUipMmweR3ayoRFoCvewuv6tjiX/CAB1waBZDFSf9E4ytlr8XDr uIHR9EM27IW1PVVxHe18+pr/BBVhHa8ywND2Y7uQTd+f1uddAP9BtdhhEGN6+E8k/h PSj0GSz0g/gO10INM3AnMLlg3T73dxCcgWEvjZbgwcy3lj2IgES3hFI65eA6vnIyOm Q07dTjJg09c684LeX8p6XLfPWJepOwcocRw042KfGRCGwLI2oPlcbAL4fDqo4PAJxw Jzv5Hd+3K3exg== Received: from pat.atlnz.lc (Not Verified[10.32.16.33]) by svr-chch-seg1.atlnz.lc with Trustwave SEG (v8,2,6,11305) id ; Fri, 27 Jan 2023 15:59:45 +1300 Received: from thomaswi-dl.ws.atlnz.lc (thomaswi-dl.ws.atlnz.lc [10.33.25.46]) by pat.atlnz.lc (Postfix) with ESMTP id AFD1313EE42; Fri, 27 Jan 2023 15:59:45 +1300 (NZDT) Received: by thomaswi-dl.ws.atlnz.lc (Postfix, from userid 1719) id AFEBA3E08C3; Fri, 27 Jan 2023 15:59:45 +1300 (NZDT) From: Thomas Winter To: davem@davemloft.net, yoshfuji@linux-ipv6.org, dsahern@kernel.org, pabeni@redhat.com, edumazet@google.com, kuba@kernel.org, a@unstable.cc, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Thomas Winter Subject: [PATCH v4 2/2] ip/ip6_gre: Fix non-point-to-point tunnel not generating IPv6 link local address Date: Fri, 27 Jan 2023 15:59:41 +1300 Message-Id: <20230127025941.2813766-3-Thomas.Winter@alliedtelesis.co.nz> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230127025941.2813766-1-Thomas.Winter@alliedtelesis.co.nz> References: <20230127025941.2813766-1-Thomas.Winter@alliedtelesis.co.nz> MIME-Version: 1.0 X-SEG-SpamProfiler-Analysis: v=2.3 cv=a6lOCnaF c=1 sm=1 tr=0 a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=RvmDmJFTN0MA:10 a=grpyvFInbdX5ElKdMEcA:9 X-SEG-SpamProfiler-Score: 0 x-atlnz-ls: pat Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org We recently found that our non-point-to-point tunnels were not generating any IPv6 link local address and instead generating an IPv6 compat address, breaking IPv6 communication on the tunnel. Previously, addrconf_gre_config always would call addrconf_addr_gen and generate a EUI64 link local address for the tunnel. Then commit e5dd729460ca changed the code path so that add_v4_addrs is called but this only generates a compat IPv6 address for non-point-to-point tunnels. I assume the compat address is specifically for SIT tunnels so have kept that only for SIT - GRE tunnels now always generate link local addresses. Fixes: e5dd729460ca ("ip/ip6_gre: use the same logic as SIT interfaces when computing v6LL address") Signed-off-by: Thomas Winter --- net/ipv6/addrconf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 0065b38fc85b..a45d7544d6a6 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -3127,17 +3127,17 @@ static void add_v4_addrs(struct inet6_dev *idev) offset = sizeof(struct in6_addr) - 4; memcpy(&addr.s6_addr32[3], idev->dev->dev_addr + offset, 4); - if (idev->dev->flags&IFF_POINTOPOINT) { + if (!(idev->dev->flags & IFF_POINTOPOINT) && idev->dev->type == ARPHRD_SIT) { + scope = IPV6_ADDR_COMPATv4; + plen = 96; + pflags |= RTF_NONEXTHOP; + } else { if (idev->cnf.addr_gen_mode == IN6_ADDR_GEN_MODE_NONE) return; addr.s6_addr32[0] = htonl(0xfe800000); scope = IFA_LINK; plen = 64; - } else { - scope = IPV6_ADDR_COMPATv4; - plen = 96; - pflags |= RTF_NONEXTHOP; } if (addr.s6_addr32[3]) {