[Qemu-commits] [qemu/qemu] 60e680: apic: avoid getting out of halted state on masked ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 60e68042cf70f271308dc6b4b22b609d054af929
      
https://github.com/qemu/qemu/commit/60e68042cf70f271308dc6b4b22b609d054af929
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-11-24 (Mon, 24 Nov 2014)

  Changed paths:
    M hw/intc/apic.c
    M target-i386/cpu.c

  Log Message:
  -----------
  apic: avoid getting out of halted state on masked PIC interrupts

After the next patch, if a masked PIC interrupts causes CPU_INTERRUPT_POLL
to be set, the CPU will spuriously get out of halted state.  While this
is technically valid, we should avoid that.

Make CPU_INTERRUPT_POLL run apic_update_irq in the right thread and then
look at CPU_INTERRUPT_HARD.  If CPU_INTERRUPT_HARD does not get set,
do not report the CPU as having work.

Also move the handling of software-disabled APIC from apic_update_irq
to apic_irq_pending, and always trigger CPU_INTERRUPT_POLL.  This will
be important once we will add a case that resets CPU_INTERRUPT_HARD
from apic_update_irq.  We want to run it even if we go through
CPU_INTERRUPT_POLL, and even if the local APIC is software disabled.

Reported-by: Richard Bilson <address@hidden>
Tested-by: Richard Bilson <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 8092cb71322ca488deeb7c750ff8022ffcc2f9a6
      
https://github.com/qemu/qemu/commit/8092cb71322ca488deeb7c750ff8022ffcc2f9a6
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-11-24 (Mon, 24 Nov 2014)

  Changed paths:
    M hw/intc/apic.c

  Log Message:
  -----------
  apic: fix loss of IPI due to masked ExtINT

This patch fixes an obscure failure of the QNX kernel on QEMU x86 SMP.
In QNX, all hardware interrupts come via the PIC, and are delivered by
the cpu 0 LAPIC in ExtINT mode, while IPIs are delivered by the LAPIC
in fixed mode.

This bug happens as follows:
- cpu 0 masks a particular PIC interrupt
- IPI sent to cpu 0 (CPU_INTERRUPT_HARD is set)
- before the IPI is accepted, the masked interrupt line is asserted by the
device

Since the interrupt is masked, apic_deliver_pic_intr will clear
CPU_INTERRUPT_HARD. The IPI will still be set in the APIC irr, but since
CPU_INTERRUPT_HARD is not set the cpu will not notice. Depending on the
scenario this can cause a system hang, i.e. if cpu 0 is expected to unmask
the interrupt.

In order to fix this, do a full check of the APIC before an EXTINT
is acknowledged.  This can result in clearing CPU_INTERRUPT_HARD, but
can also result in delivering the lost IPI.

Reported-by: Richard Bilson <address@hidden>
Tested-by: Richard Bilson <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 5224c88dd3f771702d450780a25f155e0fc8bb2b
      
https://github.com/qemu/qemu/commit/5224c88dd3f771702d450780a25f155e0fc8bb2b
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-11-24 (Mon, 24 Nov 2014)

  Changed paths:
    M hw/intc/apic.c

  Log Message:
  -----------
  apic: fix incorrect handling of ExtINT interrupts wrt processor priority

This fixes another failure with ExtINT, demonstrated by QNX.  The failure
mode is as follows:
- IPI sent to cpu 0 (bit set in APIC irr)
- IPI accepted by cpu 0 (bit cleared in irr, set in isr)
- IPI sent to cpu 0 (bit set in both irr and isr)
- PIC interrupt sent to cpu 0

The PIC interrupt causes CPU_INTERRUPT_HARD to be set, but
apic_irq_pending observes that the highest pending APIC interrupt priority
(the IPI) is the same as the processor priority (since the IPI is still
being handled), so apic_get_interrupt returns a spurious interrupt rather
than the pending PIC interrupt. The result is an endless sequence of
spurious interrupts, since nothing will clear CPU_INTERRUPT_HARD.

Instead, ExtINT interrupts should have ignored the processor priority.
Calling apic_check_pic early in apic_get_interrupt ensures that
apic_deliver_pic_intr is called instead of delivering the spurious
interrupt.  apic_deliver_pic_intr then clears CPU_INTERRUPT_HARD if needed.

Reported-by: Richard Bilson <address@hidden>
Tested-by: Richard Bilson <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: a31a7475e930dc0b8f27fb71f01ff4f0db92d1f4
      
https://github.com/qemu/qemu/commit/a31a7475e930dc0b8f27fb71f01ff4f0db92d1f4
  Author: Peter Maydell <address@hidden>
  Date:   2014-11-24 (Mon, 24 Nov 2014)

  Changed paths:
    M hw/intc/apic.c
    M target-i386/cpu.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

Three patches to fix ExtINT for the QEMU implementation of the local APIC.

# gpg: Signature made Mon 24 Nov 2014 13:38:36 GMT using RSA key ID 78C7AE83
# gpg: Good signature from "Paolo Bonzini <address@hidden>"
# gpg:                 aka "Paolo Bonzini <address@hidden>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg:          It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream:
  apic: fix incorrect handling of ExtINT interrupts wrt processor priority
  apic: fix loss of IPI due to masked ExtINT
  apic: avoid getting out of halted state on masked PIC interrupts

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/0e88f478508b...a31a7475e930