Skip to contentSkip to conversation

irq: kstat_incr_irqs_this_cpu only needs one parameter

PATCH In review Wang Chen 2 participants 3 messages Dec 26, 2008

Subsystems (3)
x86 Xen hypervisor x86 IRQ
lore
Share & tools
lore

Wang Chen

author
#0 lore raw

PATCH 2/2 irq: kstat_incr_irqs_this_cpu only needs one parameter

desc is useless for kstat_incr_irqs_this_cpu.

Signed-off-by Wang Chen <[email protected]>
---
 arch/x86/kernel/visws_quirks.c |    2 +-
 arch/x86/xen/spinlock.c        |    2 +-
 include/linux/kernel_stat.h    |    3 +--
 kernel/irq/chip.c              |   10 +++++-----
 kernel/irq/handle.c            |    4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)
arch/x86/kernel/visws_quirks.c +1 -1
index 0c9667f..bd37460 100644
@@ -633,7 +633,7 @@ static irqreturn_t piix4_master_intr(int irq, void *dev_id)
 	/*
 	 * handle this 'virtual interrupt' as a Cobalt one now.
 	 */
-	kstat_incr_irqs_this_cpu(realirq, desc);
+	kstat_incr_irqs_this_cpu(realirq);
 
 	if (likely(desc->action != NULL))
 		handle_IRQ_event(realirq, desc->action);
arch/x86/xen/spinlock.c +1 -1
index 5601506..79b4791 100644
@@ -241,7 +241,7 @@ static noinline int xen_spin_lock_slow(struct raw_spinlock *lock, bool irq_enabl
 		ADD_STATS(taken_slow_spurious, !xen_test_irq_pending(irq));
 	} while (!xen_test_irq_pending(irq)); /* check for spurious wakeups */
 
-	kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq));
+	kstat_incr_irqs_this_cpu(irq);
 
 out:
 	raw_local_irq_restore(flags);
include/linux/kernel_stat.h +1 -2
index 546a9d9..8b2e5b7 100644
@@ -47,8 +47,7 @@ extern unsigned long long nr_context_switches(void);
 
 struct irq_desc;
 
-static inline void kstat_incr_irqs_this_cpu(unsigned int irq,
-					    struct irq_desc *desc)
+static inline void kstat_incr_irqs_this_cpu(unsigned int irq)
 {
 	kstat_this_cpu.irqs[irq]++;
 }
kernel/irq/chip.c +5 -5
index b929803..e316635 100644
@@ -317,7 +317,7 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc)
 	if (unlikely(desc->status & IRQ_INPROGRESS))
 		goto out_unlock;
 	desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
-	kstat_incr_irqs_this_cpu(irq, desc);
+	kstat_incr_irqs_this_cpu(irq);
 
 	action = desc->action;
 	if (unlikely(!action || (desc->status & IRQ_DISABLED)))

@@ -359,7 +359,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
 	if (unlikely(desc->status & IRQ_INPROGRESS))
 		goto out_unlock;
 	desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
-	kstat_incr_irqs_this_cpu(irq, desc);
+	kstat_incr_irqs_this_cpu(irq);
 
 	/*
 	 * If its disabled or no action available

@@ -406,7 +406,7 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
 		goto out;
 
 	desc->status &= ~(IRQ_REPLAY | IRQ_WAITING);
-	kstat_incr_irqs_this_cpu(irq, desc);
+	kstat_incr_irqs_this_cpu(irq);
 
 	/*
 	 * If its disabled or no action available

@@ -472,7 +472,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
 		desc = irq_remap_to_desc(irq, desc);
 		goto out_unlock;
 	}
-	kstat_incr_irqs_this_cpu(irq, desc);
+	kstat_incr_irqs_this_cpu(irq);
 
 	/* Start handling the irq */
 	desc->chip->ack(irq);

@@ -528,7 +528,7 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc)
 {
 	irqreturn_t action_ret;
 
-	kstat_incr_irqs_this_cpu(irq, desc);
+	kstat_incr_irqs_this_cpu(irq);
 
 	desc->chip->ack(irq);
kernel/irq/handle.c +2 -2
index 4408672..3323d02 100644
@@ -35,7 +35,7 @@ struct lock_class_key irq_desc_lock_class;
 void handle_bad_irq(unsigned int irq, struct irq_desc *desc)
 {
 	print_irq_desc(irq, desc);
-	kstat_incr_irqs_this_cpu(irq, desc);
+	kstat_incr_irqs_this_cpu(irq);
 	ack_bad_irq(irq);
 }
 

@@ -329,7 +329,7 @@ unsigned int __do_IRQ(unsigned int irq)
 	struct irqaction *action;
 	unsigned int status;
 
-	kstat_incr_irqs_this_cpu(irq, desc);
+	kstat_incr_irqs_this_cpu(irq);
 
 	if (CHECK_IRQ_PER_CPU(desc->status)) {
 		irqreturn_t action_ret;
Signature · 1 line
1.5.3.4
#1 lore raw
Quoted 16 lines · Wang Chen

desc is useless for kstat_incr_irqs_this_cpu.

Signed-off-by Wang Chen <[email protected]>
---
 arch/x86/kernel/visws_quirks.c |    2 +-
 arch/x86/xen/spinlock.c        |    2 +-
 include/linux/kernel_stat.h    |    3 +--
 kernel/irq/chip.c              |   10 +++++-----
 kernel/irq/handle.c            |    4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)
arch/x86/kernel/visws_quirks.c +0 -0
index 0c9667f..bd37460 100644

arch/x86/kernel/visws_quirks.c static irqreturn_t piix4_master_intr(int irq, void *dev_id) · line 639

Quoted 8 lines
arch/x86/kernel/visws_quirks.c +1 -1
@@ -633,7 +633,7 @@ static irqreturn_t piix4_master_intr(int irq, void *dev_id)
 	/*
 	 * handle this 'virtual interrupt' as a Cobalt one now.
 	 */
-	kstat_incr_irqs_this_cpu(realirq, desc);
+	kstat_incr_irqs_this_cpu(realirq);
 
 	if (likely(desc->action != NULL))
 		handle_IRQ_event(realirq, desc->action);

'desc' is needed in the sparseirq model:

#define kstat_incr_irqs_this_cpu(irqno, DESC) \
        ((DESC)->kstat_irqs[smp_processor_id()]++)

See:

http://people.redhat.com/mingo/tip.git/README

Ingo

author
#2 lore raw

Ingo Molnar said the following on 2008-12-26 17:18:

Quoted 29 lines · Wang Chen
Quoted 17 lines

desc is useless for kstat_incr_irqs_this_cpu.

Signed-off-by Wang Chen <[email protected]>
---
 arch/x86/kernel/visws_quirks.c |    2 +-
 arch/x86/xen/spinlock.c        |    2 +-
 include/linux/kernel_stat.h    |    3 +--
 kernel/irq/chip.c              |   10 +++++-----
 kernel/irq/handle.c            |    4 ++--
 5 files changed, 10 insertions(+), 11 deletions(-)
arch/x86/kernel/visws_quirks.c +0 -0
index 0c9667f..bd37460 100644

arch/x86/kernel/visws_quirks.c static irqreturn_t piix4_master_intr(int irq, void *dev_id) · line 639

Quoted 8 lines
arch/x86/kernel/visws_quirks.c +1 -1
@@ -633,7 +633,7 @@ static irqreturn_t piix4_master_intr(int irq, void *dev_id)
 	/*
 	 * handle this 'virtual interrupt' as a Cobalt one now.
 	 */
-	kstat_incr_irqs_this_cpu(realirq, desc);
+	kstat_incr_irqs_this_cpu(realirq);
 
 	if (likely(desc->action != NULL))
 		handle_IRQ_event(realirq, desc->action);

'desc' is needed in the sparseirq model:

Quoted 8 lines
#define kstat_incr_irqs_this_cpu(irqno, DESC) \
        ((DESC)->kstat_irqs[smp_processor_id()]++)

See:

http://people.redhat.com/mingo/tip.git/README

Ingo

Sorry, I didn't checkout that branch.
Please ignore this one.