From patchwork Wed Apr 24 18:40:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Suryaputra X-Patchwork-Id: 1090428 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@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; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="unMWjrbq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44q9pQ4mT7z9s4Y for ; Thu, 25 Apr 2019 05:47:58 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731369AbfDXTr5 (ORCPT ); Wed, 24 Apr 2019 15:47:57 -0400 Received: from mail-it1-f195.google.com ([209.85.166.195]:33501 "EHLO mail-it1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726157AbfDXTr4 (ORCPT ); Wed, 24 Apr 2019 15:47:56 -0400 Received: by mail-it1-f195.google.com with SMTP id v8so243212itf.0 for ; Wed, 24 Apr 2019 12:47:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=kxWKdDQkMhl5d+amyb+6aj3Kc+/Dk1IeChKXXk9Rsag=; b=unMWjrbqft09HkN9aDgdMp4T8xZ8yW5VhnS+Dfaj5CVDC3FiSE0NKNrkiPB539Imrd JD2/VHeGCLeTlHnDx/qeJrnztsm+WYUjpyKfrcpbn31/GTcNnaUZI+apMNzzUYrBTmi9 u9DaeWsn8mOfRgl8FOIYLoshGv3mslhJ9MAa9iRDJmADF3wr4gx2HfilWzOe/lrqnxW/ Tt/CDrK5Eut9wX2/OP8Z6Xqaeba8NA0uSpjqiOaO8pxqXr5ZrFPDQ0h+RZE+ximb3R+X oG3pbb16UzzjZMqPs7IjrjIA1GpgWMMu5dyRx1eTGg/JhHbCg9D0wvpi1q8+BlAkHqwW cUHA== 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; bh=kxWKdDQkMhl5d+amyb+6aj3Kc+/Dk1IeChKXXk9Rsag=; b=KevwnTgnsDQlUc3V1REvrEYt/Ds+FALivKwl6z8IY+NXbO0V8ZguQ2jae6C35aiXCQ 5TcmvsWP1TYtqsJXm6rdDn36LXzSAX8KEwUGvbfuyOiPKGRgjj4Gof/7egVnL2hkxIfC 6pXWuEq5987RfQEkb0zazDtzAX5SiYyd2AMsXtGHVem/mLGhq7v0Kev8grRCxR+1NBNc jykN7lGNpc2U9rIHgskOBNzfcMo/Y6LiL/o6YdjYQ+kibG2QwzyRBPvxqit0rLdur6w0 Cbrj2t8mlf9oNdpDI8ODgy8uFznYg9i5bMSLPxr9Qj14cPTQnIhl0YGFbwx0CMwFb6v2 o+rw== X-Gm-Message-State: APjAAAVCYcdbvtg7vP+fVyyFoTCTX2NhAGuNwAh3iLBeV8yrrnhN7rO/ BhXXFMPs2fUqq2ZAgNfYdxZkbyU= X-Google-Smtp-Source: APXvYqyCEzaFPGlEeG/nM6chtlmHm0szIEgQDgXgVAcQWLL3fNcpvk/gKpAxE8K0XKgeG5nNLeD15w== X-Received: by 2002:a05:660c:3c7:: with SMTP id c7mr667808itl.2.1556135275086; Wed, 24 Apr 2019 12:47:55 -0700 (PDT) Received: from ubuntu.extremenetworks.com ([12.38.14.8]) by smtp.gmail.com with ESMTPSA id a196sm9773276ita.14.2019.04.24.12.47.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 12:47:54 -0700 (PDT) From: Stephen Suryaputra To: netdev@vger.kernel.org Cc: dsahern@gmail.com, Stephen Suryaputra Subject: [PATCH net] vrf: Use orig netdev to count Ip6InNoRoutes and a fresh route lookup when sending dest unreach Date: Wed, 24 Apr 2019 14:40:49 -0400 Message-Id: <20190424184049.20296-1-ssuryaextr@gmail.com> X-Mailer: git-send-email 2.17.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When there is no route to an IPv6 dest addr, skb_dst(skb) points to loopback dev in the case of that the IP6CB(skb)->iif is enslaved to a vrf. This causes Ip6InNoRoutes to be incremented on the loopback dev. This also causes the lookup to fail on icmpv6_send() and the dest unreachable to not sent and Ip6OutNoRoutes gets incremented on the loopback dev. To reproduce: * Gateway configuration: ip link add dev vrf_258 type vrf table 258 ip link set dev enp0s9 master vrf_258 ip addr add 66:1/64 dev enp0s9 ip -6 route add unreachable default metric 8192 table 258 sysctl -w net.ipv6.conf.all.forwarding=1 sysctl -w net.ipv6.conf.enp0s9.forwarding=1 * Sender configuration: ip addr add 66::2/64 dev enp0s9 ip -6 route add default via 66::1 and ping 66:7 for example from the sender. Fix this by counting on the original netdev and reset the skb dst to force a fresh lookup. Signed-off-by: Stephen Suryaputra --- net/ipv6/route.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index e8c73b7782cd..3b026a310b3e 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -3772,23 +3772,33 @@ int ipv6_route_ioctl(struct net *net, unsigned int cmd, void __user *arg) static int ip6_pkt_drop(struct sk_buff *skb, u8 code, int ipstats_mib_noroutes) { - int type; struct dst_entry *dst = skb_dst(skb); + struct inet6_dev *idev = ip6_dst_idev(dst); + struct net *net = dev_net(dst->dev); + int type; + + if (netif_is_l3_master(skb->dev) && + idev == __in6_dev_get(net->loopback_dev)) { + idev = __in6_dev_get_safely(dev_get_by_index_rcu(net, IP6CB(skb)->iif)); + } + switch (ipstats_mib_noroutes) { case IPSTATS_MIB_INNOROUTES: type = ipv6_addr_type(&ipv6_hdr(skb)->daddr); if (type == IPV6_ADDR_ANY) { - IP6_INC_STATS(dev_net(dst->dev), - __in6_dev_get_safely(skb->dev), - IPSTATS_MIB_INADDRERRORS); + IP6_INC_STATS(net, idev, IPSTATS_MIB_INADDRERRORS); break; } /* FALLTHROUGH */ case IPSTATS_MIB_OUTNOROUTES: - IP6_INC_STATS(dev_net(dst->dev), ip6_dst_idev(dst), - ipstats_mib_noroutes); + IP6_INC_STATS(net, idev, ipstats_mib_noroutes); break; } + + /* Start over by dropping the dst for l3mdev case */ + if (netif_is_l3_master(skb->dev)) + skb_dst_drop(skb); + icmpv6_send(skb, ICMPV6_DEST_UNREACH, code, 0); kfree_skb(skb); return 0;