Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0c168ca authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: cleanup show_interrupts 



The sparseirq patches introduced some more ugliness in show_interrupts().
Clean it up all together and make the code easier to read by splitting out
the "tail" function  which prints the special interrupts.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent d3c60047

arch/x86/kernel/irq_32.c

+77 −83
Original line number Diff line number Diff line
@@ -263,22 +263,67 @@ atomic_t irq_err_count; 
 * /proc/interrupts printing:

 */



static int show_other_interrupts(struct seq_file *p)

{

	int j;



	seq_printf(p, "NMI: ");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", nmi_count(j));

	seq_printf(p, "  Non-maskable interrupts\n");

#ifdef CONFIG_X86_LOCAL_APIC

	seq_printf(p, "LOC: ");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", per_cpu(irq_stat,j).apic_timer_irqs);

	seq_printf(p, "  Local timer interrupts\n");

#endif

#ifdef CONFIG_SMP

	seq_printf(p, "RES: ");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", per_cpu(irq_stat,j).irq_resched_count);

	seq_printf(p, "  Rescheduling interrupts\n");

	seq_printf(p, "CAL: ");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", per_cpu(irq_stat,j).irq_call_count);

	seq_printf(p, "  Function call interrupts\n");

	seq_printf(p, "TLB: ");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", per_cpu(irq_stat,j).irq_tlb_count);

	seq_printf(p, "  TLB shootdowns\n");

#endif

#ifdef CONFIG_X86_MCE

	seq_printf(p, "TRM: ");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", per_cpu(irq_stat,j).irq_thermal_count);

	seq_printf(p, "  Thermal event interrupts\n");

#endif

#ifdef CONFIG_X86_LOCAL_APIC

	seq_printf(p, "SPU: ");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", per_cpu(irq_stat,j).irq_spurious_count);

	seq_printf(p, "  Spurious interrupts\n");

#endif

	seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));

#if defined(CONFIG_X86_IO_APIC)

	seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count));

#endif

	return 0;

}



int show_interrupts(struct seq_file *p, void *v)

{

	unsigned long flags, any_count = 0;

	int i = *(loff_t *) v, j;

	struct irqaction *action;

	unsigned long flags;

	unsigned int entries;

	struct irq_desc *desc = NULL;

	int tail = 0;

	struct irq_desc *desc;



	if (i > nr_irqs)

		return 0;



	entries = nr_irqs - 1;

	i = *(loff_t *) v;

	if (i == nr_irqs)

		tail = 1;

	else

		desc = irq_to_desc(i);

		return show_other_interrupts(p);



	/* print header */

	if (i == 0) {

		seq_printf(p, "           ");

		for_each_online_cpu(j)
@@ -286,9 +331,7 @@ int show_interrupts(struct seq_file *p, void *v) 
		seq_putc(p, '\n');

	}



	if (i <= entries) {

		unsigned any_count = 0;



	desc = irq_to_desc(i);

	spin_lock_irqsave(&desc->lock, flags);

#ifndef CONFIG_SMP

	any_count = kstat_irqs(i);
@@ -298,7 +341,8 @@ int show_interrupts(struct seq_file *p, void *v) 
#endif

	action = desc->action;

	if (!action && !any_count)

			goto skip;

		goto out;



	seq_printf(p, "%3d: ", i);

#ifndef CONFIG_SMP

	seq_printf(p, "%10u ", kstat_irqs(i));
@@ -316,58 +360,8 @@ int show_interrupts(struct seq_file *p, void *v) 
	}



	seq_putc(p, '\n');

skip:

out:

	spin_unlock_irqrestore(&desc->lock, flags);

	}



	if (tail) {

		seq_printf(p, "NMI: ");

		for_each_online_cpu(j)

			seq_printf(p, "%10u ", nmi_count(j));

		seq_printf(p, "  Non-maskable interrupts\n");

#ifdef CONFIG_X86_LOCAL_APIC

		seq_printf(p, "LOC: ");

		for_each_online_cpu(j)

			seq_printf(p, "%10u ",

				per_cpu(irq_stat,j).apic_timer_irqs);

		seq_printf(p, "  Local timer interrupts\n");

#endif

#ifdef CONFIG_SMP

		seq_printf(p, "RES: ");

		for_each_online_cpu(j)

			seq_printf(p, "%10u ",

				per_cpu(irq_stat,j).irq_resched_count);

		seq_printf(p, "  Rescheduling interrupts\n");

		seq_printf(p, "CAL: ");

		for_each_online_cpu(j)

			seq_printf(p, "%10u ",

				per_cpu(irq_stat,j).irq_call_count);

		seq_printf(p, "  Function call interrupts\n");

		seq_printf(p, "TLB: ");

		for_each_online_cpu(j)

			seq_printf(p, "%10u ",

				per_cpu(irq_stat,j).irq_tlb_count);

		seq_printf(p, "  TLB shootdowns\n");

#endif

#ifdef CONFIG_X86_MCE

		seq_printf(p, "TRM: ");

		for_each_online_cpu(j)

			seq_printf(p, "%10u ",

				per_cpu(irq_stat,j).irq_thermal_count);

		seq_printf(p, "  Thermal event interrupts\n");

#endif

#ifdef CONFIG_X86_LOCAL_APIC

		seq_printf(p, "SPU: ");

		for_each_online_cpu(j)

			seq_printf(p, "%10u ",

				per_cpu(irq_stat,j).irq_spurious_count);

		seq_printf(p, "  Spurious interrupts\n");

#endif

		seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));

#if defined(CONFIG_X86_IO_APIC)

		seq_printf(p, "MIS: %10u\n", atomic_read(&irq_mis_count));

#endif

	}

	return 0;

}

arch/x86/kernel/irq_64.c

+77 −76
Original line number Diff line number Diff line
@@ -68,63 +68,10 @@ static inline void stack_overflow_check(struct pt_regs *regs) 
 * Generic, controller-independent functions:

 */



int show_interrupts(struct seq_file *p, void *v)

static int show_other_interrupts(struct seq_file *p)

{

	int i, j;

	struct irqaction * action;

	unsigned long flags;

	unsigned int entries;

	struct irq_desc *desc = NULL;

	int tail = 0;



	entries = nr_irqs - 1;

	i = *(loff_t *) v;

	if (i == nr_irqs)

		tail = 1;

	else

		desc = irq_to_desc(i);

	int j;



	if (i == 0) {

		seq_printf(p, "           ");

		for_each_online_cpu(j)

			seq_printf(p, "CPU%-8d",j);

		seq_putc(p, '\n');

	}



	if (i <= entries) {

		unsigned any_count = 0;



		spin_lock_irqsave(&desc->lock, flags);

#ifndef CONFIG_SMP

		any_count = kstat_irqs(i);

#else

		for_each_online_cpu(j)

			any_count |= kstat_irqs_cpu(i, j);

#endif

		action = desc->action;

		if (!action && !any_count)

			goto skip;

		seq_printf(p, "%3d: ", i);

#ifndef CONFIG_SMP

		seq_printf(p, "%10u ", kstat_irqs(i));

#else

		for_each_online_cpu(j)

			seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));

#endif

		seq_printf(p, " %8s", desc->chip->name);

		seq_printf(p, "-%-8s", desc->name);



		if (action) {

			seq_printf(p, "  %s", action->name);

			while ((action = action->next) != NULL)

				seq_printf(p, ", %s", action->name);

		}

		seq_putc(p, '\n');

skip:

		spin_unlock_irqrestore(&desc->lock, flags);

	}



	if (tail) {

	seq_printf(p, "NMI: ");

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", cpu_pda(j)->__nmi_count);
@@ -162,8 +109,62 @@ int show_interrupts(struct seq_file *p, void *v) 
		seq_printf(p, "%10u ", cpu_pda(j)->irq_spurious_count);

	seq_printf(p, "  Spurious interrupts\n");

	seq_printf(p, "ERR: %10u\n", atomic_read(&irq_err_count));



	return 0;

}



int show_interrupts(struct seq_file *p, void *v)

{

	unsigned long flags, any_count = 0;

	int i = *(loff_t *) v, j;

	struct irqaction *action;

	struct irq_desc *desc;



	if (i > nr_irqs)

		return 0;



	if (i == nr_irqs)

		return show_other_interrupts(p);



	/* print header */

	if (i == 0) {

		seq_printf(p, "           ");

		for_each_online_cpu(j)

			seq_printf(p, "CPU%-8d",j);

		seq_putc(p, '\n');

	}



	desc = irq_to_desc(i);

	spin_lock_irqsave(&desc->lock, flags);

#ifndef CONFIG_SMP

	any_count = kstat_irqs(i);

#else

	for_each_online_cpu(j)

		any_count |= kstat_irqs_cpu(i, j);

#endif

	action = desc->action;

	if (!action && !any_count)

		goto out;



	seq_printf(p, "%3d: ", i);

#ifndef CONFIG_SMP

	seq_printf(p, "%10u ", kstat_irqs(i));

#else

	for_each_online_cpu(j)

		seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));

#endif

	seq_printf(p, " %8s", desc->chip->name);

	seq_printf(p, "-%-8s", desc->name);



	if (action) {

		seq_printf(p, "  %s", action->name);

		while ((action = action->next) != NULL)

			seq_printf(p, ", %s", action->name);

	}



	seq_putc(p, '\n');

out:

	spin_unlock_irqrestore(&desc->lock, flags);

	return 0;

}