mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-05 10:29:37 +00:00
Code Issues Releases Wiki Activity

powerpc: Make irq_stat.timers_irqs counting more specific

Browse source 
Current irq_stat.timers_irqs counting doesn't discriminate timer event handler
and other timer interrupt(like arch_irq_work_raise). Sometimes we need to know
exactly how much interrupts timer event handler fired, so let's be more specific
on this.

Signed-off-by: Fan Du <fan.du@windriver.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
fan.du 2013-01-23 16:06:11 +08:00 committed by Benjamin Herrenschmidt
parent 0ce636700c
commit c041cfa2af
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/powerpc/include/asm/hardirq.h
View file

@ -6,7 +6,8 @@
typedef struct { typedef struct {
unsigned int __softirq_pending; unsigned int __softirq_pending;
unsigned int timer_irqs; unsigned int timer_irqs_event;
unsigned int timer_irqs_others;
unsigned int pmu_irqs; unsigned int pmu_irqs;
unsigned int mce_exceptions; unsigned int mce_exceptions;
unsigned int spurious_irqs; unsigned int spurious_irqs;

12
arch/powerpc/kernel/irq.c
View file

@ -354,8 +354,13 @@ int arch_show_interrupts(struct seq_file *p, int prec)
seq_printf(p, "%*s: ", prec, "LOC"); seq_printf(p, "%*s: ", prec, "LOC");
for_each_online_cpu(j) for_each_online_cpu(j)
seq_printf(p, "%10u ", per_cpu(irq_stat, j).timer_irqs); seq_printf(p, "%10u ", per_cpu(irq_stat, j).timer_irqs_event);
seq_printf(p, " Local timer interrupts\n"); seq_printf(p, " Local timer interrupts for timer event device\n");
seq_printf(p, "%*s: ", prec, "LOC");
for_each_online_cpu(j)
seq_printf(p, "%10u ", per_cpu(irq_stat, j).timer_irqs_others);
seq_printf(p, " Local timer interrupts for others\n");
seq_printf(p, "%*s: ", prec, "SPU"); seq_printf(p, "%*s: ", prec, "SPU");
for_each_online_cpu(j) for_each_online_cpu(j)
@ -389,11 +394,12 @@ int arch_show_interrupts(struct seq_file *p, int prec)
*/ */
u64 arch_irq_stat_cpu(unsigned int cpu) u64 arch_irq_stat_cpu(unsigned int cpu)
{ {
u64 sum = per_cpu(irq_stat, cpu).timer_irqs; u64 sum = per_cpu(irq_stat, cpu).timer_irqs_event;
sum += per_cpu(irq_stat, cpu).pmu_irqs; sum += per_cpu(irq_stat, cpu).pmu_irqs;
sum += per_cpu(irq_stat, cpu).mce_exceptions; sum += per_cpu(irq_stat, cpu).mce_exceptions;
sum += per_cpu(irq_stat, cpu).spurious_irqs; sum += per_cpu(irq_stat, cpu).spurious_irqs;
sum += per_cpu(irq_stat, cpu).timer_irqs_others;
#ifdef CONFIG_PPC_DOORBELL #ifdef CONFIG_PPC_DOORBELL
sum += per_cpu(irq_stat, cpu).doorbell_irqs; sum += per_cpu(irq_stat, cpu).doorbell_irqs;
#endif #endif

3
arch/powerpc/kernel/time.c
View file

@ -510,7 +510,6 @@ void timer_interrupt(struct pt_regs * regs)
*/ */
may_hard_irq_enable(); may_hard_irq_enable();
__get_cpu_var(irq_stat).timer_irqs++;
#if defined(CONFIG_PPC32) && defined(CONFIG_PMAC) #if defined(CONFIG_PPC32) && defined(CONFIG_PMAC)
if (atomic_read(&ppc_n_lost_interrupts) != 0) if (atomic_read(&ppc_n_lost_interrupts) != 0)
@ -532,10 +531,12 @@ void timer_interrupt(struct pt_regs * regs)
*next_tb = ~(u64)0; *next_tb = ~(u64)0;
if (evt->event_handler) if (evt->event_handler)
evt->event_handler(evt); evt->event_handler(evt);
__get_cpu_var(irq_stat).timer_irqs_event++;
} else { } else {
now = *next_tb - now; now = *next_tb - now;
if (now <= DECREMENTER_MAX) if (now <= DECREMENTER_MAX)
set_dec((int)now); set_dec((int)now);
__get_cpu_var(irq_stat).timer_irqs_others++;
} }
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64