From patchwork Tue Sep 11 23:28:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Bohrer X-Patchwork-Id: 183217 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 A55042C0089 for ; Wed, 12 Sep 2012 09:28:35 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759331Ab2IKX2d (ORCPT ); Tue, 11 Sep 2012 19:28:33 -0400 Received: from na3sys009aog126.obsmtp.com ([74.125.149.155]:53350 "EHLO na3sys009aog126.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759302Ab2IKX2c (ORCPT ); Tue, 11 Sep 2012 19:28:32 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]) (using TLSv1) by na3sys009aob126.postini.com ([74.125.148.12]) with SMTP ID DSNKUE/JHgi/D6XXhlMFR54fMmUgY4zihGsi@postini.com; Tue, 11 Sep 2012 16:28:32 PDT Received: by obbuo13 with SMTP id uo13so1692933obb.19 for ; Tue, 11 Sep 2012 16:28:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:from:to:cc:subject:date:message-id:x-mailer :content-type:x-gm-message-state; bh=NAbN9pchjQnXsRwl5YgcFbW1PCP0k3tofZ7cmSmtsvA=; b=K0dNIWocCTwsm/bMYeyaWD5bqHHU2T8vRDuaO6+otGtzNC3fbvkvGUAfvuERLT4And LK4sLG2qrCXKor/vV3/DDG5HwNk/paqa74RIArsXI0JG85egNptQmvASCR7M/PazCxuN W7ZO8e/ZiR7Wr3WtaTUNq59esja/fbtFezXEs7jdfTUnrlvEMXcqvo/ckOi6jSvXPd30 2IRdHHFv8jN5BTW44ZTs8Pv83dvYCdBgywvBsyW0jP8P92pJVwCoCJVCXC5fO0GpXKnG qHGCZcgzXxUEWqxKEriCVx+01+0DuAonnKEYuZyZgmOo7MqClV5M1pv905DVhtgnsxmi smfQ== Received: by 10.182.74.68 with SMTP id r4mr20276292obv.31.1347406110287; Tue, 11 Sep 2012 16:28:30 -0700 (PDT) MIME-Version: 1.0 Received: by 10.182.74.68 with SMTP id r4mr20276289obv.31.1347406110192; Tue, 11 Sep 2012 16:28:30 -0700 (PDT) Received: from u1015.rgmadvisors.com ([173.227.92.65]) by mx.google.com with ESMTPS id rg10sm715064obc.14.2012.09.11.16.28.29 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 11 Sep 2012 16:28:29 -0700 (PDT) From: Shawn Bohrer To: netdev@vger.kernel.org Cc: sanagi.koki@jp.fujitsu.com, davem@davemloft.net, eric.dumazet@gmail.com, Shawn Bohrer Subject: [PATCH] net_tx_action: Call trace_consume_skb() instead of trace_kfree_skb() Date: Tue, 11 Sep 2012 18:28:18 -0500 Message-Id: <1347406098-22071-1-git-send-email-sbohrer@rgmadvisors.com> X-Mailer: git-send-email 1.7.7.6 X-Gm-Message-State: ALoCoQk4oWTwQaCaU23gE2lz5jalqLJFkkwLXqfZoVra7NPMJ+PoqvsSFup42NENAE2VRpDPuF8KeNwW+9QJHcCIYmaOmZFnBg== Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Call trace_consume_skb() instead of trace_kfree_skb() as skbs are removed from the completion_queue during transmit. This avoids false positives from dropwatch/drop_monitor making them more useful. Signed-off-by: Shawn Bohrer --- In my case I seem to hit this tracepoint for every packet I transmit so these appear to be false positives to me. Perhaps there are cases where you could hit this and it is a real packet drop? net/core/dev.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 8398836..00774ce 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3015,7 +3015,7 @@ static void net_tx_action(struct softirq_action *h) clist = clist->next; WARN_ON(atomic_read(&skb->users)); - trace_kfree_skb(skb, net_tx_action); + trace_consume_skb(skb); __kfree_skb(skb); } }