ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vdpa: do not block migration if device has cvq and x-svq=on 

It was a mistake to forbid in all cases, as SVQ is already able to send
all the CVQ messages before start forwarding data vqs.  It actually
caused a regression, making impossible to migrate device previously
migratable.

Fixes: 36e4647247 ("vdpa: add vhost_vdpa_net_valid_svq_features")
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Message-Id: <20230602143854.1879091-2-eperezma@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Tested-by: Lei Yang <leiyang@redhat.com>
This commit is contained in:
Eugenio Pérez 2023-06-02 16:38:52 +02:00 committed by Michael S. Tsirkin
parent e0001297eb
commit 8bc0049ead
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/vhost-vdpa.c
View File

@ -915,14 +915,17 @@ static NetClientState *net_vhost_vdpa_init(NetClientState *peer,
s->cvq_isolated = cvq_isolated; s->cvq_isolated = cvq_isolated;
/* /*
* TODO: We cannot migrate devices with CVQ as there is no way to set * TODO: We cannot migrate devices with CVQ and no x-svq enabled as
* the device state (MAC, MQ, etc) before starting the datapath. * there is no way to set the device state (MAC, MQ, etc) before
* starting the datapath.
* *
* Migration blocker ownership now belongs to s->vhost_vdpa. * Migration blocker ownership now belongs to s->vhost_vdpa.
*/ */
if (!svq) {
error_setg(&s->vhost_vdpa.migration_blocker, error_setg(&s->vhost_vdpa.migration_blocker,
"net vdpa cannot migrate with CVQ feature"); "net vdpa cannot migrate with CVQ feature");
} }
}
ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa, queue_pair_index, nvqs); ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa, queue_pair_index, nvqs);
if (ret) { if (ret) {
qemu_del_net_client(nc); qemu_del_net_client(nc);