* [PATCH] softirq: Fix softirq_to_name
@ 2009-09-17 9:38 Li Zefan
2009-09-17 10:47 ` Jens Axboe
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Li Zefan @ 2009-09-17 9:38 UTC (permalink / raw)
To: Ingo Molnar; +Cc: Steven Rostedt, Jens Axboe, LKML
With BLOCK_IOPOLL_SOFTIRQ added, softirq_to_name[] and
show_softirq_name() needs to be updated.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
We can automatically generate softirq_to_name[] and
show_softirq_name(), but since it's rare to add new softirq,
I decide to just add the missing one.
---
include/trace/events/irq.h | 21 +++++++++++----------
kernel/softirq.c | 2 +-
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
index 1cb0c3a..b89f9db 100644
--- a/include/trace/events/irq.h
+++ b/include/trace/events/irq.h
@@ -8,16 +8,17 @@
#include <linux/interrupt.h>
#define softirq_name(sirq) { sirq##_SOFTIRQ, #sirq }
-#define show_softirq_name(val) \
- __print_symbolic(val, \
- softirq_name(HI), \
- softirq_name(TIMER), \
- softirq_name(NET_TX), \
- softirq_name(NET_RX), \
- softirq_name(BLOCK), \
- softirq_name(TASKLET), \
- softirq_name(SCHED), \
- softirq_name(HRTIMER), \
+#define show_softirq_name(val) \
+ __print_symbolic(val, \
+ softirq_name(HI), \
+ softirq_name(TIMER), \
+ softirq_name(NET_TX), \
+ softirq_name(NET_RX), \
+ softirq_name(BLOCK), \
+ softirq_name(BLOCK_IOPOLL), \
+ softirq_name(TASKLET), \
+ softirq_name(SCHED), \
+ softirq_name(HRTIMER), \
softirq_name(RCU))
/**
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 7db2506..f8749e5 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -57,7 +57,7 @@ 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", "TIMER", "NET_TX", "NET_RX", "BLOCK",
+ "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
"TASKLET", "SCHED", "HRTIMER", "RCU"
};
--
1.6.3
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] softirq: Fix softirq_to_name
2009-09-17 9:38 [PATCH] softirq: Fix softirq_to_name Li Zefan
@ 2009-09-17 10:47 ` Jens Axboe
2009-09-17 13:19 ` Steven Rostedt
2009-09-17 20:16 ` [tip:tracing/core] softirq: add BLOCK_IOPOLL to softirq_to_name tip-bot for Li Zefan
2 siblings, 0 replies; 4+ messages in thread
From: Jens Axboe @ 2009-09-17 10:47 UTC (permalink / raw)
To: Li Zefan; +Cc: Ingo Molnar, Steven Rostedt, LKML
On Thu, Sep 17 2009, Li Zefan wrote:
> With BLOCK_IOPOLL_SOFTIRQ added, softirq_to_name[] and
> show_softirq_name() needs to be updated.
Indeed, thanks!
>
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
> ---
>
> We can automatically generate softirq_to_name[] and
> show_softirq_name(), but since it's rare to add new softirq,
> I decide to just add the missing one.
>
> ---
> include/trace/events/irq.h | 21 +++++++++++----------
> kernel/softirq.c | 2 +-
> 2 files changed, 12 insertions(+), 11 deletions(-)
>
> diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
> index 1cb0c3a..b89f9db 100644
> --- a/include/trace/events/irq.h
> +++ b/include/trace/events/irq.h
> @@ -8,16 +8,17 @@
> #include <linux/interrupt.h>
>
> #define softirq_name(sirq) { sirq##_SOFTIRQ, #sirq }
> -#define show_softirq_name(val) \
> - __print_symbolic(val, \
> - softirq_name(HI), \
> - softirq_name(TIMER), \
> - softirq_name(NET_TX), \
> - softirq_name(NET_RX), \
> - softirq_name(BLOCK), \
> - softirq_name(TASKLET), \
> - softirq_name(SCHED), \
> - softirq_name(HRTIMER), \
> +#define show_softirq_name(val) \
> + __print_symbolic(val, \
> + softirq_name(HI), \
> + softirq_name(TIMER), \
> + softirq_name(NET_TX), \
> + softirq_name(NET_RX), \
> + softirq_name(BLOCK), \
> + softirq_name(BLOCK_IOPOLL), \
> + softirq_name(TASKLET), \
> + softirq_name(SCHED), \
> + softirq_name(HRTIMER), \
> softirq_name(RCU))
>
> /**
> diff --git a/kernel/softirq.c b/kernel/softirq.c
> index 7db2506..f8749e5 100644
> --- a/kernel/softirq.c
> +++ b/kernel/softirq.c
> @@ -57,7 +57,7 @@ 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", "TIMER", "NET_TX", "NET_RX", "BLOCK",
> + "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
> "TASKLET", "SCHED", "HRTIMER", "RCU"
> };
>
> --
> 1.6.3
>
--
Jens Axboe
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] softirq: Fix softirq_to_name
2009-09-17 9:38 [PATCH] softirq: Fix softirq_to_name Li Zefan
2009-09-17 10:47 ` Jens Axboe
@ 2009-09-17 13:19 ` Steven Rostedt
2009-09-17 20:16 ` [tip:tracing/core] softirq: add BLOCK_IOPOLL to softirq_to_name tip-bot for Li Zefan
2 siblings, 0 replies; 4+ messages in thread
From: Steven Rostedt @ 2009-09-17 13:19 UTC (permalink / raw)
To: Li Zefan; +Cc: Ingo Molnar, Jens Axboe, LKML
On Thu, 2009-09-17 at 17:38 +0800, Li Zefan wrote:
> With BLOCK_IOPOLL_SOFTIRQ added, softirq_to_name[] and
Ug, another softirq added :-(
> show_softirq_name() needs to be updated.
>
> Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
Thanks Li, I'll pull it in.
-- Steve
^ permalink raw reply [flat|nested] 4+ messages in thread
* [tip:tracing/core] softirq: add BLOCK_IOPOLL to softirq_to_name
2009-09-17 9:38 [PATCH] softirq: Fix softirq_to_name Li Zefan
2009-09-17 10:47 ` Jens Axboe
2009-09-17 13:19 ` Steven Rostedt
@ 2009-09-17 20:16 ` tip-bot for Li Zefan
2 siblings, 0 replies; 4+ messages in thread
From: tip-bot for Li Zefan @ 2009-09-17 20:16 UTC (permalink / raw)
To: linux-tip-commits; +Cc: linux-kernel, hpa, mingo, rostedt, lizf, tglx
Commit-ID: 5dd4de587fd9c25cb32a7a0fe9feec3647509b6f
Gitweb: http://git.kernel.org/tip/5dd4de587fd9c25cb32a7a0fe9feec3647509b6f
Author: Li Zefan <lizf@cn.fujitsu.com>
AuthorDate: Thu, 17 Sep 2009 17:38:32 +0800
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Thu, 17 Sep 2009 15:53:44 -0400
softirq: add BLOCK_IOPOLL to softirq_to_name
With BLOCK_IOPOLL_SOFTIRQ added, softirq_to_name[] and
show_softirq_name() needs to be updated.
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4AB20398.8070209@cn.fujitsu.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
include/trace/events/irq.h | 21 +++++++++++----------
kernel/softirq.c | 2 +-
2 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/include/trace/events/irq.h b/include/trace/events/irq.h
index 1cb0c3a..b89f9db 100644
--- a/include/trace/events/irq.h
+++ b/include/trace/events/irq.h
@@ -8,16 +8,17 @@
#include <linux/interrupt.h>
#define softirq_name(sirq) { sirq##_SOFTIRQ, #sirq }
-#define show_softirq_name(val) \
- __print_symbolic(val, \
- softirq_name(HI), \
- softirq_name(TIMER), \
- softirq_name(NET_TX), \
- softirq_name(NET_RX), \
- softirq_name(BLOCK), \
- softirq_name(TASKLET), \
- softirq_name(SCHED), \
- softirq_name(HRTIMER), \
+#define show_softirq_name(val) \
+ __print_symbolic(val, \
+ softirq_name(HI), \
+ softirq_name(TIMER), \
+ softirq_name(NET_TX), \
+ softirq_name(NET_RX), \
+ softirq_name(BLOCK), \
+ softirq_name(BLOCK_IOPOLL), \
+ softirq_name(TASKLET), \
+ softirq_name(SCHED), \
+ softirq_name(HRTIMER), \
softirq_name(RCU))
/**
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 7db2506..f8749e5 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -57,7 +57,7 @@ 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", "TIMER", "NET_TX", "NET_RX", "BLOCK",
+ "HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "BLOCK_IOPOLL",
"TASKLET", "SCHED", "HRTIMER", "RCU"
};
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-09-17 20:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-17 9:38 [PATCH] softirq: Fix softirq_to_name Li Zefan
2009-09-17 10:47 ` Jens Axboe
2009-09-17 13:19 ` Steven Rostedt
2009-09-17 20:16 ` [tip:tracing/core] softirq: add BLOCK_IOPOLL to softirq_to_name tip-bot for Li Zefan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox