Re: [PATCH 3/3] [BUGFIX] x86/x86_64: fix IRQ migration triggered active device IRQ interrruption
From: Eric W. Biederman
Date: Mon Apr 13 2009 - 16:17:47 EST
Gary Hade <garyhade@xxxxxxxxxx> writes:
> On Fri, Apr 10, 2009 at 11:46:39PM -0700, Yinghai Lu wrote:
>> On Wed, Apr 8, 2009 at 4:08 PM, Gary Hade <garyhade@xxxxxxxxxx> wrote:
>> > On Wed, Apr 08, 2009 at 03:03:49PM -0700, Yinghai Lu wrote:
>> >> On Wed, Apr 8, 2009 at 2:07 PM, Gary Hade <garyhade@xxxxxxxxxx> wrote:
>> >> > Impact: Eliminates an issue that can leave the system in an
>> >> > Â Â Â Âunusable state.
>> >> >
>> >> > This patch addresses an issue where device generated IRQs
>> >> > are no longer seen by the kernel following IRQ affinity
>> >> > migration while the device is generating IRQs at a high rate.
>> >> > We have seen this problem happen when IRQ affinities are
>> >> > adjusted in response to CPU offlining but I believe it
>> >> > could also happen in during user initiated IRQ affinity
>> >> > changes unrelated to CPU offlining. e.g. while the
>> >> > irqbalance daemon is adjusting IRQ affinities when the
>> >> > system is heavily loaded.
>> >> >
>> >> > I have been able to consistently reproduce the problem on
>> >> > some of our systems by running the following script (VICTIM_IRQ
>> >> > specifies the IRQ for the aic94xx device) while a single instance
>> >> > of the command
>> >> > Â# while true; do find / -exec file {} \;; done
>> >> > is keeping the filesystem activity and IRQ rate reasonably high.
>> >> >
>> >> > #!/bin/sh
>> >> >
>> >> > SYS_CPU_DIR=/sys/devices/system/cpu
>> >> > VICTIM_IRQ=25
>> >> > IRQ_MASK=f0
>> >> >
>> >> > iteration=0
>> >> > while true; do
>> >> > Âecho $iteration
>> >> > Âecho $IRQ_MASK > /proc/irq/$VICTIM_IRQ/smp_affinity
>> >> > Âfor cpudir in $SYS_CPU_DIR/cpu[1-9] $SYS_CPU_DIR/cpu??; do
>> >> > Â Âecho 0 > $cpudir/online
>> >> > Âdone
>> >> > Âfor cpudir in $SYS_CPU_DIR/cpu[1-9] $SYS_CPU_DIR/cpu??; do
>> >> > Â Âecho 1 > $cpudir/online
>> >> > Âdone
>> >> > Âiteration=`expr $iteration + 1`
>> >> > done
>> >> >
>> >> > The root cause is a known issue already addressed for some
>> >> > code paths [e.g. ack_apic_level() and the now obsolete
>> >> > migrate_irq_remapped_level_desc()] where the ioapic can
>> >> > misbehave when the I/O redirection table register is written
>> >> > while the Remote IRR bit is set.
>> >> >
>> >> > The proposed fix uses the same avoidance method and much
>> >> > of same code that the Interrupt Remapping code previously
>> >> > used to avoid the same problem.
>> >> >
>> >> > Signed-off-by: Gary Hade <garyhade@xxxxxxxxxx>
>> >> >
>> >> > ---
>> >> > Âarch/x86/kernel/apic/io_apic.c | Â 72 ++++++++++++++++++++++++++++++-
>> >> > Â1 file changed, 71 insertions(+), 1 deletion(-)
>> >> >
>> >> > Index: linux-2.6.30-rc1/arch/x86/kernel/apic/io_apic.c
>> >> > ===================================================================
>> >> > --- linux-2.6.30-rc1.orig/arch/x86/kernel/apic/io_apic.c    Â2009-04-08 09:24:11.000000000 -0700
>> >> > +++ linux-2.6.30-rc1/arch/x86/kernel/apic/io_apic.c   2009-04-08 09:24:23.000000000 -0700
>> >> > @@ -2331,7 +2331,8 @@ set_desc_affinity(struct irq_desc *desc,
>> >> > Â}
>> >> >
>> >> > Âstatic void
>> >> > -set_ioapic_affinity_irq_desc(struct irq_desc *desc, const struct cpumask *mask)
>> >> > +set_ioapic_irq_affinity_desc(struct irq_desc *desc,
>> >> > + Â Â Â Â Â Â Â Â Â Â Â Â Â Âconst struct cpumask *mask)
>> >> > Â{
>> >> > Â Â Â Âstruct irq_cfg *cfg;
>> >> > Â Â Â Âunsigned long flags;
>> >> > @@ -2352,6 +2353,75 @@ set_ioapic_affinity_irq_desc(struct irq_
>> >> > Â}
>> >> >
>> >> > Âstatic void
>> >> > +delayed_irq_move(struct work_struct *work)
>> >> > +{
>> >> > + Â Â Â unsigned int irq;
>> >> > + Â Â Â struct irq_desc *desc;
>> >> > +
>> >> > + Â Â Â for_each_irq_desc(irq, desc) {
>> >> > + Â Â Â Â Â Â Â if (desc->status & IRQ_MOVE_PENDING) {
>> >> > + Â Â Â Â Â Â Â Â Â Â Â unsigned long flags;
>> >> > +
>> >> > + Â Â Â Â Â Â Â Â Â Â Â spin_lock_irqsave(&desc->lock, flags);
>> >> > + Â Â Â Â Â Â Â Â Â Â Â if (!desc->chip->set_affinity ||
>> >> > + Â Â Â Â Â Â Â Â Â Â Â Â Â !(desc->status & IRQ_MOVE_PENDING)) {
>> >> > + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â desc->status &= ~IRQ_MOVE_PENDING;
>> >> > + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â spin_unlock_irqrestore(&desc->lock, flags);
>> >> > + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â continue;
>> >> > + Â Â Â Â Â Â Â Â Â Â Â }
>> >> > +
>> >> > + Â Â Â Â Â Â Â Â Â Â Â desc->chip->set_affinity(irq, desc->pending_mask);
>> >> > + Â Â Â Â Â Â Â Â Â Â Â spin_unlock_irqrestore(&desc->lock, flags);
>> >> > + Â Â Â Â Â Â Â }
>> >> > + Â Â Â }
>> >> > +}
>> >> > +
>> >> > +static DECLARE_DELAYED_WORK(delayed_irq_move_work, delayed_irq_move);
>> >> > +
>> >> > +static void
>> >> > +set_ioapic_irq_affinity_level_desc(struct irq_desc *desc)
>> >> > +{
>> >> > +
>> >> > + Â Â Â struct irq_cfg *cfg = desc->chip_data;
>> >> > +
>> >> > + Â Â Â mask_IO_APIC_irq_desc(desc);
>> >> > +
>> >> > + Â Â Â if (io_apic_level_ack_pending(cfg)) {
>> >> > + Â Â Â Â Â Â Â /*
>> >> > + Â Â Â Â Â Â Â Â* Interrupt in progress. Migrating irq now will change
>> >> > + Â Â Â Â Â Â Â Â* the vector information in the IO-APIC RTE which will
>> >> > + Â Â Â Â Â Â Â Â* confuse the EOI broadcast performed by cpu.
>> >> > + Â Â Â Â Â Â Â Â* So, we delay the irq migration.
>> >> > + Â Â Â Â Â Â Â Â*/
>> >> > + Â Â Â Â Â Â Â schedule_delayed_work(&delayed_irq_move_work, 1);
>> >> > + Â Â Â Â Â Â Â goto unmask;
>> >> > + Â Â Â }
>> >> > +
>> >> > + Â Â Â /* Interrupt not in progress. we can change the vector
>> >> > + Â Â Â Â* information in the IO-APIC RTE. */
>> >> > + Â Â Â set_ioapic_irq_affinity_desc(desc, desc->pending_mask);
>> >> > +
>> >> > + Â Â Â desc->status &= ~IRQ_MOVE_PENDING;
>> >> > + Â Â Â cpumask_clear(desc->pending_mask);
>> >> > +
>> >> > +unmask:
>> >> > + Â Â Â unmask_IO_APIC_irq_desc(desc);
>> >> > +}
>> >> > +
>> >> > +static void
>> >> > +set_ioapic_affinity_irq_desc(struct irq_desc *desc,
>> >> > + Â Â Â Â Â Â Â Â Â Â Â Â Â Âconst struct cpumask *mask)
>> >> > +{
>> >> > + Â Â Â if (desc->status & IRQ_LEVEL) {
>> >> > + Â Â Â Â Â Â Â desc->status |= IRQ_MOVE_PENDING;
>> >> > + Â Â Â Â Â Â Â cpumask_copy(desc->pending_mask, mask);
>> >> > + Â Â Â Â Â Â Â set_ioapic_irq_affinity_level_desc(desc);
>> >> > + Â Â Â Â Â Â Â return;
>> >> > + Â Â Â }
>> >> > + Â Â Â set_ioapic_irq_affinity_desc(desc, mask);
>> >> > +}
>> >> > +
>> >> > +static void
>> >> > Âset_ioapic_affinity_irq(unsigned int irq, const struct cpumask *mask)
>> >> > Â{
>> >> > Â Â Â Âstruct irq_desc *desc;
>> >> > --
>> >>
>> >> it seems, ack_apic_level() already checked io_apic_level_ack_pending()
>> >>
>> >> Â Â Â Â Â Â Â Â cfg = desc->chip_data;
>> >> Â Â Â Â Â Â Â Â if (!io_apic_level_ack_pending(cfg))
>> >> Â Â Â Â Â Â Â Â Â Â Â Â move_masked_irq(irq);
>> >> Â Â Â Â Â Â Â Â unmask_IO_APIC_irq_desc(desc);
>> >
>> > Yes, I have actually observed instances where the command
>> > Â `echo $IRQ_MASK > /proc/irq/$VICTIM_IRQ/smp_affinity`
>> > in the above test script failed to modify the affinity due to
>> > a debug printk confirmed non-zero return from io_apic_level_ack_pending()
>> > at this location. ÂHowever, this is definitely not catching all the cases.
>> > This was confirmed this with a printk in __target_IO_APIC_irq() that would
>> > sometimes shows the Remote IRR bit set before the io_apic_modify() call.
>> > e.g.
>> > __target_IO_APIC_irq: XXX before io_apic_modify irq=25 vector=0xd9 reg=0x1e0d9
>>
>>
>> that is strange, before that irq is masked,
>>
>> #ifdef CONFIG_GENERIC_PENDING_IRQ
>> /* If we are moving the irq we need to mask it */
>> if (unlikely(desc->status & IRQ_MOVE_PENDING)) {
>> do_unmask_irq = 1;
>> mask_IO_APIC_irq_desc(desc);
>> }
>> #endif
>
> When the device is very actively generating IRQs I suspect
> that __target_IO_APIC_irq() is sometimes visited (via CPU
> offline motivated path) before the IRQ is masked at this location.
> I believe the vulnerability window is actually a bit larger
> because it spans this mask_IO_APIC_irq_desc() call.
I don't think it makes sense to debate how broken fixup_irqs is.
The code is fundamentally wrong, if you don't have code that
can migrate an irq in process context.
Not playing games when Remote_IRR is set is the easy part. As
that is required on correctly functioning hardware. Unless
your ioapic has the magic acknowledge register.
The hard part is that ioapic to put it politely are fragile
things so you have to handle them just so. It is possible to
wedge the state machines into a unrecoverable mess on most
common ioapic implementations. Not sending the ack when
the ioapic is ready to receive it is easy by comparison.
Eric
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/