4 files changed, 222 insertions, 0 deletions

diff --git a/include/trace/events/asoc.h b/include/trace/events/asoc.h
index ae973d2e27a1..603f5a0f0365 100644
--- a/include/trace/events/asoc.h
+++ b/include/trace/events/asoc.h
@@ -9,6 +9,7 @@
 
 struct snd_soc_jack;
 struct snd_soc_codec;
+struct snd_soc_platform;
 struct snd_soc_card;
 struct snd_soc_dapm_widget;
 
@@ -59,6 +60,50 @@ DEFINE_EVENT(snd_soc_reg, snd_soc_reg_read,
 
 );
 
+DECLARE_EVENT_CLASS(snd_soc_preg,
+
+        TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
+                 unsigned int val),
+
+        TP_ARGS(platform, reg, val),
+
+        TP_STRUCT__entry(
+                __string(       name,           platform->name  )
+                __field(        int,            id              )
+                __field(        unsigned int,   reg             )
+                __field(        unsigned int,   val             )
+        ),
+
+        TP_fast_assign(
+                __assign_str(name, platform->name);
+                __entry->id = platform->id;
+                __entry->reg = reg;
+                __entry->val = val;
+        ),
+
+        TP_printk("platform=%s.%d reg=%x val=%x", __get_str(name),
+                  (int)__entry->id, (unsigned int)__entry->reg,
+                  (unsigned int)__entry->val)
+);
+
+DEFINE_EVENT(snd_soc_preg, snd_soc_preg_write,
+
+        TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
+                 unsigned int val),
+
+        TP_ARGS(platform, reg, val)
+
+);
+
+DEFINE_EVENT(snd_soc_preg, snd_soc_preg_read,
+
+        TP_PROTO(struct snd_soc_platform *platform, unsigned int reg,
+                 unsigned int val),
+
+        TP_ARGS(platform, reg, val)
+
+);
+
 DECLARE_EVENT_CLASS(snd_soc_card,
 
         TP_PROTO(struct snd_soc_card *card, int val),
diff --git a/include/trace/events/sock.h b/include/trace/events/sock.h
new file mode 100644
index 000000000000..779abb91df81
--- /dev/null
+++ b/include/trace/events/sock.h
@@ -0,0 +1,68 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM sock
+
+#if !defined(_TRACE_SOCK_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_SOCK_H
+
+#include <net/sock.h>
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(sock_rcvqueue_full,
+
+        TP_PROTO(struct sock *sk, struct sk_buff *skb),
+
+        TP_ARGS(sk, skb),
+
+        TP_STRUCT__entry(
+                __field(int, rmem_alloc)
+                __field(unsigned int, truesize)
+                __field(int, sk_rcvbuf)
+        ),
+
+        TP_fast_assign(
+                __entry->rmem_alloc = atomic_read(&sk->sk_rmem_alloc);
+                __entry->truesize   = skb->truesize;
+                __entry->sk_rcvbuf  = sk->sk_rcvbuf;
+        ),
+
+        TP_printk("rmem_alloc=%d truesize=%u sk_rcvbuf=%d",
+                __entry->rmem_alloc, __entry->truesize, __entry->sk_rcvbuf)
+);
+
+TRACE_EVENT(sock_exceed_buf_limit,
+
+        TP_PROTO(struct sock *sk, struct proto *prot, long allocated),
+
+        TP_ARGS(sk, prot, allocated),
+
+        TP_STRUCT__entry(
+                __array(char, name, 32)
+                __field(long *, sysctl_mem)
+                __field(long, allocated)
+                __field(int, sysctl_rmem)
+                __field(int, rmem_alloc)
+        ),
+
+        TP_fast_assign(
+                strncpy(__entry->name, prot->name, 32);
+                __entry->sysctl_mem = prot->sysctl_mem;
+                __entry->allocated = allocated;
+                __entry->sysctl_rmem = prot->sysctl_rmem[0];
+                __entry->rmem_alloc = atomic_read(&sk->sk_rmem_alloc);
+        ),
+
+        TP_printk("proto:%s sysctl_mem=%ld,%ld,%ld allocated=%ld "
+                "sysctl_rmem=%d rmem_alloc=%d",
+                __entry->name,
+                __entry->sysctl_mem[0],
+                __entry->sysctl_mem[1],
+                __entry->sysctl_mem[2],
+                __entry->allocated,
+                __entry->sysctl_rmem,
+                __entry->rmem_alloc)
+);
+
+#endif /* _TRACE_SOCK_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/include/trace/events/udp.h b/include/trace/events/udp.h
new file mode 100644
index 000000000000..a664bb940973
--- /dev/null
+++ b/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/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index b2c33bd955fa..36851f7f13da 100644
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -179,6 +179,83 @@ DEFINE_EVENT(mm_vmscan_direct_reclaim_end_template, mm_vmscan_memcg_softlimit_re
         TP_ARGS(nr_reclaimed)
 );
 
+TRACE_EVENT(mm_shrink_slab_start,
+        TP_PROTO(struct shrinker *shr, struct shrink_control *sc,
+                long nr_objects_to_shrink, unsigned long pgs_scanned,
+                unsigned long lru_pgs, unsigned long cache_items,
+                unsigned long long delta, unsigned long total_scan),
+
+        TP_ARGS(shr, sc, nr_objects_to_shrink, pgs_scanned, lru_pgs,
+                cache_items, delta, total_scan),
+
+        TP_STRUCT__entry(
+                __field(struct shrinker *, shr)
+                __field(void *, shrink)
+                __field(long, nr_objects_to_shrink)
+                __field(gfp_t, gfp_flags)
+                __field(unsigned long, pgs_scanned)
+                __field(unsigned long, lru_pgs)
+                __field(unsigned long, cache_items)
+                __field(unsigned long long, delta)
+                __field(unsigned long, total_scan)
+        ),
+
+        TP_fast_assign(
+                __entry->shr = shr;
+                __entry->shrink = shr->shrink;
+                __entry->nr_objects_to_shrink = nr_objects_to_shrink;
+                __entry->gfp_flags = sc->gfp_mask;
+                __entry->pgs_scanned = pgs_scanned;
+                __entry->lru_pgs = lru_pgs;
+                __entry->cache_items = cache_items;
+                __entry->delta = delta;
+                __entry->total_scan = total_scan;
+        ),
+
+        TP_printk("%pF %p: objects to shrink %ld gfp_flags %s pgs_scanned %ld lru_pgs %ld cache items %ld delta %lld total_scan %ld",
+                __entry->shrink,
+                __entry->shr,
+                __entry->nr_objects_to_shrink,
+                show_gfp_flags(__entry->gfp_flags),
+                __entry->pgs_scanned,
+                __entry->lru_pgs,
+                __entry->cache_items,
+                __entry->delta,
+                __entry->total_scan)
+);
+
+TRACE_EVENT(mm_shrink_slab_end,
+        TP_PROTO(struct shrinker *shr, int shrinker_retval,
+                long unused_scan_cnt, long new_scan_cnt),
+
+        TP_ARGS(shr, shrinker_retval, unused_scan_cnt, new_scan_cnt),
+
+        TP_STRUCT__entry(
+                __field(struct shrinker *, shr)
+                __field(void *, shrink)
+                __field(long, unused_scan)
+                __field(long, new_scan)
+                __field(int, retval)
+                __field(long, total_scan)
+        ),
+
+        TP_fast_assign(
+                __entry->shr = shr;
+                __entry->shrink = shr->shrink;
+                __entry->unused_scan = unused_scan_cnt;
+                __entry->new_scan = new_scan_cnt;
+                __entry->retval = shrinker_retval;
+                __entry->total_scan = new_scan_cnt - unused_scan_cnt;
+        ),
+
+        TP_printk("%pF %p: unused scan count %ld new scan count %ld total_scan %ld last shrinker return val %d",
+                __entry->shrink,
+                __entry->shr,
+                __entry->unused_scan,
+                __entry->new_scan,
+                __entry->total_scan,
+                __entry->retval)
+);
 
 DECLARE_EVENT_CLASS(mm_vmscan_lru_isolate_template,