64 lines
2.2 KiB
Diff
64 lines
2.2 KiB
Diff
|
From 8f2a04c1b5790f6e00160920c3bc88801b5afc16 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hawkins Jiawei <yin31149@gmail.com>
|
||
|
|
Date: Tue, 4 Jul 2023 11:34:34 +0800
|
||
|
|
Subject: [PATCH] vdpa: Return -EIO if device ack is VIRTIO_NET_ERR in
|
||
|
|
_load_mq()
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
According to VirtIO standard, "The class, command and
|
||
|
|
command-specific-data are set by the driver,
|
||
|
|
and the device sets the ack byte.
|
||
|
|
There is little it can do except issue a diagnostic
|
||
|
|
if ack is not VIRTIO_NET_OK."
|
||
|
|
|
||
|
|
Therefore, QEMU should stop sending the queued SVQ commands and
|
||
|
|
cancel the device startup if the device's ack is not VIRTIO_NET_OK.
|
||
|
|
|
||
|
|
Yet the problem is that, vhost_vdpa_net_load_mq() returns 1 based on
|
||
|
|
`*s->status != VIRTIO_NET_OK` when the device's ack is VIRTIO_NET_ERR.
|
||
|
|
As a result, net->nc->info->load() also returns 1, this makes
|
||
|
|
vhost_net_start_one() incorrectly assume the device state is
|
||
|
|
successfully loaded by vhost_vdpa_net_load() and return 0, instead of
|
||
|
|
goto `fail` label to cancel the device startup, as vhost_net_start_one()
|
||
|
|
only cancels the device startup when net->nc->info->load() returns a
|
||
|
|
negative value.
|
||
|
|
|
||
|
|
This patch fixes this problem by returning -EIO when the device's
|
||
|
|
ack is not VIRTIO_NET_OK.
|
||
|
|
|
||
|
|
Fixes: f64c7cda69 ("vdpa: Add vhost_vdpa_net_load_mq")
|
||
|
|
Signed-off-by: Hawkins Jiawei <yin31149@gmail.com>
|
||
|
|
Acked-by: Jason Wang <jasowang@redhat.com>
|
||
|
|
Acked-by: Eugenio Pérez <eperezma@redhat.com>
|
||
|
|
Message-Id: <ec515ebb0b4f56368751b9e318e245a5d994fa72.1688438055.git.yin31149@gmail.com>
|
||
|
|
Tested-by: Lei Yang <leiyang@redhat.com>
|
||
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
||
|
|
Signed-off-by: fangyi <eric.fangyi@huawei.com>
|
||
|
|
---
|
||
|
|
net/vhost-vdpa.c | 5 ++++-
|
||
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/net/vhost-vdpa.c b/net/vhost-vdpa.c
|
||
|
|
index 9af9f6554e..8192045735 100644
|
||
|
|
--- a/net/vhost-vdpa.c
|
||
|
|
+++ b/net/vhost-vdpa.c
|
||
|
|
@@ -553,8 +553,11 @@ static int vhost_vdpa_net_load_mq(VhostVDPAState *s,
|
||
|
|
if (unlikely(dev_written < 0)) {
|
||
|
|
return dev_written;
|
||
|
|
}
|
||
|
|
+ if (*s->status != VIRTIO_NET_OK) {
|
||
|
|
+ return -EIO;
|
||
|
|
+ }
|
||
|
|
|
||
|
|
- return *s->status != VIRTIO_NET_OK;
|
||
|
|
+ return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
static int vhost_vdpa_net_load(NetClientState *nc)
|
||
|
|
--
|
||
|
|
2.27.0
|
||
|
|
|