From patchwork Fri Mar 24 22:21:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 743402 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 3vqdFj2DLfz9s2s for ; Sat, 25 Mar 2017 09:22:17 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="PN5YZqdl"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935195AbdCXWWP (ORCPT ); Fri, 24 Mar 2017 18:22:15 -0400 Received: from mail-pg0-f51.google.com ([74.125.83.51]:36350 "EHLO mail-pg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934956AbdCXWWK (ORCPT ); Fri, 24 Mar 2017 18:22:10 -0400 Received: by mail-pg0-f51.google.com with SMTP id g2so1550433pge.3 for ; Fri, 24 Mar 2017 15:22:09 -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=07qb11OtGNZB/VtN5VAhGcdunPekNvLcl+LkRIDBrtU=; b=PN5YZqdl9sBeGb+69yWwZ83xlwu4LVa6zOeM9YzctTuzsVTBVgU3XrbH5L7qVFSqyC NHCf11TDewKK2PnOXqbLjGyyD0zjmFYMM899QFEEf7T3i3EeVQqxZChERsckWkL9iVQf lq8sYXAnIsxHqbfoQCxkrVBs66UC4lgcLLQpk= 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=07qb11OtGNZB/VtN5VAhGcdunPekNvLcl+LkRIDBrtU=; b=RjCYH9rVlbAhJuJb/uUuUMO4QzjKWido15TjM2+XlLJ/hgyH1ZQRU1Av+3KWMT/Avk /npj8Prp+cstzHHghNY/1OX0AHDllCoTdFE4si1Kh/4Vl3dawsP4dZdzlBM+h9MQ9I31 om0CraWFYat65shezvHM1nuET8gehDgAqe60boZx7v7zzzKnKEKsYI7zeLZg+MAVdaGC 7vxA2D4s7xy66A5wCvb/GZocrmLYVSgpJG3CFa34QKbieXYZ77LpowUz2+orxVDTQBiM NQtV89CNPIGz0O95EptC3XRi+giusHQKztc+Cks8mB6NjPYxh1yvzzCDxOk3QRm6Fpfo 5PIA== X-Gm-Message-State: AFeK/H2c9HSjDH1HYNQL2MoEwoWOT49rhDtVJBwJC1GLovRgssd4X3PiD8rdkX1wTDscLxi7 X-Received: by 10.98.22.87 with SMTP id 84mr12249638pfw.145.1490394123645; Fri, 24 Mar 2017 15:22:03 -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.02 (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 1/2] net: mpls: Don't show nexthop if device has been deleted Date: Fri, 24 Mar 2017 15:21:56 -0700 Message-Id: <1490394117-19268-2-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 If the device for a nexthop in a multipath route is deleted, the nexthop is effectively removed from the route. Currently, a route dump still returns the nexhop though without the device set: $ ip -f mpls ro ls 100 nexthopvia inet 10.11.1.2 dev br0 nexthopvia inet 10.100.3.1 dev eth3 $ ip li del br0 $ ip -f mpls ro ls 100 nexthopvia inet 10.11.1.2 dev * dead linkdown nexthopvia inet 10.100.3.1 dev eth3 Since the nexthop is effectively deleted, drop the hop from the route dump. Signed-off-by: David Ahern Acked-by: Roopa Prabhu --- net/mpls/af_mpls.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index cd8be8d5e4ad..3861f8dfa9c1 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -1769,13 +1769,15 @@ static int mpls_dump_route(struct sk_buff *skb, u32 portid, u32 seq, int event, goto nla_put_failure; for_nexthops(rt) { + dev = rtnl_dereference(nh->nh_dev); + if (!dev) + continue; + rtnh = nla_reserve_nohdr(skb, sizeof(*rtnh)); if (!rtnh) goto nla_put_failure; - dev = rtnl_dereference(nh->nh_dev); - if (dev) - rtnh->rtnh_ifindex = dev->ifindex; + rtnh->rtnh_ifindex = dev->ifindex; if (nh->nh_flags & RTNH_F_LINKDOWN) { rtnh->rtnh_flags |= RTNH_F_LINKDOWN; linkdown++;