[PULL stable-0.15] Stable-0.15 queue for qemu-kvm

[PULL stable-0.15] Stable-0.15 queue for qemu-kvm

[Andreas Färber]

Hello Marcelo,

Here's a couple of backports for your stable-0.15 branch.
Except for one (marked as "backported") these were all clean cherry-picks.

My proposal is to merge these KVM-only patches before qemu-stable-0.15.git,
where I will be tagging v0.15.2 shortly.

Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Avi Kivity <avi@redhat.com>

Cc: Anthony Liguori <anthony@codemonkey.ws>
Cc: Bruce Rogers <brogers@suse.com>

The following changes since commit 725ba81ec6812d7eeb69be92639eb81151b5306e:

  Merge remote branch 'upstream/stable-0.15' into stable-0.15 (2011-10-19 11:54:48 -0200)

are available in the git repository at:


  git://repo.or.cz/qemu/afaerber.git qemu-kvm-stable-0.15

for you to fetch changes up to b2be0429795b18c018610d48142e797cbc31be0d:

  pci-assign: Remove bogus PCIe lnkcap wmask setting (2012-10-09 19:03:59 +0200)

----------------------------------------------------------------
Alex Williamson (4):
      pci-assign: Fix PCI_EXP_FLAGS_TYPE shift
      pci-assign: Fix PCIe lnkcap
      pci-assign: Harden I/O port test
      pci-assign: Remove bogus PCIe lnkcap wmask setting

Jan Kiszka (1):
      pci-assign: Update legacy interrupts only if used

Lai Jiangshan (1):
      qemu-kvm: fix improper nmi emulation

 hw/apic.c              |   33 +++++++++++++++++++++++++++++++++
 hw/apic.h              |    1 +
 hw/device-assignment.c |   30 +++++++++++++++---------------
 monitor.c              |    6 +++++-
 4 Dateien geändert, 54 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-)

[PATCH stable-0.15 1/6] qemu-kvm: fix improper nmi emulation

[Andreas Färber]

From: Lai Jiangshan <laijs@cn.fujitsu.com>

Currently, NMI interrupt is blindly sent to all the vCPUs when NMI
button event happens. This doesn't properly emulate real hardware on
which NMI button event triggers LINT1. Because of this, NMI is sent to
the processor even when LINT1 is maskied in LVT. For example, this
causes the problem that kdump initiated by NMI sometimes doesn't work
on KVM, because kdump assumes NMI is masked on CPUs other than CPU0.

With this patch, inject-nmi request is handled as follows.

- When in-kernel irqchip is disabled, deliver LINT1 instead of NMI
  interrupt.
- When in-kernel irqchip is enabled, get the in-kernel LAPIC states
  and test the APIC_LVT_MASKED, if LINT1 is unmasked, and then
  delivering the NMI directly. (Suggested by Jan Kiszka)

Changed from old version:
  re-implement it by the Jan's suggestion.
  fix the race found by Jan.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
Reported-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
(cherry picked from commit 67feec6ed854b3618b37ccf050b90192cbb96e0f)

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/apic.c |   33 +++++++++++++++++++++++++++++++++
 hw/apic.h |    1 +
 monitor.c |    6 +++++-
 3 Dateien geändert, 39 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)

diff --git a/hw/apic.c b/hw/apic.c
index a45b57f..243900d 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -204,6 +204,39 @@ void apic_deliver_pic_intr(DeviceState *d, int level)
     }
 }
 
+static inline uint32_t kapic_reg(struct kvm_lapic_state *kapic, int reg_id);
+
+static void kvm_irqchip_deliver_nmi(void *p)
+{
+    APICState *s = p;
+    struct kvm_lapic_state klapic;
+    uint32_t lvt;
+
+    kvm_get_lapic(s->cpu_env, &klapic);
+    lvt = kapic_reg(&klapic, 0x32 + APIC_LVT_LINT1);
+
+    if (lvt & APIC_LVT_MASKED) {
+        return;
+    }
+
+    if (((lvt >> 8) & 7) != APIC_DM_NMI) {
+        return;
+    }
+
+    kvm_vcpu_ioctl(s->cpu_env, KVM_NMI);
+}
+
+void apic_deliver_nmi(DeviceState *d)
+{
+    APICState *s = DO_UPCAST(APICState, busdev.qdev, d);
+
+    if (kvm_irqchip_in_kernel()) {
+        run_on_cpu(s->cpu_env, kvm_irqchip_deliver_nmi, s);
+    } else {
+        apic_local_deliver(s, APIC_LVT_LINT1);
+    }
+}
+
 #define foreach_apic(apic, deliver_bitmask, code) \
 {\
     int __i, __j, __mask;\
diff --git a/hw/apic.h b/hw/apic.h
index c857d52..3a4be0a 100644
--- a/hw/apic.h
+++ b/hw/apic.h
@@ -10,6 +10,7 @@ void apic_deliver_irq(uint8_t dest, uint8_t dest_mode,
                              uint8_t trigger_mode);
 int apic_accept_pic_intr(DeviceState *s);
 void apic_deliver_pic_intr(DeviceState *s, int level);
+void apic_deliver_nmi(DeviceState *d);
 int apic_get_interrupt(DeviceState *s);
 void apic_reset_irq_delivered(void);
 int apic_get_irq_delivered(void);
diff --git a/monitor.c b/monitor.c
index 7680929..6af0673 100644
--- a/monitor.c
+++ b/monitor.c
@@ -2604,7 +2604,11 @@ static int do_inject_nmi(Monitor *mon, const QDict *qdict, QObject **ret_data)
     CPUState *env;
 
     for (env = first_cpu; env != NULL; env = env->next_cpu) {
-        cpu_interrupt(env, CPU_INTERRUPT_NMI);
+        if (!env->apic_state) {
+            cpu_interrupt(env, CPU_INTERRUPT_NMI);
+        } else {
+            apic_deliver_nmi(env->apic_state);
+        }
     }
 
     return 0;
-- 
1.7.10.4

[PATCH stable-0.15 2/6] pci-assign: Fix PCI_EXP_FLAGS_TYPE shift

[Andreas Färber]

From: Alex Williamson <alex.williamson@redhat.com>

Coverity found that we're doing (uint16_t)type & 0xf0 >> 8.
This is obviously always 0x0, so our attempt to filter out
some device types thinks everything is an endpoint.  Fix
shift amount.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
(cherry picked from commit b4eccd18591f3d639bc3c923e299b3c1241a0b3f)

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/device-assignment.c |    2 +-
 1 Datei geändert, 1 Zeile hinzugefügt(+), 1 Zeile entfernt(-)

diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index 177daa4..dc41bfd 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -1459,7 +1459,7 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
         }
 
         type = pci_get_word(pci_dev->config + pos + PCI_EXP_FLAGS);
-        type = (type & PCI_EXP_FLAGS_TYPE) >> 8;
+        type = (type & PCI_EXP_FLAGS_TYPE) >> 4;
         if (type != PCI_EXP_TYPE_ENDPOINT &&
             type != PCI_EXP_TYPE_LEG_END && type != PCI_EXP_TYPE_RC_END) {
             fprintf(stderr,
-- 
1.7.10.4

[PATCH stable-0.15 3/6] pci-assign: Fix PCIe lnkcap

[Andreas Färber]

From: Alex Williamson <alex.williamson@redhat.com>

Another Coverity found issue, lnkcap is a 32bit register and
we're masking bits 16 & 17.  Fix to uin32_t.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
(cherry picked from commit 21f5a19a10c8f6a10d79a415bf640de85acede78)

[AF: Backported]
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/device-assignment.c |    8 ++++----
 1 Datei geändert, 4 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)

diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index dc41bfd..c4c2535 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -1420,8 +1420,8 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
 
     if ((pos = pci_find_cap_offset(pci_dev, PCI_CAP_ID_EXP, 0))) {
         uint8_t version, size;
-        uint16_t type, devctl, lnkcap, lnksta;
-        uint32_t devcap;
+        uint16_t type, devctl, lnksta;
+        uint32_t devcap, lnkcap;
 
         version = pci_get_byte(pci_dev->config + pos + PCI_EXP_FLAGS);
         version &= PCI_EXP_FLAGS_VERS;
@@ -1491,11 +1491,11 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
         pci_set_word(pci_dev->config + pos + PCI_EXP_DEVSTA, 0);
 
         /* Link capabilities, expose links and latencues, clear reporting */
-        lnkcap = pci_get_word(pci_dev->config + pos + PCI_EXP_LNKCAP);
+        lnkcap = pci_get_long(pci_dev->config + pos + PCI_EXP_LNKCAP);
         lnkcap &= (PCI_EXP_LNKCAP_SLS | PCI_EXP_LNKCAP_MLW |
                    PCI_EXP_LNKCAP_ASPMS | PCI_EXP_LNKCAP_L0SEL |
                    PCI_EXP_LNKCAP_L1EL);
-        pci_set_word(pci_dev->config + pos + PCI_EXP_LNKCAP, lnkcap);
+        pci_set_long(pci_dev->config + pos + PCI_EXP_LNKCAP, lnkcap);
         pci_set_word(pci_dev->wmask + pos + PCI_EXP_LNKCAP,
                      PCI_EXP_LNKCTL_ASPMC | PCI_EXP_LNKCTL_RCB |
                      PCI_EXP_LNKCTL_CCC | PCI_EXP_LNKCTL_ES |
-- 
1.7.10.4

[PATCH stable-0.15 4/6] pci-assign: Harden I/O port test

[Andreas Färber]

From: Alex Williamson <alex.williamson@redhat.com>

Markus Armbruster points out that we're missing a < 0 check
from pread while trying to probe for pci-sysfs io-port
resource support.  We don't expect a short read, but we
should harden the test to abort if we get one so we're not
potentially looking at a stale errno.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
(cherry picked from commit 1d1c8a498b7ce5c5636f1014f7ad18aa4e1acc0a)

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/device-assignment.c |    5 +++--
 1 Datei geändert, 3 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-)

diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index c4c2535..d586ce4 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -618,8 +618,9 @@ static int assigned_dev_register_regions(PCIRegion *io_regions,
              * kernels return EIO.  New kernels only allow 1/2/4 byte reads
              * so should return EINVAL for a 3 byte read */
             ret = pread(pci_dev->v_addrs[i].region->resource_fd, &val, 3, 0);
-            if (ret == 3) {
-                fprintf(stderr, "I/O port resource supports 3 byte read?!\n");
+            if (ret >= 0) {
+                fprintf(stderr, "Unexpected return from I/O port read: %d\n",
+                        ret);
                 abort();
             } else if (errno != EINVAL) {
                 fprintf(stderr, "Using raw in/out ioport access (sysfs - %s)\n",
-- 
1.7.10.4

[PATCH stable-0.15 5/6] pci-assign: Update legacy interrupts only if used

[Andreas Färber]

From: Jan Kiszka <jan.kiszka@siemens.com>

Don't mess with assign_intx on devices that are in MSI or MSI-X mode, it
would corrupt their interrupt routing.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
(cherry picked from commit 096392efe1e5ee670f880c96c31f7ea8d6d76cf4)

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/device-assignment.c |    9 ++++++---
 1 Datei geändert, 6 Zeilen hinzugefügt(+), 3 Zeilen entfernt(-)

diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index d586ce4..43029a4 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -1062,9 +1062,12 @@ void assigned_dev_update_irqs(void)
     dev = QLIST_FIRST(&devs);
     while (dev) {
         next = QLIST_NEXT(dev, next);
-        r = assign_irq(dev);
-        if (r < 0)
-            qdev_unplug(&dev->dev.qdev);
+        if (dev->irq_requested_type & KVM_DEV_IRQ_HOST_INTX) {
+            r = assign_irq(dev);
+            if (r < 0) {
+                qdev_unplug(&dev->dev.qdev);
+            }
+        }
         dev = next;
     }
 }
-- 
1.7.10.4

[PATCH stable-0.15 6/6] pci-assign: Remove bogus PCIe lnkcap wmask setting

[Andreas Färber]

From: Alex Williamson <alex.williamson@redhat.com>

All the fields of lnkcap are read-only and this is setting it
with mask values from LNKCTL.  Just below it, we indicate
link control is read only, so this appears to be a stray
chunk left in from development.  Trivial comment fix while
we're here.

Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
(cherry picked from commit 0cbb68b1ce40e9b7e0b8cea5fd849f5c6bd09aee)

Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 hw/device-assignment.c |    6 +-----
 1 Datei geändert, 1 Zeile hinzugefügt(+), 5 Zeilen entfernt(-)

diff --git a/hw/device-assignment.c b/hw/device-assignment.c
index 43029a4..3908144 100644
--- a/hw/device-assignment.c
+++ b/hw/device-assignment.c
@@ -1481,7 +1481,7 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
         pci_set_long(pci_dev->config + pos + PCI_EXP_DEVCAP, devcap);
 
         /* device control: clear all error reporting enable bits, leaving
-         *                 leaving only a few host values.  Note, these are
+         *                 only a few host values.  Note, these are
          *                 all writable, but not passed to hw.
          */
         devctl = pci_get_word(pci_dev->config + pos + PCI_EXP_DEVCTL);
@@ -1500,10 +1500,6 @@ static int assigned_device_pci_cap_init(PCIDevice *pci_dev)
                    PCI_EXP_LNKCAP_ASPMS | PCI_EXP_LNKCAP_L0SEL |
                    PCI_EXP_LNKCAP_L1EL);
         pci_set_long(pci_dev->config + pos + PCI_EXP_LNKCAP, lnkcap);
-        pci_set_word(pci_dev->wmask + pos + PCI_EXP_LNKCAP,
-                     PCI_EXP_LNKCTL_ASPMC | PCI_EXP_LNKCTL_RCB |
-                     PCI_EXP_LNKCTL_CCC | PCI_EXP_LNKCTL_ES |
-                     PCI_EXP_LNKCTL_CLKREQ_EN | PCI_EXP_LNKCTL_HAWD);
 
         /* Link control, pass existing read-only copy.  Should be writable? */
 
-- 
1.7.10.4

Re: [PULL stable-0.15] Stable-0.15 queue for qemu-kvm

[Marcelo Tosatti]

On Tue, Oct 09, 2012 at 08:08:47PM +0200, Andreas Färber wrote:
> Hello Marcelo,
> 
> Here's a couple of backports for your stable-0.15 branch.
> Except for one (marked as "backported") these were all clean cherry-picks.
> 
> My proposal is to merge these KVM-only patches before qemu-stable-0.15.git,
> where I will be tagging v0.15.2 shortly.
> 
> Cc: Marcelo Tosatti <mtosatti@redhat.com>
> Cc: Avi Kivity <avi@redhat.com>
> 
> Cc: Anthony Liguori <anthony@codemonkey.ws>
> Cc: Bruce Rogers <brogers@suse.com>
> 
> The following changes since commit 725ba81ec6812d7eeb69be92639eb81151b5306e:
> 
>   Merge remote branch 'upstream/stable-0.15' into stable-0.15 (2011-10-19 11:54:48 -0200)
> 
> are available in the git repository at:
> 
> 
>   git://repo.or.cz/qemu/afaerber.git qemu-kvm-stable-0.15
> 
> for you to fetch changes up to b2be0429795b18c018610d48142e797cbc31be0d:
> 
>   pci-assign: Remove bogus PCIe lnkcap wmask setting (2012-10-09 19:03:59 +0200)
> 
> ----------------------------------------------------------------
> Alex Williamson (4):
>       pci-assign: Fix PCI_EXP_FLAGS_TYPE shift
>       pci-assign: Fix PCIe lnkcap
>       pci-assign: Harden I/O port test
>       pci-assign: Remove bogus PCIe lnkcap wmask setting
> 
> Jan Kiszka (1):
>       pci-assign: Update legacy interrupts only if used
> 
> Lai Jiangshan (1):
>       qemu-kvm: fix improper nmi emulation
> 
>  hw/apic.c              |   33 +++++++++++++++++++++++++++++++++
>  hw/apic.h              |    1 +
>  hw/device-assignment.c |   30 +++++++++++++++---------------
>  monitor.c              |    6 +++++-
>  4 Dateien geändert, 54 Zeilen hinzugefügt(+), 16 Zeilen entfernt(-)

Pulled, thanks.