* [PATCH 0/4] [GIT PULL] updates for tip/tracing/ftrace
@ 2009-03-13 5:04 Steven Rostedt
2009-03-13 5:04 ` [PATCH 1/4] tracing: left align location header in stack_trace Steven Rostedt
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Steven Rostedt @ 2009-03-13 5:04 UTC (permalink / raw)
To: linux-kernel
Cc: Ingo Molnar, Andrew Morton, Frederic Weisbecker, KOSAKI Motohiro
Ingo,
Please pull the latest tip/tracing/ftrace tree, which can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
tip/tracing/ftrace
Steven Rostedt (4):
tracing: left align location header in stack_trace
tracing: add comment for use of double __builtin_consant_p
tracing: move binary buffers into per cpu directory
softirq: no need to have SOFTIRQ in softirq name
----
kernel/softirq.c | 5 ++---
kernel/trace/trace.c | 26 +++++---------------------
kernel/trace/trace.h | 5 +++++
kernel/trace/trace_stack.c | 4 ++--
4 files changed, 14 insertions(+), 26 deletions(-)
--
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/4] tracing: left align location header in stack_trace
2009-03-13 5:04 [PATCH 0/4] [GIT PULL] updates for tip/tracing/ftrace Steven Rostedt
@ 2009-03-13 5:04 ` Steven Rostedt
2009-03-13 5:04 ` [PATCH 2/4] tracing: add comment for use of double __builtin_consant_p Steven Rostedt
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Steven Rostedt @ 2009-03-13 5:04 UTC (permalink / raw)
To: linux-kernel
Cc: Ingo Molnar, Andrew Morton, Frederic Weisbecker, KOSAKI Motohiro,
Steven Rostedt
[-- Attachment #1: 0001-tracing-left-align-location-header-in-stack_trace.patch --]
[-- Type: text/plain, Size: 1361 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Ingo Molnar suggested, instead of:
Depth Size Location (27 entries)
----- ---- --------
0) 2880 48 lock_timer_base+0x2b/0x4f
1) 2832 80 __mod_timer+0x33/0xe0
2) 2752 16 __ide_set_handler+0x63/0x65
To have it be:
Depth Size Location (27 entries)
----- ---- --------
0) 2880 48 lock_timer_base+0x2b/0x4f
1) 2832 80 __mod_timer+0x33/0xe0
2) 2752 16 __ide_set_handler+0x63/0x65
Requested-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
---
kernel/trace/trace_stack.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace_stack.c b/kernel/trace/trace_stack.c
index 91ccbf3..c750f65 100644
--- a/kernel/trace/trace_stack.c
+++ b/kernel/trace/trace_stack.c
@@ -262,9 +262,9 @@ static int t_show(struct seq_file *m, void *v)
int size;
if (v == SEQ_START_TOKEN) {
- seq_printf(m, " Depth Size Location"
+ seq_printf(m, " Depth Size Location"
" (%d entries)\n"
- " ----- ---- --------\n",
+ " ----- ---- --------\n",
max_stack_trace.nr_entries);
if (!stack_tracer_enabled && !max_stack_size)
--
1.6.1.3
--
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/4] tracing: add comment for use of double __builtin_consant_p
2009-03-13 5:04 [PATCH 0/4] [GIT PULL] updates for tip/tracing/ftrace Steven Rostedt
2009-03-13 5:04 ` [PATCH 1/4] tracing: left align location header in stack_trace Steven Rostedt
@ 2009-03-13 5:04 ` Steven Rostedt
2009-03-13 5:04 ` [PATCH 3/4] tracing: move binary buffers into per cpu directory Steven Rostedt
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Steven Rostedt @ 2009-03-13 5:04 UTC (permalink / raw)
To: linux-kernel
Cc: Ingo Molnar, Andrew Morton, Frederic Weisbecker, KOSAKI Motohiro,
Steven Rostedt
[-- Attachment #1: 0002-tracing-add-comment-for-use-of-double-__builtin_con.patch --]
[-- Type: text/plain, Size: 1176 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Impact: documentation
The use of the double __builtin_contant_p checks in the event_trace_printk
can be confusing to developers and reviewers. This patch adds a comment
to explain why it is there.
Requested-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
LKML-Reference: <20090313122235.43EB.A69D9226@jp.fujitsu.com>
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
---
kernel/trace/trace.h | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 35cfa7b..67595b8 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -776,6 +776,11 @@ extern struct ftrace_event_call __stop_ftrace_events[];
extern const char *__start___trace_bprintk_fmt[];
extern const char *__stop___trace_bprintk_fmt[];
+/*
+ * The double __builtin_constant_p is because gcc will give us an error
+ * if we try to allocate the static variable to fmt if it is not a
+ * constant. Even with the outer if statement optimizing out.
+ */
#define event_trace_printk(ip, fmt, args...) \
do { \
__trace_printk_check_format(fmt, ##args); \
--
1.6.1.3
--
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/4] tracing: move binary buffers into per cpu directory
2009-03-13 5:04 [PATCH 0/4] [GIT PULL] updates for tip/tracing/ftrace Steven Rostedt
2009-03-13 5:04 ` [PATCH 1/4] tracing: left align location header in stack_trace Steven Rostedt
2009-03-13 5:04 ` [PATCH 2/4] tracing: add comment for use of double __builtin_consant_p Steven Rostedt
@ 2009-03-13 5:04 ` Steven Rostedt
2009-03-13 5:16 ` Andrew Morton
2009-03-13 5:04 ` [PATCH 4/4] softirq: no need to have SOFTIRQ in softirq name Steven Rostedt
2009-03-13 5:30 ` [PATCH 0/4] [GIT PULL] updates for tip/tracing/ftrace Ingo Molnar
4 siblings, 1 reply; 9+ messages in thread
From: Steven Rostedt @ 2009-03-13 5:04 UTC (permalink / raw)
To: linux-kernel
Cc: Ingo Molnar, Andrew Morton, Frederic Weisbecker, KOSAKI Motohiro,
Steven Rostedt
[-- Attachment #1: 0003-tracing-move-binary-buffers-into-per-cpu-directory.patch --]
[-- Type: text/plain, Size: 2269 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
The binary_buffers directory in /debugfs/tracing held the files
to read the trace buffers in a binary format. This held one file
per CPU buffer. But we also have a per_cpu directory that holds
a way to read the pretty-print formats.
This patch moves the binary buffers into the per_cpu_directory:
# ls /debug/tracing/per_cpu/cpu1/
trace trace_pipe trace_pipe_raw
The new name is called "trace_pipe_raw". The binary buffers always
acted similar to trace_pipe, except that they produce raw data.
Requested-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
---
kernel/trace/trace.c | 26 +++++---------------------
1 files changed, 5 insertions(+), 21 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index dbb077d..efe3202 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -3543,6 +3543,11 @@ static void tracing_init_debugfs_percpu(long cpu)
(void *) cpu, &tracing_fops);
if (!entry)
pr_warning("Could not create debugfs 'trace' entry\n");
+
+ entry = debugfs_create_file("trace_pipe_raw", 0444, d_cpu,
+ (void *) cpu, &tracing_buffers_fops);
+ if (!entry)
+ pr_warning("Could not create debugfs 'trace_pipe_raw' entry\n");
}
#ifdef CONFIG_FTRACE_SELFTEST
@@ -3826,7 +3831,6 @@ static __init void create_trace_options_dir(void)
static __init int tracer_init_debugfs(void)
{
struct dentry *d_tracer;
- struct dentry *buffers;
struct dentry *entry;
int cpu;
@@ -3899,26 +3903,6 @@ static __init int tracer_init_debugfs(void)
pr_warning("Could not create debugfs "
"'trace_marker' entry\n");
- buffers = debugfs_create_dir("binary_buffers", d_tracer);
-
- if (!buffers)
- pr_warning("Could not create buffers directory\n");
- else {
- int cpu;
- char buf[64];
-
- for_each_tracing_cpu(cpu) {
- sprintf(buf, "%d", cpu);
-
- entry = debugfs_create_file(buf, 0444, buffers,
- (void *)(long)cpu,
- &tracing_buffers_fops);
- if (!entry)
- pr_warning("Could not create debugfs buffers "
- "'%s' entry\n", buf);
- }
- }
-
#ifdef CONFIG_DYNAMIC_FTRACE
entry = debugfs_create_file("dyn_ftrace_total_info", 0444, d_tracer,
&ftrace_update_tot_cnt,
--
1.6.1.3
--
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 4/4] softirq: no need to have SOFTIRQ in softirq name
2009-03-13 5:04 [PATCH 0/4] [GIT PULL] updates for tip/tracing/ftrace Steven Rostedt
` (2 preceding siblings ...)
2009-03-13 5:04 ` [PATCH 3/4] tracing: move binary buffers into per cpu directory Steven Rostedt
@ 2009-03-13 5:04 ` Steven Rostedt
2009-03-13 5:17 ` Andrew Morton
2009-03-13 5:40 ` Jaswinder Singh Rajput
2009-03-13 5:30 ` [PATCH 0/4] [GIT PULL] updates for tip/tracing/ftrace Ingo Molnar
4 siblings, 2 replies; 9+ messages in thread
From: Steven Rostedt @ 2009-03-13 5:04 UTC (permalink / raw)
To: linux-kernel
Cc: Ingo Molnar, Andrew Morton, Frederic Weisbecker, KOSAKI Motohiro,
Steven Rostedt
[-- Attachment #1: 0004-softirq-no-need-to-have-SOFTIRQ-in-softirq-name.patch --]
[-- Type: text/plain, Size: 906 bytes --]
From: Steven Rostedt <srostedt@redhat.com>
Impact: clean up
It is redundant to have 'SOFTIRQ' in the softirq names.
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Steven Rostedt <srostedt@redhat.com>
---
kernel/softirq.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/kernel/softirq.c b/kernel/softirq.c
index a5e8123..65ff3e3 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -55,9 +55,8 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
char *softirq_to_name[NR_SOFTIRQS] = {
- "HI_SOFTIRQ", "TIMER_SOFTIRQ", "NET_TX_SOFTIRQ", "NET_RX_SOFTIRQ",
- "BLOCK_SOFTIRQ", "TASKLET_SOFTIRQ", "SCHED_SOFTIRQ", "HRTIMER_SOFTIRQ",
- "RCU_SOFTIRQ"
+ "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK",
+ "TASKLET", "SCHED", "HRTIMER", "RCU"
};
/*
--
1.6.1.3
--
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 3/4] tracing: move binary buffers into per cpu directory
2009-03-13 5:04 ` [PATCH 3/4] tracing: move binary buffers into per cpu directory Steven Rostedt
@ 2009-03-13 5:16 ` Andrew Morton
0 siblings, 0 replies; 9+ messages in thread
From: Andrew Morton @ 2009-03-13 5:16 UTC (permalink / raw)
To: Steven Rostedt
Cc: linux-kernel, Ingo Molnar, Frederic Weisbecker, KOSAKI Motohiro,
Steven Rostedt
On Fri, 13 Mar 2009 01:04:49 -0400 Steven Rostedt <rostedt@goodmis.org> wrote:
> if (!entry)
> pr_warning("Could not create debugfs 'trace' entry\n");
> +
> + entry = debugfs_create_file("trace_pipe_raw", 0444, d_cpu,
> + (void *) cpu, &tracing_buffers_fops);
> + if (!entry)
> + pr_warning("Could not create debugfs 'trace_pipe_raw' entry\n");
Maybe we should just do the warning in debugfs_create_file(). It's hard to
think of a scenario where we wouldn't want this failure to be reported.
If there is such a scenario then debugfs_create_file_nowarn() beckons.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 4/4] softirq: no need to have SOFTIRQ in softirq name
2009-03-13 5:04 ` [PATCH 4/4] softirq: no need to have SOFTIRQ in softirq name Steven Rostedt
@ 2009-03-13 5:17 ` Andrew Morton
2009-03-13 5:40 ` Jaswinder Singh Rajput
1 sibling, 0 replies; 9+ messages in thread
From: Andrew Morton @ 2009-03-13 5:17 UTC (permalink / raw)
To: Steven Rostedt
Cc: linux-kernel, Ingo Molnar, Frederic Weisbecker, KOSAKI Motohiro,
Steven Rostedt
On Fri, 13 Mar 2009 01:04:50 -0400 Steven Rostedt <rostedt@goodmis.org> wrote:
> From: Steven Rostedt <srostedt@redhat.com>
>
> Impact: clean up
>
> It is redundant to have 'SOFTIRQ' in the softirq names.
>
> Reported-by: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Steven Rostedt <srostedt@redhat.com>
> ---
> kernel/softirq.c | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/softirq.c b/kernel/softirq.c
> index a5e8123..65ff3e3 100644
> --- a/kernel/softirq.c
> +++ b/kernel/softirq.c
> @@ -55,9 +55,8 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
> static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
>
> char *softirq_to_name[NR_SOFTIRQS] = {
> - "HI_SOFTIRQ", "TIMER_SOFTIRQ", "NET_TX_SOFTIRQ", "NET_RX_SOFTIRQ",
> - "BLOCK_SOFTIRQ", "TASKLET_SOFTIRQ", "SCHED_SOFTIRQ", "HRTIMER_SOFTIRQ",
> - "RCU_SOFTIRQ"
> + "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK",
> + "TASKLET", "SCHED", "HRTIMER", "RCU"
> };
>
hm, I was thinking that you'd also do
printk("%s_SOFTIRQ", ...)
but whatever.
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 0/4] [GIT PULL] updates for tip/tracing/ftrace
2009-03-13 5:04 [PATCH 0/4] [GIT PULL] updates for tip/tracing/ftrace Steven Rostedt
` (3 preceding siblings ...)
2009-03-13 5:04 ` [PATCH 4/4] softirq: no need to have SOFTIRQ in softirq name Steven Rostedt
@ 2009-03-13 5:30 ` Ingo Molnar
4 siblings, 0 replies; 9+ messages in thread
From: Ingo Molnar @ 2009-03-13 5:30 UTC (permalink / raw)
To: Steven Rostedt
Cc: linux-kernel, Andrew Morton, Frederic Weisbecker, KOSAKI Motohiro
* Steven Rostedt <rostedt@goodmis.org> wrote:
>
> Ingo,
>
> Please pull the latest tip/tracing/ftrace tree, which can be found at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace.git
> tip/tracing/ftrace
>
>
> Steven Rostedt (4):
> tracing: left align location header in stack_trace
> tracing: add comment for use of double __builtin_consant_p
> tracing: move binary buffers into per cpu directory
> softirq: no need to have SOFTIRQ in softirq name
>
> ----
> kernel/softirq.c | 5 ++---
> kernel/trace/trace.c | 26 +++++---------------------
> kernel/trace/trace.h | 5 +++++
> kernel/trace/trace_stack.c | 4 ++--
> 4 files changed, 14 insertions(+), 26 deletions(-)
Pulled, thanks Steve!
Ingo
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 4/4] softirq: no need to have SOFTIRQ in softirq name
2009-03-13 5:04 ` [PATCH 4/4] softirq: no need to have SOFTIRQ in softirq name Steven Rostedt
2009-03-13 5:17 ` Andrew Morton
@ 2009-03-13 5:40 ` Jaswinder Singh Rajput
1 sibling, 0 replies; 9+ messages in thread
From: Jaswinder Singh Rajput @ 2009-03-13 5:40 UTC (permalink / raw)
To: Steven Rostedt
Cc: linux-kernel, Ingo Molnar, Andrew Morton, Frederic Weisbecker,
KOSAKI Motohiro, Steven Rostedt
On Fri, 2009-03-13 at 01:04 -0400, Steven Rostedt wrote:
> plain text document attachment
> (0004-softirq-no-need-to-have-SOFTIRQ-in-softirq-name.patch)
> From: Steven Rostedt <srostedt@redhat.com>
>
> Impact: clean up
>
> It is redundant to have 'SOFTIRQ' in the softirq names.
>
> Reported-by: Andrew Morton <akpm@linux-foundation.org>
> Signed-off-by: Steven Rostedt <srostedt@redhat.com>
> ---
> kernel/softirq.c | 5 ++---
> 1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/kernel/softirq.c b/kernel/softirq.c
> index a5e8123..65ff3e3 100644
> --- a/kernel/softirq.c
> +++ b/kernel/softirq.c
> @@ -55,9 +55,8 @@ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp
> static DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
>
> char *softirq_to_name[NR_SOFTIRQS] = {
> - "HI_SOFTIRQ", "TIMER_SOFTIRQ", "NET_TX_SOFTIRQ", "NET_RX_SOFTIRQ",
> - "BLOCK_SOFTIRQ", "TASKLET_SOFTIRQ", "SCHED_SOFTIRQ", "HRTIMER_SOFTIRQ",
> - "RCU_SOFTIRQ"
> + "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK",
> + "TASKLET", "SCHED", "HRTIMER", "RCU"
> };
>
This will look more better:
+ "HI", "TIMER", "NET_TX",
+ "NET_RX", "BLOCK", "TASKLET",
+ "SCHED", "HRTIMER", "RCU"
--
JSR
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2009-03-13 5:41 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-03-13 5:04 [PATCH 0/4] [GIT PULL] updates for tip/tracing/ftrace Steven Rostedt
2009-03-13 5:04 ` [PATCH 1/4] tracing: left align location header in stack_trace Steven Rostedt
2009-03-13 5:04 ` [PATCH 2/4] tracing: add comment for use of double __builtin_consant_p Steven Rostedt
2009-03-13 5:04 ` [PATCH 3/4] tracing: move binary buffers into per cpu directory Steven Rostedt
2009-03-13 5:16 ` Andrew Morton
2009-03-13 5:04 ` [PATCH 4/4] softirq: no need to have SOFTIRQ in softirq name Steven Rostedt
2009-03-13 5:17 ` Andrew Morton
2009-03-13 5:40 ` Jaswinder Singh Rajput
2009-03-13 5:30 ` [PATCH 0/4] [GIT PULL] updates for tip/tracing/ftrace Ingo Molnar
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.