[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/17] libvhost-user: support resuming vq->last_avail
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 12/17] libvhost-user: support resuming vq->last_avail_idx based on used_idx |
Date: |
Fri, 8 Sep 2017 17:19:25 +0300 |
From: Marc-André Lureau <address@hidden>
This is the same workaround as commit 523b018dde3b765, which was lost
with libvhost-user transition in commit e10e798c85c2331.
Signed-off-by: Marc-André Lureau <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
contrib/libvhost-user/libvhost-user.h | 7 +++++++
contrib/libvhost-user/libvhost-user.c | 13 +++++++++++++
2 files changed, 20 insertions(+)
diff --git a/contrib/libvhost-user/libvhost-user.h
b/contrib/libvhost-user/libvhost-user.h
index 53ef222..4021f11 100644
--- a/contrib/libvhost-user/libvhost-user.h
+++ b/contrib/libvhost-user/libvhost-user.h
@@ -132,6 +132,7 @@ typedef void (*vu_set_features_cb) (VuDev *dev, uint64_t
features);
typedef int (*vu_process_msg_cb) (VuDev *dev, VhostUserMsg *vmsg,
int *do_reply);
typedef void (*vu_queue_set_started_cb) (VuDev *dev, int qidx, bool started);
+typedef bool (*vu_queue_is_processed_in_order_cb) (VuDev *dev, int qidx);
typedef struct VuDevIface {
/* called by VHOST_USER_GET_FEATURES to get the features bitmask */
@@ -148,6 +149,12 @@ typedef struct VuDevIface {
vu_process_msg_cb process_msg;
/* tells when queues can be processed */
vu_queue_set_started_cb queue_set_started;
+ /*
+ * If the queue is processed in order, in which case it will be
+ * resumed to vring.used->idx. This can help to support resuming
+ * on unmanaged exit/crash.
+ */
+ vu_queue_is_processed_in_order_cb queue_is_processed_in_order;
} VuDevIface;
typedef void (*vu_queue_handler_cb) (VuDev *dev, int qidx);
diff --git a/contrib/libvhost-user/libvhost-user.c
b/contrib/libvhost-user/libvhost-user.c
index 35fa0c5..d27d630 100644
--- a/contrib/libvhost-user/libvhost-user.c
+++ b/contrib/libvhost-user/libvhost-user.c
@@ -521,6 +521,19 @@ vu_set_vring_addr_exec(VuDev *dev, VhostUserMsg *vmsg)
vq->used_idx = vq->vring.used->idx;
+ if (vq->last_avail_idx != vq->used_idx) {
+ bool resume = dev->iface->queue_is_processed_in_order &&
+ dev->iface->queue_is_processed_in_order(dev, index);
+
+ DPRINT("Last avail index != used index: %u != %u%s\n",
+ vq->last_avail_idx, vq->used_idx,
+ resume ? ", resuming" : "");
+
+ if (resume) {
+ vq->shadow_avail_idx = vq->last_avail_idx = vq->used_idx;
+ }
+ }
+
return false;
}
--
MST
- [Qemu-devel] [PULL 00/17] pc, pci, virtio: patches queued before 2.10, Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 03/17] hw/acpi: Limit hotplug to root bus on legacy mode, Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 04/17] hw/acpi: Move acpi_set_pci_info to pcihp, Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 06/17] hw/pci: introduce pcie-pci-bridge device, Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 05/17] Revert "ACPI: don't call acpi_pcihp_device_plug_cb on xen", Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 02/17] pc: add 2.11 machine types, Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 08/17] hw/pci: add QEMU-specific PCI capability to the Generic PCI Express Root Port, Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 07/17] hw/pci: introduce bridge-only vendor-specific capability to provide some hints to firmware, Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 09/17] docs: update documentation considering PCIE-PCI bridge, Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 11/17] acpi/vmgenid: change device category to misc, Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 12/17] libvhost-user: support resuming vq->last_avail_idx based on used_idx,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 10/17] intel_iommu: fix missing BQL in pt fast path, Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 13/17] vhost-user-bridge: fix resume regression (since 2.9), Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 14/17] vmgenid: replace x-write-pointer-available hack, Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 15/17] pci: move check for existing devfn into new pci_bus_devfn_available() helper, Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 16/17] pci: add reserved slot check to do_pci_register_device(), Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 17/17] fw_cfg: rename read callback, Michael S. Tsirkin, 2017/09/08
- [Qemu-devel] [PULL 01/17] vhost: Release memory references on cleanup, Michael S. Tsirkin, 2017/09/08
- Re: [Qemu-devel] [PULL 00/17] pc, pci, virtio: patches queued before 2.10, Peter Maydell, 2017/09/08