From dd411b92b9cd46c1e437034937634755a3ad163c Mon Sep 17 00:00:00 2001
From: Satoru Moriya <satoru.moriya@hds.com>
Date: Fri, 17 Jun 2011 11:58:39 +0000
Subject: [PATCH] --- yaml --- r: 255652 b: refs/heads/master c:
 296f7ea75b45913d5e2067baef0812087e0b6eb9 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/include/trace/events/udp.h | 32 ++++++++++++++++++++++++++++++++
 trunk/net/core/net-traces.c      |  1 +
 trunk/net/ipv4/udp.c             |  2 ++
 4 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 trunk/include/trace/events/udp.h

diff --git a/[refs] b/[refs]
index dfa7348e5b0e..a2cfc931a09e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dec17b74516bb780de75b41e7cfa0072df16bb82
+refs/heads/master: 296f7ea75b45913d5e2067baef0812087e0b6eb9
diff --git a/trunk/include/trace/events/udp.h b/trunk/include/trace/events/udp.h
new file mode 100644
index 000000000000..a664bb940973
--- /dev/null
+++ b/trunk/include/trace/events/udp.h
@@ -0,0 +1,32 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM udp
+
+#if !defined(_TRACE_UDP_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_UDP_H
+
+#include <linux/udp.h>
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(udp_fail_queue_rcv_skb,
+
+	TP_PROTO(int rc, struct sock *sk),
+
+	TP_ARGS(rc, sk),
+
+	TP_STRUCT__entry(
+		__field(int, rc)
+		__field(__u16, lport)
+	),
+
+	TP_fast_assign(
+		__entry->rc = rc;
+		__entry->lport = inet_sk(sk)->inet_num;
+	),
+
+	TP_printk("rc=%d port=%hu", __entry->rc, __entry->lport)
+);
+
+#endif /* _TRACE_UDP_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/trunk/net/core/net-traces.c b/trunk/net/core/net-traces.c
index 7f1bb2aba03b..13aab64520ad 100644
--- a/trunk/net/core/net-traces.c
+++ b/trunk/net/core/net-traces.c
@@ -28,6 +28,7 @@
 #include <trace/events/skb.h>
 #include <trace/events/net.h>
 #include <trace/events/napi.h>
+#include <trace/events/udp.h>
 
 EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb);
 
diff --git a/trunk/net/ipv4/udp.c b/trunk/net/ipv4/udp.c
index abca870d8ff6..37aa9bf8d382 100644
--- a/trunk/net/ipv4/udp.c
+++ b/trunk/net/ipv4/udp.c
@@ -105,6 +105,7 @@
 #include <net/route.h>
 #include <net/checksum.h>
 #include <net/xfrm.h>
+#include <trace/events/udp.h>
 #include "udp_impl.h"
 
 struct udp_table udp_table __read_mostly;
@@ -1363,6 +1364,7 @@ static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
 					 is_udplite);
 		UDP_INC_STATS_BH(sock_net(sk), UDP_MIB_INERRORS, is_udplite);
 		kfree_skb(skb);
+		trace_udp_fail_queue_rcv_skb(rc, sk);
 		return -1;
 	}