From patchwork Thu Mar 22 17:53:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 889510 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="dOLSVxKQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 406Z7673LPz9s1r for ; Fri, 23 Mar 2018 04:54:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751847AbeCVRyT (ORCPT ); Thu, 22 Mar 2018 13:54:19 -0400 Received: from mail-he1eur01on0078.outbound.protection.outlook.com ([104.47.0.78]:16568 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751553AbeCVRyO (ORCPT ); Thu, 22 Mar 2018 13:54:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=KYW8LoBK7Fxzz/7PnVddY63V0YcHcK9mn0+zlkGwzl4=; b=dOLSVxKQH0O9tDJiKFTCCEuSkGiFSXCmpYpCH/aT7QPk4nb7Ug8SyvavXUHag/0us766t6AHq3mx8dbxKIYc7c4ypk0G07r53sJfuOCjnTorkAYCJCluqqy8SeRJVhOq0HPIXRkerB1OM3MYBisz6a4yBW+C0rVZkKINAV7NC2c= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; Received: from splinter.mtl.com (193.47.165.251) by AM5PR0501MB2003.eurprd05.prod.outlook.com (2603:10a6:203:1a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.609.10; Thu, 22 Mar 2018 17:54:08 +0000 From: Ido Schimmel To: netdev@vger.kernel.org Cc: davem@davemloft.net, jiri@mellanox.com, lucien.xin@gmail.com, mlxsw@mellanox.com, Petr Machata , Ido Schimmel Subject: [PATCH net 1/3] ip_tunnel: Emit events for post-register MTU changes Date: Thu, 22 Mar 2018 19:53:33 +0200 Message-Id: <20180322175335.26232-2-idosch@mellanox.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180322175335.26232-1-idosch@mellanox.com> References: <20180322175335.26232-1-idosch@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [193.47.165.251] X-ClientProxiedBy: AM0PR0102CA0045.eurprd01.prod.exchangelabs.com (2603:10a6:208::22) To AM5PR0501MB2003.eurprd05.prod.outlook.com (2603:10a6:203:1a::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 76917cd8-7b98-4902-e14b-08d5901de9ec X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR0501MB2003; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2003; 3:gDhs6QzbbGSDlrt5hW8OGn5vFGmtZnOIfpzqo6FokaoNU5VwVpfrZ+BIfMh3SncJn7d1jeNUrtwJw2OrICtZGkYPJtdlRW0V//T9a58gWfYevY6ifF0m0e5RNeYCMK/YKTcPkAy0hpRgMF4WCdJ16sC/TaZJYC6ArYg9hOcGF4fmKOxCUSJSSztpGh7QfAsFhRBpx2VpinrYnSWa6k3b2K7aYgaVCbbAz0uWnLfm6L9A8lL1WhV8XpM4+SpN6MhX; 25:Pv5zsWPfIcZNbNqgfyCb/AgVRXDcWJTiSlNkED/hox6V1xVqCP6j4GRWJ473FzFZWq1eW9oKeVnup9BRCPM3llebObG/XKNRWLmwSia/gN3uAJtnzSJGK2U64XBg21tmGlElZzo8rVUfYNw0r3QCygfELRPHsUDcJiof7yY62AxnCkpckeejn4iwXYfx96nYPpXlx3u13aFcB43qUSGaH92pwtqj7UwbHbfbB8U3zqrJWgrl4yfsXAuO/WjF6SslkvZy19N073qrdQVqxOs0LKwLtDJ6YAghZSpfYo14zqDXGQTtRjAwujwVT5APytFfwP/ASnAUeVZIFX0jEZX2SQ==; 31:BSbH6qZE2s4RkFp3RT6PtS0HrkdVYyZ3Q993FB6UO2wjs+h7iyaVgMPVdP7LOE3BoM5S/ML+apdMbCTPoG/FvKaeSmHvsckl8zHQgSteCmrEja2xY8K67MlpYMVH/i3aqFXOTBkZtnG4LHCQoW/98Bc6QyZfIx2yMi77bh2+0wfYgZQOQR1zL4Bzlv9rLnUAudEraVqb9E5SHgVOpUaQpjpBXAflmFVN2s4myMYdCxQ= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2003: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2003; 20:JlvsqrljLhK5CFeeEH8Pv37EBFjn4xl30NE90HT1lMI+Wm6QxF//0IZMHQjERCD+tcyUsJjsUNO4JmRmYy8lUrBQ7aKc1t9d/oQNI2gRrAiu2GNy8BpVGZZ5GNpRWRh60xQtZLVFsl1wIM3QpENDNzgmeqbLoZxZU0RabwNTv/a/+wVJSQ17oTua+9AMqOQYHQv6hzq7vZPLG4kIeoGtz7zCgjqAEVWWCZ8aJ/FeT+Y1E7anbjzQ6o9FQZCx1QewbeMujkBp9pbaTjQQVK6MPQ4U3ErAwetLfU0aBzAFoyzX84jWjXxh3WYmDo0ITnCjhTF+H0g2/r9J9wPvqzfLJEAYD3VEoFSJ+C1xXv8836G92Ail1xbnJ+On7xyIyhSbhLTttPuoe4tO2oQdwMQPqWtqhNpQ1N5IxqzWs1K+eZDXkoTzOUwC99hcZ5/3Tt9H/61DmNF7VGosgyrAfF2XpOROu+v8Om3lzykX87+ycHN573sT8VcQNqPIA4eQYZOF; 4:eF+08hQ7x6O1u8npaKLJ2M4JYVj2D5HAfSRinj1qUK4Rt6hBW9mSKFGT4h1e6AqMfG1jDKMcQf+A3CSqA/EOkqjWntHxdXHhW1wItvX0x7pe4A1VM6+OnHw3M4PE72tGSa134+AArQMsmZjXfLy8fl8NZNpEAoC65MY2GCbuA2jD++qTtAJqBwqpBe4F0iDoq/FQE2j3+TY+M339O0AxBxrnZNmQT0fh40EXSOPqc8LfUGYYzEffj692hd2CJKBbkWj0gFsEITRwibcmNbHa2w== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:AM5PR0501MB2003; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2003; X-Forefront-PRVS: 0619D53754 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(346002)(39380400002)(396003)(39860400002)(199004)(189003)(97736004)(6666003)(86362001)(26005)(2906002)(6916009)(47776003)(6486002)(66066001)(107886003)(53936002)(25786009)(11346002)(106356001)(4326008)(51416003)(1076002)(3846002)(8676002)(7736002)(50226002)(54906003)(6512007)(305945005)(6116002)(36756003)(105586002)(6506007)(386003)(39060400002)(53416004)(81156014)(478600001)(81166006)(50466002)(48376002)(5660300001)(8936002)(76176011)(68736007)(52116002)(316002)(186003)(16526019)(2361001)(16586007)(2351001)(446003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2003; H:splinter.mtl.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2003; 23:pRlrn8Q1InnhudQDtSle+sz1VSkOqOnVuq0moNl3bTWzinEP3sTswxJybokx/8IwcdCEaqfnGRw8OLgSTofvklU3Wn4ULljUNHgto8e9loBPblvrXjN5E4zypc+kn5gzgbD0XnMGhBBpjGsVRq8lzN/6CD8rnN5lv0vun8rp9gmJEmcOL2CNGMPQZhKrpaimK6t8ho7/HC/nZbeCTjM5SO4BMdTbkkWcUdu4aGvuagdDjEq0H0iefpL1ar5vYQmEkHihU4JA5q3xqdd18SnKQuqbmDnbAfTtwemP//XUt1B9ID5MiPSlcp5rrKG7cqrt27X8xzXOKnSKNSIPWflCKhyKXL8tOIlBwiaTkFTlcDtSqjTpD8UCCUv3q/1ytluEw5W2lideByr7PdL42NNWky7l+ipoEbWqu+sR33v8jAmVz68eO61GxtNP+KGfd6Kix+q7zggIvjkSbUVtN108Z/NMfsj/MOpohoQvTrkwLQc2fJvGEtfk9WqEmWx6fD6BPd8dJvKfESUtk7QJBeKQI5wejevjg2fhxaBj9jrTvLmVD5FC3c2gSTAkXuLC7UXCAhlADlaWlKovOypk08MyHjoq8yQ41x/Hw0LF+V7FSpl6/v6vYz/kG4qE7OB1LRRincb+c7YFXfcots7lT2vd33YYBAR5/qTMLPqVFA5HDJIrJCv7FY+yQ263EeQLSNKT0p+IRHIAahcyYEkKdwcCQmiBKZ8FSN+J/bL9cHnWerDw9JXsoAg2Ar6PChtqoCASryDMNUBTmdbVHVuZ7hJw0sZUzvUrC9jyIEtVRVwujEbN14V9WOdpBn/Nug+oUKFGXG1j+9U9U+2p3B4p65vmeLvDns60jcWknKn5oxM5QnCWEJOKePl3XJ46205Fi9oCNEk75EuXOA+A1HJgKEiu1AnDP9fnuwwcI+iGpAT6svW5/Myx79yLg50i3u09LhJup0Qj4XPbYvLquBmWg20s/QVGyB9DUHIuhhB6sQsxSL4sht5SHlZh8hZjqWONSs2cnfzrR+HjYfHcPUlO2mdnjIBvpVFDtzjtBHC8Gf84RJ7kyWovSEwlh9vfXdqU1u/TZJVFOQfYDE7DEnO8eprLD+kBsaWL671Rh9OJzniUHWgLpnaigG9FuWPhWSIKxt9uRbnkwAV7zzEYJIssM6PsYlH1OqibnyUdMYgoWyg2FwKzBXPDCmkDUJqm8bMkn9rC4qjBAKVmLTJ8U7p8iEAQR9j/qJHxyaQhpU7qAD0xSWE= X-Microsoft-Antispam-Message-Info: dsuHdbLqZMVpzAbyIooYvWS8JJo/xiWhI99gyEJAnL0XMctj36jeC47ti0/oDNihp5oZfxmImey7I9rYR7gqaHvR4kMsBWBByN8NGKnGlbY9nQhpChdez9fKnJJC5T/yvNIQz+n86+QShVdPPM4ZvR3Xc+5aIKoFDK99Z6+h0NBMsYG2Ygza13ndjHWEFXx+ X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2003; 6:8KpAxXdg7lB0/e6MDfFU9TA0TPNsXXNu0H/0mF2FMA0llp9R8+FDVoRpSeVs4xCDItylbGK687G5KGsQrkCfsC4I7wkIDJxwf+8HUMdMV0Kcp7eHQSDTfkYlQftwlp+uTYbApZ88oRdpDRBQLvgBcEeSZndzdbNOjksa2MFRdbxSE5T9U7o5bUzIgI8hTpUBAmUI/ts2mRaznGGC4ggEHvSrwKGuWlQT94AIv2j5vPsAJrINKBsoUYN07QCxhTPnXZF5F7ZT+mT6uCJhx+OLviRktn3fXH3x75S/ikjFZkV7btI2nCRCX8mz2olmtC8ho0QKGfov8rpEHC4YFbHG1tF//J+z6T/0cCTvmtEnZ5TOKYA5NfHt1JR21iQFhp/vdt3zfdNkwWaLlsMNxuzjBamdS71Mtv6ABRAProvBI0MYsJkpcdIv/MAV45Djfiqbe6/zBQOiMyt1l7inqibgVA==; 5:zVTUyQK/xDAMZK3oE6wjd/YGPU/dTJ1YoZsju5kbvD8LAmnpF38I28Xwrz42FAbIm8Hgh0Xa+Zl3azZg+w/Mc1e6LRG677+kjdy5ZjwTrhS+sq2ksTeSEEsKeHCqOm/hJU7IeBrT0+gDBEsnCNgg2TUxTmv7vgUUxDdRtfvE/jg=; 24:EPk/gly3qT3Kc6BYoOusJVWcd+fYUGKg8/I/A5/KpSvyguQwo+KVcHUnS3IIoyCV/5vUxA80UGc4QXmE/nfpIUcoEZvbJmoHpCQrdpvXp/c= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2003; 7:0j1OTC5mEe1ByrmzzxD1l1sVwQM6tI7NwmF5viuqZiwGg2AZ0HAorDnlpHfCp8boWGITsRPEdhknJxmIScEflj6AlVyBPOexyxuQYP5eb9ims9rWp2edhWXI2zIpwF/ZifMx6HR7W1p0iXY2hbUv7QxPn4W/BVHkdQ35sOCqsKWcJ1reNPko+ToiXYgOxIsQRXIhcEnc1IJX+/5hn2DvmH6uACWF4rShiC2EWBSMvRE4mdN4EEelJKQSZQg6uCHR X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2018 17:54:08.9766 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 76917cd8-7b98-4902-e14b-08d5901de9ec X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2003 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Petr Machata For tunnels created with IFLA_MTU, MTU of the netdevice is set by rtnl_create_link() (called from rtnl_newlink()) before the device is registered. However without IFLA_MTU that's not done. rtnl_newlink() proceeds by calling struct rtnl_link_ops.newlink, which via ip_tunnel_newlink() calls register_netdevice(), and that emits NETDEV_REGISTER. Thus any listeners that inspect the netdevice get the MTU of 0. After ip_tunnel_newlink() corrects the MTU after registering the netdevice, but since there's no event, the listeners don't get to know about the MTU until something else happens--such as a NETDEV_UP event. That's not ideal. So instead of setting the MTU directly, go through dev_set_mtu(), which takes care of distributing the necessary NETDEV_PRECHANGEMTU and NETDEV_CHANGEMTU events. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Petr Machata Signed-off-by: Ido Schimmel --- net/ipv4/ip_tunnel.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 6d21068f9b55..7b85ffad5d74 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c @@ -362,13 +362,18 @@ static struct ip_tunnel *ip_tunnel_create(struct net *net, struct ip_tunnel *nt; struct net_device *dev; int t_hlen; + int mtu; + int err; BUG_ON(!itn->fb_tunnel_dev); dev = __ip_tunnel_create(net, itn->fb_tunnel_dev->rtnl_link_ops, parms); if (IS_ERR(dev)) return ERR_CAST(dev); - dev->mtu = ip_tunnel_bind_dev(dev); + mtu = ip_tunnel_bind_dev(dev); + err = dev_set_mtu(dev, mtu); + if (err) + goto err_dev_set_mtu; nt = netdev_priv(dev); t_hlen = nt->hlen + sizeof(struct iphdr); @@ -376,6 +381,10 @@ static struct ip_tunnel *ip_tunnel_create(struct net *net, dev->max_mtu = 0xFFF8 - dev->hard_header_len - t_hlen; ip_tunnel_add(itn, nt); return nt; + +err_dev_set_mtu: + unregister_netdevice(dev); + return ERR_PTR(err); } int ip_tunnel_rcv(struct ip_tunnel *tunnel, struct sk_buff *skb, @@ -1102,17 +1111,24 @@ int ip_tunnel_newlink(struct net_device *dev, struct nlattr *tb[], nt->fwmark = fwmark; err = register_netdevice(dev); if (err) - goto out; + goto err_register_netdevice; if (dev->type == ARPHRD_ETHER && !tb[IFLA_ADDRESS]) eth_hw_addr_random(dev); mtu = ip_tunnel_bind_dev(dev); - if (!tb[IFLA_MTU]) - dev->mtu = mtu; + if (!tb[IFLA_MTU]) { + err = dev_set_mtu(dev, mtu); + if (err) + goto err_dev_set_mtu; + } ip_tunnel_add(itn, nt); -out: + return 0; + +err_dev_set_mtu: + unregister_netdevice(dev); +err_register_netdevice: return err; } EXPORT_SYMBOL_GPL(ip_tunnel_newlink); From patchwork Thu Mar 22 17:53:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 889509 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="k37SB+i1"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 406Z723VM4z9s27 for ; Fri, 23 Mar 2018 04:54:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751848AbeCVRyV (ORCPT ); Thu, 22 Mar 2018 13:54:21 -0400 Received: from mail-he1eur01on0078.outbound.protection.outlook.com ([104.47.0.78]:16568 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751825AbeCVRyQ (ORCPT ); Thu, 22 Mar 2018 13:54:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Tl528AF9AK9TNqK8ta+HmZpsd3HDYSnQwMptN92fkh8=; b=k37SB+i1UuSQEvrQM4SIB22oSK3sy29ZjqP+aMfUR2spjl0DADRhusPaSlW+9PtaG6JfeppJ9x+jgDtS1LP/MSSfX9444Moe9ihNmSVofmwupLiZO620nzylb/Ru4bupX6sEMqTsybvGYz546iQcu/k3UPd/S2rthwJ6NljykSY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; Received: from splinter.mtl.com (193.47.165.251) by AM5PR0501MB2003.eurprd05.prod.outlook.com (2603:10a6:203:1a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.609.10; Thu, 22 Mar 2018 17:54:09 +0000 From: Ido Schimmel To: netdev@vger.kernel.org Cc: davem@davemloft.net, jiri@mellanox.com, lucien.xin@gmail.com, mlxsw@mellanox.com, Petr Machata , Ido Schimmel Subject: [PATCH net 2/3] mlxsw: spectrum_router: Move mlxsw_sp_rif_ipip_lb_op() Date: Thu, 22 Mar 2018 19:53:34 +0200 Message-Id: <20180322175335.26232-3-idosch@mellanox.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180322175335.26232-1-idosch@mellanox.com> References: <20180322175335.26232-1-idosch@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [193.47.165.251] X-ClientProxiedBy: AM0PR0102CA0045.eurprd01.prod.exchangelabs.com (2603:10a6:208::22) To AM5PR0501MB2003.eurprd05.prod.outlook.com (2603:10a6:203:1a::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: e60cbbdf-3baf-4812-c88d-08d5901dea74 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR0501MB2003; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2003; 3:/KyY/OpVWWvWKURpQ/Riri58NuZgZ1dJV3NUAoHUVT1DcahS2J0uYgoJO8AEC7XR2SAn1FnDspyTqkwj2/DqT+XnKV6jtZt60bRqL7D4pw2XvL5k/SjWVNxXdjydgQ/WXxpDo3dCJu+qEGdqIxJUkXa7A5UlKC82d5tVLOj/IQysgRzL0eefdJsXy72+WedajFpfMgqCRWhlWo6u6s5FHYKKqh8yDiA9fc9pMjDIGWF7KKcWMJR7fWgEN+0F64n6; 25:7c96tUutYH7ADlsbmBzDGMf75LVHzhk/950CB3mBurv6MTjUyv5FvzsnIRukDUcdKmXTwhCAHTyc03pZ5Z7p79xhVcFcvSZzju7F2HWMUuHnp+1QdqtS2do+FWnfSRSjsoEbGXPLVEyNyR2BORcotnkjcUaPTMrj307ip4zCzOtN08Y6bfOQhroTTexaOEC5aQg8zbZFnJYDIjyxblBgCEfGO3jK6AYdGjpc2hAxy2IazShriGK2EYRoNPnPvhyvEqHRAHg/C/oxnG1maIbYtv98PvFSXApeBjpJiOZZn231rNBQz88Cr+D18nsreXATScSV8SFZQHjXlMhdreMQFA==; 31:Sk7h7Lv8XREYeuqVyNHnD+HfYb1et9e7HxjlSRWrWuS2mfz/mbD1GGL9xYP8HXqvW+nBvZ/6Bjyo9TACwWweyfcvY7HJ1iSch1i+WAeaNH3lnkeZ6hAWF59/jY5WKkEJ+Y9dUG4YkNYmrmhksymJB1pKyY0MPWTnWls9lOM2bNY7zEIUOH0dAzlmY7v4CBzy06DYMA41RejOSpaJmT7pejrrpHv7/LPVtHr+ICLXpM0= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2003: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2003; 20:zJGhMPjhMj9fQpqFDECKuhzSgkaCR+yaz21HUXh25F/U05D/n1MEfGxLvoN7CPWy9J0820WzkDECGp+RxwAEVHHEWFbmigumrBAKwyFj6etEhsslXnrub/AuFFI3ZoqxAV61Z9oAtmV35H/VyplOs3k8lNc+WRFdZ3whHtkUOSfs/P8OogT6M71GQHUNKsv4dt2KjKdUBujzYg15em6CYrSVhqMJR/c6Ucfdb57CGOzNYDRCP+KJF7uVO2CmVF6S/NoXGtIZyrXCR0Sof9mTp92zqEZ4NDOjqA0R4MeOuejdztA6cIFSKIAIcUKkw+p/wSmOb+hL8f4NVPxNpH1wSEIRlXBMVwwN6+V+PkHTtgZpNX9Zm59SqdBsJBLDx48Vi1x1oi5DXsWmqF9CtTfTfQGfaWIBcLVpD/zHG3eLCB20dvDbYY+N5JrDQjWRJBnrrsjRJmcT+twt3aetjIdrHyuoiYGP/f9a0daqt2iJ4TSIZ3H9Rq9B7GEeOZWSqvxd; 4:2MxDvuGrBOuIprZ3zKb1jTDp5v02yWzu+7Uwn5B0p8SK1+Il+unZvk4eehllbYkByZanXLGNeQ196X4dURi0jV/+LHYbhH3lW7Y3Evsq2lT2QwvEuzEKLipkxvO/a0jB7+H9jz7EB1scbX+wTWB3sX3iD19paTUk8QoKPf0mgKJxRug0Mtqegb31EzvTgKB0lLuknPo1CKx5gaiLbXmPVLWwZZoEM5G8IkP+9a+Nhw8xtOQAOu++HU6ntDkXlvvN0yU/fxhygcWzxo05N+nvlQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:AM5PR0501MB2003; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2003; X-Forefront-PRVS: 0619D53754 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(346002)(39380400002)(396003)(39860400002)(199004)(189003)(97736004)(6666003)(86362001)(575784001)(26005)(2906002)(6916009)(47776003)(6486002)(66066001)(107886003)(53936002)(25786009)(11346002)(106356001)(4326008)(51416003)(1076002)(3846002)(8676002)(7736002)(50226002)(54906003)(6512007)(305945005)(6116002)(36756003)(105586002)(6506007)(386003)(39060400002)(53416004)(81156014)(478600001)(81166006)(50466002)(48376002)(5660300001)(8936002)(76176011)(68736007)(52116002)(316002)(186003)(16526019)(2361001)(16586007)(2351001)(446003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2003; H:splinter.mtl.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2003; 23:Whx2ZqKTln/ROHCS6C6jiHqBqWF3wYoMScRGt4CZ2ZCa3SAZ+DHN+yvSRRgL+kc9ws6WZOaq/7CrhW+rak4JzPUVWYZX+yrmp2ETZs9+8GePY/Ic7wuZuCOFg+9/EG027ZnnKMyu4iG2PIsfzs9vlztqmBEmo0Z2+tPGxHw+G41tSbu2cvq9SyKHnO/P8qVVjCVtu9tLwpywJPAChcktkkTMGVIpH8VEF7F+k29OpN1QUbzEc+opUFa70R5IcfCz9LrV9BjV5PhavGw9jM/e9FonQRtAY87w1llObDum3inzudKWKwKXkCWM5wO2q9Fzs3IFj0KHRcryoe97CEgT4E3XsY6cweUKVKEpas3clpiyFHPsroz8pergIfFlXUZdFA5jGH8BRXZzvmcKOndpYl6Hr5sU/X4xsEfZf4ZTQUxeMM5yiS8PmmVim3kvnPy1qogiQiESY64IMFkGBtuJmuolRUp0aNuGiB0YOL/8VWxI8kiLDRuwtCbjV2Rc2I2crCC1rD3KOuJYNWCKiC3El28nv00q4USk95cgFnfP9toTt6QVO42HV35e7BfAoyo2EXB5yjfL8OUMdQd1hoq7JR79R0G2OoCQarX8Ckldc0SwsPIKV/o0/gylpb0q3w3Lb+cjr1Eys/sqtzt+d31oDPkrx+SPvXZg2ctUD6KFmyEGsP5nRzXLDu3Fz0Qjx319dj0kcW5TZT3D4EOGXOhw5wfXfjS7EY3eW4j7fNmTeqSVhKKesE//NeobFPtkppRc0D/n6YKG4+/sxNa9aOm15eWknaMGs64/r5pygjGCdh8DWKDd4IPWclaZB6AdFMPBGlV71x2rg7IQ526g8NzWp65TOTKSv/PQ6gtqMO8CywDJrT4qEJvqGso074MG8l8qlkDEk3slBiFLoXWUA3MDD7+4BQfPuWVRM8XvLTq5EoR7OXWf5ZgjVnOjDx55XqXsYx+8XM1gD+rr/adp50yRTwKW7Vkwehp6UGDQlyk3irFY1FWuVqInX6JNQTpX45LGCTmVvIGzi/cQerg4i9XzsTEtPTN0UcBsuKc9HskEr1XxRcuPJYC7x8CxRJ/RSY6enhVwxYZ0IfUXqNOvk3hCliswb5fvGOtg0+xCx7uq30Jvzu4IEHARrTBd02bnFKDu/HGUcEDR+cDvep2Hlhu+CPsNO57P15A0D9FDfu+IPaCmiOLUkZM+al1+vjmB6ZAlgxao/0oGqvAuQGQL+ae7gwITc/+fdWPJveQkB5YcSVfzKpx+axythEkyijknzoYdun6dWvdEypws555nlDUxSA== X-Microsoft-Antispam-Message-Info: DhYjxKTMgDISoKelgMAltoVToWTKWcnFF2HOP+Gdr1B6mGXvI0GkEYiwS1qUttL5zq+MuqXXvpzslHOpm60MsTjqb/hp7DpGh26b01YpK5zYu4sKcTMFAY5+KBEbILoslI4ss7wjmRLrNACJ1eE159W5xZVV4StB3pUo1Ghrzdl4dh3GQyE/llFexlqa9Udx X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2003; 6:zmjl6CSl76XNVZMCDq1HfvEQQd3ISmaNe4SEmZvIFzlI2hHfIcz0ZqE8XZ3WxbhOc8ollwS9fTaOhSyapQ2WuUk9KXK7N6DvmCUimYtGK0NkJPAvSpccHpPuKdBgKzEGUyEW+ic2vqXejdvz+gBiJMcMhJxCvU35/0MTFfdsNWzrGDqOQ1/86aXi4V13YFGOnvce3yeqMfHdQ3ikFQyQ6Q5grO/x7OuhmR1NiNFlqOTB3k5QYRWf0Rw0pL4oMcCJwIKDRvfBMCPqkhX83ArZcJa5kr1b0zUdInUqHi00wpvxUi1Icn+9saeKNeX2fX9VAD7C61ymorogJpYKLTLPwUx2M/hnNlLQQG8ZI9fk5mGwx9Myt6wSwQ6CUXmEw0z+GN2EPRmkR8dIH7G1MiYdPB5O7CBGLuhyBSyELmmguzvv+cmkUhd/bgLobz0NFuItWNc1EXtrbgxKlcvQ8UHNKA==; 5:dvZYQapDIFaD4ibP48iwpeJfb7mb2b03bPZDnCiWjcf3MDuXCwLfdqPONxcdmbznL2UH6ZsWXfk0Q+Mv7nU181J6eUBuoikKVmAeWxP6J1rRIVQgX4DoPwnIGxCunLkl9HWdZuW9zaXeSUl04BKsTQHO8H5xeyUZv3eMNLvoL98=; 24:nJGuGeMW/2w/Xu3HAolNDB6h7Wz6ZHaLXtYpYbNg3xig8/RDkQOsFij0D//dNLUUzC5sLSUsFDlU/mWuRZyfdxWZ5gxx2HyH6MZqoGupsKc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2003; 7:+cV/9lM0lsI0iBiCjKiD0N/Spr0qDROAmt0TM+oy4X7BrnFDh/1B1VLjw9zcR/ip+pefC0iz6npNCStH3N7CjD1Sqaoul9MYiuboaDRZOw6avkE+ni0bb4fuOS2/PMD5hhxH5IYZwULgHetlYmm61xCOTdCNGymX4+KinqqaU4cvHijVWZwBPB/5nmYWoDCiEzrfByeooHtX5+LlV8B14Fzv9gWflRZXMv0fqaISp+Ancs6oroQ68NpUXk+RH0zb X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2018 17:54:09.8828 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e60cbbdf-3baf-4812-c88d-08d5901dea74 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2003 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Petr Machata Move the function so that it can be called without forward declaration from a function that will be added in a follow-up patch. Fixes: 0063587d3587 ("mlxsw: spectrum: Support decap-only IP-in-IP tunnels") Signed-off-by: Petr Machata Signed-off-by: Ido Schimmel --- .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 54 +++++++++++----------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index f7948e983637..a7d0adf068ec 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -1380,6 +1380,33 @@ mlxsw_sp_ipip_entry_ol_up_event(struct mlxsw_sp *mlxsw_sp, decap_fib_entry); } +static int +mlxsw_sp_rif_ipip_lb_op(struct mlxsw_sp_rif_ipip_lb *lb_rif, + struct mlxsw_sp_vr *ul_vr, bool enable) +{ + struct mlxsw_sp_rif_ipip_lb_config lb_cf = lb_rif->lb_config; + struct mlxsw_sp_rif *rif = &lb_rif->common; + struct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp; + char ritr_pl[MLXSW_REG_RITR_LEN]; + u32 saddr4; + + switch (lb_cf.ul_protocol) { + case MLXSW_SP_L3_PROTO_IPV4: + saddr4 = be32_to_cpu(lb_cf.saddr.addr4); + mlxsw_reg_ritr_pack(ritr_pl, enable, MLXSW_REG_RITR_LOOPBACK_IF, + rif->rif_index, rif->vr_id, rif->dev->mtu); + mlxsw_reg_ritr_loopback_ipip4_pack(ritr_pl, lb_cf.lb_ipipt, + MLXSW_REG_RITR_LOOPBACK_IPIP_OPTIONS_GRE_KEY_PRESET, + ul_vr->id, saddr4, lb_cf.okey); + break; + + case MLXSW_SP_L3_PROTO_IPV6: + return -EAFNOSUPPORT; + } + + return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ritr), ritr_pl); +} + static void mlxsw_sp_netdevice_ipip_ol_up_event(struct mlxsw_sp *mlxsw_sp, struct net_device *ol_dev) { @@ -6843,33 +6870,6 @@ mlxsw_sp_rif_ipip_lb_setup(struct mlxsw_sp_rif *rif, rif_lb->lb_config = params_lb->lb_config; } -static int -mlxsw_sp_rif_ipip_lb_op(struct mlxsw_sp_rif_ipip_lb *lb_rif, - struct mlxsw_sp_vr *ul_vr, bool enable) -{ - struct mlxsw_sp_rif_ipip_lb_config lb_cf = lb_rif->lb_config; - struct mlxsw_sp_rif *rif = &lb_rif->common; - struct mlxsw_sp *mlxsw_sp = rif->mlxsw_sp; - char ritr_pl[MLXSW_REG_RITR_LEN]; - u32 saddr4; - - switch (lb_cf.ul_protocol) { - case MLXSW_SP_L3_PROTO_IPV4: - saddr4 = be32_to_cpu(lb_cf.saddr.addr4); - mlxsw_reg_ritr_pack(ritr_pl, enable, MLXSW_REG_RITR_LOOPBACK_IF, - rif->rif_index, rif->vr_id, rif->dev->mtu); - mlxsw_reg_ritr_loopback_ipip4_pack(ritr_pl, lb_cf.lb_ipipt, - MLXSW_REG_RITR_LOOPBACK_IPIP_OPTIONS_GRE_KEY_PRESET, - ul_vr->id, saddr4, lb_cf.okey); - break; - - case MLXSW_SP_L3_PROTO_IPV6: - return -EAFNOSUPPORT; - } - - return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ritr), ritr_pl); -} - static int mlxsw_sp_rif_ipip_lb_configure(struct mlxsw_sp_rif *rif) { From patchwork Thu Mar 22 17:53:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 889511 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=mellanox.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="rAzSyGoV"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 406Z796Ddyz9s1P for ; Fri, 23 Mar 2018 04:54:29 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751825AbeCVRy1 (ORCPT ); Thu, 22 Mar 2018 13:54:27 -0400 Received: from mail-he1eur01on0078.outbound.protection.outlook.com ([104.47.0.78]:16568 "EHLO EUR01-HE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751832AbeCVRyT (ORCPT ); Thu, 22 Mar 2018 13:54:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Mellanox.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=oelpIiB24bCfSzGfmHx61Lo6tTWqVUPSPDrWrkJP9/w=; b=rAzSyGoVdvdvHOIL3NwjOAVL91SIpNmIrJn7AdQrEukoGxdt2WsreNNAhdBCA0LEjMVrqxw8sI7Zbm80NP889Eek4T4IpWdRM+9KsVlUj8Z19/Vceo8f2TccS/mrFU/n2XttZavT7okC/YC9NEMs2iI5nDWXKmnCiI6uUiOoMD8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; Received: from splinter.mtl.com (193.47.165.251) by AM5PR0501MB2003.eurprd05.prod.outlook.com (2603:10a6:203:1a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.609.10; Thu, 22 Mar 2018 17:54:10 +0000 From: Ido Schimmel To: netdev@vger.kernel.org Cc: davem@davemloft.net, jiri@mellanox.com, lucien.xin@gmail.com, mlxsw@mellanox.com, Petr Machata , Ido Schimmel Subject: [PATCH net 3/3] mlxsw: spectrum_router: Handle MTU change of GRE netdevs Date: Thu, 22 Mar 2018 19:53:35 +0200 Message-Id: <20180322175335.26232-4-idosch@mellanox.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180322175335.26232-1-idosch@mellanox.com> References: <20180322175335.26232-1-idosch@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [193.47.165.251] X-ClientProxiedBy: AM0PR0102CA0045.eurprd01.prod.exchangelabs.com (2603:10a6:208::22) To AM5PR0501MB2003.eurprd05.prod.outlook.com (2603:10a6:203:1a::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 41f13422-2322-42f6-afcb-08d5901deafc X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:AM5PR0501MB2003; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2003; 3:5mrOuHldF6YCadc1GTW3AMzavLREk7IBNSe0hiDUzU07abtOGAcwPoM0/5sitcuN9d7xZbwZJGiops7iJUNlmj/AQY1OM2zouoKArdfuqCV7RDTxgZmS8X23CAbmvW0fmapUZF12RIIjP37Ad0LY0+kGU9F151mIMHq+fiVEImhkuCdvICmXN8h4yegETmakX1fw00sl1RtsYJKTGabMYWPSsCgE7mxpBwN+myHHhL+u3KDW/ywDrep5O+oxpVsJ; 25:QKjwI7fIZM4T9J7TBK8Tny9knc+kHDNq9yGW0vOpRLx46EHxNvl23PoF8dA0RBvZRBfnSGlpAWfiyOJ2h/GqhMBX/UIE05n300QUAbaD4Z9jND+U9o4VzOKSI4rFDSJHRBBsAi3yyKeiNpQ7U4JSYdqOWILfEe6ZaLEuVgLP46LTRWqvblk3ou9qQj3/V1KNBgM2XLk+BhyoNLl+9r44DB8p4zgM4WpcD2YPU0+ZtZlOHmQOdGSyLMG2zrgWHhkULMs6i9wv9HF5rDAozypYvkuiN720iIiwFiSSf4CZB9poSKP2T/0cr+YPUGtzzLn0i5gFvh6CdidlMTyiCETBNA==; 31:naZDZbNn5ncJQekK/xMjCdg1TeaRE2Cy1ksSSgV66GSkz+glLczFaD34J4rRopNtJw3XrBqJpJzlVnf9PQL1sCc/RWpTkEmyWvrZnXIpen5mR2zRY3fJL8bTqQ6C9ExiuC/03ZEsbRtBjTZkBb+3nHOxIlNfH6DY3mLhliZPSCxo1RW/u+cdaoJ/7/FaU8OOXzkP5ZSWlOMneOrRGARNcqURCfztXeoocxkwKQMCXFs= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2003: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2003; 20:hCMC8030yNg3rTAwvx6KQZJsstHEV+WWUDEYQQ+lhlENsKEu+5+T7iVtPUph5AF3djN5pOv/HnIWRN/Fs2r4+nRv5mdFYWkAlMmn0uu7UbPsxPwTlvgZxsWqRcDYRAucXHvubrRmXkyETRNSLbID6EUoDqiHYnrnF866Z4PlPOU2eI8qqQeZXtobVrgbG/+VNi7KRe7p8DrTu5wKQyrqxwIfCsoZ/i8v6GZS1zDpNXw5VtJ6ZpMbeHts8MnkYA4FOe7vfJBxPtBOw568qYE3UtRGdAZa9bQrJUv3YWST5Od1svQcC4Jw4jxaDxOr8Yqk3VweH8ARbkjW2oRDx7DAJ68gm97HA4OP2orX3ctP1JLexZENQ3+wy9bdl8oKbuMdU5HHTmTuG5zf/YheNww7D+hXiJlJuYQOP6lrQXLKKbxBqNHSwPrKUTOPo0yTPcStUT3Z/U55lQr6Xb86NPtzgDmreH/EYBfccb49XNd7MqDia3GDpPAz+8oplsQ9VJve; 4:q4Ploxll04VSK9L/AuCAH99Mms9cZqddF32p4TREzRuKiRBwRNYoYEUAry0JMcJ4jzC6DpQ51pKzpZzwTQjoj/Z915Q2kVnD9p9IpqdymYWrJTI+mWu7ItHpDqKaTXZBVuQjK54b72tgtpp832LMXNKBNXdM32JK/bJD2NArUy1GxlzU23MEuVQwQJx+x82HAu/e6gK2kaq24IsL7ICayiM4SqdG6sIJ0/xQIpNsF+0vpIEGHc5igLWTZakCR5QBAur2HDYUOX5xg/OqCViePQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(20161123560045)(20161123562045)(6072148)(201708071742011); SRVR:AM5PR0501MB2003; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0501MB2003; X-Forefront-PRVS: 0619D53754 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(376002)(346002)(39380400002)(396003)(39860400002)(199004)(189003)(97736004)(6666003)(86362001)(575784001)(26005)(2906002)(6916009)(47776003)(6486002)(66066001)(107886003)(53936002)(25786009)(11346002)(106356001)(4326008)(51416003)(1076002)(3846002)(8676002)(7736002)(50226002)(54906003)(6512007)(305945005)(6116002)(36756003)(105586002)(59450400001)(6506007)(386003)(39060400002)(53416004)(81156014)(478600001)(81166006)(50466002)(48376002)(5660300001)(8936002)(76176011)(68736007)(52116002)(316002)(186003)(16526019)(2361001)(16586007)(2351001)(446003); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2003; H:splinter.mtl.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2003; 23:L8Uw0rfdHO+MxFekN0OJ1HH7sKbkMnVWGFnrCzbjwUu79x3D+hWGYbkeCeQ2KNKcDCjcCL3t8K2uvXQAzB8qpKm5NimKm9HGkcs9RIgXaxn4KN3AWK5OsfP+BqY7f96uiSubtY2SyJ4e/IimRw+SyuFxOd9TtUrsNRP0ZHC8TpIvqhbzYadiOuIVg4voScMil5SvARa+MJF68W65bbFK10kCEZUUvjsPuyn/yupFdASB8VWH9BXkF1mUvc5n3KB1soDtKfOSHN30dDBgovJFCiECB57VsGA9X2kbp7+2OJrBF/Xr+hBlQWwo59wvK/3EyM6G79mD6FlGaAoOAhWBtDOJ+iPd4W5jCNZIN/aITdwHZyo4/AUsRwrOhVO/qypb4HErWgYRO7ho38ZDJHjOFZNIuD30aQsjvod/U9uF41AyWUGWJZI/k1IgQxYfaOl7o0RurWKEW44oRt1s/QGlvuYhEzUEA1auttDwCx1ASP7i4d6jDAxIvMMaOPW6hNlSfsxXEbs0TLeFrzwz4ndRziulP+wT5jVNPwk6hqF524jTZr8BJnVQ7VUVZ1kzUM1VyRYqvIC286qQy8YE2LtXrjz3wzh8QAohwOhHvR/8psByREmvAWsbjRBJrkJw+HmbEIF8zai+J6p3Is8T1u+saarpi4Gtq0POBnW0fg8ePjv48jqqx2a83x5ouyN7M4kGV6ywtu3LxMzrk4AutrP/DlgN6Uh+fdq2I4Eg9aCTF8isLBm8a2qxtKqP1l23UsAnaxKCF/aeTbbedXSPkqvUjs4+vCkzu5/c1b3Ga2WOuBhcSlA0Z3HEHqD5ZEYgRLrup9TuogdgS4CwW4Iwyfv6GW76oaqzPuuV2sHBJN6v37i8WiET1vUIGqaeN177oSjh3GWyILF0qh1OA5ev+msVaKzhCV+oiHUQyCbc3QwvfcQRjudb7t8e0bw3gSrE7giAvjODHktEPa13+836CEyXzuVusRH+tQWqrp6P8eN/XEn3QxozfLsGiA839+3DKYdSiz6IsmVFzL3nil5H+WPGV/dSeefdKoVOXEEjNG/0/btkL5Akyxlez+mQ0eSzSoV8GzsyrW4jyP9/xH4gd0pgwSopHur4/K0mwhpv52uIyB2naAN5AopV9Hlh1ik6LNJjZ8hKsnaNynqnmHJQ27VMgKHdM4ZFARdhmK+H2v+IKEyNRVfpDfcqLikTSVrVs3d1MSW6gkCgSWeYgkBYhUE/sGzo8tv/PLRtF2u1bcTP4VntiW8IeOzcYdqnxvDCuapJoimio+5BFrvN5aRikLGXcOgdJat9DUt9rFFrOD15y/8= X-Microsoft-Antispam-Message-Info: xTQ8YRIxhH0EjZgKdGCjSBx9PS7tUTxKlg1WKS/R/3woP/1KrkIrUA5FA3SsLqisjUEYfzvsE9YamZrvJIipDbkuz+jPWTLWwuBe/31T09iuBYK35VYYd7m8Ghs0vUbsgtptUcVARdYh99CRxGEFOfGPulNNo01q4nsLXSTIcqQGgnPt1N4LAKgXRmh/HXek X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2003; 6:WiitVwggIe8PcDUmg4QS7gAUfpfTN01orDU93W4nTv7RYfqx2SW0iSNR5j+fzC5SWWHB1L0+I43HXc0NuHES1AJ8GVpU32nfu4xVvpC9dkxMPRMRhRgMsd4HjF/JhtZ2aUGa2H9MrRT47SZrPxCm8NbHhixhs2+PFSahz+fOT3p8qlprzHVUt6kmfLg8TUxkgFd8d8jidJzfjfXGDcryj34pU7ZGKbCQnIeQ4wqu4GiTNt/1sLzTyr/zpO1OyMCbCeXYk7Hkg1aCXe5R3LPnvODlnpwj0G5pN4PPYAMNW3AcNlmm/mdEq0nDgY5vzCstM2txRbNEm5wGTdJ4qDVqY8+U+qTMXMSkMYLDnZtRYw5R3M8ecLRRh5ISfctmyjl1rI8Jrowg7N/ssnIGLZ1LaLkz19KtV66kfIvBsdnZDE2BS+OiAgw6Av3ubWV80wVedXwxZjFoSpPl+neTKFcWcw==; 5:2ZtLwSxqV6wtnl50velyPUBY3Y/sCAKXcxcc5DfcrnNi+2GKGZgHuQUADPYbydUlBGcUNSeFN8KPNtzkQ4HP1ENe7c39mv84j0koNZWKjOPNsUrmFDhdrzHCdUXm6gBQRubN/0VyW9z9HfgE8T/LUUkcrtQnefNr1y3ya3UsCtM=; 24:S+660Phr0MvfYfs2G9OpzgaPkPBMR0SzDSVV2EHYD6C/SCHD391iNdOrn3lSfpRDdUH35nPl10RexvAjHwiAiYsgjJrXuXY+JTyXLDz/TCk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2003; 7:QpOjW5ysI0UmD0wtTZohaZQC72eaQZGP8fpG1ciS00DUn+DLA8b56LvXXdnElmywhbPGXgTQx96VUWTZ6fdXkVDqWQObiq1WarG1pkquqGrZDwmIAm1E+ZEPxM2aRBjkYZ7+oEWZCEha8IxwkvadvqQPLSgFC1B1epuOGAB9U6cFPJc4BpiNkCpVyE6NZW0VOrcpzTlFuOnBcN2HQJy5dnbQh3XPlZNLrtjQWbE4As4zgWO89jZYSuDiGEEYBDNW X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2018 17:54:10.7735 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 41f13422-2322-42f6-afcb-08d5901deafc X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2003 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Petr Machata Update MTU of overlay loopback in accordance with the setting on the tunnel netdevice. Fixes: 0063587d3587 ("mlxsw: spectrum: Support decap-only IP-in-IP tunnels") Signed-off-by: Petr Machata Signed-off-by: Ido Schimmel --- .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c index a7d0adf068ec..997e24dcb053 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_router.c @@ -1407,6 +1407,28 @@ mlxsw_sp_rif_ipip_lb_op(struct mlxsw_sp_rif_ipip_lb *lb_rif, return mlxsw_reg_write(mlxsw_sp->core, MLXSW_REG(ritr), ritr_pl); } +static int mlxsw_sp_netdevice_ipip_ol_update_mtu(struct mlxsw_sp *mlxsw_sp, + struct net_device *ol_dev) +{ + struct mlxsw_sp_ipip_entry *ipip_entry; + struct mlxsw_sp_rif_ipip_lb *lb_rif; + struct mlxsw_sp_vr *ul_vr; + int err = 0; + + ipip_entry = mlxsw_sp_ipip_entry_find_by_ol_dev(mlxsw_sp, ol_dev); + if (ipip_entry) { + lb_rif = ipip_entry->ol_lb; + ul_vr = &mlxsw_sp->router->vrs[lb_rif->ul_vr_id]; + err = mlxsw_sp_rif_ipip_lb_op(lb_rif, ul_vr, true); + if (err) + goto out; + lb_rif->common.mtu = ol_dev->mtu; + } + +out: + return err; +} + static void mlxsw_sp_netdevice_ipip_ol_up_event(struct mlxsw_sp *mlxsw_sp, struct net_device *ol_dev) { @@ -1687,6 +1709,8 @@ int mlxsw_sp_netdevice_ipip_ol_event(struct mlxsw_sp *mlxsw_sp, extack = info->extack; return mlxsw_sp_netdevice_ipip_ol_change_event(mlxsw_sp, ol_dev, extack); + case NETDEV_CHANGEMTU: + return mlxsw_sp_netdevice_ipip_ol_update_mtu(mlxsw_sp, ol_dev); } return 0; }