d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

virtio: check if setting status bits succeeded

Browse Source 
This is required by the Virtio spec. (3.1 Device Init.)
It will also help us with vhost-user error handling.
set_status() doesn't have a way to return an error, so
its internal failures were silenced until now. When we
exceeded max memory region count (8) we only printed
an error message without failing any SPDK initialization.
This patch fixes that. It also removes not-particularly-
useful comments in virtio_dev_reset().

Change-Id: Ibe0010c493ef4e12e1fdd0a1679bf706f298d97e
Signed-off-by: Dariusz Stojaczyk <dariuszx.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/405915
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Dariusz Stojaczyk 2018-03-30 19:10:00 +02:00 committed by Jim Harris
parent c2520346bf
commit 9728d6b054
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/virtio/virtio.c
View File

@ -304,14 +304,19 @@ virtio_dev_reset(struct virtio_dev *dev, uint64_t req_features)
{
req_features |= (1ULL << VIRTIO_F_VERSION_1);
/* Reset the device although not necessary at startup */
virtio_dev_stop(dev);
/* Tell the host we've noticed this device. */
virtio_dev_set_status(dev, VIRTIO_CONFIG_S_ACKNOWLEDGE);
if (!(virtio_dev_get_status(dev) & VIRTIO_CONFIG_S_ACKNOWLEDGE)) {
SPDK_ERRLOG("Failed to set VIRTIO_CONFIG_S_ACKNOWLEDGE status.\n");
return -1;
}
/* Tell the host we've known how to drive the device. */
virtio_dev_set_status(dev, VIRTIO_CONFIG_S_DRIVER);
if (!(virtio_dev_get_status(dev) & VIRTIO_CONFIG_S_DRIVER)) {
SPDK_ERRLOG("Failed to set VIRTIO_CONFIG_S_DRIVER status.\n");
return -1;
}
return virtio_negotiate_features(dev, req_features);
}
@ -327,6 +332,11 @@ virtio_dev_start(struct virtio_dev *vdev, uint16_t max_queues, uint16_t fixed_qu
}
virtio_dev_set_status(vdev, VIRTIO_CONFIG_S_DRIVER_OK);
if (!(virtio_dev_get_status(vdev) & VIRTIO_CONFIG_S_DRIVER_OK)) {
SPDK_ERRLOG("Failed to set VIRTIO_CONFIG_S_DRIVER_OK status.\n");
return -1;
}
return 0;
}