virtio-ccw: updates
Subsystems (5)
Cornelia Huck
maintainercover virtio-ccw: updates
[Now not as pull request, as requested. The first patch had already been in my last pull request. Patches are against master, but should apply basically anywhere.
Git branch:git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git virtio-ccw]
Some updates: documentation, gracefully handle invalid queues, and wire up the ->bus_name callback (which had somehow fallen through the cracks.)
Cornelia Huck (2):
virtio-ccw: diag 500 may return a negative cookie
virtio-ccw: wire up ->bus_name callback
Halil Pasic (1):
s390/virtio: handle find on invalid queue gracefully
Documentation/virtual/kvm/s390-diag.txt | 3 ++- drivers/s390/virtio/virtio_ccw.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-)
Signature · 1 line
2.17.2
Cornelia Huck
maintainerPATCH 1/3 virtio-ccw: diag 500 may return a negative cookie
If something goes wrong in the kvm io bus handling, the virtio-ccw diagnose may return a negative error value in the cookie gpr.
Document this.
--- Documentation/virtual/kvm/s390-diag.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/virtual/kvm/s390-diag.txt +2 -1
@@ -68,7 +68,8 @@ Subcode 3 - virtio-ccw notification identifier, it is ignored. After completion of the DIAGNOSE call, general register 2 may contain - a 64bit identifier (in the kvm_io_bus cookie case). + a 64bit identifier (in the kvm_io_bus cookie case), or a negative + error value, if an internal error occurred. See also the virtio standard for a discussion of this hypercall.
Signature · 1 line
2.17.2
Cornelia Huck
maintainerPATCH 2/3 s390/virtio: handle find on invalid queue gracefully
In reply to Cornelia HuckFrom: Halil Pasic <[email protected]>
A queue with a capacity of zero is clearly not a valid virtio queue. Some emulators report zero queue size if queried with an invalid queue index. Instead of crashing in this case let us just return -ENOENT. To make that work properly, let us fix the notifier cleanup logic as well.
Message-Id: <[email protected]>
--- drivers/s390/virtio/virtio_ccw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/s390/virtio/virtio_ccw.c +3 -1
@@ -272,6 +272,8 @@ static void virtio_ccw_drop_indicators(struct virtio_ccw_device *vcdev) {struct virtio_ccw_vq_info *info; +if (!vcdev->airq_info) +return ;list_for_each_entry (info, &vcdev->virtqueues, node)drop_airq_indicator (info->vq, vcdev->airq_info); }
@@ -413,7 +415,7 @@ static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, ret =ccw_io_helper (vcdev, ccw,VIRTIO_CCW_DOING_READ_VQ_CONF );if (ret)return ret; -return vcdev->config_block->num; +return vcdev->config_block->num ?: -ENOENT ; }static void virtio_ccw_del_vq (struct virtqueue *vq,struct ccw1 *ccw)
Signature · 1 line
2.17.2
Cornelia Huck
maintainerPATCH 3/3 virtio-ccw: wire up ->bus_name callback
In reply to Cornelia HuckReturn the bus id of the ccw proxy device. This makes 'ethtool -i' show a more useful value than 'virtio' in the bus-info field.
--- drivers/s390/virtio/virtio_ccw.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/s390/virtio/virtio_ccw.c +8 -0
@@ -975,6 +975,13 @@ static void virtio_ccw_set_status(struct virtio_device *vdev, u8 status)kfree (ccw); } +static const char *virtio_ccw_bus_name (struct virtio_device *vdev) +{ +struct virtio_ccw_device *vcdev =to_vc_device (vdev); + +return dev_name (&vcdev->cdev->dev); +} +static const struct virtio_config_ops virtio_ccw_config_ops = { .get_features = virtio_ccw_get_features, .finalize_features = virtio_ccw_finalize_features,
@@ -985,6 +992,7 @@ static const struct virtio_config_ops virtio_ccw_config_ops = { .reset = virtio_ccw_reset, .find_vqs = virtio_ccw_find_vqs, .del_vqs = virtio_ccw_del_vqs, + .bus_name = virtio_ccw_bus_name, };
Signature · 1 line
2.17.2
Michael S. Tsirkin
maintainerQuoted 9 lines · Cornelia Huck
[Now not as pull request, as requested. The first patch had already been in my last pull request. Patches are against master, but should apply basically anywhere.
Git branch:
git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.gitvirtio-ccw]Some updates: documentation, gracefully handle invalid queues, and wire up the ->bus_name callback (which had somehow fallen through the cracks.)
Thanks, will queue.
Quoted 13 lines
Cornelia Huck (2):
virtio-ccw: diag 500 may return a negative cookie
virtio-ccw: wire up ->bus_name callbackHalil Pasic (1):
s390/virtio: handle find on invalid queue gracefullyDocumentation/virtual/kvm/s390-diag.txt | 3 ++- drivers/s390/virtio/virtio_ccw.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-)Signature · 1 line
2.17.2