From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 53464C31E57 for ; Mon, 17 Jun 2019 13:34:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 20C2C20657 for ; Mon, 17 Jun 2019 13:34:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WkVdWgbl" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727970AbfFQNen (ORCPT ); Mon, 17 Jun 2019 09:34:43 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:43679 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726405AbfFQNen (ORCPT ); Mon, 17 Jun 2019 09:34:43 -0400 Received: by mail-pg1-f195.google.com with SMTP id f25so5826661pgv.10 for ; Mon, 17 Jun 2019 06:34:42 -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:in-reply-to:references :in-reply-to:references; bh=XQB/IlK9ti/EW4b4Hw0cdZdjCUh7WjAf+/WozL9mkVE=; b=WkVdWgblhYbvoZu1FlFM1eHbjOLmSo1/UWbJxHaSHMjF05hRbctPuIbD7O0HG223b8 E3cOKpJOGUyXDa5h8lnPkjsuQMZrmj08YES9PB5BLK6YlVFxHjDN/QF8Pxlgs6asi0We f2r6g/FXWUIfyX2TTW/tFqd3NaSyGLPyIfY5zNEnKrfViuRThl2mOfRJJq72kTEsGjyW 4TwG1HZS+JmMPqEQ0K/jePicvkYJ7k9LI+VwmOqvoo+l3/3sn8UqMAuZq6BVEB5Y/EaH ylHsPJBtRBUhjR3tbd/otit5wrTOvctdsoP4adXpGEACX07UzTtF/MGQsomSSP52v1iM E3nA== 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:in-reply-to:references; bh=XQB/IlK9ti/EW4b4Hw0cdZdjCUh7WjAf+/WozL9mkVE=; b=c2yNL/4zeXDoje6lpTf40zjRRWoiFeMDuY4rCmOhfwg5pXYWP8l0v4ZaOUsTtEiHcv fq2ox5+75sFBv9wvpVKIEFFZgRIaPxO7NBFTVB/XVBEUuYJC4LiyD+nLXJdX+tEV+ngr BLnXmNBq5CBkLsed45qT6Ybnt6XP0+YKf0+PdAHVZZZGv6iQra9v+Ec5VM75oO4otVp4 mdF+C5g6jxPd6pli+qAnENeRRU+zUUdw2+kVbeTCCaFZGYHl5SCZLLy6jfAx3DK1flLn LULF2x43uOIf0nOYgTHMvMHmYjz1ybvPf1SjYbBoSwcRPFfwrbs/UfEii+jbBoDGcoso 5Fyg== X-Gm-Message-State: APjAAAWInOKxuKcmz6gphROA5lUDLKShtxgYymE4D8K7s5/atNrlVAxG WEVRlo7Q8sRNJhtvejNyQ5Mh2iRr X-Google-Smtp-Source: APXvYqzcZWC6E7Dnr2qPM6/0Yo3PNIsK9F+pIgYQ3pRhRnRyWrKa4KZMVFbF5A4Md4cmuC9dzvIcHg== X-Received: by 2002:a17:90a:628a:: with SMTP id d10mr25990134pjj.7.1560778481825; Mon, 17 Jun 2019 06:34:41 -0700 (PDT) Received: from localhost ([209.132.188.80]) by smtp.gmail.com with ESMTPSA id l1sm11173394pgi.91.2019.06.17.06.34.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jun 2019 06:34:41 -0700 (PDT) From: Xin Long To: network dev Cc: davem@davemloft.net, Jon Maloy , Ying Xue , tipc-discussion@lists.sourceforge.net, Marcelo Ricardo Leitner , Neil Horman , Su Yanjun , David Ahern , syzkaller-bugs@googlegroups.com, Dmitry Vyukov , Pravin B Shelar Subject: [PATCH net 2/3] ip6_tunnel: allow not to count pkts on tstats by passing dev as NULL Date: Mon, 17 Jun 2019 21:34:14 +0800 Message-Id: <92d40ac2577045f09a1d3ee79c7fed73fbdbde1a.1560778340.git.lucien.xin@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <89113721df2e1ea6f2ea9ecffe4024588f224dc3.1560778340.git.lucien.xin@gmail.com> References: <89113721df2e1ea6f2ea9ecffe4024588f224dc3.1560778340.git.lucien.xin@gmail.com> In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org A similar fix to Patch "ip_tunnel: allow not to count pkts on tstats by setting skb's dev to NULL" is also needed by ip6_tunnel. Signed-off-by: Xin Long --- include/net/ip6_tunnel.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/include/net/ip6_tunnel.h b/include/net/ip6_tunnel.h index 69b4bcf..028eaea 100644 --- a/include/net/ip6_tunnel.h +++ b/include/net/ip6_tunnel.h @@ -158,9 +158,12 @@ static inline void ip6tunnel_xmit(struct sock *sk, struct sk_buff *skb, memset(skb->cb, 0, sizeof(struct inet6_skb_parm)); pkt_len = skb->len - skb_inner_network_offset(skb); err = ip6_local_out(dev_net(skb_dst(skb)->dev), sk, skb); - if (unlikely(net_xmit_eval(err))) - pkt_len = -1; - iptunnel_xmit_stats(dev, pkt_len); + + if (dev) { + if (unlikely(net_xmit_eval(err))) + pkt_len = -1; + iptunnel_xmit_stats(dev, pkt_len); + } } #endif #endif -- 2.1.0