lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list] 
Message-ID: <20090225230742.GA21928@Krystal>
Date:	Wed, 25 Feb 2009 18:07:43 -0500
From:	Mathieu Desnoyers <compudj@...stal.dyndns.org>
To:	Steven Rostedt <rostedt@...dmis.org>
Cc:	linux-kernel@...r.kernel.org, Ingo Molnar <mingo@...e.hu>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Peter Zijlstra <peterz@...radead.org>,
	Frederic Weisbecker <fweisbec@...il.com>,
	Theodore Tso <tytso@....edu>,
	Arjan van de Ven <arjan@...radead.org>,
	Pekka Paalanen <pq@....fi>,
	Arnaldo Carvalho de Melo <acme@...hat.com>,
	Jason Baron <jbaron@...hat.com>,
	Martin Bligh <mbligh@...gle.com>,
	"Frank Ch. Eigler" <fche@...hat.com>,
	KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>,
	Jens Axboe <jens.axboe@...cle.com>,
	Masami Hiramatsu <mhiramat@...hat.com>,
	Steven Rostedt <srostedt@...hat.com>
Subject: Re: [PATCH 1/2] tracing: rename DEFINE_TRACE_FMT to just
	TRACE_FORMAT

* Steven Rostedt (rostedt@...dmis.org) wrote:
> From: Steven Rostedt <srostedt@...hat.com>
> 
> There's been a bit confusion to whether DEFINE/DECLARE_TRACE_FMT should
> be a DEFINE or a DECLARE. Ingo Molnar suggested simply calling it
> TRACE_FORMAT.
> 
> Reported-by: Ingo Molnar <mingo@...e.hu>
> Signed-off-by: Steven Rostedt <srostedt@...hat.com>
> ---
>  include/linux/tracepoint.h        |    2 +-
>  include/trace/sched_event_types.h |   26 +++++++++++++-------------
>  kernel/trace/trace_events.h       |    4 ++--
>  3 files changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h
> index 34ae464..3de09fa 100644
> --- a/include/linux/tracepoint.h
> +++ b/include/linux/tracepoint.h
> @@ -153,7 +153,7 @@ static inline void tracepoint_synchronize_unregister(void)
>  	synchronize_sched();
>  }
>  
> -#define DEFINE_TRACE_FMT(name, proto, args, fmt)		\
> +#define TRACE_FORMAT(name, proto, args, fmt)		\
>  	DECLARE_TRACE(name, TPPROTO(proto), TPARGS(args))
>  

Hi Steven,

Just to synchronize.. Does the tree you are basing your work on has both
DEFINE_TRACE and DECLARE_TRACE ? If yes, then I think your TRACE_FORMAT
should be put in the .c files (not in the headers) and add the format
string to a supplementary tracepoint field (passed as a supplementary
parameter to DEFINE_TRACE). Then this format string would become
available to all tracers which connect to the tracepoints.

Your probe could then connect to the tracepoint just like any other
probe, and use the new "format" string available in the tracepoint data
structure.

This format string would indeed be NULL if tracepoints are declared
without any format string.

What do you think of this proposal ?

Mathieu


>  #endif
> diff --git a/include/trace/sched_event_types.h b/include/trace/sched_event_types.h
> index a4f6629..a3d3d66 100644
> --- a/include/trace/sched_event_types.h
> +++ b/include/trace/sched_event_types.h
> @@ -1,72 +1,72 @@
>  
>  /* use <trace/sched.h> instead */
> -#ifndef DEFINE_TRACE_FMT
> +#ifndef TRACE_FORMAT
>  # error Do not include this file directly.
>  # error Unless you know what you are doing.
>  #endif
>  
> -DEFINE_TRACE_FMT(sched_kthread_stop,
> +TRACE_FORMAT(sched_kthread_stop,
>  	TPPROTO(struct task_struct *t),
>  	TPARGS(t),
>  	TPFMT("task %s:%d", t->comm, t->pid));
>  
> -DEFINE_TRACE_FMT(sched_kthread_stop_ret,
> +TRACE_FORMAT(sched_kthread_stop_ret,
>  	TPPROTO(int ret),
>  	TPARGS(ret),
>  	TPFMT("ret=%d", ret));
>  
> -DEFINE_TRACE_FMT(sched_wait_task,
> +TRACE_FORMAT(sched_wait_task,
>  	TPPROTO(struct rq *rq, struct task_struct *p),
>  	TPARGS(rq, p),
>  	TPFMT("task %s:%d", p->comm, p->pid));
>  
> -DEFINE_TRACE_FMT(sched_wakeup,
> +TRACE_FORMAT(sched_wakeup,
>  	TPPROTO(struct rq *rq, struct task_struct *p, int success),
>  	TPARGS(rq, p, success),
>  	TPFMT("task %s:%d %s",
>  	      p->comm, p->pid, success?"succeeded":"failed"));
>  
> -DEFINE_TRACE_FMT(sched_wakeup_new,
> +TRACE_FORMAT(sched_wakeup_new,
>  	TPPROTO(struct rq *rq, struct task_struct *p, int success),
>  	TPARGS(rq, p, success),
>  	TPFMT("task %s:%d",
>  	      p->comm, p->pid, success?"succeeded":"failed"));
>  
> -DEFINE_TRACE_FMT(sched_switch,
> +TRACE_FORMAT(sched_switch,
>  	TPPROTO(struct rq *rq, struct task_struct *prev,
>  		struct task_struct *next),
>  	TPARGS(rq, prev, next),
>  	TPFMT("task %s:%d ==> %s:%d",
>  	      prev->comm, prev->pid, next->comm, next->pid));
>  
> -DEFINE_TRACE_FMT(sched_migrate_task,
> +TRACE_FORMAT(sched_migrate_task,
>  	TPPROTO(struct task_struct *p, int orig_cpu, int dest_cpu),
>  	TPARGS(p, orig_cpu, dest_cpu),
>  	TPFMT("task %s:%d from: %d  to: %d",
>  	      p->comm, p->pid, orig_cpu, dest_cpu));
>  
> -DEFINE_TRACE_FMT(sched_process_free,
> +TRACE_FORMAT(sched_process_free,
>  	TPPROTO(struct task_struct *p),
>  	TPARGS(p),
>  	TPFMT("task %s:%d", p->comm, p->pid));
>  
> -DEFINE_TRACE_FMT(sched_process_exit,
> +TRACE_FORMAT(sched_process_exit,
>  	TPPROTO(struct task_struct *p),
>  	TPARGS(p),
>  	TPFMT("task %s:%d", p->comm, p->pid));
>  
> -DEFINE_TRACE_FMT(sched_process_wait,
> +TRACE_FORMAT(sched_process_wait,
>  	TPPROTO(struct pid *pid),
>  	TPARGS(pid),
>  	TPFMT("pid %d", pid));
>  
> -DEFINE_TRACE_FMT(sched_process_fork,
> +TRACE_FORMAT(sched_process_fork,
>  	TPPROTO(struct task_struct *parent, struct task_struct *child),
>  	TPARGS(parent, child),
>  	TPFMT("parent %s:%d  child %s:%d",
>  	      parent->comm, parent->pid, child->comm, child->pid));
>  
> -DEFINE_TRACE_FMT(sched_signal_send,
> +TRACE_FORMAT(sched_signal_send,
>  	TPPROTO(int sig, struct task_struct *p),
>  	TPARGS(sig, p),
>  	TPFMT("sig: %d   task %s:%d", sig, p->comm, p->pid));
> diff --git a/kernel/trace/trace_events.h b/kernel/trace/trace_events.h
> index cb8455b..deb95e5 100644
> --- a/kernel/trace/trace_events.h
> +++ b/kernel/trace/trace_events.h
> @@ -17,8 +17,8 @@ struct ftrace_event_call {
>  #undef TPFMT
>  #define TPFMT(fmt, args...)	fmt "\n", ##args
>  
> -#undef DEFINE_TRACE_FMT
> -#define DEFINE_TRACE_FMT(call, proto, args, fmt)			\
> +#undef TRACE_FORMAT
> +#define TRACE_FORMAT(call, proto, args, fmt)				\
>  static void ftrace_event_##call(proto)					\
>  {									\
>  	event_trace_printk(_RET_IP_, "(" #call ") " fmt);		\
> -- 
> 1.5.6.5
> 
> -- 
> 

-- 
Mathieu Desnoyers
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ