search for: virtio_ccw_read_vq_conf

From: Pierre Morel <pmorel at linux.vnet.ibm.com> In virtio_ccw_read_vq_conf() the return value of ccw_io_helper() was not checked. If the configuration could not be read properly, we'd wrongly assume a queue size of 0. Let's propagate any I/O error to virtio_ccw_setup_vq() so it may properly fail. Signed-off-by: Pierre Morel <pmorel at linux.vnet.ibm.com> S...

Michael, here's a bugfix for the virtio-ccw driver. Question: How would you like to get patches? This one is formatted against your current linux-next branch; I can prepare a branch for you to pull from as well. Pierre Morel (1): virtio/s390: handle failures of READ_VQ_CONF ccw drivers/s390/virtio/virtio_ccw.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.3.8

Michael, here's a bugfix for the virtio-ccw driver. Question: How would you like to get patches? This one is formatted against your current linux-next branch; I can prepare a branch for you to pull from as well. Pierre Morel (1): virtio/s390: handle failures of READ_VQ_CONF ccw drivers/s390/virtio/virtio_ccw.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) -- 2.3.8

On Mon, Feb 25, 2013 at 04:27:45PM +0100, Cornelia Huck wrote: > Here's the latest version of my patch series enabling ioeventfds > on s390, again against kvm-next. > > Patches 1 and 2 (cleaning up initialization and exporting the virtio-ccw > api) would make sense even independent of the ioeventfd enhancements. > > Patches 3-5 are concerned with adding a new type of

On Mon, Feb 25, 2013 at 04:27:45PM +0100, Cornelia Huck wrote: > Here's the latest version of my patch series enabling ioeventfds > on s390, again against kvm-next. > > Patches 1 and 2 (cleaning up initialization and exporting the virtio-ccw > api) would make sense even independent of the ioeventfd enhancements. > > Patches 3-5 are concerned with adding a new type of

...ified that explicitly > > for virtio-ccw, but it does make sense. > > > > virtio-pci returns -ENOENT in that case, which might be a good choice > > here as well. > > virtio-mmio does the same. I will change it to -ENOENT. Maybe also do > something like > int virtio_ccw_read_vq_conf() { > [..] > return vcdev->config_block->num ?: -ENOENT; > } > > instead of the extra if statement, or? Yes, why not. > > > > > > > > > --- > > > drivers/s390/virtio/virtio_ccw.c | 6 ++++++ > > > 1 file changed, 6 inserti...

..._kvm_notify(struct virtqueue *vq) > +{ > + return virtio_ccw_do_kvm_notify(vq, vq->index); > +} > + > +static bool virtio_ccw_kvm_notify_with_data(struct virtqueue *vq) > +{ > + return virtio_ccw_do_kvm_notify(vq, vring_notification_data(vq)); > +} > + > static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, > struct ccw1 *ccw, int index) > { > @@ -501,6 +511,9 @@ static struct virtqueue *virtio_ccw_setup_vq(struct virtio_device *vdev, > u64 queue; > unsigned long flags; > bool may_reduce; > + bool (*notify)(struct virtqueue *vq) = __...

...vq->index); > > > +} > > > + > > > +static bool virtio_ccw_kvm_notify_with_data(struct virtqueue *vq) > > > +{ > > > + return virtio_ccw_do_kvm_notify(vq, vring_notification_data(vq)); > > > +} > > > + > > > static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, > > > struct ccw1 *ccw, int index) > > > { > > > @@ -501,6 +511,9 @@ static struct virtqueue *virtio_ccw_setup_vq(struct virtio_device *vdev, > > > u64 queue; > > > unsigned l...

...atorp = 0; ccw->cmd_code = CCW_CMD_SET_IND; ccw->count = sizeof(indicators(vcdev)); - ccw->cda = (__u32)(unsigned long) indicatorp; + ccw->cda = (__u32)virt_to_phys(indicatorp); } /* Deregister indicators from host. */ *indicators(vcdev) = 0; @@ -417,7 +417,7 @@ static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, ccw->cmd_code = CCW_CMD_READ_VQ_CONF; ccw->flags = 0; ccw->count = sizeof(struct vq_config_block); - ccw->cda = (__u32)(unsigned long)(&vcdev->dma_area->config_block); + ccw->cda = (__u32)virt_to_phys(&vcdev->dma_area->config...

...atorp = 0; ccw->cmd_code = CCW_CMD_SET_IND; ccw->count = sizeof(indicators(vcdev)); - ccw->cda = (__u32)(unsigned long) indicatorp; + ccw->cda = (__u32)virt_to_phys(indicatorp); } /* Deregister indicators from host. */ *indicators(vcdev) = 0; @@ -417,7 +417,7 @@ static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, ccw->cmd_code = CCW_CMD_READ_VQ_CONF; ccw->flags = 0; ccw->count = sizeof(struct vq_config_block); - ccw->cda = (__u32)(unsigned long)(&vcdev->dma_area->config_block); + ccw->cda = (__u32)virt_to_phys(&vcdev->dma_area->config...

..._kvm_notify(struct virtqueue *vq) > +{ > + return virtio_ccw_do_kvm_notify(vq, vq->index); > +} > + > +static bool virtio_ccw_kvm_notify_with_data(struct virtqueue *vq) > +{ > + return virtio_ccw_do_kvm_notify(vq, vring_notification_data(vq)); > +} > + > static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, > struct ccw1 *ccw, int index) > { > @@ -501,6 +511,12 @@ static struct virtqueue *virtio_ccw_setup_vq(struct virtio_device *vdev, > u64 queue; > unsigned long flags; > bool may_reduce; > + bool (*notify)(struct virtqueue *vq); G...

...irtio_ccw_kvm_notify(struct virtqueue *vq) vcdev = to_vc_device(info->vq->vdev); ccw_device_get_schid(vcdev->cdev, &schid); info->cookie = do_kvm_notify(schid, vq->index, info->cookie); + if (info->cookie < 0) + return info->cookie; + return 0; } static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, diff --git a/drivers/virtio/virtio_mmio.c b/drivers/virtio/virtio_mmio.c index 1ba0d68..e213991 100644 --- a/drivers/virtio/virtio_mmio.c +++ b/drivers/virtio/virtio_mmio.c @@ -219,13 +219,14 @@ static void vm_reset(struct virtio_device *vdev) /* Transport interfac...

..._kvm_notify(struct virtqueue *vq) > +{ > + return virtio_ccw_do_kvm_notify(vq, vq->index); > +} > + > +static bool virtio_ccw_kvm_notify_with_data(struct virtqueue *vq) > +{ > + return virtio_ccw_do_kvm_notify(vq, vring_notification_data(vq)); > +} > + > static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, > struct ccw1 *ccw, int index) > { > @@ -501,6 +511,9 @@ static struct virtqueue *virtio_ccw_setup_vq(struct virtio_device *vdev, > u64 queue; > unsigned long flags; > bool may_reduce; > + bool (*notify)(struct virtqueue *vq) = __...

Rusty, here is just patch 1 (using bool as return value in notify API). Thanks. Heinz Graalfs (9): virtio_ring: change host notification API virtio_ring: let virtqueue_{kick()/notify()} return a bool virtio_net: verify if virtqueue_kick() succeeded virtio_test: verify if virtqueue_kick() succeeded virtio_ring: add new function virtqueue_is_broken() virtio_blk: verify if queue is

Rusty, here is just patch 1 (using bool as return value in notify API). Thanks. Heinz Graalfs (9): virtio_ring: change host notification API virtio_ring: let virtqueue_{kick()/notify()} return a bool virtio_net: verify if virtqueue_kick() succeeded virtio_test: verify if virtqueue_kick() succeeded virtio_ring: add new function virtqueue_is_broken() virtio_blk: verify if queue is

Hi, this patch-set tries to solve various hang situations when virtio devices (network or block) are hot-unplugged from a KVM guest. On System z there exists no handshake mechanism between host and guest when a device is hot-unplugged. The device is removed and no further I/O is possible. The guest is notified about the hard removal with a CRW machine check. As per architecture, the host must

Hi, this patch-set tries to solve various hang situations when virtio devices (network or block) are hot-unplugged from a KVM guest. On System z there exists no handshake mechanism between host and guest when a device is hot-unplugged. The device is removed and no further I/O is possible. The guest is notified about the hard removal with a CRW machine check. As per architecture, the host must

...rs(vcdev); - kfree(indicatorp); - kfree(thinint_area); + __vc_dma_free(&vcdev->vdev, sizeof(indicators(vcdev)), + indicatorp); + vc_dma_free_struct(&vcdev->vdev, thinint_area); } static inline long __do_kvm_notify(struct subchannel_id schid, @@ -416,15 +436,15 @@ static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, { int ret; - vcdev->config_block->index = index; + vcdev->dma_area->config_block.index = index; ccw->cmd_code = CCW_CMD_READ_VQ_CONF; ccw->flags = 0; ccw->count = sizeof(struct vq_config_block); - ccw->cda = (__u32)(unsigned long)(...

...rs(vcdev); - kfree(indicatorp); - kfree(thinint_area); + __vc_dma_free(&vcdev->vdev, sizeof(indicators(vcdev)), + indicatorp); + vc_dma_free_struct(&vcdev->vdev, thinint_area); } static inline long __do_kvm_notify(struct subchannel_id schid, @@ -417,15 +437,15 @@ static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, { int ret; - vcdev->config_block->index = index; + vcdev->dma_area->config_block.index = index; ccw->cmd_code = CCW_CMD_READ_VQ_CONF; ccw->flags = 0; ccw->count = sizeof(struct vq_config_block); - ccw->cda = (__u32)(unsigned long)(...

...rs(vcdev); - kfree(indicatorp); - kfree(thinint_area); + __vc_dma_free(&vcdev->vdev, sizeof(indicators(vcdev)), + indicatorp); + vc_dma_free_struct(&vcdev->vdev, thinint_area); } static inline long __do_kvm_notify(struct subchannel_id schid, @@ -417,15 +437,15 @@ static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev, { int ret; - vcdev->config_block->index = index; + vcdev->dma_area->config_block.index = index; ccw->cmd_code = CCW_CMD_READ_VQ_CONF; ccw->flags = 0; ccw->count = sizeof(struct vq_config_block); - ccw->cda = (__u32)(unsigned long)(...