From mboxrd@z Thu Jan  1 00:00:00 1970
From: mathieu.desnoyers@polymtl.ca (Mathieu Desnoyers)
Date: Wed, 17 Dec 2008 23:19:18 -0500
Subject: [ltt-dev] [PATCH 2/2] tracepoints-kexec
In-Reply-To: <4949BD67.40501@cn.fujitsu.com>
References: <4949BD17.2000704@cn.fujitsu.com> <4949BD67.40501@cn.fujitsu.com>
Message-ID: <20081218041918.GB21563@Krystal>

* Zhaolei (zhaolei at cn.fujitsu.com) wrote:
> Instrumentation of kexec related events : kernel_kexec and crash_kexec.
> It is useful for build flight-recorder program based on lttng infrastructure.
> 
> Signed-off-by: Zhao lei <zhaolei at cn.fujitsu.com>
> ---
>  include/trace/kexec.h |   14 ++++++++++++++
>  kernel/kexec.c        |    8 ++++++++
>  2 files changed, 22 insertions(+), 0 deletions(-)
>  create mode 100644 include/trace/kexec.h
> 
> diff --git a/include/trace/kexec.h b/include/trace/kexec.h
> new file mode 100644
> index 0000000..928bdd2
> --- /dev/null
> +++ b/include/trace/kexec.h
> @@ -0,0 +1,14 @@
> +#ifndef _TRACE_KEXEC_H
> +#define _TRACE_KEXEC_H
> +
> +#include <linux/tracepoint.h>
> +#include <linux/kexec.h>
> +
> +DECLARE_TRACE(kexec_kernel_kexec,
> +	TPPROTO(struct kimage *image),
> +	TPARGS(image));
> +DECLARE_TRACE(kexec_crash_kexec,
> +	TPPROTO(struct kimage *image, struct pt_regs *regs),
> +	TPARGS(image, regs));
> +

Those could fit in include/trace/kernel.h too.

kernel_kexec
and
kernel_kexec_crash

?

My rule of thumb would be this :
- If we instrument a very small kernel file under kernel/, then we use
  kernel_ prefix.
- If we instrument a bigger kernel infrastructure, even if under
  kernel/, like the scheduler, then it may be better to use a sched_
  prefix.

Mathieu

> +#endif
> diff --git a/kernel/kexec.c b/kernel/kexec.c
> index aef2653..01ab16b 100644
> --- a/kernel/kexec.c
> +++ b/kernel/kexec.c
> @@ -30,6 +30,7 @@
>  #include <linux/pm.h>
>  #include <linux/cpu.h>
>  #include <linux/console.h>
> +#include <trace/kexec.h>
>  
>  #include <asm/page.h>
>  #include <asm/uaccess.h>
> @@ -37,6 +38,9 @@
>  #include <asm/system.h>
>  #include <asm/sections.h>
>  
> +DEFINE_TRACE(kexec_kernel_kexec);
> +DEFINE_TRACE(kexec_crash_kexec);
> +
>  /* Per cpu memory for storing cpu states in case of system crash. */
>  note_buf_t* crash_notes;
>  
> @@ -1062,6 +1066,8 @@ asmlinkage long compat_sys_kexec_load(unsigned long entry,
>  
>  void crash_kexec(struct pt_regs *regs)
>  {
> +	trace_kexec_crash_kexec(kexec_crash_image, regs);
> +
>  	/* Take the kexec_mutex here to prevent sys_kexec_load
>  	 * running on one cpu from replacing the crash kernel
>  	 * we are using after a panic on a different cpu.
> @@ -1428,6 +1434,8 @@ int kernel_kexec(void)
>  {
>  	int error = 0;
>  
> +	trace_kexec_kernel_kexec(kexec_image);
> +
>  	if (!mutex_trylock(&kexec_mutex))
>  		return -EBUSY;
>  	if (!kexec_image) {
> -- 
> 1.5.5.3
> 
> 

-- 
Mathieu Desnoyers
OpenPGP key fingerprint: 8CD5 52C3 8E3C 4140 715F  BA06 3F25 A8FE 3BAE 9A68