Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc182a43 authored by Zhaolei's avatar Zhaolei Committed by Ingo Molnar
Browse files

tracing, kmemtrace: Make kmem tracepoints use TRACE_EVENT macro 



TRACE_EVENT is a more generic way to define tracepoints.
Doing so adds these new capabilities to this tracepoint:

  - zero-copy and per-cpu splice() tracing
  - binary tracing without printf overhead
  - structured logging records exposed under /debug/tracing/events
  - trace events embedded in function tracer output and other plugins
  - user-defined, per tracepoint filter expressions

Signed-off-by: default avatarZhao Lei <zhaolei@cn.fujitsu.com>
Acked-by: default avatarEduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Acked-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <49DEE6DA.80600@cn.fujitsu.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 02af61bb

include/trace/kmem.h

+2 −37
Original line number Diff line number Diff line 
#ifndef _TRACE_KMEM_H

#define _TRACE_KMEM_H



#include <linux/tracepoint.h>

#include <linux/types.h>

#include <linux/tracepoint.h>



DECLARE_TRACE(kmalloc,

	      TP_PROTO(unsigned long call_site,

		      const void *ptr,

		      size_t bytes_req,

		      size_t bytes_alloc,

		      gfp_t gfp_flags),

	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));

DECLARE_TRACE(kmem_cache_alloc,

	      TP_PROTO(unsigned long call_site,

		      const void *ptr,

		      size_t bytes_req,

		      size_t bytes_alloc,

		      gfp_t gfp_flags),

	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags));

DECLARE_TRACE(kmalloc_node,

	      TP_PROTO(unsigned long call_site,

		      const void *ptr,

		      size_t bytes_req,

		      size_t bytes_alloc,

		      gfp_t gfp_flags,

		      int node),

	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));

DECLARE_TRACE(kmem_cache_alloc_node,

	      TP_PROTO(unsigned long call_site,

		      const void *ptr,

		      size_t bytes_req,

		      size_t bytes_alloc,

		      gfp_t gfp_flags,

		      int node),

	      TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node));

DECLARE_TRACE(kfree,

	      TP_PROTO(unsigned long call_site, const void *ptr),

	      TP_ARGS(call_site, ptr));

DECLARE_TRACE(kmem_cache_free,

	      TP_PROTO(unsigned long call_site, const void *ptr),

	      TP_ARGS(call_site, ptr));

#include <trace/kmem_event_types.h>



#endif /* _TRACE_KMEM_H */

include/trace/kmem_event_types.h

0 → 100644
+193 −0
Original line number Diff line number Diff line 


/* use <trace/kmem.h> instead */

#ifndef TRACE_EVENT

# error Do not include this file directly.

# error Unless you know what you are doing.

#endif



#undef TRACE_SYSTEM

#define TRACE_SYSTEM kmem



TRACE_EVENT(kmalloc,



	TP_PROTO(unsigned long call_site,

		 const void *ptr,

		 size_t bytes_req,

		 size_t bytes_alloc,

		 gfp_t gfp_flags),



	TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags),



	TP_STRUCT__entry(

		__field(	unsigned long,	call_site	)

		__field(	const void *,	ptr		)

		__field(	size_t,		bytes_req	)

		__field(	size_t,		bytes_alloc	)

		__field(	gfp_t,		gfp_flags	)

	),



	TP_fast_assign(

		__entry->call_site	= call_site;

		__entry->ptr		= ptr;

		__entry->bytes_req	= bytes_req;

		__entry->bytes_alloc	= bytes_alloc;

		__entry->gfp_flags	= gfp_flags;

	),



	TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%08x",

		__entry->call_site,

		__entry->ptr,

		__entry->bytes_req,

		__entry->bytes_alloc,

		__entry->gfp_flags)

);



TRACE_EVENT(kmem_cache_alloc,



	TP_PROTO(unsigned long call_site,

		 const void *ptr,

		 size_t bytes_req,

		 size_t bytes_alloc,

		 gfp_t gfp_flags),



	TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags),



	TP_STRUCT__entry(

		__field(	unsigned long,	call_site	)

		__field(	const void *,	ptr		)

		__field(	size_t,		bytes_req	)

		__field(	size_t,		bytes_alloc	)

		__field(	gfp_t,		gfp_flags	)

	),



	TP_fast_assign(

		__entry->call_site	= call_site;

		__entry->ptr		= ptr;

		__entry->bytes_req	= bytes_req;

		__entry->bytes_alloc	= bytes_alloc;

		__entry->gfp_flags	= gfp_flags;

	),



	TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%08x",

		__entry->call_site,

		__entry->ptr,

		__entry->bytes_req,

		__entry->bytes_alloc,

		__entry->gfp_flags)

);



TRACE_EVENT(kmalloc_node,



	TP_PROTO(unsigned long call_site,

		 const void *ptr,

		 size_t bytes_req,

		 size_t bytes_alloc,

		 gfp_t gfp_flags,

		 int node),



	TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node),



	TP_STRUCT__entry(

		__field(	unsigned long,	call_site	)

		__field(	const void *,	ptr		)

		__field(	size_t,		bytes_req	)

		__field(	size_t,		bytes_alloc	)

		__field(	gfp_t,		gfp_flags	)

		__field(	int,		node		)

	),



	TP_fast_assign(

		__entry->call_site	= call_site;

		__entry->ptr		= ptr;

		__entry->bytes_req	= bytes_req;

		__entry->bytes_alloc	= bytes_alloc;

		__entry->gfp_flags	= gfp_flags;

		__entry->node		= node;

	),



	TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%08x node=%d",

		__entry->call_site,

		__entry->ptr,

		__entry->bytes_req,

		__entry->bytes_alloc,

		__entry->gfp_flags,

		__entry->node)

);



TRACE_EVENT(kmem_cache_alloc_node,



	TP_PROTO(unsigned long call_site,

		 const void *ptr,

		 size_t bytes_req,

		 size_t bytes_alloc,

		 gfp_t gfp_flags,

		 int node),



	TP_ARGS(call_site, ptr, bytes_req, bytes_alloc, gfp_flags, node),



	TP_STRUCT__entry(

		__field(	unsigned long,	call_site	)

		__field(	const void *,	ptr		)

		__field(	size_t,		bytes_req	)

		__field(	size_t,		bytes_alloc	)

		__field(	gfp_t,		gfp_flags	)

		__field(	int,		node		)

	),



	TP_fast_assign(

		__entry->call_site	= call_site;

		__entry->ptr		= ptr;

		__entry->bytes_req	= bytes_req;

		__entry->bytes_alloc	= bytes_alloc;

		__entry->gfp_flags	= gfp_flags;

		__entry->node		= node;

	),



	TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%08x node=%d",

		__entry->call_site,

		__entry->ptr,

		__entry->bytes_req,

		__entry->bytes_alloc,

		__entry->gfp_flags,

		__entry->node)

);



TRACE_EVENT(kfree,



	TP_PROTO(unsigned long call_site, const void *ptr),



	TP_ARGS(call_site, ptr),



	TP_STRUCT__entry(

		__field(	unsigned long,	call_site	)

		__field(	const void *,	ptr		)

	),



	TP_fast_assign(

		__entry->call_site	= call_site;

		__entry->ptr		= ptr;

	),



	TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr)

);



TRACE_EVENT(kmem_cache_free,



	TP_PROTO(unsigned long call_site, const void *ptr),



	TP_ARGS(call_site, ptr),



	TP_STRUCT__entry(

		__field(	unsigned long,	call_site	)

		__field(	const void *,	ptr		)

	),



	TP_fast_assign(

		__entry->call_site	= call_site;

		__entry->ptr		= ptr;

	),



	TP_printk("call_site=%lx ptr=%p", __entry->call_site, __entry->ptr)

);



#undef TRACE_SYSTEM

include/trace/trace_event_types.h

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ 
#include <trace/irq_event_types.h>

#include <trace/lockdep_event_types.h>

#include <trace/skb_event_types.h>

#include <trace/kmem_event_types.h>

include/trace/trace_events.h

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ 
#include <trace/irq.h>

#include <trace/lockdep.h>

#include <trace/skb.h>

#include <trace/kmem.h>