From patchwork Sun Jan 7 10:45:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ido Schimmel X-Patchwork-Id: 856513 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="GCW4SpkD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zDw7t574zz9ryv for ; Sun, 7 Jan 2018 21:46:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753266AbeAGKqs (ORCPT ); Sun, 7 Jan 2018 05:46:48 -0500 Received: from mail-eopbgr00048.outbound.protection.outlook.com ([40.107.0.48]:42941 "EHLO EUR02-AM5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753182AbeAGKqp (ORCPT ); Sun, 7 Jan 2018 05:46:45 -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=GCW4SpkDBUL0rN93XQqtEC2dsGZOP8As+1QXoRsg+7CqHDPGU2cYu4ktSvcpieoCBE6XLkPuWYzpfiIjxUiA+B1G89VeHY4pdsR41GfBqdIf8pAiOkuC1uZz5Eo2okK777uJgwowhBeJILad3FSSOnrF/mLbhGk+ODSn9X4UWCc= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=idosch@mellanox.com; Received: from splinter.mtl.com (79.177.48.236) by HE1PR0501MB2012.eurprd05.prod.outlook.com (2603:10a6:3:35::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.386.5; Sun, 7 Jan 2018 10:46:32 +0000 From: Ido Schimmel To: netdev@vger.kernel.org Cc: davem@davemloft.net, dsahern@gmail.com, roopa@cumulusnetworks.com, nicolas.dichtel@6wind.com, weiwan@google.com, kafai@fb.com, yoshfuji@linux-ipv6.org, mlxsw@mellanox.com, Ido Schimmel Subject: [PATCH net-next 01/18] ipv6: Remove redundant route flushing during namespace dismantle Date: Sun, 7 Jan 2018 12:45:01 +0200 Message-Id: <20180107104518.31693-2-idosch@mellanox.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180107104518.31693-1-idosch@mellanox.com> References: <20180107104518.31693-1-idosch@mellanox.com> MIME-Version: 1.0 X-Originating-IP: [79.177.48.236] X-ClientProxiedBy: VI1PR0701CA0039.eurprd07.prod.outlook.com (2603:10a6:800:90::25) To HE1PR0501MB2012.eurprd05.prod.outlook.com (2603:10a6:3:35::14) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: a9a0f74c-f81b-4dad-2afc-08d555bbebc6 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(48565401081)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:HE1PR0501MB2012; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2012; 3:zv1OCO88IToVMtRZ+oPRq0Hx+MexaDOGjDHjUHzMH0hcKLPm4n5fIwNWPjOy1ZX05HBT3Cy/n5dCCyKCggpuGp0tAzJItFvyhVwzRgvd7kHFNzdPsMC8jnffucMm6o9dQy04nrkWF+gVVYICdxDbvoJIN+bNVu9DyonAXVTB5nBVp2evJ+/5gWWndPIVIbdNcGBAqP0hMJ8UPt5AyMb0bcT3M2Vfo0VJMrqiBej6Er5YoD2Alh2RBlaZj2UCu5wc; 25:s0oGNzwWIx5DnGDGatBe/pthBN7kA6bwJ7KQZIcZ8Q2pliUH81H6FaaNx1atrkvLCHSBCicTTMxbcWhkX72EMxXKhQPBl83IQiz5n9G+h5pqjd71Av+sRmnLvXZk6RPlA+4fA/Ro73gMVzcDlX3v6AgJcckyOf8jeBGfcwOU5QcCE8+sWHR2fs40ZR/WYaa5+rmFQwbf+QHw0Co8wlA+Io7r3GslQKflvr4azrBUc0PHx0kUxm8O6xWqLwYhcF/Ry8tMb1crvCwMBVFyiy3GSna0/xD/WaJL1MCELzGaosCkH/LZOP7MM/znVwz+vPUoP6ghrKrCbDC8j3pSQGrjAw==; 31:jB2i5PBlbCIxuIUn1PttbvxyubVnB2Vbf+cCREXJk7kWg9jfGcYWRE2WKGxXOZLOh7ql1bhgUqWw5Mx4Cfj9yqNOsWsZvRB9wCD0p5iH72mbn56EHTldkSIKY9gZ64VC0kkLBEjmsvdkcY/qdf+hAkIlGGeIYwoN31Y70QDHyRDHaBeiOEnX+/5FAR0UDntyjAel52jCVL9NSnjW2TCKoL1PzBuE2geTJvIJmzMZt4Y= X-MS-TrafficTypeDiagnostic: HE1PR0501MB2012: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2012; 20:SOWEQ0dIpdjY0v3v9SnvrPu/fZ84Q1OTBh7UUvHOgbrlfxLYmhhLDLfbFV+u0SUxA24zorMaIydsyYtagWzbrtKrxmDnSqWjdMEoX4X2psStRDR/jufw7VGnCpTXMCdV1AUboJKiGYcHKXi6crldN0cTXxDN4/iwUMeHVueBJS4F0tJbR9l5KDyIZVkdN8vvQq0WC827mLS8lgE2uezwI0DYgawLQSZ0Ptl2rntDwFhvpOrAQ4pu16WiMORFp5czw3kXopcPRzhBOdPSdUho0B6qxitva2CukkQ485/CTp7uWJHxLsKA42tmV/5BH7xDNBVcV0je2RKccJmYLxbRf/aA/6XtoA+lRVUNFk2D9PAYwljcLW6Q9dK8r+HYDluF8Yi8mXs+Z5jruqBP2tXfpJP0l3lLn2hGjd3RuIDeaQminP0A7ayYwlZb9JcRKLQGSbbFKSnVeEAq7THbXwtqvHpgS8n+9whs20f5Bw1bNn1NYUD56tixWI97YALANzCw; 4:ydUPwE9rBtgn/KTjzhqZbFbfURDpZDT+9U5NBrDMUmqG7Nz8iqlITePkTMLkkIluqBGS2CPahK2mGM6Vg1HnxtM95i5/+7GSjeBk2n/etj137f0RdlGts1xdsOJnNGn/b01jW6D13kFKPZ8e0eiS61cpkqBt8D0WL8IfXmvmoMW7QOWgxWapqUt2LhV1qEX/xWtRB10L/OjEDUJTqi9+2ip9orGnzUCMjRTg6OX6+NKInXrf/XgOLs/59lSSASgH34w3OE/dOnxWDhY1/wILaw== 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)(10201501046)(3002001)(3231023)(944501075)(6055026)(6041268)(20161123564045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(6072148)(201708071742011); SRVR:HE1PR0501MB2012; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:HE1PR0501MB2012; X-Forefront-PRVS: 0545EFAC9A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(979002)(396003)(346002)(366004)(39380400002)(376002)(39860400002)(189003)(199004)(107886003)(106356001)(76176011)(51416003)(50466002)(86362001)(16586007)(4326008)(8936002)(68736007)(105586002)(81166006)(1076002)(81156014)(2361001)(47776003)(6486002)(6506007)(50226002)(386003)(6512007)(66066001)(16526018)(8676002)(2351001)(5660300001)(53936002)(7736002)(36756003)(2950100002)(6916009)(305945005)(97736004)(478600001)(6666003)(2906002)(6116002)(52116002)(48376002)(25786009)(3846002)(316002)(53416004)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:HE1PR0501MB2012; H:splinter.mtl.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: mellanox.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2012; 23:YvNyZACaASXz8YjjK0Ctd4hAPaobVHdNSns7QxZmc3vAxzcG3yFMChNhvmy9H67O72TJJrxXZeOwYnsecu8dSO2jgcoVRyF9rL2y4TOnx29N1Vry+X1ldCZq/W2SLbqFgZtpt5ymL4PzRnkR+CD0BQvkOpJ5i3MaCfv5WOj1/ZVtQfIPL41KcNLVl6dnLRFtpJZjZ64zMKP6H0cEarAYt8srxgSECoMVEU8cDxfcdYCJOWv86S5PNg+vn99JOybxMn1t7STUqHwG94oIFXh1I4XDtHUA9LlKvTRKa9SCQB7FSgsc8Dm0MNh60e8ClD4mS/oOATRhxQlL2cM8GzlnXVc/TNa3lXzY5C9ipVoqnoyqkByyN2wNdQtxEvF05T2X3orsRASnWKdtcplqkYyuil85jih6WD6gzPKeHvqfixsSasnl91QO9P5si6+ZiFQh3ozTF3BjsYVUfTWSFgJGTNG7h7yC9de+jdnxRS4x0RC28ovHX/lIS2unF1aDiDP5nR4MNecWbJ38F8EK8JuvnaQL0tscfK8ZgbQaV+vkS0xHH1L7tDH1bOMZ86qMuGrDEXxY/hQupmfN+Wqv95at7IikgsJnCzY4BDGDRrXBJdvHkzH1ChE91RwfsJ39eGhXYWL0SRu4yYPjEreeF4kVCY6tWKE06AYzfyBAM2rg8yi7M4EYM5I9pLFFhId44v7kKRHhZUR3Q3GEDDOEfiuYqS0wswQ23F1hLKSibgTbBt5iUb35NYhFxB3DicP/YtajLuvJ1CU1XWh3EneRyUvjxooMMJIUdfP8s5/W7BZTW0GFb+lmIlWpUsPv7J0EqJSKGB2FtPWCN+OSee95aFSh2ragmM+bVZ1u31zs79gMmp5IUfjscVqqAL3CFUk3EQ+Ow6aYf0jp+zs80bUvRvSHHiX4H5vpAsyPeWzKgPPmZmjdt0Ze2rZ4dimp6zvDkwkPFgKwIiMaocds2ALCi/OB61Fyn8MP94CKGaBrWmH66YM4kVi0eybgq8Q5U7WylXo6iYOm5Tx9uo4i7YxOnymq8BJzEljuab/YQjnZlnVrQXYsUeJpiVNzuV00x6T+dUCU+6o1VuuviZFe8UP5oltCwsuiCTdS6w7dA4Bvm4l8YFXsL0LjmZkoohuDwFU03K2m+KHkZZpB9e6/1r32d9A5zDfjyXKMn8JcnCNPZkqaksYvA9FVEtMZDMLu2hu6bb4LGr1KMFwBlBv8HQz6n5d5ZisjQp3th7OYlMVLzzJbFpYf2GnrNq6TY+c8nQQaK9mZ X-Microsoft-Exchange-Diagnostics: 1; HE1PR0501MB2012; 6:JlKkaY6a1oH39A7DGB3EtlfH4NTGFXAeIOxsUayloaB09SpNKEiWO6wdFSPA3YXRt2JF9apCe9M+8WtwXOnjvHONBcxxhcCRlMF/JTZ3QBxRwvbPZ4AQE8w+W3f0QoD3bJYtRVRQr92r4xEzCb8H6MBM5541LUsGa0IeqidxuauZILfsxGYG0zEiZIzUfLE07+T7rb9t8Q5JJEYBkk3eKKbGB26MhFKb5DEancFNb8wOkeRf6dMZzdxU5mGbbywxyFOxe19Bve7SAiwGXnufDqS5GyohzYRuWsgZb2EtmDOKicI2rhsOoty1BPoshAxsg6il5ChD4Vf5QoO9R6S1vV3R1G8/xBslQ/M2B6Z17no=; 5:We3LYKppCvwKUS92V0TnIVNvQvwnYCT+H3wIz1CCVwUOIeWLYDaQ3qqY1Oil7cLoDGceE1z2wcINN9EYZD0GLxNSPoFturrYaGDQ66bLzlhmU/Ewh2il0EIKYCkNlbiaNGJWe4IgdM0qah70xJkaZETqVeHLVO5giMA7caLXxGI=; 24:4UX9JrKFlkDwv6l0B+1MP4qLcMIqIS9osQDnczvV9ackQGxv4w32jrHZHw37tCafTWvCdiVLdJNGr7SuP3cdC45bz7iFwkSwlE/t+Bq69Dc=; 7:R0QxqCJ0Ew7PEI855jO4LZECuiFMDtPKQ6K8HNIeC3VnnFVDkJ9dTiqezeko56gO0gJF0QwjLd/yJsVKwRkCf40uclbCvap1B4H6P3nrQzCXWTbRBwe87DElu2RAktg1GK6Pa0ImcIoKmJEClEnS/Ze3gp7KOPxXbpa2t0FZZAzlKrn1gVxPZI+EXJH4x9DD+gDIGd3tpwzi+Qm9N6Lcb8sw0ZKy0+lowB1C/H3Y4gdQRj1An3AnC8iHZhcSe/Q6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jan 2018 10:46:32.6764 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a9a0f74c-f81b-4dad-2afc-08d555bbebc6 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: a652971c-7d2e-4d9b-a6a4-d149256f461b X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0501MB2012 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 Acked-by: David Ahern --- 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 {