From patchwork Wed Mar 7 01:12:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesus Sanchez-Palencia X-Patchwork-Id: 882346 X-Patchwork-Delegate: davem@davemloft.net Return-Path: 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=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=intel.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zwwhV4dgTz9sYh for ; Wed, 7 Mar 2018 12:16:26 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933519AbeCGBQZ (ORCPT ); Tue, 6 Mar 2018 20:16:25 -0500 Received: from mga09.intel.com ([134.134.136.24]:56493 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932906AbeCGBPB (ORCPT ); Tue, 6 Mar 2018 20:15:01 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 06 Mar 2018 17:14:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,433,1515484800"; d="scan'208";a="23096775" Received: from darjeeling.jf.intel.com ([10.24.15.164]) by orsmga008.jf.intel.com with ESMTP; 06 Mar 2018 17:14:59 -0800 From: Jesus Sanchez-Palencia To: netdev@vger.kernel.org Cc: jhs@mojatatu.com, xiyou.wangcong@gmail.com, jiri@resnulli.us, vinicius.gomes@intel.com, richardcochran@gmail.com, intel-wired-lan@lists.osuosl.org, anna-maria@linutronix.de, henrik@austad.us, tglx@linutronix.de, john.stultz@linaro.org, levi.pearson@harman.com, edumazet@google.com, willemb@google.com, mlichvar@redhat.com, Jesus Sanchez-Palencia Subject: [RFC v3 net-next 02/18] net: Clear skb->tstamp only on the forwarding path Date: Tue, 6 Mar 2018 17:12:14 -0800 Message-Id: <20180307011230.24001-3-jesus.sanchez-palencia@intel.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180307011230.24001-1-jesus.sanchez-palencia@intel.com> References: <20180307011230.24001-1-jesus.sanchez-palencia@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This is done in preparation for the upcoming time based transmission patchset. Now that skb->tstamp will be used to hold packet's txtime, we must ensure that it is being cleared when traversing namespaces. Also, doing that from skb_scrub_packet() would break our feature when tunnels are used. Signed-off-by: Jesus Sanchez-Palencia --- include/linux/netdevice.h | 1 + net/core/skbuff.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index dbe6344b727a..7104de2bc957 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3379,6 +3379,7 @@ static __always_inline int ____dev_forward_skb(struct net_device *dev, skb_scrub_packet(skb, true); skb->priority = 0; + skb->tstamp = 0; return 0; } diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 715c13495ba6..678fc5416ae1 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4865,7 +4865,6 @@ EXPORT_SYMBOL(skb_try_coalesce); */ void skb_scrub_packet(struct sk_buff *skb, bool xnet) { - skb->tstamp = 0; skb->pkt_type = PACKET_HOST; skb->skb_iif = 0; skb->ignore_df = 0;