From patchwork Fri Mar 24 22:21:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 743401 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3vqdFg5DTzz9s2s for ; Sat, 25 Mar 2017 09:22:15 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="PwO/YNW2"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935134AbdCXWWI (ORCPT ); Fri, 24 Mar 2017 18:22:08 -0400 Received: from mail-pf0-f180.google.com ([209.85.192.180]:32798 "EHLO mail-pf0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934956AbdCXWWF (ORCPT ); Fri, 24 Mar 2017 18:22:05 -0400 Received: by mail-pf0-f180.google.com with SMTP id o190so1410656pfo.0 for ; Fri, 24 Mar 2017 15:22:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Rdf0O7tiLoLSdmv+Jf9XLwRnscZkbBW69y6GhgTvJcs=; b=PwO/YNW2sypM+BENwJYvjVhkHGV0nj3GPYhT7kUvIUsRXDcEnMxL4XEKws3eWm8y+E BBo7MbogfleE3gLTeS1VaSfYCuUI7Kv5zVC6RQpjKUKdsWoxxVARu3cwCqvmCwiyVOCq mCx4udyjN69TDUx3XReGbsl/IMjipoHrZWVk0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Rdf0O7tiLoLSdmv+Jf9XLwRnscZkbBW69y6GhgTvJcs=; b=FEowHTCG/qKrJ5+gmRVxu6suq2INEBEKSCyrPRSA78/F91PDvbvSmZUO0CNEfAzHZs r30vp97gaCwGaQiMowHlr6lRBwWSxfAmENaGR8suqz+QgQEH9eAOB3ETGwr4WCVyKRDU 3A3qq//+nsj41wJ8yDTsqzACd+ykdpD+VLKpPn3DfdfphQsUZeIvvYQLGxb+T3PLZT8x r6m//mJfLO6y/ulfMiCSq+cyLw5klcM5P3LStiGKw2SjWcSEJIjmxPYklpXc3uQLeLlj taDqpVmQCh4Co7sRXAdv9KCjRCtSKmcUihQ/P7W3QBCbjiXq8p7iRi0k+esVnQQiYsFM RqqA== X-Gm-Message-State: AFeK/H08Juz7YhrFO9wyAavZT3cNrsjdmvY3betw83U42mpSdyI+hMwO9SJiabaTCfcD0zTw X-Received: by 10.98.65.211 with SMTP id g80mr11851990pfd.187.1490394124475; Fri, 24 Mar 2017 15:22:04 -0700 (PDT) Received: from kenny.it.cumulusnetworks.com. ([216.129.126.126]) by smtp.googlemail.com with ESMTPSA id v86sm6522392pfa.86.2017.03.24.15.22.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Mar 2017 15:22:03 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: rshearma@brocade.com, roopa@cumulusnetworks.com, David Ahern Subject: [PATCH net-next 2/2] net: mpls: Delete route when all nexthops have been deleted Date: Fri, 24 Mar 2017 15:21:57 -0700 Message-Id: <1490394117-19268-3-git-send-email-dsa@cumulusnetworks.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1490394117-19268-1-git-send-email-dsa@cumulusnetworks.com> References: <1490394117-19268-1-git-send-email-dsa@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When all devices for all nexthops in a route have been deleted, the route is effectively dead, so remove it. Signed-off-by: David Ahern Acked-by: Roopa Prabhu --- net/mpls/af_mpls.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 3861f8dfa9c1..74755920c689 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -1299,7 +1299,7 @@ static void mpls_ifdown(struct net_device *dev, int event) struct mpls_route __rcu **platform_label; struct net *net = dev_net(dev); unsigned int nh_flags = RTNH_F_DEAD | RTNH_F_LINKDOWN; - unsigned int alive; + unsigned int alive, deleted; unsigned index; platform_label = rtnl_dereference(net->mpls.platform_label); @@ -1310,6 +1310,7 @@ static void mpls_ifdown(struct net_device *dev, int event) continue; alive = 0; + deleted = 0; change_nexthops(rt) { if (rtnl_dereference(nh->nh_dev) != dev) goto next; @@ -1328,9 +1329,15 @@ static void mpls_ifdown(struct net_device *dev, int event) next: if (!(nh->nh_flags & nh_flags)) alive++; + if (!rtnl_dereference(nh->nh_dev)) + deleted++; } endfor_nexthops(rt); WRITE_ONCE(rt->rt_nhn_alive, alive); + + /* if there are no more nexthops, delete the route */ + if (event == NETDEV_UNREGISTER && deleted == rt->rt_nhn) + mpls_route_update(net, index, NULL, NULL); } }