lkml.org 
[lkml]   [2009]   [Sep]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] softirq: Fix softirq_to_name
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



\
 
 \ /
  Last update: 2009-09-17 12:51    [W:0.053 / U:0.364 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site