irq: Use a common macro to go through the actions list
PATCH 1/1 irq: Use a common macro to go through the actions list
The irq code browses the list of actions differently to inspect the element one by one. Even if it is not a problem, for the sake of lisibility and to unification of the code, provide a macro similar to for_each_irq_desc in order to have the same loop to go through the actions list and use it in the code.
--- kernel/irq/handle.c | 7 +++---- kernel/irq/internals.h | 3 +++ kernel/irq/manage.c | 8 +++----- kernel/irq/proc.c | 2 +- kernel/irq/spurious.c | 4 +--- 5 files changed, 11 insertions(+), 13 deletions(-)
kernel/irq/handle.c +3 -4
@@ -136,9 +136,9 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc) {irqreturn_t retval =IRQ_NONE ;unsigned int flags =0 , irq = desc->irq_data.irq; -struct irqaction *action = desc->action; +struct irqaction *action; - do { +for_each_desc_action (desc, action) {irqreturn_t res;trace_irq_handler_entry (irq, action);
@@ -172,8 +172,7 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc) } retval |= res; - action = action->next; - }while (action); + }add_interrupt_randomness (irq, flags);
kernel/irq/internals.h +3 -0
@@ -131,6 +131,9 @@ static inline void chip_bus_sync_unlock(struct irq_desc *desc)#define IRQ_GET_DESC_CHECK_GLOBAL (_IRQ_DESC_CHECK)#define IRQ_GET_DESC_CHECK_PERCPU (_IRQ_DESC_CHECK | _IRQ_DESC_PERCPU) +#define for_each_desc_action (desc, act) \ + for (act = desc->act; act; act = act->next) +struct irq_desc *__irq_get_desc_lock (unsigned int irq,unsigned long *flags,bool bus,unsigned int check);
kernel/irq/manage.c +3 -5
@@ -144,13 +144,11 @@ int irq_can_set_affinity(unsigned int irq)*/ void irq_set_thread_affinity (struct irq_desc *desc) { -struct irqaction *action = desc->action; +struct irqaction *action; -while (action) { +for_each_desc_action (desc, action)if (action->thread)set_bit (IRQTF_AFFINITY , &action->thread_flags); - action = action->next; - } }#ifdef CONFIG_GENERIC_PENDING_IRQ
@@ -994,7 +992,7 @@ void irq_wake_thread(unsigned int irq, void *dev_id)return ;raw_spin_lock_irqsave (&desc->lock, flags); -for (action = desc->action; action; action = action->next) { +for_each_desc_action (desc, action) {if (action->dev_id == dev_id) {if (action->thread)__irq_wake_thread (desc, action);
kernel/irq/proc.c +1 -1
@@ -291,7 +291,7 @@ static int name_unique(unsigned int irq, struct irqaction *new_action)int ret =1 ;raw_spin_lock_irqsave (&desc->lock, flags); -for (action = desc->action ; action; action = action->next) { +for_each_desc_action (desc, action) {if ((action != new_action) && action->name && !strcmp (new_action->name, action->name)) { ret =0 ;
kernel/irq/spurious.c +1 -3
@@ -211,14 +211,12 @@ static void __report_bad_irq(struct irq_desc *desc, irqreturn_t action_ret)* desc->lock here. See synchronize_irq(). */ raw_spin_lock_irqsave (&desc->lock, flags); - action = desc->action; -while (action) { +for_each_desc_action (desc, action) {printk (KERN_ERR "[<%p>] %pf" , action->handler, action->handler);if (action->thread_fn)printk (KERN_CONT " threaded [<%p>] %pf" , action->thread_fn, action->thread_fn);printk (KERN_CONT "\n" ); - action = action->next; }raw_spin_unlock_irqrestore (&desc->lock, flags); }
Signature · 1 line
1.9.1
tip-bot for Daniel Lezcano
merge bot[tip:irq/core] genirq: Use a common macro to go through the actions list
genirq: Use a common macro to go through the actions list
Commit-ID: aff62cf66ad6065ce04fc3454a11ec19714537fb Gitweb: http://git.kernel.org/tip/aff62cf66ad6065ce04fc3454a11ec19714537fb Author: Daniel Lezcano <[email protected]> AuthorDate: Thu, 14 Jan 2016 10:54:13 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 8 Feb 2016 11:45:21 +0100
genirq: Use a common macro to go through the actions list
The irq code browses the list of actions differently to inspect the element one by one. Even if it is not a problem, for the sake of consistent code, provide a macro similar to for_each_irq_desc in order to have the same loop to go through the actions list and use it in the code.
[ tglx: Renamed the macro ]
--- kernel/irq/handle.c | 5 ++--- kernel/irq/internals.h | 3 +++ kernel/irq/manage.c | 8 +++----- kernel/irq/proc.c | 2 +- kernel/irq/spurious.c | 4 +--- 5 files changed, 10 insertions(+), 12 deletions(-)
kernel/irq/handle.c +2 -3
@@ -136,10 +136,9 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc) {irqreturn_t retval =IRQ_NONE ;unsigned int flags =0 , irq = desc->irq_data.irq; -struct irqaction *action = desc->action; +struct irqaction *action; -/* action might have become NULL since we dropped the lock */ -while (action) { +for_each_action_of_desc (desc, action) {irqreturn_t res;trace_irq_handler_entry (irq, action);
kernel/irq/internals.h +3 -0
@@ -131,6 +131,9 @@ static inline void chip_bus_sync_unlock(struct irq_desc *desc)#define IRQ_GET_DESC_CHECK_GLOBAL (_IRQ_DESC_CHECK)#define IRQ_GET_DESC_CHECK_PERCPU (_IRQ_DESC_CHECK | _IRQ_DESC_PERCPU) +#define for_each_action_of_desc (desc, act) \ + for (act = desc->act; act; act = act->next) +struct irq_desc *__irq_get_desc_lock (unsigned int irq,unsigned long *flags,bool bus,unsigned int check);
kernel/irq/manage.c +3 -5
@@ -144,13 +144,11 @@ int irq_can_set_affinity(unsigned int irq)*/ void irq_set_thread_affinity (struct irq_desc *desc) { -struct irqaction *action = desc->action; +struct irqaction *action; -while (action) { +for_each_action_of_desc (desc, action)if (action->thread)set_bit (IRQTF_AFFINITY , &action->thread_flags); - action = action->next; - } }#ifdef CONFIG_GENERIC_PENDING_IRQ
@@ -994,7 +992,7 @@ void irq_wake_thread(unsigned int irq, void *dev_id)return ;raw_spin_lock_irqsave (&desc->lock, flags); -for (action = desc->action; action; action = action->next) { +for_each_action_of_desc (desc, action) {if (action->dev_id == dev_id) {if (action->thread)__irq_wake_thread (desc, action);
kernel/irq/proc.c +1 -1
@@ -291,7 +291,7 @@ static int name_unique(unsigned int irq, struct irqaction *new_action)int ret =1 ;raw_spin_lock_irqsave (&desc->lock, flags); -for (action = desc->action ; action; action = action->next) { +for_each_action_of_desc (desc, action) {if ((action != new_action) && action->name && !strcmp (new_action->name, action->name)) { ret =0 ;
kernel/irq/spurious.c +1 -3
@@ -211,14 +211,12 @@ static void __report_bad_irq(struct irq_desc *desc, irqreturn_t action_ret)* desc->lock here. See synchronize_irq(). */ raw_spin_lock_irqsave (&desc->lock, flags); - action = desc->action; -while (action) { +for_each_action_of_desc (desc, action) {printk (KERN_ERR "[<%p>] %pf" , action->handler, action->handler);if (action->thread_fn)printk (KERN_CONT " threaded [<%p>] %pf" , action->thread_fn, action->thread_fn);printk (KERN_CONT "\n" ); - action = action->next; }raw_spin_unlock_irqrestore (&desc->lock, flags); }
Re: [tip:irq/core] genirq: Use a common macro to go through the actions list
Quoted 34 lines · tip-bot for Daniel Lezcano
Commit-ID: aff62cf66ad6065ce04fc3454a11ec19714537fb Gitweb: http://git.kernel.org/tip/aff62cf66ad6065ce04fc3454a11ec19714537fb Author: Daniel Lezcano <[email protected]> AuthorDate: Thu, 14 Jan 2016 10:54:13 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 8 Feb 2016 11:45:21 +0100genirq: Use a common macro to go through the actions list
The irq code browses the list of actions differently to inspect the element one by one. Even if it is not a problem, for the sake of consistent code, provide a macro similar to
for_each_irq_descin order to have the same loop to go through the actions list and use it in the code.[ tglx: Renamed the macro ]
Signed-off-by Daniel Lezcano <[email protected]>Signed-off-by Thomas Gleixner <[email protected]>--- kernel/irq/handle.c | 5 ++--- kernel/irq/internals.h | 3 +++ kernel/irq/manage.c | 8 +++----- kernel/irq/proc.c | 2 +- kernel/irq/spurious.c | 4 +--- 5 files changed, 10 insertions(+), 12 deletions(-)kernel/irq/handle.c +0
-0@@ -136,10 +136,9 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc) {irqreturn_t retval =IRQ_NONE ;
kernel/irq/handle.c irqreturn_t handle_irq_event_percpu(struct irq_desc *desc) · line 144
Quoted 10 lines
kernel/irq/handle.c +2
-3unsigned int flags =0 , irq = desc->irq_data.irq; -struct irqaction *action = desc->action; +struct irqaction *action; -/* action might have become NULL since we dropped the lock */ -while (action) { +for_each_action_of_desc (desc, action) {irqreturn_t res;trace_irq_handler_entry (irq, action);
The merge lost the removal of:
action = action->next;
resulting to the NULL pointer dereference bug spotted by 01.org.
Do you want me to resend a new patch ?
-- Daniel
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
tip-bot for Daniel Lezcano
merge bot[tip:irq/core] genirq: Use a common macro to go through the actions list
In reply to Daniel Lezcanogenirq: Use a common macro to go through the actions list
Commit-ID: f944b5a7aff05a244a6c8cac297819af09a199e4 Gitweb: http://git.kernel.org/tip/f944b5a7aff05a244a6c8cac297819af09a199e4 Author: Daniel Lezcano <[email protected]> AuthorDate: Thu, 14 Jan 2016 10:54:13 +0100 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 15 Feb 2016 00:07:34 +0100
genirq: Use a common macro to go through the actions list
The irq code browses the list of actions differently to inspect the element one by one. Even if it is not a problem, for the sake of consistent code, provide a macro similar to for_each_irq_desc in order to have the same loop to go through the actions list and use it in the code.
[ tglx: Renamed the macro ]
--- kernel/irq/handle.c | 6 ++---- kernel/irq/internals.h | 3 +++ kernel/irq/manage.c | 8 +++----- kernel/irq/proc.c | 2 +- kernel/irq/spurious.c | 4 +--- 5 files changed, 10 insertions(+), 13 deletions(-)
kernel/irq/handle.c +2 -4
@@ -136,10 +136,9 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc) {irqreturn_t retval =IRQ_NONE ;unsigned int flags =0 , irq = desc->irq_data.irq; -struct irqaction *action = desc->action; +struct irqaction *action; -/* action might have become NULL since we dropped the lock */ -while (action) { +for_each_action_of_desc (desc, action) {irqreturn_t res;trace_irq_handler_entry (irq, action);
@@ -173,7 +172,6 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc) } retval |= res; - action = action->next; }add_interrupt_randomness (irq, flags);
kernel/irq/internals.h +3 -0
@@ -131,6 +131,9 @@ static inline void chip_bus_sync_unlock(struct irq_desc *desc)#define IRQ_GET_DESC_CHECK_GLOBAL (_IRQ_DESC_CHECK)#define IRQ_GET_DESC_CHECK_PERCPU (_IRQ_DESC_CHECK | _IRQ_DESC_PERCPU) +#define for_each_action_of_desc (desc, act) \ + for (act = desc->act; act; act = act->next) +struct irq_desc *__irq_get_desc_lock (unsigned int irq,unsigned long *flags,bool bus,unsigned int check);
kernel/irq/manage.c +3 -5
@@ -144,13 +144,11 @@ int irq_can_set_affinity(unsigned int irq)*/ void irq_set_thread_affinity (struct irq_desc *desc) { -struct irqaction *action = desc->action; +struct irqaction *action; -while (action) { +for_each_action_of_desc (desc, action)if (action->thread)set_bit (IRQTF_AFFINITY , &action->thread_flags); - action = action->next; - } }#ifdef CONFIG_GENERIC_PENDING_IRQ
@@ -994,7 +992,7 @@ void irq_wake_thread(unsigned int irq, void *dev_id)return ;raw_spin_lock_irqsave (&desc->lock, flags); -for (action = desc->action; action; action = action->next) { +for_each_action_of_desc (desc, action) {if (action->dev_id == dev_id) {if (action->thread)__irq_wake_thread (desc, action);
kernel/irq/proc.c +1 -1
@@ -291,7 +291,7 @@ static int name_unique(unsigned int irq, struct irqaction *new_action)int ret =1 ;raw_spin_lock_irqsave (&desc->lock, flags); -for (action = desc->action ; action; action = action->next) { +for_each_action_of_desc (desc, action) {if ((action != new_action) && action->name && !strcmp (new_action->name, action->name)) { ret =0 ;
kernel/irq/spurious.c +1 -3
@@ -211,14 +211,12 @@ static void __report_bad_irq(struct irq_desc *desc, irqreturn_t action_ret)* desc->lock here. See synchronize_irq(). */ raw_spin_lock_irqsave (&desc->lock, flags); - action = desc->action; -while (action) { +for_each_action_of_desc (desc, action) {printk (KERN_ERR "[<%p>] %pf" , action->handler, action->handler);if (action->thread_fn)printk (KERN_CONT " threaded [<%p>] %pf" , action->thread_fn, action->thread_fn);printk (KERN_CONT "\n" ); - action = action->next; }raw_spin_unlock_irqrestore (&desc->lock, flags); }