[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH 11/12] libvhost-user: support resuming vq->last_ava
From: |
Michael Roth |
Subject: |
[Qemu-stable] [PATCH 11/12] libvhost-user: support resuming vq->last_avail_idx based on used_idx |
Date: |
Tue, 19 Sep 2017 19:45:20 -0500 |
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>
(cherry picked from commit 35480cbfcb73143af66c8de4b444d686a46c2e88)
Signed-off-by: Michael Roth <address@hidden>
---
contrib/libvhost-user/libvhost-user.c | 13 +++++++++++++
contrib/libvhost-user/libvhost-user.h | 7 +++++++
2 files changed, 20 insertions(+)
diff --git a/contrib/libvhost-user/libvhost-user.c
b/contrib/libvhost-user/libvhost-user.c
index 35fa0c5e56..d27d6303db 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;
}
diff --git a/contrib/libvhost-user/libvhost-user.h
b/contrib/libvhost-user/libvhost-user.h
index 53ef222c0b..4021f1124e 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);
--
2.11.0
- [Qemu-stable] [PATCH 00/12] Patch Round-up for stable 2.10.1, freeze on 2017-09-27, Michael Roth, 2017/09/19
- [Qemu-stable] [PATCH 09/12] mps2-an511: Fix wiring of UART overflow interrupt lines, Michael Roth, 2017/09/19
- [Qemu-stable] [PATCH 10/12] scsi-bus: correct responses for INQUIRY and REQUEST SENSE, Michael Roth, 2017/09/19
- [Qemu-stable] [PATCH 03/12] target/arm: Fix aa64 ldp register writeback, Michael Roth, 2017/09/19
- [Qemu-stable] [PATCH 11/12] libvhost-user: support resuming vq->last_avail_idx based on used_idx,
Michael Roth <=
- [Qemu-stable] [PATCH 02/12] s390-ccw: Fix alignment for CCW1, Michael Roth, 2017/09/19
- [Qemu-stable] [PATCH 12/12] vhost-user-bridge: fix resume regression (since 2.9), Michael Roth, 2017/09/19
- [Qemu-stable] [PATCH 07/12] qcow2: move qcow2_store_persistent_dirty_bitmaps() before cache flushing, Michael Roth, 2017/09/19
- [Qemu-stable] [PATCH 06/12] hw/arm/allwinner-a10: Mark the allwinner-a10 device with user_creatable = false, Michael Roth, 2017/09/19
- [Qemu-stable] [PATCH 05/12] arm_gicv3_kvm: Fix compile warning, Michael Roth, 2017/09/19
- [Qemu-stable] [PATCH 01/12] slirp: fix clearing ifq_so from pending packets, Michael Roth, 2017/09/19
- [Qemu-stable] [PATCH 04/12] virtfs: error out gracefully when mandatory suboptions are missing, Michael Roth, 2017/09/19
- [Qemu-stable] [PATCH 08/12] vhost: Release memory references on cleanup, Michael Roth, 2017/09/19
- Re: [Qemu-stable] [Qemu-devel] [PATCH 00/12] Patch Round-up for stable 2.10.1, freeze on 2017-09-27, Thomas Huth, 2017/09/20
- Re: [Qemu-stable] [Qemu-devel] [PATCH 00/12] Patch Round-up for stable 2.10.1, freeze on 2017-09-27, Greg Kurz, 2017/09/20