From patchwork Sun Dec 18 21:57:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Winter X-Patchwork-Id: 13076103 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 9A68FC46467 for ; Sun, 18 Dec 2022 21:57:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231179AbiLRV5a (ORCPT ); Sun, 18 Dec 2022 16:57:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229537AbiLRV52 (ORCPT ); Sun, 18 Dec 2022 16:57:28 -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 4216FC746 for ; Sun, 18 Dec 2022 13:57:27 -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 D0E292C04E6; Mon, 19 Dec 2022 10:57:23 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1671400643; bh=on0aAcpT9RZ3AqkBWAogbg7L2dEMXrMxFsOZ86no9+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fe9cnYYxtzlaXbSSn8XUvmsEqGm8CekxpX+z3Op0VLZP2dMf43bI2PrXbJKVpN/Um OQmBgyNytkDqX4e29GC6SOhbwE6EThoNQLKPA++oBhf6Uqif9aeoRETp49hR2CeYE0 1YVqOzdDJbbAu1D75KxAZEKbaB3B9TyGiICeK9QKXB5CA+CsV+SXCAnxHZQ1eBNSHu il6X6XVfVrSYKLP5+/uXKH68qrxCEElBTiIcPKL4pLDJJwjkeHkTaHepAqr5UfmE3y JDE2DhfTqBUwxAOCq4e2Qmoj9F51Wiw++8lvhSk8sOCuh6SdAlWKGLSIGNmLMIMK9+ C3uvc3EcbGa0w== 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 ; Mon, 19 Dec 2022 10:57:23 +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 7919A13EE7B; Mon, 19 Dec 2022 10:57:23 +1300 (NZDT) Received: by thomaswi-dl.ws.atlnz.lc (Postfix, from userid 1719) id 74E7D3E512F; Mon, 19 Dec 2022 10:57:23 +1300 (NZDT) From: Thomas Winter To: davem@davemloft.net, yoshfuji@linux-ipv6.org, dsahern@kernel.org, kuba@kernel.org, a@unstable.cc, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Thomas Winter Subject: [PATCH 1/2] ip/ip6_gre: Fix changing addr gen mode not generating IPv6 link local address Date: Mon, 19 Dec 2022 10:57:17 +1300 Message-Id: <20221218215718.1491444-2-Thomas.Winter@alliedtelesis.co.nz> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221218215718.1491444-1-Thomas.Winter@alliedtelesis.co.nz> References: <20221218215718.1491444-1-Thomas.Winter@alliedtelesis.co.nz> MIME-Version: 1.0 X-SEG-SpamProfiler-Analysis: v=2.3 cv=X/cs11be c=1 sm=1 tr=0 a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=sHyYjHe8cH0A:10 a=sxvoXph97cTEOaL2aYsA: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 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. 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 | 47 +++++++++++++++++++++++++-------------------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 6dcf034835ec..9c0d085fb9af 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 addrconf_dev_config(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) @@ -3611,26 +3635,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; - } + addrconf_dev_config(dev); if (!IS_ERR_OR_NULL(idev)) { if (run_pending) From patchwork Sun Dec 18 21:57:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Winter X-Patchwork-Id: 13076101 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 20F9EC4332F for ; Sun, 18 Dec 2022 21:57:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231171AbiLRV5c (ORCPT ); Sun, 18 Dec 2022 16:57:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231174AbiLRV5a (ORCPT ); Sun, 18 Dec 2022 16:57:30 -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 C51D1CE33 for ; Sun, 18 Dec 2022 13:57:28 -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 CBAD22C04D0; Mon, 19 Dec 2022 10:57:23 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1671400643; bh=MM+uE5Zc3dz1eyoEKPaZ4JK4dExyhoj2OoMElRXlEpw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2xYbdLQLi/AHbPJKijyVPKvSFAFe9MR0bJXtU6dt29c4iWXNnKGRmWiKvSbbCzXAa gppJexYDE7LofQzMvz0eq46/ufYqHgWOIUM7tTW6uOKwLYdaDJbQN3EtwofGptBenT zbAh6bJmgpCCFaxvbm3hDxIjRtkDVztLRno2VG53K59WGb+hgrIDytCGh7xDToKn+T EGm2XQORyKS9ox+JqsPY6hx9atuvM83OVD6QBXQ8/UDZh1cgiy7LB0GLy0CfRT7mTP Dkl/tw2TRcMgC3GNqykQ8/xF8VC6Bt5wiesfdVb4EDvNe9762OImvNzj8EG7FfpluL NxChfsBw0YC/A== 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 ; Mon, 19 Dec 2022 10:57:23 +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 7A27B13EE82; Mon, 19 Dec 2022 10:57:23 +1300 (NZDT) Received: by thomaswi-dl.ws.atlnz.lc (Postfix, from userid 1719) id 766B93E5133; Mon, 19 Dec 2022 10:57:23 +1300 (NZDT) From: Thomas Winter To: davem@davemloft.net, yoshfuji@linux-ipv6.org, dsahern@kernel.org, kuba@kernel.org, a@unstable.cc, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Thomas Winter Subject: [PATCH 2/2] ip/ip6_gre: Fix non-point-to-point tunnel not generating IPv6 link local address Date: Mon, 19 Dec 2022 10:57:18 +1300 Message-Id: <20221218215718.1491444-3-Thomas.Winter@alliedtelesis.co.nz> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221218215718.1491444-1-Thomas.Winter@alliedtelesis.co.nz> References: <20221218215718.1491444-1-Thomas.Winter@alliedtelesis.co.nz> MIME-Version: 1.0 X-SEG-SpamProfiler-Analysis: v=2.3 cv=X/cs11be c=1 sm=1 tr=0 a=KLBiSEs5mFS1a/PbTCJxuA==:117 a=sHyYjHe8cH0A:10 a=Bk4KLNytfi6p_AlvEHIA: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 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 9c0d085fb9af..12126601093d 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -3129,17 +3129,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]) {