From patchwork Sun Dec 31 16:14:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 854224 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="Hr+1y4u2"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z8lnb3Qzsz9s84 for ; Mon, 1 Jan 2018 03:16:35 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750986AbdLaQQ2 (ORCPT ); Sun, 31 Dec 2017 11:16:28 -0500 Received: from mail-eopbgr30047.outbound.protection.outlook.com ([40.107.3.47]:24032 "EHLO EUR03-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750923AbdLaQQ0 (ORCPT ); Sun, 31 Dec 2017 11:16:26 -0500 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=ggsOuXQfj8Is46+6aYhbrTqUJF9OTBDw8TzuQ45E3tw=; b=Hr+1y4u2Vp7UjjZUY3j/lRGsMI+vjYH7YWjUwpPrCRbJzgLWb+0JC8xI38X5lzIKWOsYfHAHrDwD47OvlPd5OWlbCRPIX0sQDkVaIF/UO9nmRhkRjEgbiP7U3RxUBatS7z35Z3naN79/3lWFJWTSSKzoMFQeHIUHUq5xjDHtAz8= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; Received: from splinter.mtl.com (193.47.165.251) by AM5PR0501MB2001.eurprd05.prod.outlook.com (2603:10a6:203:1a::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.366.8; Sun, 31 Dec 2017 16:16:21 +0000 From: Ido Schimmel To: netdev@vger.kernel.org Cc: davem@davemloft.net, dsahern@gmail.com, roopa@cumulusnetworks.com, nicolas.dichtel@6wind.com, mlxsw@mellanox.com, Ido Schimmel Subject: [RFC PATCH net-next 01/19] ipv6: Remove redundant route flushing during namespace dismantle Date: Sun, 31 Dec 2017 18:14:55 +0200 Message-Id: <20171231161513.25785-2-idosch@mellanox.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171231161513.25785-1-idosch@mellanox.com> References: <20171231161513.25785-1-idosch@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [193.47.165.251] X-ClientProxiedBy: AM5PR0502CA0020.eurprd05.prod.outlook.com (2603:10a6:203:91::30) To AM5PR0501MB2001.eurprd05.prod.outlook.com (2603:10a6:203:1a::11) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c7dc99d5-2a10-481f-9ae1-08d55069d576 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(48565401081)(2017052603307)(7153060); SRVR:AM5PR0501MB2001; X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2001; 3:Z47S/349WhJp5DIMZbhKK3DiZLbqc+wdnt9FbxHHPaBrwdGBUdk75DzVuRDiLggj1J2JAOeTJdjulyDPQnZpM8p0aOu5uLvt5526Bil1jH5Qtr6jZ7xAkdrTViPeKdJAg/1GPrta/JEwAXScP10lRL04avTIHXT0Z9C2oqFcDLdT09alRXlujI4MKWuo1oLN35Sc2nQAqacexj34dhG7DD2iy1DnsdiH//v/ao6Jo8VRlwjT6E8zaKCrY82w4aBD; 25:xSmhdqnKxUwjilDDEqqMFlsq0u6CVFr2/o43RsfGyVdBEB/Nf2cmZRj6TPa62EJHpRMRpBVfqibcTM4x54tKo/M3VNThregDmFRveycnDUMT1ZmGP3Sk6MpBrdnMbx7YgTEFltPGttCBZGWPkwnNbHGGqrJBUgLX2jH6VJD64QuQMB+n0RobyMEuX14MFDd4lz75/xmWbulD7kX59utOUFazPu4z8F36VsFSYJH7Tdj6dhjN7K4zvSwf+mKFjKvJpfnz2nIT407p7+mz6YVeEu5BzF79/BJG6ZqOxL0K9k426kcSl1Ae7vtSC7llpzL0M8pZWbUPO0XuLbTxTZvRnA==; 31:FIzq5r+rRdyqGjY4oOGpWv2DqBrc5N3ivLk/uMHMI7q+XGazrqB8K4m0/JS/TdQ3z2/RbRJq+K094zYnCLwZGb6zI3CMcrAEnEvDq9S0Nfn1W3APOnF8uRInXb+Ly80W76VJfUASkP+ImUDNwPimeZ4yEpzyAEzXZeTSG83AlI+MQVq3nBVvvFopzRAT8CaB6oEO+KCa6B4sNn/RpI8QKy5i9T1Asi0gSDElYM9P51U= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2001: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2001; 20:BietgeUUM4dz1Gjo/4ENB+FVSlJnrqZtMuY0S0WaGW3dRFsArN8g2+C2Gj7V72lHuiwGD9Od5UOQUxtFwxpJrfZX5fCu3H91v6JAIhx8IllKVJccDefnTx8+eU4dotjPOeZRfKQQAc++WxLpchO6Lqwg26tbCffwhEFjTjMEklQw7xBH+k87SOaKHD5yzZ9CKQ2IsuousW+hBVZLgX9w0iaOFEgHrtG6CZbn6je0c6RIZPx5u0VsFzYzTUAjA0byN18U8KLiqrdjzI5bgXaJAd57zkBNMRxunblkC/QdQojgAKlL57rKwjzr19XIkZNej4wbDOjIDbgFzZPTt0Xj7N+4XZ5p1wE+ab6kjX85WmuXpeK2sWlD4BAPxChmKI4AG8FK0KyYubyqg+w8H5oJ15zlrK0At2N/L/UZiFZOLLu1DAz7+AQKpabRa+zECO8jXH/2TjrXubdgf0WU9qRtEctj+JYY/EAfUUFPY1LQxZ0i02jQ4zAv6G83NMVp5q/P; 4:fdKEFNR/QjgYx+OLkN+yoZkQav71opMPAXffvtirs1Tk5wWJvAwbkq2RASMmGouH7kUfc4pOgoZUB1ZhYO2hV48na8DDQAnpYzTNXX4PYa3/qJ66D7FqhKtdnokVZdPvQC0kQNcRsHwT1afEiTAELL9ChO0D88FjPmLR7UFnwCzWOWUIFcfna/xu7PNb/JIgDdFx8wyXAyx6oYJknzvF9rTmbvNXmr28iEAu5iJB/HpvRMv8tmJhbRTbHR5iEga23xmsSlR8qyR6AkNUGDw0hw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040470)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231023)(944501075)(6055026)(6041268)(20161123562045)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123564045)(6072148)(201708071742011); SRVR:AM5PR0501MB2001; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:AM5PR0501MB2001; X-Forefront-PRVS: 0538A71254 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(366004)(346002)(396003)(39860400002)(376002)(199004)(189003)(106356001)(86362001)(305945005)(6512007)(6486002)(1076002)(316002)(81156014)(2906002)(6116002)(3846002)(16526018)(16586007)(8676002)(5660300001)(47776003)(66066001)(25786009)(6916009)(2361001)(39060400002)(68736007)(105586002)(6666003)(36756003)(51416003)(97736004)(48376002)(8936002)(4326008)(52116002)(2351001)(7736002)(53936002)(478600001)(386003)(107886003)(50226002)(50466002)(2950100002)(53416004)(81166006)(76176011)(6506007)(217873001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0501MB2001; 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; AM5PR0501MB2001; 23:Vo5W6qnKWhdXwCwy+2b0hIM6QknoEOvUcTkhe1NNNn6wPd3POK/z3+gXI8ThwjMtCy+YUpTnurCHoakyRP9IjBbDuH4+Kd7OUutS64i8b0Kuu/G9sMzbJKNsSa+BiEn7WMCMp4knR2ModLJYq7/tK49VGYk9kAlzlkaeyOgHRu3MQgk95iFd6pKVS4YKYEvECzDnDb3pPkpNnT3e0634GNqc7ThsAiZ9N4uletF9STlCAbcY3ZdotuQ1zXXYEEFMmWlJiaFjK5r+x/XJ5keyAIrCt6B0+w4smf7SNwx682edy9qATil47qh/88wueyn7LyxXKEAgcWEuIRA1Pcv9+ROd49+40pSuJf3Y26hg7dN8H5NztxDpFy4l6gpujGAlthXvtBc3g/wLyQxeg+zyRPLwvzI/MJUvmaBaljfiqgP5OHsgTt3TI/BHimLD+FB335b0vzrqrZe6jD0AZE9zmbK8tMCNHCGQoEaGRCRHzWlo0l+R2xrslSwzGTlwudAFxIv21kPSSvgWwHEtO9UVXSnX05TwzNbrHDMy67pWUehiwD8TK0c202fijoEEhM1iFPC9/8qBoaaDYHF36rTXemfiCnyXZEXSUkX405g1lTdV/OkatK2qwTZzV86BeTCewEzxdjyPlttZXlEelGJOzB5+OxHOSotJSmMmbWZqLkjmVCdiT/FjepuPmFVTv9SJ3QRsY8FO0hKSNbyQK0HcWkiNiIBXG+CnLuagXiweslndl3Y5nlwab163GsSSi8aXuPs830GBIjv2bKaAql9CTrQqGgY+meXIuJivieFNyGFqbylb/7JPSrBP5UWh+aYndEeRIN9WfEKv9fl7ogvSMe93ZEP2u2vRkOL8cG1PY4k6BdjjI0SyWlE5VN+96ThIIniBTxeyf4dsfrccsave+AwlbCizpGjSJLDYbg4d7EX705kx1xcqjkQ95ZjdSZri8wiTNcFDKYvfO5WZ1Tlmrup/w07T0R6XgFO+OObm5gu5Y66riV9wJg6MIfTmIdi4TcxMdcZ8epi69O7K7m9xNYEutUE+L2Wcg4txDlhvCtzMoTcQnXQj0/slqPCGpQ41MuDa+g7iqtQcGXK7iDZDuA9Qjd4v3QTi0gNZ400p1Et1koq2UYI2OP/qBp4zweAzt6kVrk2cnaco2HAZ8YStg+CV0jasGJfspQOpSWqRqRAy1fOZeFTyUQoLoKVj036oQXcVLxZaJUnr6QXkFOQinw== X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2001; 6:fuWV6yRE6lLwpRwKVqekg6yGQw3NMAxhPe+tLyAqEffF7+kxi9sZtrTNk3i44/0SdPa9kqipG3KWRJk3D4XpofsL2GZKOSLGXI4rK0j9m12hw23hi8hK7EPjRmJGGKLck/G6vW8hfRFffQoVWlxUmGfNWxAQ+pPCpI6RM9Fq/5GpcZ/RSWp0EjiZ3S6Rh8xGvZ7NLVnqPlJGR6+f9JUB1cxi3gJuQ4M6Si8lC9hcAtQcwoM3D1VGclthS2rl7WS9NuVDitKTLcksP5pkLkvVfa4ygwFydTFx0S31FOzcldz42C8+8BTAwBi3xLhYcmx4GWQcbJ118fs0NxrY5d2HJX9n9Ph6AalLcZ8EWo4hgs4=; 5:B0tsyYVlWhXTW0yLYprqSPiuZF4PxewEB789h+tVrEiHHMgyUxbrNjobuOkrtSRiwqZGS7MfY7fzys1rpUQ8/UBQaN8iWCMgeLLJGdfskhyOOSmdXk33ZnveTLdJKSkKvhWEOzN4cWYl9xDQCcK+To20JxGHSZ7I0s8uanO9gcA=; 24:BgOuTJOj5MoOwL27PllgYgbsYgJCukwbe/BNFihujaIahbIHIC7rQEjc62xFr2/FxeWOKaAf3OWUjEvR0oliVllr7B+0yFBMFBDeEO3s1x0=; 7:Kksy8KtP1IZmMFKfmjkmfdBM93uEH9PK2CoHO7KTM1QCPoQdxwZC6EHq0th/zD9JpP96Cjj00O6LHAJsjtVw5T5ICclANbbgoH6q1mDo5NTt0sgPYtErRc8MVhrpeK0V8iPOOoNxResVdBVURI0AVTk8dQ/6D3VpuLqGDEsF2b0ysygbjPL8Ywl2/tWqtnthwlsXuisHZK8kjaTpz6tosGYL7BiuqjY8OISj672PQ6A4+JhAVcN3prw9xI6Gvd0l SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Dec 2017 16:16:21.9963 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c7dc99d5-2a10-481f-9ae1-08d55069d576 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0501MB2001 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org By the time fib6_net_exit() is executed all the netdevs in the namespace have been either unregistered or pushed back to the default namespace. That is because pernet subsys operations are always ordered before pernet device operations and therefore invoked after them during namespace dismantle. Thus, all the routing tables in the namespace are empty by the time fib6_net_exit() is invoked and the call to rt6_ifdown() can be removed. This allows us to simplify the condition in fib6_ifdown() as it's only ever called with an actual netdev. Signed-off-by: Ido Schimmel --- net/ipv6/ip6_fib.c | 1 - net/ipv6/route.c | 8 +++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index a64d559fa513..3bbb89d8187d 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -2103,7 +2103,6 @@ static void fib6_net_exit(struct net *net) { unsigned int i; - rt6_ifdown(net, NULL); del_timer_sync(&net->ipv6.ip6_fib_timer); for (i = 0; i < FIB6_TABLE_HASHSZ; i++) { diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 2490280b3394..c557362daa23 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -3470,10 +3470,9 @@ static int fib6_ifdown(struct rt6_info *rt, void *arg) const struct arg_dev_net *adn = arg; const struct net_device *dev = adn->dev; - if ((rt->dst.dev == dev || !dev) && + if (rt->dst.dev == dev && rt != adn->net->ipv6.ip6_null_entry && - (rt->rt6i_nsiblings == 0 || - (dev && netdev_unregistering(dev)) || + (rt->rt6i_nsiblings == 0 || netdev_unregistering(dev) || !rt->rt6i_idev->cnf.ignore_routes_with_linkdown)) return -1; @@ -3488,8 +3487,7 @@ void rt6_ifdown(struct net *net, struct net_device *dev) }; fib6_clean_all(net, fib6_ifdown, &adn); - if (dev) - rt6_uncached_list_flush_dev(net, dev); + rt6_uncached_list_flush_dev(net, dev); } struct rt6_mtu_change_arg {