* [PULL 01/18] virtio: Allow .get_vhost() without vhost_started
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
@ 2024-09-11 13:51 ` Michael S. Tsirkin
2024-09-11 13:51 ` [PULL 02/18] virtio: Always reset vhost devices Michael S. Tsirkin
` (17 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:51 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Hanna Czenczek, Stefan Hajnoczi,
Marc-André Lureau, Stefano Garzarella, Jason Wang,
Gonglei (Arei)
From: Hanna Czenczek <hreitz@redhat.com>
Historically, .get_vhost() was probably only called when
vdev->vhost_started is true. However, we now decidedly want to call it
also when vhost_started is false, specifically so we can issue a reset
to the vhost back-end while device operation is stopped.
Some .get_vhost() implementations dereference some pointers (or return
offsets from them) that are probably guaranteed to be non-NULL when
vhost_started is true, but not necessarily otherwise. This patch makes
all such implementations check all such pointers, returning NULL if any
is NULL.
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
Message-Id: <20240723163941.48775-2-hreitz@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
include/hw/virtio/virtio.h | 1 +
hw/display/vhost-user-gpu.c | 2 +-
hw/net/virtio-net.c | 19 +++++++++++++++++--
hw/virtio/virtio-crypto.c | 18 +++++++++++++++---
4 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 0fcbc5c0c6..f526ecc8fc 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -223,6 +223,7 @@ struct VirtioDeviceClass {
int (*post_load)(VirtIODevice *vdev);
const VMStateDescription *vmsd;
bool (*primary_unplug_pending)(void *opaque);
+ /* May be called even when vdev->vhost_started is false */
struct vhost_dev *(*get_vhost)(VirtIODevice *vdev);
void (*toggle_device_iotlb)(VirtIODevice *vdev);
};
diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
index c0c66910f1..14548f1a57 100644
--- a/hw/display/vhost-user-gpu.c
+++ b/hw/display/vhost-user-gpu.c
@@ -642,7 +642,7 @@ vhost_user_gpu_device_realize(DeviceState *qdev, Error **errp)
static struct vhost_dev *vhost_user_gpu_get_vhost(VirtIODevice *vdev)
{
VhostUserGPU *g = VHOST_USER_GPU(vdev);
- return &g->vhost->dev;
+ return g->vhost ? &g->vhost->dev : NULL;
}
static Property vhost_user_gpu_properties[] = {
diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index ed33a32877..fb84d142ee 100644
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -3896,8 +3896,23 @@ static bool dev_unplug_pending(void *opaque)
static struct vhost_dev *virtio_net_get_vhost(VirtIODevice *vdev)
{
VirtIONet *n = VIRTIO_NET(vdev);
- NetClientState *nc = qemu_get_queue(n->nic);
- struct vhost_net *net = get_vhost_net(nc->peer);
+ NetClientState *nc;
+ struct vhost_net *net;
+
+ if (!n->nic) {
+ return NULL;
+ }
+
+ nc = qemu_get_queue(n->nic);
+ if (!nc) {
+ return NULL;
+ }
+
+ net = get_vhost_net(nc->peer);
+ if (!net) {
+ return NULL;
+ }
+
return &net->dev;
}
diff --git a/hw/virtio/virtio-crypto.c b/hw/virtio/virtio-crypto.c
index 5034768bff..0793f56965 100644
--- a/hw/virtio/virtio-crypto.c
+++ b/hw/virtio/virtio-crypto.c
@@ -1247,9 +1247,21 @@ static bool virtio_crypto_guest_notifier_pending(VirtIODevice *vdev, int idx)
static struct vhost_dev *virtio_crypto_get_vhost(VirtIODevice *vdev)
{
VirtIOCrypto *vcrypto = VIRTIO_CRYPTO(vdev);
- CryptoDevBackend *b = vcrypto->cryptodev;
- CryptoDevBackendClient *cc = b->conf.peers.ccs[0];
- CryptoDevBackendVhost *vhost_crypto = cryptodev_get_vhost(cc, b, 0);
+ CryptoDevBackend *b;
+ CryptoDevBackendClient *cc;
+ CryptoDevBackendVhost *vhost_crypto;
+
+ b = vcrypto->cryptodev;
+ if (!b) {
+ return NULL;
+ }
+
+ cc = b->conf.peers.ccs[0];
+ vhost_crypto = cryptodev_get_vhost(cc, b, 0);
+ if (!vhost_crypto) {
+ return NULL;
+ }
+
return &vhost_crypto->dev;
}
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PULL 02/18] virtio: Always reset vhost devices
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
2024-09-11 13:51 ` [PULL 01/18] virtio: Allow .get_vhost() without vhost_started Michael S. Tsirkin
@ 2024-09-11 13:51 ` Michael S. Tsirkin
2024-09-11 13:51 ` [PULL 03/18] hw: Move declaration of IRQState to header and add init function Michael S. Tsirkin
` (16 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Hanna Czenczek, Stefan Hajnoczi
From: Hanna Czenczek <hreitz@redhat.com>
Requiring `vhost_started` to be true for resetting vhost devices in
`virtio_reset()` seems like the wrong condition: Most importantly, the
preceding `virtio_set_status(vdev, 0)` call will (for vhost devices) end
up in `vhost_dev_stop()` (through vhost devices' `.set_status`
implementations), setting `vdev->vhost_started = false`. Therefore, the
gated `vhost_reset_device()` call is unreachable.
`vhost_started` is not documented, so it is hard to say what exactly it
is supposed to mean, but judging from the fact that `vhost_dev_start()`
sets it and `vhost_dev_stop()` clears it, it seems like it indicates
whether there is a vhost back-end, and whether that back-end is
currently running and processing virtio requests.
Making a reset conditional on whether the vhost back-end is processing
virtio requests seems wrong; in fact, it is probably better to reset it
only when it is not currently processing requests, which is exactly the
current order of operations in `virtio_reset()`: First, the back-end is
stopped through `virtio_set_status(vdev, 0)`, then we want to send a
reset.
Therefore, we should drop the `vhost_started` condition, but in its
stead we then have to verify that we can indeed send a reset to this
vhost device, by not just checking `k->get_vhost != NULL` (introduced by
commit 95e1019a4a9), but also that the vhost back-end is connected
(`hdev = k->get_vhost(); hdev != NULL && hdev->vhost_ops != NULL`).
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
Message-Id: <20240723163941.48775-3-hreitz@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/virtio.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 9e10cbc058..42589adf2c 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -2331,8 +2331,12 @@ void virtio_reset(void *opaque)
vdev->device_endian = virtio_default_endian();
}
- if (vdev->vhost_started && k->get_vhost) {
- vhost_reset_device(k->get_vhost(vdev));
+ if (k->get_vhost) {
+ struct vhost_dev *hdev = k->get_vhost(vdev);
+ /* Only reset when vhost back-end is connected */
+ if (hdev && hdev->vhost_ops) {
+ vhost_reset_device(hdev);
+ }
}
if (k->reset) {
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PULL 03/18] hw: Move declaration of IRQState to header and add init function
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
2024-09-11 13:51 ` [PULL 01/18] virtio: Allow .get_vhost() without vhost_started Michael S. Tsirkin
2024-09-11 13:51 ` [PULL 02/18] virtio: Always reset vhost devices Michael S. Tsirkin
@ 2024-09-11 13:51 ` Michael S. Tsirkin
2024-09-11 13:51 ` [PULL 04/18] hw/isa/vt82c686.c: Embed i8259 irq in device state instead of allocating Michael S. Tsirkin
` (15 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, BALATON Zoltan
From: BALATON Zoltan <balaton@eik.bme.hu>
To allow embedding a qemu_irq in a struct move its definition to the
header and add a function to init it in place without allocating it.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <e3ffd0f6ef8845d0f7247c9b6ff33f7ee8b432cf.1719690591.git.balaton@eik.bme.hu>
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
include/hw/irq.h | 18 ++++++++++++++++++
hw/core/irq.c | 25 +++++++++++--------------
2 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/include/hw/irq.h b/include/hw/irq.h
index 645b73d251..c861c1debd 100644
--- a/include/hw/irq.h
+++ b/include/hw/irq.h
@@ -1,9 +1,20 @@
#ifndef QEMU_IRQ_H
#define QEMU_IRQ_H
+#include "qom/object.h"
+
/* Generic IRQ/GPIO pin infrastructure. */
#define TYPE_IRQ "irq"
+OBJECT_DECLARE_SIMPLE_TYPE(IRQState, IRQ)
+
+struct IRQState {
+ Object parent_obj;
+
+ qemu_irq_handler handler;
+ void *opaque;
+ int n;
+};
void qemu_set_irq(qemu_irq irq, int level);
@@ -23,6 +34,13 @@ static inline void qemu_irq_pulse(qemu_irq irq)
qemu_set_irq(irq, 0);
}
+/*
+ * Init a single IRQ. The irq is assigned with a handler, an opaque data
+ * and the interrupt number.
+ */
+void qemu_init_irq(IRQState *irq, qemu_irq_handler handler, void *opaque,
+ int n);
+
/* Returns an array of N IRQs. Each IRQ is assigned the argument handler and
* opaque data.
*/
diff --git a/hw/core/irq.c b/hw/core/irq.c
index 3f14e2dda7..db95ffc18f 100644
--- a/hw/core/irq.c
+++ b/hw/core/irq.c
@@ -26,16 +26,6 @@
#include "hw/irq.h"
#include "qom/object.h"
-OBJECT_DECLARE_SIMPLE_TYPE(IRQState, IRQ)
-
-struct IRQState {
- Object parent_obj;
-
- qemu_irq_handler handler;
- void *opaque;
- int n;
-};
-
void qemu_set_irq(qemu_irq irq, int level)
{
if (!irq)
@@ -44,6 +34,15 @@ void qemu_set_irq(qemu_irq irq, int level)
irq->handler(irq->opaque, irq->n, level);
}
+void qemu_init_irq(IRQState *irq, qemu_irq_handler handler, void *opaque,
+ int n)
+{
+ object_initialize(irq, sizeof(*irq), TYPE_IRQ);
+ irq->handler = handler;
+ irq->opaque = opaque;
+ irq->n = n;
+}
+
qemu_irq *qemu_extend_irqs(qemu_irq *old, int n_old, qemu_irq_handler handler,
void *opaque, int n)
{
@@ -69,10 +68,8 @@ qemu_irq qemu_allocate_irq(qemu_irq_handler handler, void *opaque, int n)
{
IRQState *irq;
- irq = IRQ(object_new(TYPE_IRQ));
- irq->handler = handler;
- irq->opaque = opaque;
- irq->n = n;
+ irq = g_new(IRQState, 1);
+ qemu_init_irq(irq, handler, opaque, n);
return irq;
}
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PULL 04/18] hw/isa/vt82c686.c: Embed i8259 irq in device state instead of allocating
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (2 preceding siblings ...)
2024-09-11 13:51 ` [PULL 03/18] hw: Move declaration of IRQState to header and add init function Michael S. Tsirkin
@ 2024-09-11 13:51 ` Michael S. Tsirkin
2024-09-11 13:51 ` [PULL 05/18] pci: don't skip function 0 occupancy verification for devfn auto assign Michael S. Tsirkin
` (14 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:51 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, BALATON Zoltan, Philippe Mathieu-Daudé,
Jiaxun Yang
From: BALATON Zoltan <balaton@eik.bme.hu>
To avoid a warning about unfreed qemu_irq embed the i8259 irq in the
device state instead of allocating it.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <b70b9e72063b4dd4005bf4bc040b84f2bb617bf4.1719690591.git.balaton@eik.bme.hu>
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
hw/isa/vt82c686.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/hw/isa/vt82c686.c b/hw/isa/vt82c686.c
index 505b44c4e6..82591e3e07 100644
--- a/hw/isa/vt82c686.c
+++ b/hw/isa/vt82c686.c
@@ -592,6 +592,8 @@ OBJECT_DECLARE_SIMPLE_TYPE(ViaISAState, VIA_ISA)
struct ViaISAState {
PCIDevice dev;
+
+ IRQState i8259_irq;
qemu_irq cpu_intr;
qemu_irq *isa_irqs_in;
uint16_t irq_state[ISA_NUM_IRQS];
@@ -715,13 +717,12 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
ViaISAState *s = VIA_ISA(d);
DeviceState *dev = DEVICE(d);
PCIBus *pci_bus = pci_get_bus(d);
- qemu_irq *isa_irq;
ISABus *isa_bus;
int i;
qdev_init_gpio_out_named(dev, &s->cpu_intr, "intr", 1);
qdev_init_gpio_in_named(dev, via_isa_pirq, "pirq", PCI_NUM_PINS);
- isa_irq = qemu_allocate_irqs(via_isa_request_i8259_irq, s, 1);
+ qemu_init_irq(&s->i8259_irq, via_isa_request_i8259_irq, s, 0);
isa_bus = isa_bus_new(dev, pci_address_space(d), pci_address_space_io(d),
errp);
@@ -729,7 +730,7 @@ static void via_isa_realize(PCIDevice *d, Error **errp)
return;
}
- s->isa_irqs_in = i8259_init(isa_bus, *isa_irq);
+ s->isa_irqs_in = i8259_init(isa_bus, &s->i8259_irq);
isa_bus_register_input_irqs(isa_bus, s->isa_irqs_in);
i8254_pit_init(isa_bus, 0x40, 0, NULL);
i8257_dma_init(OBJECT(d), isa_bus, 0);
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PULL 05/18] pci: don't skip function 0 occupancy verification for devfn auto assign
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (3 preceding siblings ...)
2024-09-11 13:51 ` [PULL 04/18] hw/isa/vt82c686.c: Embed i8259 irq in device state instead of allocating Michael S. Tsirkin
@ 2024-09-11 13:51 ` Michael S. Tsirkin
2024-09-11 13:51 ` [PULL 06/18] hw/pci/pci-hmp-cmds: Avoid displaying bogus size in 'info pci' Michael S. Tsirkin
` (13 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:51 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Dongli Zhang, Aswin Unnikrishnan, Marcel Apfelbaum
From: Dongli Zhang <dongli.zhang@oracle.com>
When the devfn is already assigned in the command line, the
do_pci_register_device() may verify if the function 0 is already occupied.
However, when devfn < 0, the verification is skipped because it is part of
the last "else if".
For instance, suppose there is already a device at addr=00.00 of a port.
-device pcie-root-port,bus=pcie.0,chassis=115,id=port01,addr=0e.00 \
-device virtio-net-pci,bus=port01,id=vnet01,addr=00.00 \
When 'addr' is specified for the 2nd device, the hotplug is denied.
(qemu) device_add virtio-net-pci,bus=port01,id=vnet02,addr=01.00
Error: PCI: slot 0 function 0 already occupied by virtio-net-pci, new func virtio-net-pci cannot be exposed to guest.
When 'addr' is automatically assigned, the hotplug is not denied. This is
because the verification is skipped.
(qemu) device_add virtio-net-pci,bus=port01,id=vnet02
warning: PCI: slot 1 is not valid for virtio-net-pci, parent device only allows plugging into slot 0.
Fix the issue by moving the verification into an independent 'if'
statement.
Fixes: 3f1e1478db2d ("enable multi-function hot-add")
Reported-by: Aswin Unnikrishnan <aswin.u.unnikrishnan@oracle.com>
Signed-off-by: Dongli Zhang <dongli.zhang@oracle.com>
Message-Id: <20240708041056.54504-1-dongli.zhang@oracle.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/pci/pci.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index d2caf3ee8b..87da35ca9b 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -1181,14 +1181,15 @@ static PCIDevice *do_pci_register_device(PCIDevice *pci_dev,
PCI_SLOT(devfn), PCI_FUNC(devfn), name,
bus->devices[devfn]->name, bus->devices[devfn]->qdev.id);
return NULL;
- } /*
- * Populating function 0 triggers a scan from the guest that
- * exposes other non-zero functions. Hence we need to ensure that
- * function 0 wasn't added yet.
- */
- else if (dev->hotplugged &&
- !pci_is_vf(pci_dev) &&
- pci_get_function_0(pci_dev)) {
+ }
+
+ /*
+ * Populating function 0 triggers a scan from the guest that
+ * exposes other non-zero functions. Hence we need to ensure that
+ * function 0 wasn't added yet.
+ */
+ if (dev->hotplugged && !pci_is_vf(pci_dev) &&
+ pci_get_function_0(pci_dev)) {
error_setg(errp, "PCI: slot %d function 0 already occupied by %s,"
" new func %s cannot be exposed to guest.",
PCI_SLOT(pci_get_function_0(pci_dev)->devfn),
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PULL 06/18] hw/pci/pci-hmp-cmds: Avoid displaying bogus size in 'info pci'
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (4 preceding siblings ...)
2024-09-11 13:51 ` [PULL 05/18] pci: don't skip function 0 occupancy verification for devfn auto assign Michael S. Tsirkin
@ 2024-09-11 13:51 ` Michael S. Tsirkin
2024-09-11 13:51 ` [PULL 07/18] virtio: rename virtio_split_packed_update_used_idx Michael S. Tsirkin
` (12 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Philippe Mathieu-Daudé, Marcel Apfelbaum
From: Philippe Mathieu-Daudé <philmd@linaro.org>
When BAR aren't mapped, we get:
(qemu) info pci
Bus 0, device 0, function 0:
Host bridge: PCI device dead:beef
...
BAR4: 32 bit memory at 0xffffffffffffffff [0x00000ffe].
BAR5: I/O at 0xffffffffffffffff [0x0ffe].
Check the BAR is mapped comparing its address to PCI_BAR_UNMAPPED
which is what the PCI layer uses for unmapped BARs.
See pci_bar_address and pci_update_mappings implementations and
in "hw/pci/pci.h":
typedef struct PCIIORegion {
pcibus_t addr; /* current PCI mapping address. -1 means not mapped */
#define PCI_BAR_UNMAPPED (~(pcibus_t)0)
...
This improves the logging, not displaying bogus sizes:
(qemu) info pci
Bus 0, device 0, function 0:
Host bridge: PCI device dead:beef
...
BAR4: 32 bit memory (not mapped)
BAR5: I/O (not mapped)
Remove trailing dot which is not used in other commands format.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20240801131449.51328-1-philmd@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/pci/pci-hmp-cmds.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/hw/pci/pci-hmp-cmds.c b/hw/pci/pci-hmp-cmds.c
index b09fce9377..fdfe44435c 100644
--- a/hw/pci/pci-hmp-cmds.c
+++ b/hw/pci/pci-hmp-cmds.c
@@ -83,15 +83,25 @@ static void hmp_info_pci_device(Monitor *mon, const PciDeviceInfo *dev)
monitor_printf(mon, " BAR%" PRId64 ": ", region->value->bar);
if (!strcmp(region->value->type, "io")) {
- monitor_printf(mon, "I/O at 0x%04" PRIx64
- " [0x%04" PRIx64 "].\n",
- addr, addr + size - 1);
+ if (addr != PCI_BAR_UNMAPPED) {
+ monitor_printf(mon, "I/O at 0x%04" PRIx64
+ " [0x%04" PRIx64 "]\n",
+ addr, addr + size - 1);
+ } else {
+ monitor_printf(mon, "I/O (not mapped)\n");
+ }
} else {
- monitor_printf(mon, "%d bit%s memory at 0x%08" PRIx64
- " [0x%08" PRIx64 "].\n",
- region->value->mem_type_64 ? 64 : 32,
- region->value->prefetch ? " prefetchable" : "",
- addr, addr + size - 1);
+ if (addr != PCI_BAR_UNMAPPED) {
+ monitor_printf(mon, "%d bit%s memory at 0x%08" PRIx64
+ " [0x%08" PRIx64 "]\n",
+ region->value->mem_type_64 ? 64 : 32,
+ region->value->prefetch ? " prefetchable" : "",
+ addr, addr + size - 1);
+ } else {
+ monitor_printf(mon, "%d bit%s memory (not mapped)\n",
+ region->value->mem_type_64 ? 64 : 32,
+ region->value->prefetch ? " prefetchable" : "");
+ }
}
}
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PULL 07/18] virtio: rename virtio_split_packed_update_used_idx
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (5 preceding siblings ...)
2024-09-11 13:51 ` [PULL 06/18] hw/pci/pci-hmp-cmds: Avoid displaying bogus size in 'info pci' Michael S. Tsirkin
@ 2024-09-11 13:51 ` Michael S. Tsirkin
2024-09-11 13:51 ` [PULL 08/18] intel_iommu: Fix invalidation descriptor type field Michael S. Tsirkin
` (11 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Wenyu Huang
From: Wenyu Huang <huangwenyuu@outlook.com>
virtio_split_packed_update_used_idx should be
virtio_queue_split_update_used_idx like
virtio_split_packed_update_used_idx.
Signed-off-by: Wenyu Huang <huangwenyuu@outlook.com>
Message-Id: <TYBP286MB036536B9015994AA5F3E4495ACB22@TYBP286MB0365.JPNP286.PROD.OUTLOOK.COM>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/virtio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 42589adf2c..a26f18908e 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -3669,7 +3669,7 @@ static void virtio_queue_packed_update_used_idx(VirtIODevice *vdev, int n)
return;
}
-static void virtio_split_packed_update_used_idx(VirtIODevice *vdev, int n)
+static void virtio_queue_split_update_used_idx(VirtIODevice *vdev, int n)
{
RCU_READ_LOCK_GUARD();
if (vdev->vq[n].vring.desc) {
@@ -3682,7 +3682,7 @@ void virtio_queue_update_used_idx(VirtIODevice *vdev, int n)
if (virtio_vdev_has_feature(vdev, VIRTIO_F_RING_PACKED)) {
return virtio_queue_packed_update_used_idx(vdev, n);
} else {
- return virtio_split_packed_update_used_idx(vdev, n);
+ return virtio_queue_split_update_used_idx(vdev, n);
}
}
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PULL 08/18] intel_iommu: Fix invalidation descriptor type field
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (6 preceding siblings ...)
2024-09-11 13:51 ` [PULL 07/18] virtio: rename virtio_split_packed_update_used_idx Michael S. Tsirkin
@ 2024-09-11 13:51 ` Michael S. Tsirkin
2024-09-11 13:51 ` [PULL 09/18] intel_iommu: Make PASID-cache and PIOTLB type invalid in legacy mode Michael S. Tsirkin
` (10 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:51 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Zhenzhong Duan, Clément Mathieu--Drif, Yi Liu,
Jason Wang, Marcel Apfelbaum, Paolo Bonzini, Richard Henderson,
Eduardo Habkost
From: Zhenzhong Duan <zhenzhong.duan@intel.com>
According to spec, invalidation descriptor type is 7bits which is
concatenation of bits[11:9] and bits[3:0] of invalidation descriptor.
Currently we only pick bits[3:0] as the invalidation type and treat
bits[11:9] as reserved zero. This is not a problem for now as bits[11:9]
is zero for all current invalidation types. But it will break if newer
type occupies bits[11:9].
Fix it by taking bits[11:9] into type and make reserved bits check accurate.
Suggested-by: Clément Mathieu--Drif<clement.mathieu--drif@eviden.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Yi Liu <yi.l.liu@intel.com>
Reviewed-by: Clément Mathieu--Drif<clement.mathieu--drif@eviden.com>
Message-Id: <20240814071321.2621384-2-zhenzhong.duan@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/i386/intel_iommu_internal.h | 11 ++++++-----
hw/i386/intel_iommu.c | 2 +-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/hw/i386/intel_iommu_internal.h b/hw/i386/intel_iommu_internal.h
index 5f32c36943..13d5d129ae 100644
--- a/hw/i386/intel_iommu_internal.h
+++ b/hw/i386/intel_iommu_internal.h
@@ -356,7 +356,8 @@ union VTDInvDesc {
typedef union VTDInvDesc VTDInvDesc;
/* Masks for struct VTDInvDesc */
-#define VTD_INV_DESC_TYPE 0xf
+#define VTD_INV_DESC_TYPE(val) ((((val) >> 5) & 0x70ULL) | \
+ ((val) & 0xfULL))
#define VTD_INV_DESC_CC 0x1 /* Context-cache Invalidate Desc */
#define VTD_INV_DESC_IOTLB 0x2
#define VTD_INV_DESC_DEVICE 0x3
@@ -372,7 +373,7 @@ typedef union VTDInvDesc VTDInvDesc;
#define VTD_INV_DESC_WAIT_IF (1ULL << 4)
#define VTD_INV_DESC_WAIT_FN (1ULL << 6)
#define VTD_INV_DESC_WAIT_DATA_SHIFT 32
-#define VTD_INV_DESC_WAIT_RSVD_LO 0Xffffff80ULL
+#define VTD_INV_DESC_WAIT_RSVD_LO 0Xfffff180ULL
#define VTD_INV_DESC_WAIT_RSVD_HI 3ULL
/* Masks for Context-cache Invalidation Descriptor */
@@ -383,7 +384,7 @@ typedef union VTDInvDesc VTDInvDesc;
#define VTD_INV_DESC_CC_DID(val) (((val) >> 16) & VTD_DOMAIN_ID_MASK)
#define VTD_INV_DESC_CC_SID(val) (((val) >> 32) & 0xffffUL)
#define VTD_INV_DESC_CC_FM(val) (((val) >> 48) & 3UL)
-#define VTD_INV_DESC_CC_RSVD 0xfffc00000000ffc0ULL
+#define VTD_INV_DESC_CC_RSVD 0xfffc00000000f1c0ULL
/* Masks for IOTLB Invalidate Descriptor */
#define VTD_INV_DESC_IOTLB_G (3ULL << 4)
@@ -393,7 +394,7 @@ typedef union VTDInvDesc VTDInvDesc;
#define VTD_INV_DESC_IOTLB_DID(val) (((val) >> 16) & VTD_DOMAIN_ID_MASK)
#define VTD_INV_DESC_IOTLB_ADDR(val) ((val) & ~0xfffULL)
#define VTD_INV_DESC_IOTLB_AM(val) ((val) & 0x3fULL)
-#define VTD_INV_DESC_IOTLB_RSVD_LO 0xffffffff0000ff00ULL
+#define VTD_INV_DESC_IOTLB_RSVD_LO 0xffffffff0000f100ULL
#define VTD_INV_DESC_IOTLB_RSVD_HI 0xf80ULL
#define VTD_INV_DESC_IOTLB_PASID_PASID (2ULL << 4)
#define VTD_INV_DESC_IOTLB_PASID_PAGE (3ULL << 4)
@@ -406,7 +407,7 @@ typedef union VTDInvDesc VTDInvDesc;
#define VTD_INV_DESC_DEVICE_IOTLB_SIZE(val) ((val) & 0x1)
#define VTD_INV_DESC_DEVICE_IOTLB_SID(val) (((val) >> 32) & 0xFFFFULL)
#define VTD_INV_DESC_DEVICE_IOTLB_RSVD_HI 0xffeULL
-#define VTD_INV_DESC_DEVICE_IOTLB_RSVD_LO 0xffff0000ffe0fff8
+#define VTD_INV_DESC_DEVICE_IOTLB_RSVD_LO 0xffff0000ffe0f1f0
/* Rsvd field masks for spte */
#define VTD_SPTE_SNP 0x800ULL
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 16d2885fcc..68cb72a481 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -2744,7 +2744,7 @@ static bool vtd_process_inv_desc(IntelIOMMUState *s)
return false;
}
- desc_type = inv_desc.lo & VTD_INV_DESC_TYPE;
+ desc_type = VTD_INV_DESC_TYPE(inv_desc.lo);
/* FIXME: should update at first or at last? */
s->iq_last_desc_type = desc_type;
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PULL 09/18] intel_iommu: Make PASID-cache and PIOTLB type invalid in legacy mode
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (7 preceding siblings ...)
2024-09-11 13:51 ` [PULL 08/18] intel_iommu: Fix invalidation descriptor type field Michael S. Tsirkin
@ 2024-09-11 13:51 ` Michael S. Tsirkin
2024-09-11 13:51 ` [PULL 10/18] tests/acpi: pc: allow DSDT acpi table changes Michael S. Tsirkin
` (9 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:51 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Zhenzhong Duan, Yi Liu, Clément Mathieu--Drif,
Jason Wang, Paolo Bonzini, Richard Henderson, Eduardo Habkost,
Marcel Apfelbaum
From: Zhenzhong Duan <zhenzhong.duan@intel.com>
In vtd_process_inv_desc(), VTD_INV_DESC_PC and VTD_INV_DESC_PIOTLB are
bypassed without scalable mode check. These two types are not valid
in legacy mode and we should report error.
Fixes: 4a4f219e8a10 ("intel_iommu: add scalable-mode option to make scalable mode work")
Suggested-by: Yi Liu <yi.l.liu@intel.com>
Signed-off-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
Reviewed-by: Clément Mathieu--Drif<clement.mathieu--drif@eviden.com>
Reviewed-by: Yi Liu <yi.l.liu@intel.com>
Message-Id: <20240814071321.2621384-3-zhenzhong.duan@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/i386/intel_iommu.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index 68cb72a481..90cd4e5044 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -2763,17 +2763,6 @@ static bool vtd_process_inv_desc(IntelIOMMUState *s)
}
break;
- /*
- * TODO: the entity of below two cases will be implemented in future series.
- * To make guest (which integrates scalable mode support patch set in
- * iommu driver) work, just return true is enough so far.
- */
- case VTD_INV_DESC_PC:
- break;
-
- case VTD_INV_DESC_PIOTLB:
- break;
-
case VTD_INV_DESC_WAIT:
trace_vtd_inv_desc("wait", inv_desc.hi, inv_desc.lo);
if (!vtd_process_wait_desc(s, &inv_desc)) {
@@ -2795,6 +2784,17 @@ static bool vtd_process_inv_desc(IntelIOMMUState *s)
}
break;
+ /*
+ * TODO: the entity of below two cases will be implemented in future series.
+ * To make guest (which integrates scalable mode support patch set in
+ * iommu driver) work, just return true is enough so far.
+ */
+ case VTD_INV_DESC_PC:
+ case VTD_INV_DESC_PIOTLB:
+ if (s->scalable_mode) {
+ break;
+ }
+ /* fallthrough */
default:
error_report_once("%s: invalid inv desc: hi=%"PRIx64", lo=%"PRIx64
" (unknown type)", __func__, inv_desc.hi,
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PULL 10/18] tests/acpi: pc: allow DSDT acpi table changes
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (8 preceding siblings ...)
2024-09-11 13:51 ` [PULL 09/18] intel_iommu: Make PASID-cache and PIOTLB type invalid in legacy mode Michael S. Tsirkin
@ 2024-09-11 13:51 ` Michael S. Tsirkin
2024-09-11 13:51 ` [PULL 11/18] hw/i386/acpi-build: Return a pre-computed _PRT table Michael S. Tsirkin
` (8 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Ricardo Ribalda, Igor Mammedov, Ani Sinha
From: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Message-Id: <20240814115736.1580337-2-ribalda@chromium.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index dfb8523c8b..f81f4e2469 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1 +1,16 @@
/* List of comma-separated changed AML files to ignore */
+"tests/data/acpi/x86/pc/DSDT",
+"tests/data/acpi/x86/pc/DSDT.acpierst",
+"tests/data/acpi/x86/pc/DSDT.acpihmat",
+"tests/data/acpi/x86/pc/DSDT.bridge",
+"tests/data/acpi/x86/pc/DSDT.cphp",
+"tests/data/acpi/x86/pc/DSDT.dimmpxm",
+"tests/data/acpi/x86/pc/DSDT.hpbridge",
+"tests/data/acpi/x86/pc/DSDT.hpbrroot",
+"tests/data/acpi/x86/pc/DSDT.ipmikcs",
+"tests/data/acpi/x86/pc/DSDT.memhp",
+"tests/data/acpi/x86/pc/DSDT.nohpet",
+"tests/data/acpi/x86/pc/DSDT.numamem",
+"tests/data/acpi/x86/pc/DSDT.roothp",
+"tests/data/acpi/x86/q35/DSDT.cxl",
+"tests/data/acpi/x86/q35/DSDT.viot",
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PULL 11/18] hw/i386/acpi-build: Return a pre-computed _PRT table
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (9 preceding siblings ...)
2024-09-11 13:51 ` [PULL 10/18] tests/acpi: pc: allow DSDT acpi table changes Michael S. Tsirkin
@ 2024-09-11 13:51 ` Michael S. Tsirkin
2024-09-11 13:52 ` [PULL 12/18] tests/acpi: pc: update golden masters for DSDT Michael S. Tsirkin
` (7 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:51 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Ricardo Ribalda, Igor Mammedov, Richard Henderson,
Ani Sinha, Paolo Bonzini, Eduardo Habkost, Marcel Apfelbaum
From: Ricardo Ribalda <ribalda@chromium.org>
When qemu runs without kvm acceleration the ACPI executions take a great
amount of time. If they take more than the default time (30sec), the
ACPI calls fail and the system might not behave correctly.
Now the _PRT table is computed on the fly. We can drastically reduce the
execution of the _PRT method if we return a pre-computed table.
Without this patch:
[ 51.343484] ACPI Error: Aborting method \_SB.PCI0._PRT due to previous error (AE_AML_LOOP_TIMEOUT) (20230628/psparse-529)
[ 51.527032] ACPI Error: Method execution failed \_SB.PCI0._PRT due to previous error (AE_AML_LOOP_TIMEOUT) (20230628/uteval-68)
[ 51.530049] virtio-pci 0000:00:02.0: can't derive routing for PCI INT A
[ 51.530797] virtio-pci 0000:00:02.0: PCI INT A: no GSI
[ 81.922901] ACPI Error: Aborting method \_SB.PCI0._PRT due to previous error (AE_AML_LOOP_TIMEOUT) (20230628/psparse-529)
[ 82.103534] ACPI Error: Method execution failed \_SB.PCI0._PRT due to previous error (AE_AML_LOOP_TIMEOUT) (20230628/uteval-68)
[ 82.106088] virtio-pci 0000:00:04.0: can't derive routing for PCI INT A
[ 82.106761] virtio-pci 0000:00:04.0: PCI INT A: no GSI
[ 112.192568] ACPI Error: Aborting method \_SB.PCI0._PRT due to previous error (AE_AML_LOOP_TIMEOUT) (20230628/psparse-529)
[ 112.486687] ACPI Error: Method execution failed \_SB.PCI0._PRT due to previous error (AE_AML_LOOP_TIMEOUT) (20230628/uteval-68)
[ 112.489554] virtio-pci 0000:00:05.0: can't derive routing for PCI INT A
[ 112.490027] virtio-pci 0000:00:05.0: PCI INT A: no GSI
[ 142.559448] ACPI Error: Aborting method \_SB.PCI0._PRT due to previous error (AE_AML_LOOP_TIMEOUT) (20230628/psparse-529)
[ 142.718596] ACPI Error: Method execution failed \_SB.PCI0._PRT due to previous error (AE_AML_LOOP_TIMEOUT) (20230628/uteval-68)
[ 142.722889] virtio-pci 0000:00:06.0: can't derive routing for PCI INT A
[ 142.724578] virtio-pci 0000:00:06.0: PCI INT A: no GSI
With this patch:
[ 22.938076] ACPI: \_SB_.LNKB: Enabled at IRQ 10
[ 24.214002] ACPI: \_SB_.LNKD: Enabled at IRQ 11
[ 25.465170] ACPI: \_SB_.LNKA: Enabled at IRQ 10
[ 27.944920] ACPI: \_SB_.LNKC: Enabled at IRQ 11
ACPI disassembly:
Scope (PCI0)
{
Method (_PRT, 0, NotSerialized) // _PRT: PCI Routing Table
{
Return (Package (0x80)
{
Package (0x04)
{
0xFFFF,
Zero,
LNKD,
Zero
},
Package (0x04)
{
0xFFFF,
One,
LNKA,
Zero
},
Package (0x04)
{
0xFFFF,
0x02,
LNKB,
Zero
},
Package (0x04)
{
0xFFFF,
0x03,
LNKC,
Zero
},
Package (0x04)
{
0x0001FFFF,
Zero,
LNKS,
Zero
},
Context: https://lore.kernel.org/virtualization/20240417145544.38d7b482@imammedo.users.ipa.redhat.com/T/#t
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20240814115736.1580337-3-ribalda@chromium.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/i386/acpi-build.c | 118 ++++++++-----------------------------------
1 file changed, 21 insertions(+), 97 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 5d4bd2b710..4967aa7459 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -724,120 +724,44 @@ static Aml *aml_pci_pdsm(void)
return method;
}
-/**
- * build_prt_entry:
- * @link_name: link name for PCI route entry
- *
- * build AML package containing a PCI route entry for @link_name
- */
-static Aml *build_prt_entry(const char *link_name)
-{
- Aml *a_zero = aml_int(0);
- Aml *pkg = aml_package(4);
- aml_append(pkg, a_zero);
- aml_append(pkg, a_zero);
- aml_append(pkg, aml_name("%s", link_name));
- aml_append(pkg, a_zero);
- return pkg;
-}
-
/*
- * initialize_route - Initialize the interrupt routing rule
- * through a specific LINK:
- * if (lnk_idx == idx)
- * route using link 'link_name'
- */
-static Aml *initialize_route(Aml *route, const char *link_name,
- Aml *lnk_idx, int idx)
-{
- Aml *if_ctx = aml_if(aml_equal(lnk_idx, aml_int(idx)));
- Aml *pkg = build_prt_entry(link_name);
-
- aml_append(if_ctx, aml_store(pkg, route));
-
- return if_ctx;
-}
-
-/*
- * build_prt - Define interrupt rounting rules
+ * build_prt - Define interrupt routing rules
*
* Returns an array of 128 routes, one for each device,
* based on device location.
* The main goal is to equally distribute the interrupts
* over the 4 existing ACPI links (works only for i440fx).
- * The hash function is (slot + pin) & 3 -> "LNK[D|A|B|C]".
+ * The hash function is: (slot + pin) & 3 -> "LNK[D|A|B|C]".
*
*/
static Aml *build_prt(bool is_pci0_prt)
{
- Aml *method, *while_ctx, *pin, *res;
+ const int nroutes = 128;
+ Aml *rt_pkg, *method;
+ int pin;
method = aml_method("_PRT", 0, AML_NOTSERIALIZED);
- res = aml_local(0);
- pin = aml_local(1);
- aml_append(method, aml_store(aml_package(128), res));
- aml_append(method, aml_store(aml_int(0), pin));
+ rt_pkg = aml_varpackage(nroutes);
- /* while (pin < 128) */
- while_ctx = aml_while(aml_lless(pin, aml_int(128)));
- {
- Aml *slot = aml_local(2);
- Aml *lnk_idx = aml_local(3);
- Aml *route = aml_local(4);
+ for (pin = 0; pin < nroutes; pin++) {
+ Aml *pkg = aml_package(4);
+ int slot = pin >> 2;
- /* slot = pin >> 2 */
- aml_append(while_ctx,
- aml_store(aml_shiftright(pin, aml_int(2), NULL), slot));
- /* lnk_idx = (slot + pin) & 3 */
- aml_append(while_ctx,
- aml_store(aml_and(aml_add(pin, slot, NULL), aml_int(3), NULL),
- lnk_idx));
-
- /* route[2] = "LNK[D|A|B|C]", selection based on pin % 3 */
- aml_append(while_ctx, initialize_route(route, "LNKD", lnk_idx, 0));
- if (is_pci0_prt) {
- Aml *if_device_1, *if_pin_4, *else_pin_4;
-
- /* device 1 is the power-management device, needs SCI */
- if_device_1 = aml_if(aml_equal(lnk_idx, aml_int(1)));
- {
- if_pin_4 = aml_if(aml_equal(pin, aml_int(4)));
- {
- aml_append(if_pin_4,
- aml_store(build_prt_entry("LNKS"), route));
- }
- aml_append(if_device_1, if_pin_4);
- else_pin_4 = aml_else();
- {
- aml_append(else_pin_4,
- aml_store(build_prt_entry("LNKA"), route));
- }
- aml_append(if_device_1, else_pin_4);
- }
- aml_append(while_ctx, if_device_1);
+ aml_append(pkg, aml_int((slot << 16) | 0xFFFF));
+ aml_append(pkg, aml_int(pin & 3));
+ /* device 1 is the power-management device, needs SCI */
+ if (is_pci0_prt && pin == 4) {
+ aml_append(pkg, aml_name("%s", "LNKS"));
} else {
- aml_append(while_ctx, initialize_route(route, "LNKA", lnk_idx, 1));
+ static const char link_name[][5] = {"LNKD", "LNKA", "LNKB", "LNKC"};
+ int hash = (slot + pin) & 3;
+ aml_append(pkg, aml_name("%s", link_name[hash]));
}
- aml_append(while_ctx, initialize_route(route, "LNKB", lnk_idx, 2));
- aml_append(while_ctx, initialize_route(route, "LNKC", lnk_idx, 3));
-
- /* route[0] = 0x[slot]FFFF */
- aml_append(while_ctx,
- aml_store(aml_or(aml_shiftleft(slot, aml_int(16)), aml_int(0xFFFF),
- NULL),
- aml_index(route, aml_int(0))));
- /* route[1] = pin & 3 */
- aml_append(while_ctx,
- aml_store(aml_and(pin, aml_int(3), NULL),
- aml_index(route, aml_int(1))));
- /* res[pin] = route */
- aml_append(while_ctx, aml_store(route, aml_index(res, pin)));
- /* pin++ */
- aml_append(while_ctx, aml_increment(pin));
+ aml_append(pkg, aml_int(0));
+ aml_append(rt_pkg, pkg);
}
- aml_append(method, while_ctx);
- /* return res*/
- aml_append(method, aml_return(res));
+
+ aml_append(method, aml_return(rt_pkg));
return method;
}
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PULL 12/18] tests/acpi: pc: update golden masters for DSDT
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (10 preceding siblings ...)
2024-09-11 13:51 ` [PULL 11/18] hw/i386/acpi-build: Return a pre-computed _PRT table Michael S. Tsirkin
@ 2024-09-11 13:52 ` Michael S. Tsirkin
2024-09-11 13:52 ` [PULL 13/18] vhost_net: configure all host notifiers in a single MR transaction Michael S. Tsirkin
` (6 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:52 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Ricardo Ribalda, Igor Mammedov, Ani Sinha
From: Ricardo Ribalda <ribalda@chromium.org>
Signed-off-by: Ricardo Ribalda <ribalda@chromium.org>
Message-Id: <20240814115736.1580337-4-ribalda@chromium.org>
Acked-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
tests/qtest/bios-tables-test-allowed-diff.h | 15 ---------------
tests/data/acpi/x86/pc/DSDT | Bin 6830 -> 8527 bytes
tests/data/acpi/x86/pc/DSDT.acpierst | Bin 6741 -> 8438 bytes
tests/data/acpi/x86/pc/DSDT.acpihmat | Bin 8155 -> 9852 bytes
tests/data/acpi/x86/pc/DSDT.bridge | Bin 13701 -> 15398 bytes
tests/data/acpi/x86/pc/DSDT.cphp | Bin 7294 -> 8991 bytes
tests/data/acpi/x86/pc/DSDT.dimmpxm | Bin 8484 -> 10181 bytes
tests/data/acpi/x86/pc/DSDT.hpbridge | Bin 6781 -> 8478 bytes
tests/data/acpi/x86/pc/DSDT.hpbrroot | Bin 3337 -> 5034 bytes
tests/data/acpi/x86/pc/DSDT.ipmikcs | Bin 6902 -> 8599 bytes
tests/data/acpi/x86/pc/DSDT.memhp | Bin 8189 -> 9886 bytes
tests/data/acpi/x86/pc/DSDT.nohpet | Bin 6688 -> 8385 bytes
tests/data/acpi/x86/pc/DSDT.numamem | Bin 6836 -> 8533 bytes
tests/data/acpi/x86/pc/DSDT.roothp | Bin 10623 -> 12320 bytes
tests/data/acpi/x86/q35/DSDT.cxl | Bin 9714 -> 13148 bytes
tests/data/acpi/x86/q35/DSDT.viot | Bin 9464 -> 14615 bytes
16 files changed, 15 deletions(-)
diff --git a/tests/qtest/bios-tables-test-allowed-diff.h b/tests/qtest/bios-tables-test-allowed-diff.h
index f81f4e2469..dfb8523c8b 100644
--- a/tests/qtest/bios-tables-test-allowed-diff.h
+++ b/tests/qtest/bios-tables-test-allowed-diff.h
@@ -1,16 +1 @@
/* List of comma-separated changed AML files to ignore */
-"tests/data/acpi/x86/pc/DSDT",
-"tests/data/acpi/x86/pc/DSDT.acpierst",
-"tests/data/acpi/x86/pc/DSDT.acpihmat",
-"tests/data/acpi/x86/pc/DSDT.bridge",
-"tests/data/acpi/x86/pc/DSDT.cphp",
-"tests/data/acpi/x86/pc/DSDT.dimmpxm",
-"tests/data/acpi/x86/pc/DSDT.hpbridge",
-"tests/data/acpi/x86/pc/DSDT.hpbrroot",
-"tests/data/acpi/x86/pc/DSDT.ipmikcs",
-"tests/data/acpi/x86/pc/DSDT.memhp",
-"tests/data/acpi/x86/pc/DSDT.nohpet",
-"tests/data/acpi/x86/pc/DSDT.numamem",
-"tests/data/acpi/x86/pc/DSDT.roothp",
-"tests/data/acpi/x86/q35/DSDT.cxl",
-"tests/data/acpi/x86/q35/DSDT.viot",
diff --git a/tests/data/acpi/x86/pc/DSDT b/tests/data/acpi/x86/pc/DSDT
index c93ad6b7f83a168a1833d7dba1112dd2ab8a431f..92225236e717b2e522a2ee00492fb0ded418dc7b 100644
GIT binary patch
delta 1914
zcmY+_OODep0DxgPNnd%jP12_CiUT0A;Q&p;V$`UN=xkV3oPpV!ldxiqgg66h&cP{+
zY{yalUETPX{l!W9^Znl{tnc;9$2UR@KK}~edh+S}<6b@H&Fk~!>0R;R_3`}aMf}K{
zui>{W3L>RMbGz2UejYTp>se&6{yy}Y+qH57zqws6B1?i;se#bVy&LJO5?N}mneO6-
zQkb-ECwnHXx{*%ZT+gO;n|ii9w{v|{x-IyobW?p>p4-y5rCCMBN(Cl$TL?_*<_0!(
z+YfB&mKmDTZD9!MkkTQcqZTUdEgL~PqI5**7}7DMV@k(8X{^))(1|W(C!J6_p>zuA
z6w)cBQ%b{DYM~*Zp^)Zra0eAq8bKOC8c`Zi8bcbJ(j95shf1Z#{iip9G=VgsG@&$w
zG=(&^rGusp+MfRm(ix;PN@tYLA)P}y?@N^)_Mr=1n)5er?E=yTr3*?kNHa(?N;4<5
ztK@*@Lh3i%-IbiuoYDf)0@8xgg3_fa-D|q+L#0|$x}<ak=?c;nr7KEHNJ~>XXxTxf
z`Bf|_T|>HtbWQ1+(ha1WzEo`p-I!A9J(=_0Lb`=?OX-%<9i%%*cb(KgcZBYRZ2w-&
v7WR<tDcw_gfb;<AfzpF59rW0Teo;qAkCYxMJwbYc^hD{&Nq_(I{*?a#$3o0}
delta 204
zcmX}gy$XU*7zW_ipT$oCl^|$t4T9<dQis9_Nq0S-a{-5-p(JvY)<e5Rvk+ZFbC*=K
zI6lwEZ|4*yVcHG>&3@8YKQCul;%81oaj=^7L(1Z93hC)pF2U};b!Ak^BO@J!EO)E`
z8Q_hhIHYHpz<Lvf5Y0$&t#K72v+D%n*6Xx@Xk5if@5cYnRB<x83Lxa^P>=)r`$a7P
VSu!$E3k_1#Im4bk^4G<B4}P3QG;{y}
diff --git a/tests/data/acpi/x86/pc/DSDT.acpierst b/tests/data/acpi/x86/pc/DSDT.acpierst
index f643fa2d034053fa07f74f095565b64f021d4290..25b39955059409b177870800949eaf937cd39005 100644
GIT binary patch
delta 1914
zcmY+_O^%x|7=U31$R7}r015d|FHotAULXlwjDn(3GyACf?mBz-BwbX!K-IJK5WT=`
zUGW(s-d!C0%6>2;e?PvR!t!3eyuDMZ_w#r7-qTM%9{2NOR=qx7o<8KCULVh&U(~Ox
z`WAjqqaZRyRkv%Y?B`x}yPi}U*WZU;b-SM3z^`uCi%KU!Y)ntp&AlDf)mf#9y(Zno
z4YiWAY$kh>p4(BKy1AZB%O>?~d1~hRQo1epQo5<WEl*A9+fr81u`z+9ZVQ2=Zf;;x
zxBbATZkfK6ZVP=#`;_(x9W+pFZ`lCS0i^><hmZ~-9a1{%NMmD0fR5@?x6%=%BTC1R
zjv*aWI;J#iq!t<i8Y(T1gFC2@(g@NB(umTC(iqZMN_V7j7phG??moQ}NGFg^D4kH6
zK$<|B*wR502W`%O3h5NmDWy|NXOPYyopq(A9(JMgx|H*mw{{NcoYFa^DWoZ+DW$2C
z+Ep?@Go|Y{+})Lo(u~p^(j3y9(wx$Tl<qZMbfMZTC|yvxgmek%lF}um1*C<P4qCKO
zEx(Edr7K8Rkgh0QQM!h7-Iba(p=&91y(c;U4Wt`LH<WHD-9oyBblXY=x+Qd{bo2Kj
vTi8LmqjX2<9@0IedrJ4VbkIW=`o$a|Jy3d}^a$w@(j%ouC;ju!`&#@5@EFZr
delta 204
zcmX}gy$XU*7zW_ipT#c%l^|$t4T8J@e}=*cNt^X}&e(7W8cHHZX+5-CbOX_~bStez
zi{tZr{I^F@8fBXiprucm=;yhYr$KJVl!S}vAfh~3XOOO57ZU6qSXV~1JTlTz%4)|-
zkOAJ>ibJ}V2`pD}1ksKa*IGw0GP_P8Zv9R^MC&L{dN;v;W{Q*1RR|$ZhmvgczF#x~
WkQE~XjnE)PQ!wn=qj+7c?eGW5el%79
diff --git a/tests/data/acpi/x86/pc/DSDT.acpihmat b/tests/data/acpi/x86/pc/DSDT.acpihmat
index 9d3695ff289036856886a093733926667a32a058..73a9ce59e9426b180fea0ec5820c4841ebdb6700 100644
GIT binary patch
delta 1914
zcmY+_OODzw0DxhWgjZfb62dFMuDeRTK?S6X5fK`d*`uDJv#jKvq^n+_>T!C4Zo3}I
zmF+mnzr)18>@QB>&&RhWtnc;9w|7De%3tAoPd@#4+|Q4B^ZI;w`cQm&eLR1D5kK?h
zYxq5jf=DUR+^)5-p9jtDdJ<WzzYo3Uc0Id+-`uVjktIQ_)IjLw-i>s17FlYqneO6-
zQkb-ECwnG6cO#v;xt>kyHuY?IYUlc<bX)LE>8AR&Jhi27OS6iMl?qJiwh)-q%?)ho
zwjbEkEi*Kw+rkjiA*Dk?M=ey^TQ-7pMCpjqF{EQi$CQqH(paeppc7rnPCB7<Lg^IJ
zDWp?Mr<8`R)Ivi*Lm|!M;0`LJG=emOG@>-3G=?-br90BN50y%f`%iBIX##0NX+miV
zX$om-O9xFIv_1bBq%%lol+GxfLpq0a-j^yp>_Zp2H0N*L+6ANwN*9!7kY<o(lx9w9
zSIGg*h174jyDK@RIi&@p1*8R~1*J<<y4Q5shf1}ibV+FmX$fgbX-Vk{(v>M4bk#wn
z`Bhv|x`uQO>6+3tr5i{$eW}_Ix-q5Hdot(0g>(z)meMVyJ4kns?mDS~?g*`fZ2w-&
u7Ai<9N-IkDknSPfQ@XdMgC6?OFX{m4fzkt|M@Wy59w|LK>F>YZzv@4Lfz1m5
delta 204
zcmX}gy$XU*7zW_ipT#c%mByf@H3({t)S*x!(p`_|T)-h{D2W`U_0Vq74MaE5J#-h%
zfzjglJm2U&qaY5F_W;md4;tyG#Wan*)DCIwFUP%r()A{RboDZmU^maYFe>GNk&avz
zTb6?i@Y+@!(zQ$=T7>~bJycw)9mU9OJBGM+Tg@SAM{&~I@%}SWoQ$@72zlJ+WTVqG
Ys01JjMg}UOL5eD4*s*)|JX@ds52i3S0{{R3
diff --git a/tests/data/acpi/x86/pc/DSDT.bridge b/tests/data/acpi/x86/pc/DSDT.bridge
index 840b45f354ac14c858d0af8fbd31e97949a65d4b..4cef454e379e1009141694e0f4036a2a701c80d7 100644
GIT binary patch
delta 1914
zcmY+_xsKC79DwnO?OZ-`*v@@*bStf>X_A;?6)Rei?IS7*O17XI8r}j?A$r79@f3sn
zACKj)%f$0(=I61K@1K8v4U1dx^5&gVolk$l2Two!yx&guN%{JGetOK`zuuoeyr^GU
z`6c|8MnPnZDzBG9+0UKwdO4~zuD%bw@_ISBfnQ!PXO$*FY)nU0&8-<#)k&ozdri8t
z8)_wKQBU?HJvE~$b#pzN7Io^`@>tLHrF2{HrF2t$TORAux23G2V`BnI-4+5#-Q2*Y
zZu@~v-7;M%-4?o#b}8)=+N+`3-m)H~JxY6&_95*<+NZSNlE%gi03B4NZlnWB2b2yW
z9YQ*!bVzAfOD!}6G*nt12X{~*r4ghNq!FbNr7@(jl<r95HdLEx+<tl!NE1jCN)t*)
zkd7c7+0sEr4qBi87}7DMV@k)AP9U8?I%!KyHEcttRVn8$Z|xM)DWy|NQ%F-tQ%X}O
zwX0-+W=dCYxVtMEr5U9;q&cKHr8%WDDcx&2YeTh}Q97e^4(S}yIi+(-7mzNbbkIcu
z)$*&jpmYi864E85OG;OeuG&(wB6KCCuJ$D7zlL-T>6+3tr5i{$kZu~OKsSVLm9GC@
wWD8qJx0G%v-9fs8bVupVmJYgaLqD25q<c#DlpY{GKzg9`;G}>5c|YF%2Z)!<hyVZp
delta 204
zcmX}gJqv<B90%Z^XN&&`ELz%IgXrZ0qz*+9k?wllZ7oL-R1&oa(t5NtToLWj2Q*q7
zpXa^LHxz_Hl#c<c^PwI)Pe*a+#qOL|{;b~)C|<22s1~~<3jFCgH%=FI<iwDwY|B%S
z4Pjg@pju81SS;rOr0Hs5nWpAct2%^yG%8IXO;ZbE)p-9IYC(2YKBPJwQgTr*OB51N
V87CWsw4h{>aP0Ui`Cgs-;0LeYG=KmA
diff --git a/tests/data/acpi/x86/pc/DSDT.cphp b/tests/data/acpi/x86/pc/DSDT.cphp
index dbc0141b2bbc77a6d806ff046dc137992c59a899..1dc928333d7ae7e4df6bb51d850af5e1cb480158 100644
GIT binary patch
delta 1914
zcmY+_yROqP0DxgPNpHEeP0~wx%fO7p$l5j_9W|<s=-DftfwP;JV1<PjK+HT4FM*Nm
zILg1(jepr+oV5Sm|M(cz_xh!JBgEj(ukfuWpT0lt=f}KxeZD-sD?YqFo<F^apLz2o
z{F+5Uq?BlG*IL-mgXVTUi7eLNhhB5Lp54H2Zr6**k|0)UAarx@M!GtSEVb86cX2~0
zOj@^-J(Hfhkxt!Q&!%;odbT{ZbA3~~E%>H%Q+->W+S0eBSw+T51txV{2u$kc1~zru
z4{Yj|8Jf~<VF>Av(jlRv7Aoy68$mjvbVTVG(lMlCO2<8EtkeY1i7sU)olrWVbPDMd
z(kZ1=O2bxap&_85kmhl42NhBpK^j3CQ5sPiLmHdX9ckQ$N~OpBr#FE#fi$5sp)`dw
zg*3ILgQgDJp8pKe8Kg5xXOzw%okKeBOO+n>p$lD_^EYqp0@4Mg3raIcGe|Q^GbgpH
z<bdWv>Nniom7LO?(gM-~(t^^0(xoZgYr5=1rCL(Dq;v)83epv&D@xapu1)En>kcZ-
zui~204Wt`LH<WHDEg>!YQdJUKno{aLne*R5x`lL0>6X$Rq&rA=ozy^ggzklG|6a@%
t_K@x=-BWsi^Z@CB(t|A>^w@`fR!2yWlpZOqAgv&+D6O3I_h0W@`5$`N%&PzZ
delta 204
zcmX}gJqv<B90%Z^+TuR~i<Y3VH3({GO^+yykaXAcZtn;hN_rWk^>EIjFA#mdj26e|
zxzE2-Vj+vpeZbhhX=q*+lQ?u^$EUzsj=GHEU=u-g%xj{+pRQeSx~d~56RFB}JOx=0
zrK1H@$8G?twa*~Sffh#D)|?u3hmem}tr=w5)`HA>-2aTVAgeA9Qk@PdIcQcDatWx6
UlZ9LwP%=+A_WYH6Zg$c80pWTyqW}N^
diff --git a/tests/data/acpi/x86/pc/DSDT.dimmpxm b/tests/data/acpi/x86/pc/DSDT.dimmpxm
index 1294f655d418dbdccc095e0d47ab220869a61a07..9f71d2e58b1707e733584e38dab7f73f9bda5eb7 100644
GIT binary patch
delta 1914
zcmY+_OODzw0DxhWgjZfb65bG&T~+G7D?+*$5z$eZJ?a@cdw1JQbTt>KdWJbnPvOdT
z9Od6(;$QX`C-7Fie+}z<{qp`nh{3Nv;YUwC{eIl5$GmxczC3*@zPvu3zrBdJy!jFS
z%%UJtN;J1?E$rt(bGx2J7VGaruen_-H}IR=^&+w)h?N=$-Q2s8t}2nG_L}J~ZYYIG
z>vpnd(yANj)Xnv5TDPfZ%X2%|H>KNxZ%Q}Sx8=DleOsDUWUN$RQn!V`q;76tQ@8!V
zrf!*`Dcu%^kPayw5;|(3(%!NWq$5g4l#U@CLpr8(+>^#iO#q$fQg+e_r4vf0kWL|;
zQaYtHY^4?&0vZZw9tU?&A*B(d5u_2N5v4Jtu_@h=#(k(%dfb0{6G#(C6G{_GQ%F-t
zQ(HP{>Y(lU&mf&aI-_((=^WBIr1QR1>0uwb(4{$l^VTjPT~NB9G=nsQG@~?gQoBkH
zXfC9F!`)rUDa|P@AT1y*C@m;mn$o?d%RW@9C8bMBSCFnCT~WHCbPeg+ln%P?pwj#*
zt|{F>x`A{<>4wrRq}#q!Z3*3)QtCaK^WQ<bgLFsfj?z7(dr0@4)Ij%y9)xWFUd$E_
skRB*KP<n*)2<eg1qb(h@>_fk+64H{=lF}2TCrD3}o}BdWKksw-AM!HHs{jB1
delta 204
zcmX}gy$XU*7zW_ipT#c%mF6I54T73#N*xNLB;ECR&IKHThLXrpS`Y0O-avE>U6;|~
z_&ncz<53U?$#?{4i#JX5+j^eHUTTLF`J3q=pfoxpkgi^4671z!4@RZDFw&9B;>dE4
z0bbjRL%Nm;Y<FP*QI8eZYDY0LyN)5A{Z1>0+EJYJZoL1@6epuAA3|QwIoas7Eh+)X
Vf{}qrXpo}H7*4FoK6h(5`~hC_Got_i
diff --git a/tests/data/acpi/x86/pc/DSDT.hpbridge b/tests/data/acpi/x86/pc/DSDT.hpbridge
index 8012b5eb3155377dc7995b73059ecb267d19232c..db420593a3c51eced25cd57420353fbb9ccdf63c 100644
GIT binary patch
delta 1914
zcmY+_OODzw0DxhWgjZfb5(sb9161mw7a*jI5fK`d*`uDJvv)7hUDvbf1*)E^hp0TV
z9Y^_hnE03d#R>fX{8okay?!}<5MuE2Px#T3Pj8QV^_VxW&zGl9#h2H|^Vb*gJ8!;+
zKe8x@loHMDS_}Jm(A=(Pk;VG^&}(kj$_@PHcD;x!31X!NLO1trq^n9~sl8^piyKN|
z(z>1OnY8LgI(2hBo7QdW+49`Z^-bxv;G5D-^=)}>OW&4e6&WiPnAB|{FsYjx*wk%5
zu&G;SXiB$*A*4e}hlGw=sI<3i1nG#<5v5~D$B>RG9rvWMQWHQYx|E%CLg|FkDWp?K
zr<6`94O^*&hJc1bn#aK%R7hzAX#{CRX+&uZX>3Y&q;VfAl^*w>-UQMF(uC54(iGAZ
z($tm?nmTBE{xe8tkj^NbQ96fo4(YrvReIQmE_7+m-@LU8NEehYD9s?vAk8SvoYbz8
z1DXq|-*9(Va!PYb3rGt{3rY)0m!@>D>9P-%YDwvm(iNmDNLQ4uC@mo^P3fRz2bJbm
zv7~ej=^D~CrE5wzkZ$@?wIOt4N~!l`&VLK(7Sb)HTS|A3?jYTDQUl!)x)-wjdof$s
tL%OGQPw4^D1EdE^54LpBV;}lW9U(nZdZhFO=?T&kr6(u-`_KDTz5}&$%xeGu
delta 204
zcmX}gy$XU*7zW_ipT#c%l^|$t4T9VwbtsIGbl2lK7jOs~N+d^VJ++2KHxON46fKU=
zbMrqQg-MuJBS4$KXriB%UY7Wo9Z?*trh|~Oc$-4HdYwzKhi_dO)$+(lM<L4{D?kQ#
zYby@vS|+gGL?J{wR$OZx#mMYBfw=cOEg)J)anif-|1(pZjIII*Sse<p(ffYU2tbyM
T3^YQ66iv>sXV3h7wl2dTv#B&=
diff --git a/tests/data/acpi/x86/pc/DSDT.hpbrroot b/tests/data/acpi/x86/pc/DSDT.hpbrroot
index 4fa0c6fe720f7859f0541b82f828c0329a3c0548..31b6adb4eb941e5bf0c02ec8c3819c9213adf022 100644
GIT binary patch
delta 1913
zcmY+_yN=pG7(n3xo11TdZEogPrp+q=PO-v5tFS%F1Ek8f(WFh8K1!8p+q_WTWLEyi
zWBGIpo}-!1W5dtl?L$!B%a^xIsowWr!GHbq=W#zjX4UKS<>_Po>Gkpa`9=NBs&B!M
zH1tDbRCT+S%6{%ux9drzQT=_;uWr|~8+g_2dQoZYN5=G2-Q3$zU7b~$*lW^V+)yh?
z%Vu(4(sMhiQ#ZG7)3QnXwmda+Jt^H5JSp8&&z7gA^lT}s=*SpfQnv+PQa9JPsoTD9
zQ@6}OO1FgpqytI^gbo|1wzq5u>5$SPr6Wj3kd7!Fb)=CoV?f7ssaxro(lMnINGFg^
zD4kFmG*Sx<01cFu$H5&`KxqhR2x&-ZNNEIVB&9pjs0-Dm9(SMK7}6Nhn9`Wi1kwc3
z#Fh@4IB0YJQ%I+fPAQ#II)iiu>8vX?^{@+_*QK1lytQ*k=akMVO(9JoO({*C)UJ{N
znkiks;qI<vlxCFXkmiu)l;)H!q;#+8q6^h#LFt0hC8SG8my|9kT|v5%(m_`(RLig8
ziqbWtYe?6Wt|{F>y6H;IhR}_ay55tVe*tL$X+dd0=@!y0q}x_1&@G`mrJKJO*}@Le
r9i=-;_mJ)(-BY@^rGp;2&@biy>4DM%rAJ7QkRB;LI_baPy|3XrepAd$
delta 203
zcmX}gF$;n~7zW^1ZOBgom8RyPErMDbGKZpwNOwK&*5C*lN+L%a<7mI4skJ}UKPg&n
ze4bbD(xEtsQ?~_J{VRRWvr(2rnZKa*bUtXul&v=@WN25p1bam8jZr0!jBFIL+_3`W
zfNNiI$k1&7%he)=&|SqX9VkW((+R}AWi)}%f#PJFiT*QGoE%eA2zfdb<iq=ZQ42tp
Uj2zU$f)sVmuxHQwJ#KEjA1t^tL;wH)
diff --git a/tests/data/acpi/x86/pc/DSDT.ipmikcs b/tests/data/acpi/x86/pc/DSDT.ipmikcs
index 0a891baf458abee4a772ffba7a31914ec22418ec..c2a0330d97d495298889b9e28bde2f90235cea88 100644
GIT binary patch
delta 1914
zcmY+_OODzw9Ds3?gjZfb5+J<Q161m!2LRH=hzO0!>`~9q*}J!xU01z8)wA>vy+F4f
z#m*n)+hO8Q_AgH0|L3=JSlz0Zw+~A7{{9X>div?-{dT%f>(}S=)2HIg>;3ubi~5z<
z-@_kS6hy|T`g*C9``oLqm!rz!=KIjAua}by{Q7!1t1Jm(V|uD-ZjVt@om7^(YqmSf
zP%E2O?PSlUr^l#CWv=Jas!cst9^1LTEoBS7EoG|j%41vluC%M@*qFekvW38=GB<Fk
zY(H?REYr88Y@rWnpVB^|gBGgYEgL{Opmad#5Yi!}LrRAoX>800&{0$Bhjc{gh|)2n
zV@Su8jwuaWse^`qhDzJVK@KXUG=emOG@>-3G=?;`r5tJ8g=*7`yH9TdX##0NX+miV
zX$ooTN`a;VZO?xK=>*aVr4vf0kWL|;cBQ5ncA>MTwC8W%+8LxXN@tX2kY<o(lx8Az
ztK@*@N;hw~+?AZtoYDf)0@8xgg3`Gy<u#pmq1wzTom0AibOGst(gmeUNSC%0=<)&8
z_E&L9X$ffwX-R2G=?c<SS87&-u578BJ=ybLL%N1^P3fA_4Wt`LHxH?WZV25f-TuAU
uEo>p(Qo5yd2k8#d9i=;03UuFvelvSW_mu7_JwSSZ^g!uBq<{W-N%;=-%*>hq
delta 204
zcmX}gy$XU*7zW_ipT#c(m4;|;4T9<dQis9_Nq0S-a{-5-p(JukS`X1`(G5iR)@rmk
zKF>Y)&M8d7^g9H!%bUjfc{$4xKXW3AgVm%TQWkGhNKdbF3HJ1@8>31d8R;lwxnl*$
z0B;<{AwA0k)|)7VXhw=_jjI@$T_+F^yVC-qaTO=M8~;C3#mVR@fRLv{K@NIti&_A(
UWMrTg8l<RmhCO@bpQ~jLemcN3k^lez
diff --git a/tests/data/acpi/x86/pc/DSDT.memhp b/tests/data/acpi/x86/pc/DSDT.memhp
index 9b442a64cf711b33d80691fe84f1d3a6256f943b..c15a9fae947bb3929a30c60b7c0f2092705868f8 100644
GIT binary patch
delta 1914
zcmY+_OODzw0DxhWgjZfb65a%M-Bs!hDj;2qlA=+WJ?a@cd-o))dV#8^>LDsuw&N)O
z4io>fzc_(^pPygD>R!D)KL|0Xe}^AE`SN_+FOPZi{(61+RD5}VyncHVzw+is_%n-w
zNGZ|W>PpzpgXUJBMHcJtL$A5j7dP;mTYVK-62wXkgl_KLNLLq;rS_WXu5KuWNvn3U
zXVObI(y5#4*|cg?&z9$Qu5U`W1>clzs&C74Tl%&%tH@ZXz@%;qfl1xmz@~2dflb{q
zLsPmf3?Us-IwW+|LZ!WBBS=S-jwl^NI)-#i>9{A2m6`xL(WUI96G|tPP9dE_I;C_<
zY1m3FGz2sh(mW3Cph8L`NFzuiN+U{RNMlpFBaQn|sr0!2^d^udkS3HSl%|lTkfyeD
z(9}WO^PfRFgLFpejM6!zb4cfXsnWwfbfHUg{^qS+K)RrGL1_kQ25ClV=A?F&9MD`y
z{f4`{l2e*fT0mMrT2NY0x-_MGO_zPBR7*;il&&CMLAs)JMd=#SwJ9BR-9e@KRa{fL
zfpi1uhSCkCTS&KksoD~{HKo*hGUva8bO-5<(jBFHNcWKLJE?*02|Wne{=Jwj93VYV
pdZ4s~w1l*zw6vvz9{bSm>ImtP(j%oONKcTSC_OpppTAyF{s&CX%t`<N
delta 204
zcmX}gy$XU*7zW_ipT#c%71wBK4T9PubttTmbl2lK7jOs~N+L&TJ+y{JHxON)6fKU=
zbKkUc3X?Exhk(|;X{=wCvn=s5JEAyPO}vn@c$Y%DdX-DCr*GXDRr170M<L5SD?kQ#
zV=E5nS|+gGMj=EqQe0~s#mMYBfq3*gEg%|4anif-|1(vbjIII*c|I0oqxb!y7Jw`n
T8K{K@De9czz+U<1YI%bnwrDj%
diff --git a/tests/data/acpi/x86/pc/DSDT.nohpet b/tests/data/acpi/x86/pc/DSDT.nohpet
index 1754c6878839fc657230e1e714cd7c5142e0a77e..dd29f5cb620e5164601e303e37524530ddb12684 100644
GIT binary patch
delta 1914
zcmY+_OODzw9Ds3?gjXIsl0bM<sq0EzRO%W?7b7AxDzisDLuc=vr0Sv<sCt4qPEX+~
zcK%Vm9VY%{|KbFGeR?~E<-L4)d#6<I{h#oIr=Na4?&rs>dVRh;eayeSKAyk6sNY%j
zJ^YbIL1c`oZr4(|&%Nq)J*hOVzYo3Yc0J3$uWr|iN|PWqrl;!W-j3?(tkQ|QX1j|F
zwX$j1O!jPgZbx-0b3K=qP3pPw)Xep5DO>PuDN}t{o|@8krCmkG#soH%Ed(}|xq(Y%
z`+-YknZ7M$3w=oYl=cZ7G*Ins*#Oc3r2|TbkPaaoQabENV`D~uj_Ojk(h;R2O2?3n
zAstgXrZjA%4jKX)Ds3MJIjE4*2+|1Bh|-AC7}D65a-?w=s!cuaKD`N~38V?738fQA
zCy-8DDbR^PoAaMSI)!vf>6FqLq%%loU8$*uUFf_n?fKicb`I&B(mACmq$#8+rKw2W
zDjA@e()AlIcO|1Vqcn#!hcu@&r*vUUc}*8xs5T2q7nCj`T|&B~bV+FeX<<u&7A;iU
zU&Vsb6{IUjSCp<OT|>I=O3j+kwJmkMCwu-INH>sfDBV!Hg>(z)wv}4wme8Hj&EJdN
u!Vc0Mr8`RZknSPfQ@VGhKo4E$H*<jWK<R<fBcw-2kCYxo`uCsrx%dyBBg_i`
delta 204
zcmX}gF$%&k7zWU<X_x*Yv_%k{99#v#g0r=QqKMe;ZJHb)2o5TuV{r}cQM`b70`K5`
z6qk(ey~ie|G)wbt2XH=5>a)`{F0!Nu=Cqp32CbBe)jEfY*tt~T_r$+)I;%Y=hDsea
zyaKrpCeQ*Z@;zX&oTrecr-fre&B?Q!LEf5HV@MNfLCj9_pP?4y+L}PB<F29rjqew=
X1k{0(i&{ERvMxEc{87Fx{;2%}tYtI<
diff --git a/tests/data/acpi/x86/pc/DSDT.numamem b/tests/data/acpi/x86/pc/DSDT.numamem
index 9fc731d3d2bcde5e2612a8ccd81e12098134afe9..8a6b56fe7da18bf42c339d13b863aabf81780527 100644
GIT binary patch
delta 1914
zcmY+_OODzw0DxhWgjZfb5(sb9161m!2Oy-25fK`d=^FJ6oxOXKu6lv0y+zkO#GJyF
z?KsN6!^FSrFHYdk$A48=-|Lqz?}Qlmzry#PeERXYSC4t~`h0o%P<(oQJb!)>KlA2W
z_&tk)NGZ|WuC=hA2hHtz7Fn#n554Agt=zzGZr6**k|0)UAarx@M!Kp*mfCBkySSkg
zCav4ao=K~2q*FK7vuWL?o-NPqT;G%)7cRNt28w)AajR*|t%fl1vK0+YJAflb}^
z1Dm>KhNg5|7(zOvbV%r^g-UzNMv#su9Z@=lbPVa3(s553D>VUhqD$FHCzMVookBW=
zbV})z(y*0UXb5O1q<I|NL4}k?kVcS3ltz@skjAETM;iB`Qt5I3=}jO_AWbMuC`}<v
zAx&-Rps9nl=RbpV2I-8_8KrYb=aA0(Ql*D|=t7s~{LNdtfOJ9Wg3=7q4AP9!%t`Gk
zIiR_a`VDt?C8so}w1BjLw4k)0bZJWWnlAfLsg{&3DP2Ljf^<dciqaC&(v%Kbc2H@4
z6-!Fjkgg$JQ@W;f1L>wORU1M#rj&Y5=KQyiZXw-Lx}|gn=?>CeCpFL=p?e|QzZbKG
tJ*0a|_mmzWJwSS(^k7Q|J@%nr)e+JorAJCnke(ntQF?OH-*4XE@;}cy%sv1B
delta 204
zcmX}gy$XU*7zW_ipT#c%l^|$t4T9<dQisBbNOwJ+a{-5-p(JvY)<e5RHxSuXG<Q8l
zi{tZry?RDL6vXua(B4lP>F32XiM+%PY2z=)y?~O<HimTdB9&lw&$==y<dKn%Oy)b5
zfei4<Rvgl`OklMR1Bhy<xK=rek=b?xaqG64LsX99q_^Y!XQDV6ZTS%LbjZj?r)f|M
WK<11LltP0PWy-K;kMwo1KK&mkqBS-E
diff --git a/tests/data/acpi/x86/pc/DSDT.roothp b/tests/data/acpi/x86/pc/DSDT.roothp
index e654c83ebe40c413b204c711adcefe3f04655e8c..a16b0d9d4becec47fa3cf57ed0077ff6cff88908 100644
GIT binary patch
delta 1914
zcmY+_J8s)B9Ds3Jl3#k+mgM)VQ?~-Sf^B68EEqwY-RT*cojpazqC+oG^h_Oc3Kk;u
zH}q|$#Si39lx*|z>n$v=<?E*hr8@uqgkL=U^z(K--p1AY^XciKcznM-zr3p7dG#&)
zo<%`qjH)i@Qn}Ba>T*7)EUv!~z3Os4%D}HK=ab5kAU39>>gIYM)zwjDsk>&olMJ=8
zY1vHnY<j$p>Qv@>E-jnXbLF9#>)TSc;M-EB`mQ`QrSD3+ijIv5Y${s_Y$|gDm&*17
zm&!6-Tgn!?kaj8U654B^+TF4qq&-S|l=dO*L)xdb-;&103;-R}rM^oClny8zLOO(W
zNa>K$u#q}w2xzFZeH`SVLP{e@BS<4kBT8dPV_V9R#%-uJ^|<}?CXgnOCX^<WrjVwP
zrmhrdD$wTqN05#n9Z@=>bPVYj(s5gA>R}r?sY`qQ_N|>jI-ztzX$ENqX+~)#QnyMD
zXs&eqhRa>aDa|P@AT1y*C@m<R+EQNAX&b7|l+r1sGe~EU&M2KxI)`*_OM%YsP;Gw|
z=aeoWT|l~^bV2D7(q&s}mV_>Csp~!2^It)_f^<dciqbWtYe?63sfDfy-6-Asz1S^m
tAl*>9p>zxB7Sb)HTUQEn*M@#IJ4knw?kL?ux`%X6>0YFNKfE8G{{x?A%_RT;
delta 204
zcmX}gO$vfQ7zW_ipN(GxDjgw$7C}%KNL>_0NV?Z?<^V&`q9k-FZHH<*MHh$;XtZ(p
zJi6%i6s1vCPXXicp_y5)mw6iGZcItInU5mMlYIv1n@u6XUV(FC)W|a<6Q!&UtOQx$
z+EpCVcWhw0iz5g<R@~5@Vr2K7LOh4PRuI}#oXmcL|11<ItFI73UQQ*s7<3(40mzDx
Tg;p4lqAeJX>|K1X&VBL&G=nuA
diff --git a/tests/data/acpi/x86/q35/DSDT.cxl b/tests/data/acpi/x86/q35/DSDT.cxl
index afcdc0d0ba8e41bb70ac20a78dcc8562ca0cb74b..f561750cab8b061c123c041fe2209d74c7a740f1 100644
GIT binary patch
delta 3550
zcmeI#JC4&p0LJn0BZ=cj9(G<zvaz7ro@&b^hLvy>A$B`fN(V@k&=2AOQ0x`x*aqzp
zxCWPi3k>p%C&~W^NbWL;Kl%I3#52j?^7q@YxG8S$o(bWUKf~-I+J3t`+-weSzP$YU
zczJQ<$mgF9uU_AZ@7eBS_&JUINGY+~mxVB|o!!1%i!`p@58d6q+}MG)+m~CBCVs4x
zBdW~$II2<`k@n1II=4Lyt7K7MD_tGk)I(QC?X|9n7IoAWI%;p@>7=dT>7>2XGs$(G
z^i0y;#n(w)LB>k?I%===P1M%+P1N3|1!)V?7Nsqdw9+=9?HVf0B(*7RQ`&*F18IlS
z4yD0K8Y>k58dOPnTBv~1E~H&ZyOee*4IvF{sey)shLX|<(g@Os(umR+(iqa%B<+&M
zXV7Z>6G#(C6G{_Gdyw`Z?NQnzv|mG|d4T$m_9^XCI)HQl>44I~nKV{v2<Wg%%HymI
zDIHRpLYhLFQkqhl)lvh^0L_Hdn}dD!GD=5~jvyUTI-+z8=~yT2@{iA<QdQ&g9ccpT
z1kwqm6H2F$P9dF|q=il`^vX=j4AL2-GfHQ*^!`_HE$xmrN6k5F&RKJTnhVriu;#+n
zG%c5CxfIS*v+L`9e#x3kTk}Wv`n|2WLd_Lxu2?fi%^Wpz*350q`#-A>IO5*r%@Nle
oamPo$IpXxswdRP^J63bV>2E`G#F>99dNTfpBX08e;>m;m5BYsr8UO$Q
delta 354
zcmcbU_Q{*eCD<k8lPUuP<Nb|X!m`|c$}#c5PVv!AuF9J=WGxx%9XR6yf<hPygqRu<
z3K$X>`LRz;<Z39WO5|c<NGhl<N=#zlVrEEQATT+Zp+Ja}g@M7x&)bC|1th=-7jR@q
zSs*w$nTrW7;sh08hKo2eq!iRvCUFTcaR2|$(2>HxP*9yH$i>Xik;2GOkkXNm$WWTN
XBw_M0)oc`J%BT%SXKtRQcZdZ54M$#(
diff --git a/tests/data/acpi/x86/q35/DSDT.viot b/tests/data/acpi/x86/q35/DSDT.viot
index 64e81f571120e3eb2b8c6c9545293a78c75b7bbd..8d98dd8845a60a08df5aff27097646bea4913b75 100644
GIT binary patch
literal 14615
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
delta 518
zcmbPU^uv?OCD<k8hYAA&<CBeC!m`|6qA~HoPVv!Aj-rz_WS7)CaK;A&g)kHdF*PI<
zFeEPWW1pJH)lg8C$i>8vR8U=%n8d)v%#gf5U~)1;fe<GP1A~vBw+llGNPrP8;K-1&
zKyY$07ZY5>2`a)27jb4tDX6VX;u2us{{Nq$BZYyXpgK{Ii<zM#g^{5kr6VDcp)_$x
f!el{J85CDqs18O~D(a%T(nEI;x^lCj=`&^k(btIc
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PULL 13/18] vhost_net: configure all host notifiers in a single MR transaction
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (11 preceding siblings ...)
2024-09-11 13:52 ` [PULL 12/18] tests/acpi: pc: update golden masters for DSDT Michael S. Tsirkin
@ 2024-09-11 13:52 ` Michael S. Tsirkin
2024-09-11 13:52 ` [PULL 14/18] virtio-pci: Add lookup subregion of VirtIOPCIRegion MR Michael S. Tsirkin
` (5 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:52 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, zuoboqun, Stefano Garzarella, Jason Wang
From: zuoboqun <zuoboqun@baidu.com>
This allows the vhost_net device which has multiple virtqueues to batch
the setup of all its host notifiers. This significantly reduces the
vhost_net device starting and stoping time, e.g. the time spend
on enabling notifiers reduce from 630ms to 75ms and the time spend on
disabling notifiers reduce from 441ms to 45ms for a VM with 192 vCPUs
and 15 vhost-user-net devices (64vq per device) in our case.
Signed-off-by: zuoboqun <zuoboqun@baidu.com>
Message-Id: <20240816070835.8309-1-zuoboqun@baidu.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/virtio/vhost.h | 4 +
hw/net/vhost_net.c | 155 +++++++++++++++++++++++++++++++++++---
hw/virtio/vhost.c | 6 +-
3 files changed, 150 insertions(+), 15 deletions(-)
diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
index d75faf46e9..c75be46c06 100644
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -171,6 +171,10 @@ int vhost_dev_init(struct vhost_dev *hdev, void *opaque,
*/
void vhost_dev_cleanup(struct vhost_dev *hdev);
+void vhost_dev_disable_notifiers_nvqs(struct vhost_dev *hdev,
+ VirtIODevice *vdev,
+ unsigned int nvqs);
+
/**
* vhost_dev_enable_notifiers() - enable event notifiers
* @hdev: common vhost_dev structure
diff --git a/hw/net/vhost_net.c b/hw/net/vhost_net.c
index dedf9ad7c2..997aab0557 100644
--- a/hw/net/vhost_net.c
+++ b/hw/net/vhost_net.c
@@ -162,6 +162,135 @@ void vhost_net_save_acked_features(NetClientState *nc)
#endif
}
+static void vhost_net_disable_notifiers_nvhosts(VirtIODevice *dev,
+ NetClientState *ncs, int data_queue_pairs, int nvhosts)
+{
+ VirtIONet *n = VIRTIO_NET(dev);
+ BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(dev)));
+ struct vhost_net *net;
+ struct vhost_dev *hdev;
+ int r, i, j;
+ NetClientState *peer;
+
+ /*
+ * Batch all the host notifiers in a single transaction to avoid
+ * quadratic time complexity in address_space_update_ioeventfds().
+ */
+ memory_region_transaction_begin();
+
+ for (i = 0; i < nvhosts; i++) {
+ if (i < data_queue_pairs) {
+ peer = qemu_get_peer(ncs, i);
+ } else {
+ peer = qemu_get_peer(ncs, n->max_queue_pairs);
+ }
+
+ net = get_vhost_net(peer);
+ hdev = &net->dev;
+ for (j = 0; j < hdev->nvqs; j++) {
+ r = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus),
+ hdev->vq_index + j,
+ false);
+ if (r < 0) {
+ error_report("vhost %d VQ %d notifier cleanup failed: %d",
+ i, j, -r);
+ }
+ assert(r >= 0);
+ }
+ }
+ /*
+ * The transaction expects the ioeventfds to be open when it
+ * commits. Do it now, before the cleanup loop.
+ */
+ memory_region_transaction_commit();
+
+ for (i = 0; i < nvhosts; i++) {
+ if (i < data_queue_pairs) {
+ peer = qemu_get_peer(ncs, i);
+ } else {
+ peer = qemu_get_peer(ncs, n->max_queue_pairs);
+ }
+
+ net = get_vhost_net(peer);
+ hdev = &net->dev;
+ for (j = 0; j < hdev->nvqs; j++) {
+ virtio_bus_cleanup_host_notifier(VIRTIO_BUS(qbus),
+ hdev->vq_index + j);
+ }
+ virtio_device_release_ioeventfd(dev);
+ }
+}
+
+static int vhost_net_enable_notifiers(VirtIODevice *dev,
+ NetClientState *ncs, int data_queue_pairs, int cvq)
+{
+ VirtIONet *n = VIRTIO_NET(dev);
+ BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(dev)));
+ int nvhosts = data_queue_pairs + cvq;
+ struct vhost_net *net;
+ struct vhost_dev *hdev;
+ int r, i, j;
+ NetClientState *peer;
+
+ /*
+ * Batch all the host notifiers in a single transaction to avoid
+ * quadratic time complexity in address_space_update_ioeventfds().
+ */
+ memory_region_transaction_begin();
+
+ for (i = 0; i < nvhosts; i++) {
+ if (i < data_queue_pairs) {
+ peer = qemu_get_peer(ncs, i);
+ } else {
+ peer = qemu_get_peer(ncs, n->max_queue_pairs);
+ }
+
+ net = get_vhost_net(peer);
+ hdev = &net->dev;
+ /*
+ * We will pass the notifiers to the kernel, make sure that QEMU
+ * doesn't interfere.
+ */
+ r = virtio_device_grab_ioeventfd(dev);
+ if (r < 0) {
+ error_report("binding does not support host notifiers");
+ memory_region_transaction_commit();
+ goto fail_nvhosts;
+ }
+
+ for (j = 0; j < hdev->nvqs; j++) {
+ r = virtio_bus_set_host_notifier(VIRTIO_BUS(qbus),
+ hdev->vq_index + j,
+ true);
+ if (r < 0) {
+ error_report("vhost %d VQ %d notifier binding failed: %d",
+ i, j, -r);
+ memory_region_transaction_commit();
+ vhost_dev_disable_notifiers_nvqs(hdev, dev, j);
+ goto fail_nvhosts;
+ }
+ }
+ }
+
+ memory_region_transaction_commit();
+
+ return 0;
+fail_nvhosts:
+ vhost_net_disable_notifiers_nvhosts(dev, ncs, data_queue_pairs, i);
+ return r;
+}
+
+/*
+ * Stop processing guest IO notifications in qemu.
+ * Start processing them in vhost in kernel.
+ */
+static void vhost_net_disable_notifiers(VirtIODevice *dev,
+ NetClientState *ncs, int data_queue_pairs, int cvq)
+{
+ vhost_net_disable_notifiers_nvhosts(dev, ncs, data_queue_pairs,
+ data_queue_pairs + cvq);
+}
+
static int vhost_net_get_fd(NetClientState *backend)
{
switch (backend->info->type) {
@@ -272,11 +401,6 @@ static int vhost_net_start_one(struct vhost_net *net,
}
}
- r = vhost_dev_enable_notifiers(&net->dev, dev);
- if (r < 0) {
- goto fail_notifiers;
- }
-
r = vhost_dev_start(&net->dev, dev, false);
if (r < 0) {
goto fail_start;
@@ -328,8 +452,6 @@ fail:
}
vhost_dev_stop(&net->dev, dev, false);
fail_start:
- vhost_dev_disable_notifiers(&net->dev, dev);
-fail_notifiers:
return r;
}
@@ -351,7 +473,6 @@ static void vhost_net_stop_one(struct vhost_net *net,
if (net->nc->info->stop) {
net->nc->info->stop(net->nc);
}
- vhost_dev_disable_notifiers(&net->dev, dev);
}
int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
@@ -396,10 +517,16 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
}
}
+ r = vhost_net_enable_notifiers(dev, ncs, data_queue_pairs, cvq);
+ if (r < 0) {
+ error_report("Error enabling host notifiers: %d", -r);
+ goto err;
+ }
+
r = k->set_guest_notifiers(qbus->parent, total_notifiers, true);
if (r < 0) {
error_report("Error binding guest notifier: %d", -r);
- goto err;
+ goto err_host_notifiers;
}
for (i = 0; i < nvhosts; i++) {
@@ -414,19 +541,19 @@ int vhost_net_start(VirtIODevice *dev, NetClientState *ncs,
r = vhost_set_vring_enable(peer, peer->vring_enable);
if (r < 0) {
- goto err_start;
+ goto err_guest_notifiers;
}
}
r = vhost_net_start_one(get_vhost_net(peer), dev);
if (r < 0) {
- goto err_start;
+ goto err_guest_notifiers;
}
}
return 0;
-err_start:
+err_guest_notifiers:
while (--i >= 0) {
peer = qemu_get_peer(ncs, i < data_queue_pairs ?
i : n->max_queue_pairs);
@@ -437,6 +564,8 @@ err_start:
fprintf(stderr, "vhost guest notifier cleanup failed: %d\n", e);
fflush(stderr);
}
+err_host_notifiers:
+ vhost_net_disable_notifiers(dev, ncs, data_queue_pairs, cvq);
err:
return r;
}
@@ -468,6 +597,8 @@ void vhost_net_stop(VirtIODevice *dev, NetClientState *ncs,
fflush(stderr);
}
assert(r >= 0);
+
+ vhost_net_disable_notifiers(dev, ncs, data_queue_pairs, cvq);
}
void vhost_net_cleanup(struct vhost_net *net)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 06fc71746e..7c5ef81b55 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1682,9 +1682,9 @@ void vhost_dev_cleanup(struct vhost_dev *hdev)
memset(hdev, 0, sizeof(struct vhost_dev));
}
-static void vhost_dev_disable_notifiers_nvqs(struct vhost_dev *hdev,
- VirtIODevice *vdev,
- unsigned int nvqs)
+void vhost_dev_disable_notifiers_nvqs(struct vhost_dev *hdev,
+ VirtIODevice *vdev,
+ unsigned int nvqs)
{
BusState *qbus = BUS(qdev_get_parent_bus(DEVICE(vdev)));
int i, r;
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PULL 14/18] virtio-pci: Add lookup subregion of VirtIOPCIRegion MR
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (12 preceding siblings ...)
2024-09-11 13:52 ` [PULL 13/18] vhost_net: configure all host notifiers in a single MR transaction Michael S. Tsirkin
@ 2024-09-11 13:52 ` Michael S. Tsirkin
2024-09-17 20:19 ` Peter Xu
2024-09-11 13:52 ` [PULL 15/18] hw/cxl: fix physical address field in get scan media results output Michael S. Tsirkin
` (4 subsequent siblings)
18 siblings, 1 reply; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:52 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Gao Shiyuan, Zuo Boqun
From: Gao Shiyuan <gaoshiyuan@baidu.com>
Now virtio_address_space_lookup only lookup common/isr/device/notify
MR and exclude their subregions.
When VHOST_USER_PROTOCOL_F_HOST_NOTIFIER enable, the notify MR has
host-notifier subregions and we need use host-notifier MR to
notify the hardware accelerator directly instead of eventfd notify.
Further more, maybe common/isr/device MR also has subregions in
the future, so need memory_region_find for each MR incluing
their subregions.
Add lookup subregion of VirtIOPCIRegion MR instead of only lookup container MR.
Fixes: a93c8d8 ("virtio-pci: Replace modern_as with direct access to modern_bar")
Co-developed-by: Zuo Boqun <zuoboqun@baidu.com>
Signed-off-by: Gao Shiyuan <gaoshiyuan@baidu.com>
Signed-off-by: Zuo Boqun <zuoboqun@baidu.com>
Message-Id: <20240903120304.97833-1-gaoshiyuan@baidu.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/virtio-pci.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 524b63e5c7..4d832fe845 100644
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -615,8 +615,12 @@ static MemoryRegion *virtio_address_space_lookup(VirtIOPCIProxy *proxy,
reg = &proxy->regs[i];
if (*off >= reg->offset &&
*off + len <= reg->offset + reg->size) {
- *off -= reg->offset;
- return ®->mr;
+ MemoryRegionSection mrs = memory_region_find(®->mr,
+ *off - reg->offset, len);
+ assert(mrs.mr);
+ *off = mrs.offset_within_region;
+ memory_region_unref(mrs.mr);
+ return mrs.mr;
}
}
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PULL 14/18] virtio-pci: Add lookup subregion of VirtIOPCIRegion MR
2024-09-11 13:52 ` [PULL 14/18] virtio-pci: Add lookup subregion of VirtIOPCIRegion MR Michael S. Tsirkin
@ 2024-09-17 20:19 ` Peter Xu
0 siblings, 0 replies; 22+ messages in thread
From: Peter Xu @ 2024-09-17 20:19 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: qemu-devel, Peter Maydell, Gao Shiyuan, Zuo Boqun
On Wed, Sep 11, 2024 at 09:52:08AM -0400, Michael S. Tsirkin wrote:
> From: Gao Shiyuan <gaoshiyuan@baidu.com>
>
> Now virtio_address_space_lookup only lookup common/isr/device/notify
> MR and exclude their subregions.
>
> When VHOST_USER_PROTOCOL_F_HOST_NOTIFIER enable, the notify MR has
> host-notifier subregions and we need use host-notifier MR to
> notify the hardware accelerator directly instead of eventfd notify.
>
> Further more, maybe common/isr/device MR also has subregions in
> the future, so need memory_region_find for each MR incluing
> their subregions.
>
> Add lookup subregion of VirtIOPCIRegion MR instead of only lookup container MR.
>
> Fixes: a93c8d8 ("virtio-pci: Replace modern_as with direct access to modern_bar")
> Co-developed-by: Zuo Boqun <zuoboqun@baidu.com>
> Signed-off-by: Gao Shiyuan <gaoshiyuan@baidu.com>
> Signed-off-by: Zuo Boqun <zuoboqun@baidu.com>
> Message-Id: <20240903120304.97833-1-gaoshiyuan@baidu.com>
> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Hi,
QEMU master currently crashes with below cmdlines on my system:
qemu_bin=./qemu-system-x86_64
$qemu_bin -accel kvm -m 4g \
-name peter-vm,debug-threads=on -msg timestamp=on \
-nographic -cpu host -smp 4 \
-device ioh3420,id=pcie.1,chassis=1 \
-netdev user,id=net0 \
-device virtio-net-pci,netdev=net0,bus=pcie.1
qemu-system-x86_64: ../hw/virtio/virtio-pci.c:620: virtio_address_space_lookup: Assertion `mrs.mr' failed.
Bisection goes to this patch..
Thanks,
--
Peter Xu
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PULL 15/18] hw/cxl: fix physical address field in get scan media results output
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (13 preceding siblings ...)
2024-09-11 13:52 ` [PULL 14/18] virtio-pci: Add lookup subregion of VirtIOPCIRegion MR Michael S. Tsirkin
@ 2024-09-11 13:52 ` Michael S. Tsirkin
2024-09-11 13:52 ` [PULL 16/18] hw/audio/virtio-sound: fix heap buffer overflow Michael S. Tsirkin
` (3 subsequent siblings)
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:52 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, peng guo, Jonathan Cameron, Fan Ni
From: peng guo <engguopeng@buaa.edu.cn>
When using the mailbox command get scan media results, the scan media
restart physical address field in the ouput palyload is not 64-byte
aligned.
This patch removed the error source of the restart physical address.
The Scan Media Restart Physical Address is the location from which the
host should restart the Scan Media operation. [5:0] bits are reserved.
Refer to CXL spec r3.1 Table 8-146
Fixes: 89b5cfcc31e6 ("hw/cxl: Add get scan media results cmd support")
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Link: https://lore.kernel.org/linux-cxl/20240819154206.16456-1-engguopeng@buaa.edu.cn/
Signed-off-by: peng guo <engguopeng@buaa.edu.cn>
Message-Id: <20240825102212.3871-1-engguopeng@buaa.edu.cn>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/cxl/cxl-mailbox-utils.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/cxl/cxl-mailbox-utils.c b/hw/cxl/cxl-mailbox-utils.c
index 3ebbd32e10..9258e48f95 100644
--- a/hw/cxl/cxl-mailbox-utils.c
+++ b/hw/cxl/cxl-mailbox-utils.c
@@ -2076,7 +2076,7 @@ static CXLRetCode cmd_media_get_scan_media_results(const struct cxl_cmd *cmd,
start = ROUND_DOWN(ent->start, 64ull);
stop = ROUND_DOWN(ent->start, 64ull) + ent->length;
- stq_le_p(&out->records[i].addr, start | (ent->type & 0x7));
+ stq_le_p(&out->records[i].addr, start);
stl_le_p(&out->records[i].length, (stop - start) / CXL_CACHE_LINE_SIZE);
i++;
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PULL 16/18] hw/audio/virtio-sound: fix heap buffer overflow
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (14 preceding siblings ...)
2024-09-11 13:52 ` [PULL 15/18] hw/cxl: fix physical address field in get scan media results output Michael S. Tsirkin
@ 2024-09-11 13:52 ` Michael S. Tsirkin
2024-09-13 18:47 ` Volker Rümelin
2024-09-11 13:52 ` [PULL 17/18] virtio-mem: don't warn about THP sizes on a kernel without THP support Michael S. Tsirkin
` (2 subsequent siblings)
18 siblings, 1 reply; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:52 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Volker Rümelin, Gerd Hoffmann,
Manos Pitsidianakis
From: Volker Rümelin <vr_qemu@t-online.de>
Currently, the guest may write to the device configuration space,
whereas the virtio sound device specification in chapter 5.14.4
clearly states that the fields in the device configuration space
are driver-read-only.
Remove the set_config function from the virtio_snd class.
This also prevents a heap buffer overflow. See QEMU issue #2296.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2296
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-Id: <20240901130112.8242-1-vr_qemu@t-online.de>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/audio/virtio-snd.c | 24 ------------------------
hw/audio/trace-events | 1 -
2 files changed, 25 deletions(-)
diff --git a/hw/audio/virtio-snd.c b/hw/audio/virtio-snd.c
index d1cf5eb445..69838181dd 100644
--- a/hw/audio/virtio-snd.c
+++ b/hw/audio/virtio-snd.c
@@ -107,29 +107,6 @@ virtio_snd_get_config(VirtIODevice *vdev, uint8_t *config)
}
-static void
-virtio_snd_set_config(VirtIODevice *vdev, const uint8_t *config)
-{
- VirtIOSound *s = VIRTIO_SND(vdev);
- const virtio_snd_config *sndconfig =
- (const virtio_snd_config *)config;
-
-
- trace_virtio_snd_set_config(vdev,
- s->snd_conf.jacks,
- sndconfig->jacks,
- s->snd_conf.streams,
- sndconfig->streams,
- s->snd_conf.chmaps,
- sndconfig->chmaps);
-
- memcpy(&s->snd_conf, sndconfig, sizeof(virtio_snd_config));
- le32_to_cpus(&s->snd_conf.jacks);
- le32_to_cpus(&s->snd_conf.streams);
- le32_to_cpus(&s->snd_conf.chmaps);
-
-}
-
static void
virtio_snd_pcm_buffer_free(VirtIOSoundPCMBuffer *buffer)
{
@@ -1400,7 +1377,6 @@ static void virtio_snd_class_init(ObjectClass *klass, void *data)
vdc->realize = virtio_snd_realize;
vdc->unrealize = virtio_snd_unrealize;
vdc->get_config = virtio_snd_get_config;
- vdc->set_config = virtio_snd_set_config;
vdc->get_features = get_features;
vdc->reset = virtio_snd_reset;
vdc->legacy_features = 0;
diff --git a/hw/audio/trace-events b/hw/audio/trace-events
index b1870ff224..b8ef572767 100644
--- a/hw/audio/trace-events
+++ b/hw/audio/trace-events
@@ -41,7 +41,6 @@ asc_update_irq(int irq, int a, int b) "set IRQ to %d (A: 0x%x B: 0x%x)"
#virtio-snd.c
virtio_snd_get_config(void *vdev, uint32_t jacks, uint32_t streams, uint32_t chmaps) "snd %p: get_config jacks=%"PRIu32" streams=%"PRIu32" chmaps=%"PRIu32""
-virtio_snd_set_config(void *vdev, uint32_t jacks, uint32_t new_jacks, uint32_t streams, uint32_t new_streams, uint32_t chmaps, uint32_t new_chmaps) "snd %p: set_config jacks from %"PRIu32"->%"PRIu32", streams from %"PRIu32"->%"PRIu32", chmaps from %"PRIu32"->%"PRIu32
virtio_snd_get_features(void *vdev, uint64_t features) "snd %p: get_features 0x%"PRIx64
virtio_snd_vm_state_running(void) "vm state running"
virtio_snd_vm_state_stopped(void) "vm state stopped"
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PULL 16/18] hw/audio/virtio-sound: fix heap buffer overflow
2024-09-11 13:52 ` [PULL 16/18] hw/audio/virtio-sound: fix heap buffer overflow Michael S. Tsirkin
@ 2024-09-13 18:47 ` Volker Rümelin
0 siblings, 0 replies; 22+ messages in thread
From: Volker Rümelin @ 2024-09-13 18:47 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-stable, Michael Tokarev
Cc: qemu-stable@nongnu.org
stable-8.2, stable-9.0 and stable-9.1
> From: Volker Rümelin <vr_qemu@t-online.de>
>
> Currently, the guest may write to the device configuration space,
> whereas the virtio sound device specification in chapter 5.14.4
> clearly states that the fields in the device configuration space
> are driver-read-only.
>
> Remove the set_config function from the virtio_snd class.
>
> This also prevents a heap buffer overflow. See QEMU issue #2296.
>
> Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2296
> Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
> Message-Id: <20240901130112.8242-1-vr_qemu@t-online.de>
> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> hw/audio/virtio-snd.c | 24 ------------------------
> hw/audio/trace-events | 1 -
> 2 files changed, 25 deletions(-)
>
> diff --git a/hw/audio/virtio-snd.c b/hw/audio/virtio-snd.c
> index d1cf5eb445..69838181dd 100644
> --- a/hw/audio/virtio-snd.c
> +++ b/hw/audio/virtio-snd.c
> @@ -107,29 +107,6 @@ virtio_snd_get_config(VirtIODevice *vdev, uint8_t *config)
>
> }
>
> -static void
> -virtio_snd_set_config(VirtIODevice *vdev, const uint8_t *config)
> -{
> - VirtIOSound *s = VIRTIO_SND(vdev);
> - const virtio_snd_config *sndconfig =
> - (const virtio_snd_config *)config;
> -
> -
> - trace_virtio_snd_set_config(vdev,
> - s->snd_conf.jacks,
> - sndconfig->jacks,
> - s->snd_conf.streams,
> - sndconfig->streams,
> - s->snd_conf.chmaps,
> - sndconfig->chmaps);
> -
> - memcpy(&s->snd_conf, sndconfig, sizeof(virtio_snd_config));
> - le32_to_cpus(&s->snd_conf.jacks);
> - le32_to_cpus(&s->snd_conf.streams);
> - le32_to_cpus(&s->snd_conf.chmaps);
> -
> -}
> -
> static void
> virtio_snd_pcm_buffer_free(VirtIOSoundPCMBuffer *buffer)
> {
> @@ -1400,7 +1377,6 @@ static void virtio_snd_class_init(ObjectClass *klass, void *data)
> vdc->realize = virtio_snd_realize;
> vdc->unrealize = virtio_snd_unrealize;
> vdc->get_config = virtio_snd_get_config;
> - vdc->set_config = virtio_snd_set_config;
> vdc->get_features = get_features;
> vdc->reset = virtio_snd_reset;
> vdc->legacy_features = 0;
> diff --git a/hw/audio/trace-events b/hw/audio/trace-events
> index b1870ff224..b8ef572767 100644
> --- a/hw/audio/trace-events
> +++ b/hw/audio/trace-events
> @@ -41,7 +41,6 @@ asc_update_irq(int irq, int a, int b) "set IRQ to %d (A: 0x%x B: 0x%x)"
>
> #virtio-snd.c
> virtio_snd_get_config(void *vdev, uint32_t jacks, uint32_t streams, uint32_t chmaps) "snd %p: get_config jacks=%"PRIu32" streams=%"PRIu32" chmaps=%"PRIu32""
> -virtio_snd_set_config(void *vdev, uint32_t jacks, uint32_t new_jacks, uint32_t streams, uint32_t new_streams, uint32_t chmaps, uint32_t new_chmaps) "snd %p: set_config jacks from %"PRIu32"->%"PRIu32", streams from %"PRIu32"->%"PRIu32", chmaps from %"PRIu32"->%"PRIu32
> virtio_snd_get_features(void *vdev, uint64_t features) "snd %p: get_features 0x%"PRIx64
> virtio_snd_vm_state_running(void) "vm state running"
> virtio_snd_vm_state_stopped(void) "vm state stopped"
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PULL 17/18] virtio-mem: don't warn about THP sizes on a kernel without THP support
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (15 preceding siblings ...)
2024-09-11 13:52 ` [PULL 16/18] hw/audio/virtio-sound: fix heap buffer overflow Michael S. Tsirkin
@ 2024-09-11 13:52 ` Michael S. Tsirkin
2024-09-11 13:52 ` [PULL 18/18] hw/acpi/ich9: Add periodic and swsmi timer Michael S. Tsirkin
2024-09-13 9:24 ` [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Peter Maydell
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:52 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, David Hildenbrand, Gavin Shan, Juraj Marcin
From: David Hildenbrand <david@redhat.com>
If the config directory in sysfs does not exist at all, we are dealing
with a system that does not support THPs. Simply use 1 MiB block size
then, instead of warning "Could not detect THP size, falling back to
..." and falling back to the default THP size.
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Gavin Shan <gshan@redhat.com>
Cc: Juraj Marcin <jmarcin@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20240910163433.2100295-1-david@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
hw/virtio/virtio-mem.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index ef64bf1b4a..4075f3d4ce 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -88,6 +88,7 @@ static uint32_t virtio_mem_default_thp_size(void)
static uint32_t thp_size;
#define HPAGE_PMD_SIZE_PATH "/sys/kernel/mm/transparent_hugepage/hpage_pmd_size"
+#define HPAGE_PATH "/sys/kernel/mm/transparent_hugepage/"
static uint32_t virtio_mem_thp_size(void)
{
gchar *content = NULL;
@@ -98,6 +99,12 @@ static uint32_t virtio_mem_thp_size(void)
return thp_size;
}
+ /* No THP -> no restrictions. */
+ if (!g_file_test(HPAGE_PATH, G_FILE_TEST_EXISTS)) {
+ thp_size = VIRTIO_MEM_MIN_BLOCK_SIZE;
+ return thp_size;
+ }
+
/*
* Try to probe the actual THP size, fallback to (sane but eventually
* incorrect) default sizes.
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PULL 18/18] hw/acpi/ich9: Add periodic and swsmi timer
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (16 preceding siblings ...)
2024-09-11 13:52 ` [PULL 17/18] virtio-mem: don't warn about THP sizes on a kernel without THP support Michael S. Tsirkin
@ 2024-09-11 13:52 ` Michael S. Tsirkin
2024-09-13 9:24 ` [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Peter Maydell
18 siblings, 0 replies; 22+ messages in thread
From: Michael S. Tsirkin @ 2024-09-11 13:52 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Maydell, Dominic Prinz, Igor Mammedov, Ani Sinha,
Marcel Apfelbaum, Paolo Bonzini, Richard Henderson,
Eduardo Habkost
From: Dominic Prinz <git@dprinz.de>
This patch implements the periodic and the swsmi ICH9 chipset timers. They are
especially useful when prototyping UEFI firmware (e.g. with EDK2's OVMF)
using QEMU.
For backwards compatibility, the compat properties "x-smi-swsmi-timer",
and "x-smi-periodic-timer" are introduced.
Additionally, writes to the SMI_STS register are enabled for the
corresponding two bits using a write mask to make future work easier.
Signed-off-by: Dominic Prinz <git@dprinz.de>
Message-Id: <1d90ea69e01ab71a0f2ced116801dc78e04f4448.1725991505.git.git@dprinz.de>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/acpi/ich9.h | 6 +++
include/hw/acpi/ich9_timer.h | 23 +++++++++
include/hw/southbridge/ich9.h | 4 ++
hw/acpi/ich9.c | 23 +++++++++
hw/acpi/ich9_timer.c | 93 +++++++++++++++++++++++++++++++++++
hw/i386/pc.c | 5 +-
hw/isa/lpc_ich9.c | 14 ++++++
hw/acpi/meson.build | 2 +-
8 files changed, 168 insertions(+), 2 deletions(-)
create mode 100644 include/hw/acpi/ich9_timer.h
create mode 100644 hw/acpi/ich9_timer.c
diff --git a/include/hw/acpi/ich9.h b/include/hw/acpi/ich9.h
index 2faf7f0cae..245fe08dc2 100644
--- a/include/hw/acpi/ich9.h
+++ b/include/hw/acpi/ich9.h
@@ -46,6 +46,7 @@ typedef struct ICH9LPCPMRegs {
uint32_t smi_en;
uint32_t smi_en_wmask;
uint32_t smi_sts;
+ uint32_t smi_sts_wmask;
qemu_irq irq; /* SCI */
@@ -68,6 +69,11 @@ typedef struct ICH9LPCPMRegs {
bool smm_compat;
bool enable_tco;
TCOIORegs tco_regs;
+
+ bool swsmi_timer_enabled;
+ bool periodic_timer_enabled;
+ QEMUTimer *swsmi_timer;
+ QEMUTimer *periodic_timer;
} ICH9LPCPMRegs;
#define ACPI_PM_PROP_TCO_ENABLED "enable_tco"
diff --git a/include/hw/acpi/ich9_timer.h b/include/hw/acpi/ich9_timer.h
new file mode 100644
index 0000000000..5112df4385
--- /dev/null
+++ b/include/hw/acpi/ich9_timer.h
@@ -0,0 +1,23 @@
+/*
+ * QEMU ICH9 Timer emulation
+ *
+ * Copyright (c) 2024 Dominic Prinz <git@dprinz.de>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#ifndef HW_ACPI_ICH9_TIMER_H
+#define HW_ACPI_ICH9_TIMER_H
+
+#include "hw/acpi/ich9.h"
+
+void ich9_pm_update_swsmi_timer(ICH9LPCPMRegs *pm, bool enable);
+
+void ich9_pm_swsmi_timer_init(ICH9LPCPMRegs *pm);
+
+void ich9_pm_update_periodic_timer(ICH9LPCPMRegs *pm, bool enable);
+
+void ich9_pm_periodic_timer_init(ICH9LPCPMRegs *pm);
+
+#endif
diff --git a/include/hw/southbridge/ich9.h b/include/hw/southbridge/ich9.h
index fd01649d04..6c60017024 100644
--- a/include/hw/southbridge/ich9.h
+++ b/include/hw/southbridge/ich9.h
@@ -196,8 +196,12 @@ struct ICH9LPCState {
#define ICH9_PMIO_GPE0_LEN 16
#define ICH9_PMIO_SMI_EN 0x30
#define ICH9_PMIO_SMI_EN_APMC_EN (1 << 5)
+#define ICH9_PMIO_SMI_EN_SWSMI_EN (1 << 6)
#define ICH9_PMIO_SMI_EN_TCO_EN (1 << 13)
+#define ICH9_PMIO_SMI_EN_PERIODIC_EN (1 << 14)
#define ICH9_PMIO_SMI_STS 0x34
+#define ICH9_PMIO_SMI_STS_SWSMI_STS (1 << 6)
+#define ICH9_PMIO_SMI_STS_PERIODIC_STS (1 << 14)
#define ICH9_PMIO_TCO_RLD 0x60
#define ICH9_PMIO_TCO_LEN 32
diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 02d8546bd3..c15e5b8281 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -35,6 +35,7 @@
#include "sysemu/runstate.h"
#include "hw/acpi/acpi.h"
#include "hw/acpi/ich9_tco.h"
+#include "hw/acpi/ich9_timer.h"
#include "hw/southbridge/ich9.h"
#include "hw/mem/pc-dimm.h"
@@ -108,6 +109,18 @@ static void ich9_smi_writel(void *opaque, hwaddr addr, uint64_t val,
}
pm->smi_en &= ~pm->smi_en_wmask;
pm->smi_en |= (val & pm->smi_en_wmask);
+ if (pm->swsmi_timer_enabled) {
+ ich9_pm_update_swsmi_timer(pm, pm->smi_en &
+ ICH9_PMIO_SMI_EN_SWSMI_EN);
+ }
+ if (pm->periodic_timer_enabled) {
+ ich9_pm_update_periodic_timer(pm, pm->smi_en &
+ ICH9_PMIO_SMI_EN_PERIODIC_EN);
+ }
+ break;
+ case 4:
+ pm->smi_sts &= ~pm->smi_sts_wmask;
+ pm->smi_sts |= (val & pm->smi_sts_wmask);
break;
}
}
@@ -286,6 +299,8 @@ static void pm_powerdown_req(Notifier *n, void *opaque)
void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, qemu_irq sci_irq)
{
+ pm->smi_sts_wmask = 0;
+
memory_region_init(&pm->io, OBJECT(lpc_pci), "ich9-pm", ICH9_PMIO_SIZE);
memory_region_set_enabled(&pm->io, false);
memory_region_add_subregion(pci_address_space_io(lpc_pci),
@@ -305,6 +320,14 @@ void ich9_pm_init(PCIDevice *lpc_pci, ICH9LPCPMRegs *pm, qemu_irq sci_irq)
"acpi-smi", 8);
memory_region_add_subregion(&pm->io, ICH9_PMIO_SMI_EN, &pm->io_smi);
+ if (pm->swsmi_timer_enabled) {
+ ich9_pm_swsmi_timer_init(pm);
+ }
+
+ if (pm->periodic_timer_enabled) {
+ ich9_pm_periodic_timer_init(pm);
+ }
+
if (pm->enable_tco) {
acpi_pm_tco_init(&pm->tco_regs, &pm->io);
}
diff --git a/hw/acpi/ich9_timer.c b/hw/acpi/ich9_timer.c
new file mode 100644
index 0000000000..5b1c910156
--- /dev/null
+++ b/hw/acpi/ich9_timer.c
@@ -0,0 +1,93 @@
+/*
+ * QEMU ICH9 Timer emulation
+ *
+ * Copyright (c) 2024 Dominic Prinz <git@dprinz.de>
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "qemu/osdep.h"
+#include "hw/core/cpu.h"
+#include "hw/pci/pci.h"
+#include "hw/southbridge/ich9.h"
+#include "qemu/timer.h"
+
+#include "hw/acpi/ich9_timer.h"
+
+void ich9_pm_update_swsmi_timer(ICH9LPCPMRegs *pm, bool enable)
+{
+ uint16_t swsmi_rate_sel;
+ int64_t expire_time;
+ ICH9LPCState *lpc;
+
+ if (enable) {
+ lpc = container_of(pm, ICH9LPCState, pm);
+ swsmi_rate_sel =
+ (pci_get_word(lpc->d.config + ICH9_LPC_GEN_PMCON_3) & 0xc0) >> 6;
+
+ if (swsmi_rate_sel == 0) {
+ expire_time = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 1500000LL;
+ } else {
+ expire_time = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
+ 8 * (1 << swsmi_rate_sel) * 1000000LL;
+ }
+
+ timer_mod(pm->swsmi_timer, expire_time);
+ } else {
+ timer_del(pm->swsmi_timer);
+ }
+}
+
+static void ich9_pm_swsmi_timer_expired(void *opaque)
+{
+ ICH9LPCPMRegs *pm = opaque;
+
+ pm->smi_sts |= ICH9_PMIO_SMI_STS_SWSMI_STS;
+ ich9_generate_smi();
+
+ ich9_pm_update_swsmi_timer(pm, pm->smi_en & ICH9_PMIO_SMI_EN_SWSMI_EN);
+}
+
+void ich9_pm_swsmi_timer_init(ICH9LPCPMRegs *pm)
+{
+ pm->smi_sts_wmask |= ICH9_PMIO_SMI_STS_SWSMI_STS;
+ pm->swsmi_timer =
+ timer_new_ns(QEMU_CLOCK_VIRTUAL, ich9_pm_swsmi_timer_expired, pm);
+}
+
+void ich9_pm_update_periodic_timer(ICH9LPCPMRegs *pm, bool enable)
+{
+ uint16_t per_smi_sel;
+ int64_t expire_time;
+ ICH9LPCState *lpc;
+
+ if (enable) {
+ lpc = container_of(pm, ICH9LPCState, pm);
+ per_smi_sel = pci_get_word(lpc->d.config + ICH9_LPC_GEN_PMCON_1) & 3;
+ expire_time = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) +
+ 8 * (1 << (3 - per_smi_sel)) * NANOSECONDS_PER_SECOND;
+
+ timer_mod(pm->periodic_timer, expire_time);
+ } else {
+ timer_del(pm->periodic_timer);
+ }
+}
+
+static void ich9_pm_periodic_timer_expired(void *opaque)
+{
+ ICH9LPCPMRegs *pm = opaque;
+
+ pm->smi_sts = ICH9_PMIO_SMI_STS_PERIODIC_STS;
+ ich9_generate_smi();
+
+ ich9_pm_update_periodic_timer(pm,
+ pm->smi_en & ICH9_PMIO_SMI_EN_PERIODIC_EN);
+}
+
+void ich9_pm_periodic_timer_init(ICH9LPCPMRegs *pm)
+{
+ pm->smi_sts_wmask |= ICH9_PMIO_SMI_STS_PERIODIC_STS;
+ pm->periodic_timer =
+ timer_new_ns(QEMU_CLOCK_VIRTUAL, ich9_pm_periodic_timer_expired, pm);
+}
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index ba0ff51183..8d84c22458 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -79,7 +79,10 @@
{ "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\
{ "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },
-GlobalProperty pc_compat_9_1[] = {};
+GlobalProperty pc_compat_9_1[] = {
+ { "ICH9-LPC", "x-smi-swsmi-timer", "off" },
+ { "ICH9-LPC", "x-smi-periodic-timer", "off" },
+};
const size_t pc_compat_9_1_len = G_N_ELEMENTS(pc_compat_9_1);
GlobalProperty pc_compat_9_0[] = {
diff --git a/hw/isa/lpc_ich9.c b/hw/isa/lpc_ich9.c
index bd727b2320..ab17b76f54 100644
--- a/hw/isa/lpc_ich9.c
+++ b/hw/isa/lpc_ich9.c
@@ -43,6 +43,7 @@
#include "hw/southbridge/ich9.h"
#include "hw/acpi/acpi.h"
#include "hw/acpi/ich9.h"
+#include "hw/acpi/ich9_timer.h"
#include "hw/pci/pci_bus.h"
#include "hw/qdev-properties.h"
#include "sysemu/runstate.h"
@@ -531,6 +532,15 @@ ich9_lpc_pmcon_update(ICH9LPCState *lpc)
uint16_t gen_pmcon_1 = pci_get_word(lpc->d.config + ICH9_LPC_GEN_PMCON_1);
uint16_t wmask;
+ if (lpc->pm.swsmi_timer_enabled) {
+ ich9_pm_update_swsmi_timer(
+ &lpc->pm, lpc->pm.smi_en & ICH9_PMIO_SMI_EN_SWSMI_EN);
+ }
+ if (lpc->pm.periodic_timer_enabled) {
+ ich9_pm_update_periodic_timer(
+ &lpc->pm, lpc->pm.smi_en & ICH9_PMIO_SMI_EN_PERIODIC_EN);
+ }
+
if (gen_pmcon_1 & ICH9_LPC_GEN_PMCON_1_SMI_LOCK) {
wmask = pci_get_word(lpc->d.wmask + ICH9_LPC_GEN_PMCON_1);
wmask &= ~ICH9_LPC_GEN_PMCON_1_SMI_LOCK;
@@ -826,6 +836,10 @@ static Property ich9_lpc_properties[] = {
ICH9_LPC_SMI_F_CPU_HOTPLUG_BIT, true),
DEFINE_PROP_BIT64("x-smi-cpu-hotunplug", ICH9LPCState, smi_host_features,
ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT, true),
+ DEFINE_PROP_BOOL("x-smi-swsmi-timer", ICH9LPCState,
+ pm.swsmi_timer_enabled, true),
+ DEFINE_PROP_BOOL("x-smi-periodic-timer", ICH9LPCState,
+ pm.periodic_timer_enabled, true),
DEFINE_PROP_END_OF_LIST(),
};
diff --git a/hw/acpi/meson.build b/hw/acpi/meson.build
index fa5c07db90..7f8ccc9b7a 100644
--- a/hw/acpi/meson.build
+++ b/hw/acpi/meson.build
@@ -24,7 +24,7 @@ acpi_ss.add(when: 'CONFIG_ACPI_PCI_BRIDGE', if_true: files('pci-bridge.c'))
acpi_ss.add(when: 'CONFIG_ACPI_PCIHP', if_true: files('pcihp.c'))
acpi_ss.add(when: 'CONFIG_ACPI_PCIHP', if_false: files('acpi-pci-hotplug-stub.c'))
acpi_ss.add(when: 'CONFIG_ACPI_VIOT', if_true: files('viot.c'))
-acpi_ss.add(when: 'CONFIG_ACPI_ICH9', if_true: files('ich9.c', 'ich9_tco.c'))
+acpi_ss.add(when: 'CONFIG_ACPI_ICH9', if_true: files('ich9.c', 'ich9_tco.c', 'ich9_timer.c'))
acpi_ss.add(when: 'CONFIG_ACPI_ERST', if_true: files('erst.c'))
acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false: files('ipmi-stub.c'))
acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c'))
--
MST
^ permalink raw reply related [flat|nested] 22+ messages in thread* Re: [PULL 00/18] virtio,pc,pci: features, fixes, cleanups
2024-09-11 13:51 [PULL 00/18] virtio,pc,pci: features, fixes, cleanups Michael S. Tsirkin
` (17 preceding siblings ...)
2024-09-11 13:52 ` [PULL 18/18] hw/acpi/ich9: Add periodic and swsmi timer Michael S. Tsirkin
@ 2024-09-13 9:24 ` Peter Maydell
18 siblings, 0 replies; 22+ messages in thread
From: Peter Maydell @ 2024-09-13 9:24 UTC (permalink / raw)
To: Michael S. Tsirkin; +Cc: qemu-devel
On Wed, 11 Sept 2024 at 14:51, Michael S. Tsirkin <mst@redhat.com> wrote:
>
> The following changes since commit a66f28df650166ae8b50c992eea45e7b247f4143:
>
> Merge tag 'migration-20240909-pull-request' of https://gitlab.com/peterx/qemu into staging (2024-09-10 11:19:22 +0100)
>
> are available in the Git repository at:
>
> https://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
>
> for you to fetch changes up to 6e3c2d58e967cde3dadae298e81c5e8eb9fb9080:
>
> hw/acpi/ich9: Add periodic and swsmi timer (2024-09-11 09:46:14 -0400)
>
> ----------------------------------------------------------------
> virtio,pc,pci: features, fixes, cleanups
>
> i286 acpi speedup by precomputing _PRT by Ricardo Ribalda
> vhost_net speedup by using MR transactions by Zuo Boqun
> ich9 gained support for periodic and swsmi timer by Dominic Prinz
>
> Fixes, cleanups all over the place.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/9.2
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 22+ messages in thread