[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/13] hw/virtio: fix vhost user fails to startup whe
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 03/13] hw/virtio: fix vhost user fails to startup when MQ |
Date: |
Thu, 18 May 2017 00:45:11 +0300 |
From: Zhiyong Yang <address@hidden>
Qemu2.7~2.9 and vhost user for dpdk 17.02 release work together
to cause failures of new connection when negotiating to set MQ.
(one queue pair works well).
Because there exist some bugs in qemu code when introducing
VHOST_USER_PROTOCOL_F_REPLY_ACK to qemu. When vhost_user_set_mem_table
is invoked to deal with the vhost message VHOST_USER_SET_MEM_TABLE
for the second time, qemu indeed doesn't send the messge (The message
needs to be sent only once)but still will be waiting for dpdk's reply
ack, then, qemu is always freezing, while DPDK is always waiting for
next vhost message from qemu.
The patch aims to fix the bug, MQ can work well.
The same bug is found in function vhost_user_net_set_mtu, it is fixed
at the same time.
DPDK related patch is as following:
http://www.dpdk.org/dev/patchwork/patch/23955/
Signed-off-by: Zhiyong Yang <address@hidden>
Cc: address@hidden
Fixes: ca525ce5618b ("vhost-user: Introduce a new protocol feature REPLY_ACK.")
Reviewed-by: Maxime Coquelin <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Tested-by: Jens Freimann <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
---
hw/virtio/vhost-user.c | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 9334a8a..32a95a8 100644
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -163,22 +163,26 @@ fail:
}
static int process_message_reply(struct vhost_dev *dev,
- VhostUserRequest request)
+ VhostUserMsg msg)
{
- VhostUserMsg msg;
+ VhostUserMsg msg_reply;
- if (vhost_user_read(dev, &msg) < 0) {
+ if ((msg.flags & VHOST_USER_NEED_REPLY_MASK) == 0) {
+ return 0;
+ }
+
+ if (vhost_user_read(dev, &msg_reply) < 0) {
return -1;
}
- if (msg.request != request) {
+ if (msg_reply.request != msg.request) {
error_report("Received unexpected msg type."
"Expected %d received %d",
- request, msg.request);
+ msg.request, msg_reply.request);
return -1;
}
- return msg.payload.u64 ? -1 : 0;
+ return msg_reply.payload.u64 ? -1 : 0;
}
static bool vhost_user_one_time_request(VhostUserRequest request)
@@ -208,6 +212,7 @@ static int vhost_user_write(struct vhost_dev *dev,
VhostUserMsg *msg,
* request, we just ignore it.
*/
if (vhost_user_one_time_request(msg->request) && dev->vq_index != 0) {
+ msg->flags &= ~VHOST_USER_NEED_REPLY_MASK;
return 0;
}
@@ -320,7 +325,7 @@ static int vhost_user_set_mem_table(struct vhost_dev *dev,
}
if (reply_supported) {
- return process_message_reply(dev, msg.request);
+ return process_message_reply(dev, msg);
}
return 0;
@@ -712,7 +717,7 @@ static int vhost_user_net_set_mtu(struct vhost_dev *dev,
uint16_t mtu)
/* If reply_ack supported, slave has to ack specified MTU is valid */
if (reply_supported) {
- return process_message_reply(dev, msg.request);
+ return process_message_reply(dev, msg);
}
return 0;
--
MST
- [Qemu-devel] [PULL 00/13] pci, virtio, vhost: fixes, Michael S. Tsirkin, 2017/05/17
- [Qemu-devel] [PULL 01/13] hw/acpi-defs: replace leading X with x_ in FADT field names, Michael S. Tsirkin, 2017/05/17
- [Qemu-devel] [PULL 03/13] hw/virtio: fix vhost user fails to startup when MQ,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 04/13] libvhost-user: fix crash when rings aren't ready, Michael S. Tsirkin, 2017/05/17
- [Qemu-devel] [PULL 05/13] pc/fwcfg: unbreak migration from qemu-2.5 and qemu-2.6 during firmware boot, Michael S. Tsirkin, 2017/05/17
- [Qemu-devel] [PULL 02/13] hw/arm/virt: generate 64-bit addressable ACPI objects, Michael S. Tsirkin, 2017/05/17
- [Qemu-devel] [PULL 08/13] ACPI: don't call acpi_pcihp_device_plug_cb on xen, Michael S. Tsirkin, 2017/05/17
- [Qemu-devel] [PULL 07/13] iommu: Don't crash if machine is not PC_MACHINE, Michael S. Tsirkin, 2017/05/17
- [Qemu-devel] [PULL 09/13] acpi-defs: clean up open brace usage, Michael S. Tsirkin, 2017/05/17
- [Qemu-devel] [PULL 06/13] pc: add 2.10 machine type, Michael S. Tsirkin, 2017/05/17
- [Qemu-devel] [PULL 10/13] Revert "hw/pci: disable pci-bridge's shpc by default", Michael S. Tsirkin, 2017/05/17
- [Qemu-devel] [PULL 11/13] virtio: allow broken device to notify guest, Michael S. Tsirkin, 2017/05/17
- [Qemu-devel] [PULL 12/13] pci: deassert intx when pci device unrealize, Michael S. Tsirkin, 2017/05/17