Messages in this thread Patch in this message | | | From | Mark Rutland <> | Subject | [PATCH 1/2] irq: abstract irqaction handler invocation | Date | Tue, 12 Jan 2021 13:59:49 +0000 |
| |
We have a few functions which invoke irqaction handlers, all of which need to call trace_irq_handler_entry() and trace_irq_handler_exit().
In preparation for adding some additional debug logic to each irqaction handler invocation, let's factor out this work to a helper.
There should be no functional change as a result of this patch.
Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Marc Zyngier <maz@kernel.org> Cc: Paul E. McKenney <paulmck@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> --- kernel/irq/chip.c | 15 +++------------ kernel/irq/handle.c | 4 +--- kernel/irq/internals.h | 28 ++++++++++++++++++++++++++++ 3 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 6d89e33fe3aa..ce3f40d881a8 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -741,16 +741,13 @@ void handle_fasteoi_nmi(struct irq_desc *desc) struct irq_chip *chip = irq_desc_get_chip(desc); struct irqaction *action = desc->action; unsigned int irq = irq_desc_get_irq(desc); - irqreturn_t res; __kstat_incr_irqs_this_cpu(desc); - trace_irq_handler_entry(irq, action); /* * NMIs cannot be shared, there is only one action. */ - res = action->handler(irq, action->dev_id); - trace_irq_handler_exit(irq, action, res); + handle_irqaction(irq, action); if (chip->irq_eoi) chip->irq_eoi(&desc->irq_data); @@ -914,7 +911,6 @@ void handle_percpu_devid_irq(struct irq_desc *desc) struct irq_chip *chip = irq_desc_get_chip(desc); struct irqaction *action = desc->action; unsigned int irq = irq_desc_get_irq(desc); - irqreturn_t res; /* * PER CPU interrupts are not serialized. Do not touch @@ -926,9 +922,7 @@ void handle_percpu_devid_irq(struct irq_desc *desc) chip->irq_ack(&desc->irq_data); if (likely(action)) { - trace_irq_handler_entry(irq, action); - res = action->handler(irq, raw_cpu_ptr(action->percpu_dev_id)); - trace_irq_handler_exit(irq, action, res); + handle_irqaction_percpu_devid(irq, action); } else { unsigned int cpu = smp_processor_id(); bool enabled = cpumask_test_cpu(cpu, desc->percpu_enabled); @@ -957,13 +951,10 @@ void handle_percpu_devid_fasteoi_nmi(struct irq_desc *desc) struct irq_chip *chip = irq_desc_get_chip(desc); struct irqaction *action = desc->action; unsigned int irq = irq_desc_get_irq(desc); - irqreturn_t res; __kstat_incr_irqs_this_cpu(desc); - trace_irq_handler_entry(irq, action); - res = action->handler(irq, raw_cpu_ptr(action->percpu_dev_id)); - trace_irq_handler_exit(irq, action, res); + handle_irqaction_percpu_devid(irq, action); if (chip->irq_eoi) chip->irq_eoi(&desc->irq_data); diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index 762a928e18f9..65994befd280 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -152,9 +152,7 @@ irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc, unsigned int *flags !(action->flags & (IRQF_NO_THREAD | IRQF_PERCPU | IRQF_ONESHOT))) lockdep_hardirq_threaded(); - trace_irq_handler_entry(irq, action); - res = action->handler(irq, action->dev_id); - trace_irq_handler_exit(irq, action, res); + res = handle_irqaction(irq, action); if (WARN_ONCE(!irqs_disabled(),"irq %u handler %pS enabled interrupts\n", irq, action->handler)) diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index 54363527feea..70a4694cc891 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h @@ -11,6 +11,8 @@ #include <linux/pm_runtime.h> #include <linux/sched/clock.h> +#include <trace/events/irq.h> + #ifdef CONFIG_SPARSE_IRQ # define IRQ_BITMAP_BITS (NR_IRQS + 8196) #else @@ -107,6 +109,32 @@ irqreturn_t __handle_irq_event_percpu(struct irq_desc *desc, unsigned int *flags irqreturn_t handle_irq_event_percpu(struct irq_desc *desc); irqreturn_t handle_irq_event(struct irq_desc *desc); +static inline irqreturn_t __handle_irqaction(unsigned int irq, + struct irqaction *action, + void *dev_id) +{ + irqreturn_t res; + + trace_irq_handler_entry(irq, action); + res = action->handler(irq, dev_id); + trace_irq_handler_exit(irq, action, res); + + return res; +} + +static inline irqreturn_t handle_irqaction(unsigned int irq, + struct irqaction *action) +{ + return __handle_irqaction(irq, action, action->dev_id); +} + +static inline irqreturn_t handle_irqaction_percpu_devid(unsigned int irq, + struct irqaction *action) +{ + return __handle_irqaction(irq, action, + raw_cpu_ptr(action->percpu_dev_id)); +} + /* Resending of interrupts :*/ int check_irq_resend(struct irq_desc *desc, bool inject); bool irq_wait_for_poll(struct irq_desc *desc); -- 2.11.0
| |