SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

vdpa net: follow VirtIO initialization properly at cvq isolation probing

Browse Source 
This patch solves a few issues.  The most obvious is that the feature
set was done previous to ACKNOWLEDGE | DRIVER status bit set.  Current
vdpa devices are permissive with this, but it is better to follow the
standard.

Fixes: 152128d646 ("vdpa: move CVQ isolation check to net_init_vhost_vdpa")
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Message-Id: <20230915170836.3078172-4-eperezma@redhat.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>
This commit is contained in:
Eugenio Pérez 2023-09-15 19:08:36 +02:00 committed by Michael S. Tsirkin
parent f1085882d0
commit 845ec38ae1
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
net/vhost-vdpa.c
View File

@ -1345,8 +1345,7 @@ static int vhost_vdpa_probe_cvq_isolation(int device_fd, uint64_t features,
uint64_t backend_features; uint64_t backend_features;
int64_t cvq_group; int64_t cvq_group;
uint8_t status = VIRTIO_CONFIG_S_ACKNOWLEDGE | uint8_t status = VIRTIO_CONFIG_S_ACKNOWLEDGE |
VIRTIO_CONFIG_S_DRIVER | VIRTIO_CONFIG_S_DRIVER;
VIRTIO_CONFIG_S_FEATURES_OK;
int r; int r;
ERRP_GUARD(); ERRP_GUARD();
@ -1361,15 +1360,22 @@ static int vhost_vdpa_probe_cvq_isolation(int device_fd, uint64_t features,
return 0; return 0;
} }
r = ioctl(device_fd, VHOST_SET_FEATURES, &features); r = ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status);
if (unlikely(r)) { if (unlikely(r)) {
error_setg_errno(errp, errno, "Cannot set features"); error_setg_errno(errp, -r, "Cannot set device status");
goto out; goto out;
} }
r = ioctl(device_fd, VHOST_SET_FEATURES, &features);
if (unlikely(r)) {
error_setg_errno(errp, -r, "Cannot set features");
goto out;
}
status |= VIRTIO_CONFIG_S_FEATURES_OK;
r = ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status); r = ioctl(device_fd, VHOST_VDPA_SET_STATUS, &status);
if (unlikely(r)) { if (unlikely(r)) {
error_setg_errno(errp, -r, "Cannot set status"); error_setg_errno(errp, -r, "Cannot set device status");
goto out; goto out;
} }