| Message ID | 20171231161513.25785-8-idosch@mellanox.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show
Return-Path: <netdev-owner@vger.kernel.org> 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=<UNKNOWN>) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=Mellanox.com header.i=@Mellanox.com header.b="ZMiX8fWc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3z8lqS6XTMz9s84 for <patchwork-incoming@ozlabs.org>; Mon, 1 Jan 2018 03:18:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751194AbdLaQSK (ORCPT <rfc822;patchwork-incoming@ozlabs.org>); Sun, 31 Dec 2017 11:18:10 -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 S1751128AbdLaQQh (ORCPT <rfc822;netdev@vger.kernel.org>); Sun, 31 Dec 2017 11:16:37 -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=ujiGtoAm4JFqvPxuubl4nFUxTQRWj5PGNvf1S2ODsPQ=; b=ZMiX8fWc6NCVBJeRM5SMgyVGwrz2jU3pVtbNEBUhFkDvMYG5gVCHYP/hM4FGhQDgXaKsE8W6FIbQS41cg6WaF3ZmDVCEfYk6Nd85hxVKXO7nu6w1Y2lvI8McQhrXnYCkwazzXw1rxfJa23y80C+KSnUuWbT7sYFDXgmzAsEMsZ4= 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:28 +0000 From: Ido Schimmel <idosch@mellanox.com> To: netdev@vger.kernel.org Cc: davem@davemloft.net, dsahern@gmail.com, roopa@cumulusnetworks.com, nicolas.dichtel@6wind.com, mlxsw@mellanox.com, Ido Schimmel <idosch@mellanox.com> Subject: [RFC PATCH net-next 07/19] ipv6: Check nexthop flags during route lookup instead of carrier Date: Sun, 31 Dec 2017 18:15:01 +0200 Message-Id: <20171231161513.25785-8-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 Content-Type: text/plain 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: 8ece2c41-676b-4207-d632-08d55069d9b5 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:PNcnFLQYWnNqm+rms/rvBphxkYG+HlGVpt0730hT8Ur9786Tw1gHmyfrQ0yuBaeOZxSp8dG/+A6pwgCrbCl1JT7m1lNtbAqVXCPUqYa/35sux2SP1vIdAr+W6q0b+dYNNLb4J+P0eEqODPmq0ricAo+jYGVArFkQetPsW4FMlhH22BgA0mtMh5pe+4SCTee38Okuls9hdlue0ucPl78nzxGu3k6tWhyiHp2BwsHcGMrrt7Q60k0fVKtS9YyLMa7w; 25:kf/Uz5r9P0ztWGJd0EdSb8UXI4jqXmaLCSvwfJAszZYj/XTEYogYDDfQshdXCn+5GMfpHcQ1FLZ82l9/BllBGjkHYvdanh9HF2CEiP4L4nVSgck6nkO8f+FPoqa3MfAkLk2vNEI3f0LZEMn5mWA/20PEfABN3+mSTLNcvfYo88HaXkf1hnj8X8k6K9iV5d4k5oBJERqpmzrd+UKjFDPTmGMK1QaOQATxeR60Nv1M9c4kP5XXeJuaMX9MqMML3RbM29hyL6h0DwZ8wDow/RxYFVM5Nl7kE25DJXxagJr/1IVRLWgnLiIaWzALRJKNOZWzX3cSjlzBETFkLJL2OXwGKw==; 31:0sOvIgUWe9Ef6hhpamG+4/v717zVqmjX+tXsxLl1Mmg7WZNrwm9jhoc2ru8/Jqs4UZnSSfwO55Zsm+Kd6D2KAFh4h0p0TJVUNVf97d6aPmm2FrztlFGf8HnSbmyefx0kniHnamlzQeavpylFXHK89G8GQGQdruhCBbrYcdI90op/CXRLyM2ydNR+YPDx8N6GKang+JPylDFyNV+pp8zbYaQ47RU6hY5qwrSeBqFE+hk= X-MS-TrafficTypeDiagnostic: AM5PR0501MB2001: X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2001; 20:K7it9tmWGLe6D3i/mNTYHoFeXEPGi3In9kJMbOeUQsobUj87RChXkTahFNJGKMqCqLk8xKtjhN6NSIgBbaOjSThO1Rk723S2paRwxZFZ/g5IFcI+M4Qxu2o3DwK8mryxOe1fRPmsROik2vH+NUCGB8znkbHtcfXlc6t4T/BM45q/2HAKmQc9UyDkKZlYhYFOt03SqO5+aFrPtD68VWHV4uMD1dd3beCECjPLQKiTjEqJ29cx2JTvHffTgm9/qJddGVLDwOE5qnZsBmT4r1mm+wYcnZIg6YRt77tJ+6BNBvmkmfAPkwzD5EXWhKEOxwZwvLaoWgt/NgMad23a95YSR5VwazlEeTgsiHkMb0jeb74fx6WLeudHfySbVsOZ+BMHzkCfBlXMNNdancTKxF0SOf+MNHHkMjl0NZnlV+ENW3BDAZxENlyhV74RFuInbyfCJAdsKGpifZCvtOiy+J98YnHK8S9xUxMMZaQ1twDHo55IMPscTZVx+xgf0z35hZl9; 4:N0gbtwSy2wnqTvBDB1WUaVk6c1GxH2JhR0MRp4BrPkL8Vb/nH2Fz1shw8imkkQ44lWPQLDhydJbsJyhPdK3DVyeEmomo/ohACwcP9v6PLFXf6TzCP7jGop66MGTXsFYts0dMrF6fURJeondrCLb/szQo8g8gaujyOpyj+ZOvC034sXH2fb6EgoiC90pbZvFCB0cfglevW22wYp4SbGRpJJ3iWk1KH8iQMzosUWqaHQUzDmbWASinKlH9y0FNUO0Mkcs/5JVuA/HtyGxuNu/7JQ== X-Microsoft-Antispam-PRVS: <AM5PR0501MB2001805F932008BB7770780BBF1B0@AM5PR0501MB2001.eurprd05.prod.outlook.com> 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)(979002)(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)(969003)(989001)(999001)(1009001)(1019001); 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:eGRLDvARyCYGuBmpSLKBnPMeVymtv0J/qkbuiK0aIHRda15rsDEyBAn8RuCBH4nQZb/5fEnYQ5e4qNoQul/bUk3WODvd1akmiAuvXuepYpB33kcb+RtPrH6Jzo/eoNV7suNC3lCAPp8l1JougF1D0eQ1/6UowSIWCaXJRb2C5Yo0eRiznrz1K6e6s5ccPeDYJaA3CiYCdTtsHSqkEY7X2jxaGytX03it9cFlF1QJStCJpJMP1jjKo6/RJvO7NICv+SXWGEvRpSX1eSxLyKszbIWwKInQVabTEXKIDw/wGSQk/G7hF10egxQf5wujrbAYl12at/IMJnlBJIrS6N086oV78pbXXbGarJZorB4PvKOmAiXOxPU28UWLvIWWYTW9jziobIGRQ4PbevuRrud8xw3EVadIQl1Zxfc8bIf//IL/mmpXwF7NIUeGWTKALN5BzBPCybOVYHnwDFLRPCbrRhEkHqhCa77Naujf2eujM6nWvHvT77qwpKi92qckgqQgE5DXGNRROLWDZpQDntOEWNLokKWYv8LUi2tWsNSumEONTCWAQgG1PmPcPsHNm9I7Zj6e2eqyYgES0qi3ou8HrdteYCOuhID9pk8cL/RXRI2EqA+qgw5QVDJIXQPGcNIU+6u3q6wNo2fTkexE4Xiet5nYxtdbv50MXSv15w4nLfeQTCr8Nc2brDCPgJ9QvMjFFM+NJZE8PshLeHYcb00afBqCDtbc4/3mFSVaYS9KwQPx2eMHmZJNcQLEPyK4v4Fr62QD22+BEVkyEojFcdlpClFfH+pmeVxIQ2Lvc5tAAwjX0+JvXk6mRKQIU0/cYso4pOGgHmE8g1YmfBp9Jagmtiwq3tWsoNdGG3ujwLwe9vGGSEINI1V4kNxQ8R+PxaVqEK55WfJFk9O15IOFh0hkc1hZrghRy3pLoLufBiBnIRgplHJr+J4E8N5kxGw7s7VxKAgOgTBfrpttNBzelHPY6csh4x/dEQ/iB1KILEs7m4BVuJiLRjIkEHM1YFteiSJCPFshbcgm742I8eJjix9tBoTOwG4pcnmHVMDPMLh6t1xKi69yXgWGM8YRQ4mV14jVQVrPinm/1Ini+ZhBuhakP3p7P+wo7vfKT1+tCNVOekFc3NxA/8EuEn9LkCYaLwRYrIkBr53MHDo3cJRE5BOreiapUoCjkj9dF8/ojdCoYrSGQ5pd4ouGF4gq8RIhiYNP2XIUyVnDE30w49VUzakDl0DgJU2K7olPjdW8Riun743JhUea4YlWEgKym2gNSzjx6YKvRlLHXJLG7v7Dt2qEvX9IAQyWOp63+RmPpmd/2IM= X-Microsoft-Exchange-Diagnostics: 1; AM5PR0501MB2001; 6:Ds/wiJEoRNEhs12tQwllNWuy5WdiSZ4U1Sg/f943d54c4V06uTzqmM/RV5PX5bfHr24hm5TUSpjRRb++Z5/bxeIT0cNKo9sj02T5rGQXV274MEjfjrMTHFaTwF6h75R2JzLdeQSv/Rn9tVvBZtf1bLUphwtbcZe5iJuk43xyFQCuxPRVml5y2hnZL4FimeuNEFzzAYY437wlRcT0OjTrJSjzmPZ1E6qLLlQnxzaJwQPLAZn2Q9co4bukoJMmr3PmR/DZmdJ9scLxYWh/ZBUK5gcMLekk800RZa2sZHuIj+AxzjEWPowLST05ObQKR5spsPEtFbrLwdJStqcR/cH+p9ahwJQq1e63eju1nPeIfSs=; 5:HJohXiLaHymMqz8MrsS+sIiR5YbgN/0z0ii10soNhezWjoRiki9IjPDcgBJFLxyhvrG1w9dhERV1j88nRPK7oh1oey33nXqOlBcFeZ+tozb9OzLa3G/omwX512nsdLH69YA6A3luyqQ7jDLT+mcsX31OuPdrMyKZU7YmRrHc4sM=; 24:/le3fPIrmZWV0dQzUaJGhmF+Lbpjwi/OW4oFaseAOmLKDhKnGpArCA2/Z/RWEoOmwOG0twNhW0YhJy/2Q/4/I9K//w1mwcoRJs38/8AWUw8=; 7:BeC9IKmhjfn9kXSpTiZmKTzeBS0ld8rL1mudDUKoC1xCAztfequEGiBYCttX9K51JmBzTAKhmTR2BGJfCqn4G3DfS7ZgiujOA+tlBA2qv2W3zhCi/JY7jezdljkIvqe1Jm7ZZhM1WDaLXJeBivtSov/3eolbVtmSJFqD6B5M6d3KOXUHZoVOp52Xl9okpQiMFLD4nDPhPyxmBp3fqQyVI3svTSDJrX5ya8zDF7uNQtXj1WR1A6EUFhJEcRcbqSBn SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: Mellanox.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Dec 2017 16:16:28.3403 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8ece2c41-676b-4207-d632-08d55069d9b5 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: <netdev.vger.kernel.org> X-Mailing-List: netdev@vger.kernel.org |
| Series |
[RFC,net-next,01/19] ipv6: Remove redundant route flushing during namespace dismantle
|
expand
|
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 13238c4e76cc..3c4e679614fd 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -474,7 +474,7 @@ static struct rt6_info *rt6_multipath_select(struct rt6_info *match, if (route_choosen == 0) { struct inet6_dev *idev = sibling->rt6i_idev; - if (!netif_carrier_ok(sibling->dst.dev) && + if (sibling->rt6i_nh_flags & RTNH_F_LINKDOWN && idev->cnf.ignore_routes_with_linkdown) break; if (rt6_score_route(sibling, oif, strict) < 0) @@ -679,10 +679,9 @@ static struct rt6_info *find_match(struct rt6_info *rt, int oif, int strict, int m; bool match_do_rr = false; struct inet6_dev *idev = rt->rt6i_idev; - struct net_device *dev = rt->dst.dev; - if (dev && !netif_carrier_ok(dev) && - idev->cnf.ignore_routes_with_linkdown && + if (idev->cnf.ignore_routes_with_linkdown && + rt->rt6i_nh_flags & RTNH_F_LINKDOWN && !(strict & RT6_LOOKUP_F_IGNORE_LINKSTATE)) goto out;
Now that the RTNH_F_LINKDOWN flag is set in nexthops, we can avoid the need to dereference the nexthop device and check its carrier and instead check for the presence of the flag. Signed-off-by: Ido Schimmel <idosch@mellanox.com> --- net/ipv6/route.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)