softirq: Fix softirq_to_name
PATCH 1/1 softirq: Fix softirq_to_name
With BLOCK_IOPOLL_SOFTIRQ added, softirq_to_name[] and show_softirq_name() needs to be updated.
---
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(-)
include/trace/events/irq.h +11 -10
@@ -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))/**
kernel/softirq.c +1 -1
@@ -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" };
Signature · 1 line
1.6.3
Quoted 2 lines · Li Zefan
With
BLOCK_IOPOLL_SOFTIRQadded, softirq_to_name[] andshow_softirq_name()needs to be updated.
Indeed, thanks!
Quoted 61 lines
Signed-off-by Li Zefan <[email protected]>---
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(-)include/trace/events/irq.h +11
-10@@ -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))/** kernel/softirq.c +1
-1@@ -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" };Signature · 1 line
1.6.3
Signature · 1 line
Jens Axboe
Steven Rostedt
maintainerQuoted 1 line · Li Zefan
With
BLOCK_IOPOLL_SOFTIRQadded, softirq_to_name[] and
Ug, another softirq added :-(
Quoted 3 lines
show_softirq_name()needs to be updated.Signed-off-by Li Zefan <[email protected]>
Thanks Li, I'll pull it in.
-- Steve
[tip:tracing/core] softirq: add BLOCK_IOPOLL to softirq_to_name
In reply to Li ZefanCommit-ID: 5dd4de587fd9c25cb32a7a0fe9feec3647509b6f Gitweb: http://git.kernel.org/tip/5dd4de587fd9c25cb32a7a0fe9feec3647509b6f Author: Li Zefan <[email protected]> AuthorDate: Thu, 17 Sep 2009 17:38:32 +0800 Committer: Steven Rostedt <[email protected]> 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.
LKML-Reference: <[email protected]>
--- include/trace/events/irq.h | 21 +++++++++++---------- kernel/softirq.c | 2 +- 2 files changed, 12 insertions(+), 11 deletions(-)
include/trace/events/irq.h +11 -10
@@ -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))/**
kernel/softirq.c +1 -1
@@ -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" };