Skip to contentSkip to conversation

x86: Fix XT-PIC-XT-PIC in /proc/interrupts

PATCH In review Maciej W. Rozycki 3 participants 6 messages Oct 26, 2014 – Oct 28, 2014 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: Fix XT-PIC-XT-PIC in /proc/interrupts

Fix duplicate XT-PIC seen in /proc/interrupts on x86 systems that make use of 8259A Programmable Interrupt Controllers. Specifically convert output like this:

CPU0

  0:      76573    XT-PIC-XT-PIC    timer
  1:         11    XT-PIC-XT-PIC    i8042
  2:          0    XT-PIC-XT-PIC    cascade
  4:          8    XT-PIC-XT-PIC    serial
  6:          3    XT-PIC-XT-PIC    floppy
  7:          0    XT-PIC-XT-PIC    parport0
  8:          1    XT-PIC-XT-PIC    rtc0
 10:        448    XT-PIC-XT-PIC    fddi0
 12:         23    XT-PIC-XT-PIC    eth0
 14:       2464    XT-PIC-XT-PIC    ide0
NMI:          0   Non-maskable interrupts
ERR:          0

to one like this:

CPU0

  0:     122033    XT-PIC  timer
  1:         11    XT-PIC  i8042
  2:          0    XT-PIC  cascade
  4:          8    XT-PIC  serial
  6:          3    XT-PIC  floppy
  7:          0    XT-PIC  parport0
  8:          1    XT-PIC  rtc0
 10:        145    XT-PIC  fddi0
 12:         31    XT-PIC  eth0
 14:       2245    XT-PIC  ide0
NMI:          0   Non-maskable interrupts
ERR:          0

that is one like we used to have from ~2.2 till it was changed sometime.

The rationale is there is no value in this duplicate information, it merely clutters output and looks ugly. We only have one handler for 8259A interrupts so there is no need to give it a name separate from the name already given to irq_chip.

We could define meaningful names for handlers based on bits in the ELCR register on systems that have it or the value of the LTIM bit we use in ICW1 otherwise (hardcoded to 0 though with MCA support gone), to tell edge-triggered and level-triggered inputs apart. While that information does not affect 8259A interrupt handlers it could help people determine which lines are shareable and which are not. That is material for a separate change though.

Any tools that parse /proc/interrupts are supposed not to be affected since it was many years we used the format this change converts back to.

---
Original report recorded here: https://lkml.org/lkml/2014/9/25/190 --
and given no feedback here is a fix, as promised. I'll be happy to discuss it further if there is any concern about this change.

Otherwise, please apply.

Maciej

linux-x86-xt-pic.patch

arch/x86/kernel/i8259.c +1 -2
Index: linux-3.16-dolch/arch/x86/kernel/i8259.c
===================================================================
@@ -111,8 +111,7 @@ static void make_8259A_irq(unsigned int 
 {
 	disable_irq_nosync(irq);
 	io_apic_irqs &= ~(1<<irq);
-	irq_set_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq,
-				      i8259A_chip.name);
+	irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
 	enable_irq(irq);
 }
 
arch/x86/kernel/irqinit.c +1 -2
Index: linux-3.16-dolch/arch/x86/kernel/irqinit.c
===================================================================
@@ -70,7 +70,6 @@ int vector_used_by_percpu_irq(unsigned i
 void __init init_ISA_irqs(void)
 {
 	struct irq_chip *chip = legacy_pic->chip;
-	const char *name = chip->name;
 	int i;
 
 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_LOCAL_APIC)
@@ -79,7 +78,7 @@ void __init init_ISA_irqs(void)
 	legacy_pic->init(0);
 
 	for (i = 0; i < nr_legacy_irqs(); i++)
-		irq_set_chip_and_handler_name(i, chip, handle_level_irq, name);
+		irq_set_chip_and_handler(i, chip, handle_level_irq);
 }
 
 void __init init_IRQ(void)
#1 lore raw
Quoted 49 lines · Maciej W. Rozycki

Fix duplicate XT-PIC seen in /proc/interrupts on x86 systems that make use of 8259A Programmable Interrupt Controllers. Specifically convert output like this:

CPU0

  0:      76573    XT-PIC-XT-PIC    timer
  1:         11    XT-PIC-XT-PIC    i8042
  2:          0    XT-PIC-XT-PIC    cascade
  4:          8    XT-PIC-XT-PIC    serial
  6:          3    XT-PIC-XT-PIC    floppy
  7:          0    XT-PIC-XT-PIC    parport0
  8:          1    XT-PIC-XT-PIC    rtc0
 10:        448    XT-PIC-XT-PIC    fddi0
 12:         23    XT-PIC-XT-PIC    eth0
 14:       2464    XT-PIC-XT-PIC    ide0
NMI:          0   Non-maskable interrupts
ERR:          0

to one like this:

CPU0

  0:     122033    XT-PIC  timer
  1:         11    XT-PIC  i8042
  2:          0    XT-PIC  cascade
  4:          8    XT-PIC  serial
  6:          3    XT-PIC  floppy
  7:          0    XT-PIC  parport0
  8:          1    XT-PIC  rtc0
 10:        145    XT-PIC  fddi0
 12:         31    XT-PIC  eth0
 14:       2245    XT-PIC  ide0
NMI:          0   Non-maskable interrupts
ERR:          0

that is one like we used to have from ~2.2 till it was changed sometime.

The rationale is there is no value in this duplicate information, it merely clutters output and looks ugly. We only have one handler for 8259A interrupts so there is no need to give it a name separate from the name already given to irq_chip.

We could define meaningful names for handlers based on bits in the ELCR register on systems that have it or the value of the LTIM bit we use in ICW1 otherwise (hardcoded to 0 though with MCA support gone), to tell edge-triggered and level-triggered inputs apart. While that information does not affect 8259A interrupt handlers it could help people determine which lines are shareable and which are not. That is material for a separate change though.

Quoted 2 lines

Any tools that parse /proc/interrupts are supposed not to be affected since it was many years we used the format this change converts back to.

What's the effect of this change on the output for non-8259A irq controllers?

Thanks,

Ingo

#2 lore raw
Quoted 2 lines · Ingo Molnar

What's the effect of this change on the output for non-8259A irq controllers?

Good question, I didn't expect any other IRQ controller to be used for
ISA interrupts (the APIC is handled elsewhere). I have checked the sources and the only other controller that can be used for legacy_pic' is dummy_irq_chip' (cf. default_legacy_pic' vs null_legacy_pic' in arch/x86/kernel/i8259.c). That affects init_ISA_irqs' only (the other place, make_8259A_irq', has a reference to `i8259A_chip' hardcoded).

In this case the output would change from "dummy-dummy" to "dummy",
which IMHO has just as much value as the change from "XT-PIC-XT-PIC" to "XT-PIC". However I don't think you'd be able to request such IRQs so they will never show up in /proc/interrupts, making this observation largely irrelevant. If you think I may be wrong here, then can you please find such a system and try this change with it (or can someone else reading this make this check for me by any chance)? Unfortunately all x86 hardware I have does have an 8259A pair.

Also please note that both places explicitly refer to the name of the
IRQ chip being installed as the name of the handler as well, with i8259A_chip.name' and chip->name' respectively, this is hardcoded. So no matter which chip is used there'll be a duplicate name in /proc/interrupts.

Does this answer address your concern?

Maciej

#3 lore raw
Quoted 21 lines · Maciej W. Rozycki
Quoted 2 lines · Ingo Molnar

What's the effect of this change on the output for non-8259A irq controllers?

Good question, I didn't expect any other IRQ controller to be used for
ISA interrupts (the APIC is handled elsewhere). I have checked the sources and the only other controller that can be used for legacy_pic' is dummy_irq_chip' (cf. default_legacy_pic' vs null_legacy_pic' in arch/x86/kernel/i8259.c). That affects init_ISA_irqs' only (the other place, make_8259A_irq', has a reference to `i8259A_chip' hardcoded).

In this case the output would change from "dummy-dummy" to "dummy",
which IMHO has just as much value as the change from "XT-PIC-XT-PIC" to "XT-PIC". However I don't think you'd be able to request such IRQs so they will never show up in /proc/interrupts, making this observation largely irrelevant. If you think I may be wrong here, then can you please find such a system and try this change with it (or can someone else reading this make this check for me by any chance)? Unfortunately all x86 hardware I have does have an 8259A pair.

Quoted 7 lines

Also please note that both places explicitly refer to the name of the
IRQ chip being installed as the name of the handler as well, with i8259A_chip.name' and chip->name' respectively, this is hardcoded. So no matter which chip is used there'll be a duplicate name in /proc/interrupts.

Does this answer address your concern?

Yeah, it addresses it, I'll queue up your fix, thanks!

Ingo

#4 lore raw

[tip:x86/urgent] x86/irq: Fix XT-PIC-XT-PIC in /proc/interrupts

In reply to Maciej W. Rozycki
x86/irq: Fix XT-PIC-XT-PIC in /proc/interrupts
Commit-ID:  0c7ba5008365b49c55f5bb9d9e859785b1f5cffe
Gitweb:     http://git.kernel.org/tip/0c7ba5008365b49c55f5bb9d9e859785b1f5cffe
Author:     Maciej W. Rozycki <[email protected]>
AuthorDate: Sun, 26 Oct 2014 16:06:28 +0000
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 28 Oct 2014 11:04:55 +0100

x86/irq: Fix XT-PIC-XT-PIC in /proc/interrupts

Fix duplicate XT-PIC seen in /proc/interrupts on x86 systems that make use of 8259A Programmable Interrupt Controllers. Specifically convert output like this:

CPU0

  0:      76573    XT-PIC-XT-PIC    timer
  1:         11    XT-PIC-XT-PIC    i8042
  2:          0    XT-PIC-XT-PIC    cascade
  4:          8    XT-PIC-XT-PIC    serial
  6:          3    XT-PIC-XT-PIC    floppy
  7:          0    XT-PIC-XT-PIC    parport0
  8:          1    XT-PIC-XT-PIC    rtc0
 10:        448    XT-PIC-XT-PIC    fddi0
 12:         23    XT-PIC-XT-PIC    eth0
 14:       2464    XT-PIC-XT-PIC    ide0
NMI:          0   Non-maskable interrupts
ERR:          0

to one like this:

CPU0

  0:     122033    XT-PIC  timer
  1:         11    XT-PIC  i8042
  2:          0    XT-PIC  cascade
  4:          8    XT-PIC  serial
  6:          3    XT-PIC  floppy
  7:          0    XT-PIC  parport0
  8:          1    XT-PIC  rtc0
 10:        145    XT-PIC  fddi0
 12:         31    XT-PIC  eth0
 14:       2245    XT-PIC  ide0
NMI:          0   Non-maskable interrupts
ERR:          0

that is one like we used to have from ~2.2 till it was changed sometime.

The rationale is there is no value in this duplicate information, it merely clutters output and looks ugly. We only have one handler for 8259A interrupts so there is no need to give it a name separate from the name already given to irq_chip.

We could define meaningful names for handlers based on bits in the ELCR register on systems that have it or the value of the LTIM bit we use in ICW1 otherwise (hardcoded to 0 though with MCA support gone), to tell edge-triggered and level-triggered inputs apart. While that information does not affect 8259A interrupt handlers it could help people determine which lines are shareable and which are not. That is material for a separate change though.

Any tools that parse /proc/interrupts are supposed not to be affected since it was many years we used the format this change converts back to.

---
 arch/x86/kernel/i8259.c   | 3 +--
 arch/x86/kernel/irqinit.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
arch/x86/kernel/i8259.c +1 -2
index 8af8171..e7cc537 100644
@@ -111,8 +111,7 @@ static void make_8259A_irq(unsigned int irq)
 {
 	disable_irq_nosync(irq);
 	io_apic_irqs &= ~(1<<irq);
-	irq_set_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq,
-				      i8259A_chip.name);
+	irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
 	enable_irq(irq);
 }
 
arch/x86/kernel/irqinit.c +1 -2
index 44f1ed4..4de73ee 100644
@@ -70,7 +70,6 @@ int vector_used_by_percpu_irq(unsigned int vector)
 void __init init_ISA_irqs(void)
 {
 	struct irq_chip *chip = legacy_pic->chip;
-	const char *name = chip->name;
 	int i;
 
 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_LOCAL_APIC)
@@ -79,7 +78,7 @@ void __init init_ISA_irqs(void)
 	legacy_pic->init(0);
 
 	for (i = 0; i < nr_legacy_irqs(); i++)
-		irq_set_chip_and_handler_name(i, chip, handle_level_irq, name);
+		irq_set_chip_and_handler(i, chip, handle_level_irq);
 }
 
 void __init init_IRQ(void)
#5 lore raw

[tip:x86/urgent] x86/irq: Fix XT-PIC-XT-PIC in /proc/interrupts

In reply to Maciej W. Rozycki
x86/irq: Fix XT-PIC-XT-PIC in /proc/interrupts
Commit-ID:  60e684f0d66369add7aa49fc39785d2f26fe9169
Gitweb:     http://git.kernel.org/tip/60e684f0d66369add7aa49fc39785d2f26fe9169
Author:     Maciej W. Rozycki <[email protected]>
AuthorDate: Sun, 26 Oct 2014 16:06:28 +0000
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 28 Oct 2014 12:01:08 +0100

x86/irq: Fix XT-PIC-XT-PIC in /proc/interrupts

Fix duplicate XT-PIC seen in /proc/interrupts on x86 systems that make use of 8259A Programmable Interrupt Controllers. Specifically convert output like this:

CPU0

  0:      76573    XT-PIC-XT-PIC    timer
  1:         11    XT-PIC-XT-PIC    i8042
  2:          0    XT-PIC-XT-PIC    cascade
  4:          8    XT-PIC-XT-PIC    serial
  6:          3    XT-PIC-XT-PIC    floppy
  7:          0    XT-PIC-XT-PIC    parport0
  8:          1    XT-PIC-XT-PIC    rtc0
 10:        448    XT-PIC-XT-PIC    fddi0
 12:         23    XT-PIC-XT-PIC    eth0
 14:       2464    XT-PIC-XT-PIC    ide0
NMI:          0   Non-maskable interrupts
ERR:          0

to one like this:

CPU0

  0:     122033    XT-PIC  timer
  1:         11    XT-PIC  i8042
  2:          0    XT-PIC  cascade
  4:          8    XT-PIC  serial
  6:          3    XT-PIC  floppy
  7:          0    XT-PIC  parport0
  8:          1    XT-PIC  rtc0
 10:        145    XT-PIC  fddi0
 12:         31    XT-PIC  eth0
 14:       2245    XT-PIC  ide0
NMI:          0   Non-maskable interrupts
ERR:          0

that is one like we used to have from ~2.2 till it was changed sometime.

The rationale is there is no value in this duplicate information, it merely clutters output and looks ugly. We only have one handler for 8259A interrupts so there is no need to give it a name separate from the name already given to irq_chip.

We could define meaningful names for handlers based on bits in the ELCR register on systems that have it or the value of the LTIM bit we use in ICW1 otherwise (hardcoded to 0 though with MCA support gone), to tell edge-triggered and level-triggered inputs apart. While that information does not affect 8259A interrupt handlers it could help people determine which lines are shareable and which are not. That is material for a separate change though.

Any tools that parse /proc/interrupts are supposed not to be affected since it was many years we used the format this change converts back to.

---
 arch/x86/kernel/i8259.c   | 3 +--
 arch/x86/kernel/irqinit.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
arch/x86/kernel/i8259.c +1 -2
index 8af8171..e7cc537 100644
@@ -111,8 +111,7 @@ static void make_8259A_irq(unsigned int irq)
 {
 	disable_irq_nosync(irq);
 	io_apic_irqs &= ~(1<<irq);
-	irq_set_chip_and_handler_name(irq, &i8259A_chip, handle_level_irq,
-				      i8259A_chip.name);
+	irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq);
 	enable_irq(irq);
 }
 
arch/x86/kernel/irqinit.c +1 -2
index 44f1ed4..4de73ee 100644
@@ -70,7 +70,6 @@ int vector_used_by_percpu_irq(unsigned int vector)
 void __init init_ISA_irqs(void)
 {
 	struct irq_chip *chip = legacy_pic->chip;
-	const char *name = chip->name;
 	int i;
 
 #if defined(CONFIG_X86_64) || defined(CONFIG_X86_LOCAL_APIC)
@@ -79,7 +78,7 @@ void __init init_ISA_irqs(void)
 	legacy_pic->init(0);
 
 	for (i = 0; i < nr_legacy_irqs(); i++)
-		irq_set_chip_and_handler_name(i, chip, handle_level_irq, name);
+		irq_set_chip_and_handler(i, chip, handle_level_irq);
 }
 
 void __init init_IRQ(void)