From patchwork Tue Jun 8 05:30:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Koki Sanagi X-Patchwork-Id: 54931 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 C9620B7D61 for ; Tue, 8 Jun 2010 15:30:56 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753086Ab0FHFau (ORCPT ); Tue, 8 Jun 2010 01:30:50 -0400 Received: from fgwmail5.fujitsu.co.jp ([192.51.44.35]:60736 "EHLO fgwmail5.fujitsu.co.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753034Ab0FHFat (ORCPT ); Tue, 8 Jun 2010 01:30:49 -0400 Received: from m2.gw.fujitsu.co.jp ([10.0.50.72]) by fgwmail5.fujitsu.co.jp (Fujitsu Gateway) with ESMTP id o585UmWP012332 for (envelope-from sanagi.koki@jp.fujitsu.com); Tue, 8 Jun 2010 14:30:48 +0900 Received: from smail (m2 [127.0.0.1]) by outgoing.m2.gw.fujitsu.co.jp (Postfix) with ESMTP id 3C05A327879 for ; Tue, 8 Jun 2010 14:30:48 +0900 (JST) Received: from s2.gw.fujitsu.co.jp (s2.gw.fujitsu.co.jp [10.0.50.92]) by m2.gw.fujitsu.co.jp (Postfix) with ESMTP id 1216D1EF081 for ; Tue, 8 Jun 2010 14:30:48 +0900 (JST) Received: from s2.gw.fujitsu.co.jp (localhost.localdomain [127.0.0.1]) by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id A4C8D1DB8038 for ; Tue, 8 Jun 2010 14:30:47 +0900 (JST) Received: from m107.s.css.fujitsu.com (m107.s.css.fujitsu.com [10.249.87.107]) by s2.gw.fujitsu.co.jp (Postfix) with ESMTP id 5310C1DB803C for ; Tue, 8 Jun 2010 14:30:45 +0900 (JST) Received: from m107.css.fujitsu.com (m107 [127.0.0.1]) by m107.s.css.fujitsu.com (Postfix) with ESMTP id 18106670004; Tue, 8 Jun 2010 14:30:45 +0900 (JST) Received: from [127.0.0.1] (unknown [10.124.101.143]) by m107.s.css.fujitsu.com (Postfix) with ESMTP id 9A025670001; Tue, 8 Jun 2010 14:30:44 +0900 (JST) X-SecurityPolicyCheck-FJ: OK by FujitsuOutboundMailChecker v1.3.1 Received: from univ556[192.168.246.143] by univ556 (FujitsuOutboundMailChecker v1.3.1/9992[192.168.246.143]); Tue, 08 Jun 2010 14:31:01 +0900 (JST) Message-ID: <4C0DD58D.1010703@jp.fujitsu.com> Date: Tue, 08 Jun 2010 14:30:53 +0900 From: Koki Sanagi User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.1.5) Gecko/20091204 Thunderbird/3.0 MIME-Version: 1.0 To: netdev@vger.kernel.org CC: davem@davemloft.net, kaneshige.kenji@jp.fujitsu.com, izumi.taku@jp.fujitsu.com Subject: [RFC PATCH 4/5] skb: add tracepoints to freeing skb References: <4C0DD43F.9090902@jp.fujitsu.com> In-Reply-To: <4C0DD43F.9090902@jp.fujitsu.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch adds tracepoint to consume_skb and dev_kfree_skb_irq. Signed-off-by: Koki Sanagi --- include/trace/events/skb.h | 36 ++++++++++++++++++++++++++++++++++++ net/core/dev.c | 2 ++ net/core/skbuff.c | 1 + 3 files changed, 39 insertions(+), 0 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/trace/events/skb.h b/include/trace/events/skb.h index 4b2be6d..6ab5b34 100644 --- a/include/trace/events/skb.h +++ b/include/trace/events/skb.h @@ -35,6 +35,42 @@ TRACE_EVENT(kfree_skb, __entry->skbaddr, __entry->protocol, __entry->location) ); +TRACE_EVENT(consume_skb, + + TP_PROTO(struct sk_buff *skb), + + TP_ARGS(skb), + + TP_STRUCT__entry( + __field( void *, skbaddr ) + ), + + TP_fast_assign( + __entry->skbaddr = skb; + ), + + TP_printk("skbaddr=%p", + __entry->skbaddr) +); + +TRACE_EVENT(dev_kfree_skb_irq, + + TP_PROTO(struct sk_buff *skb), + + TP_ARGS(skb), + + TP_STRUCT__entry( + __field( void *, skbaddr ) + ), + + TP_fast_assign( + __entry->skbaddr = skb; + ), + + TP_printk("skbaddr=%p", + __entry->skbaddr) +); + TRACE_EVENT(skb_copy_datagram_iovec, TP_PROTO(const struct sk_buff *skb, int len), diff --git a/net/core/dev.c b/net/core/dev.c index f7c731b..e0093c4 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -131,6 +131,7 @@ #include #include #include +#include #include #include "net-sysfs.h" @@ -1584,6 +1585,7 @@ void dev_kfree_skb_irq(struct sk_buff *skb) struct softnet_data *sd; unsigned long flags; + trace_dev_kfree_skb_irq(skb); local_irq_save(flags); sd = &__get_cpu_var(softnet_data); skb->next = sd->completion_queue; diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 4e7ac09..008c019 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -466,6 +466,7 @@ void consume_skb(struct sk_buff *skb) smp_rmb(); else if (likely(!atomic_dec_and_test(&skb->users))) return; + trace_consume_skb(skb); __kfree_skb(skb); } EXPORT_SYMBOL(consume_skb);