Nicholas A. Bellinger
2012-Jul-06 20:15 UTC
[PATCH] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
From: Nicholas Bellinger <nab at linux-iscsi.org>
This patch changes virtio-scsi to use a new virtio_driver->scan() callback
so that scsi_scan_host() can be properly invoked once virtio_dev_probe() has
set add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK) to signal active virtio-ring
operation, instead of from within virtscsi_probe().
This fixes a bug where SCSI LUN scanning for both virtio-scsi-raw and
virtio-scsi/tcm_vhost setups was happening before VIRTIO_CONFIG_S_DRIVER_OK
had been set, causing VIRTIO_SCSI_S_BAD_TARGET to occur. This fixes a bug
with virtio-scsi/tcm_vhost where LUN scan was not detecting LUNs.
Tested with virtio-scsi-raw + virtio-scsi/tcm_vhost w/ IBLOCK on 3.5-rc2 code.
Reviewed-by: Paolo Bonzini <pbonzini at redhat.com>
Cc: Stefan Hajnoczi <stefanha at linux.vnet.ibm.com>
Cc: Zhi Yong Wu <wuzhy at cn.ibm.com>
Cc: Christoph Hellwig <hch at lst.de>
Cc: Hannes Reinecke <hare at suse.de>
Cc: <stable at vger.kernel.org>
Signed-off-by: Nicholas Bellinger <nab at linux-iscsi.org>
---
drivers/scsi/virtio_scsi.c | 15 ++++++++++++---
drivers/virtio/virtio.c | 5 ++++-
include/linux/virtio.h | 1 +
3 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c
index 1b38431..391b30d 100644
--- a/drivers/scsi/virtio_scsi.c
+++ b/drivers/scsi/virtio_scsi.c
@@ -481,9 +481,10 @@ static int __devinit virtscsi_probe(struct virtio_device
*vdev)
err = scsi_add_host(shost, &vdev->dev);
if (err)
goto scsi_add_host_failed;
-
- scsi_scan_host(shost);
-
+ /*
+ * scsi_scan_host() happens in virtscsi_scan() via virtio_driver->scan()
+ * after VIRTIO_CONFIG_S_DRIVER_OK has been set..
+ */
return 0;
scsi_add_host_failed:
@@ -493,6 +494,13 @@ virtscsi_init_failed:
return err;
}
+static void virtscsi_scan(struct virtio_device *vdev)
+{
+ struct Scsi_Host *shost = (struct Scsi_Host *)vdev->priv;
+
+ scsi_scan_host(shost);
+}
+
static void virtscsi_remove_vqs(struct virtio_device *vdev)
{
/* Stop all the virtqueues. */
@@ -537,6 +545,7 @@ static struct virtio_driver virtio_scsi_driver = {
.driver.owner = THIS_MODULE,
.id_table = id_table,
.probe = virtscsi_probe,
+ .scan = virtscsi_scan,
#ifdef CONFIG_PM
.freeze = virtscsi_freeze,
.restore = virtscsi_restore,
diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c
index f355807..c3b3f7f 100644
--- a/drivers/virtio/virtio.c
+++ b/drivers/virtio/virtio.c
@@ -141,8 +141,11 @@ static int virtio_dev_probe(struct device *_d)
err = drv->probe(dev);
if (err)
add_status(dev, VIRTIO_CONFIG_S_FAILED);
- else
+ else {
add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK);
+ if (drv->scan)
+ drv->scan(dev);
+ }
return err;
}
diff --git a/include/linux/virtio.h b/include/linux/virtio.h
index 8efd28a..a1ba8bb 100644
--- a/include/linux/virtio.h
+++ b/include/linux/virtio.h
@@ -92,6 +92,7 @@ struct virtio_driver {
const unsigned int *feature_table;
unsigned int feature_table_size;
int (*probe)(struct virtio_device *dev);
+ void (*scan)(struct virtio_device *dev);
void (*remove)(struct virtio_device *dev);
void (*config_changed)(struct virtio_device *dev);
#ifdef CONFIG_PM
--
1.7.2.5
Nicholas A. Bellinger
2012-Jul-06 20:19 UTC
[PATCH] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
Hi James, Please consider picking this one up for your next scsi-rc-fixes PULL, and it's CC'ed to stable following Paolo's request. Thank you, --nab On Fri, 2012-07-06 at 20:15 +0000, Nicholas A. Bellinger wrote:> From: Nicholas Bellinger <nab at linux-iscsi.org> > > This patch changes virtio-scsi to use a new virtio_driver->scan() callback > so that scsi_scan_host() can be properly invoked once virtio_dev_probe() has > set add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK) to signal active virtio-ring > operation, instead of from within virtscsi_probe(). > > This fixes a bug where SCSI LUN scanning for both virtio-scsi-raw and > virtio-scsi/tcm_vhost setups was happening before VIRTIO_CONFIG_S_DRIVER_OK > had been set, causing VIRTIO_SCSI_S_BAD_TARGET to occur. This fixes a bug > with virtio-scsi/tcm_vhost where LUN scan was not detecting LUNs. > > Tested with virtio-scsi-raw + virtio-scsi/tcm_vhost w/ IBLOCK on 3.5-rc2 code. > > Reviewed-by: Paolo Bonzini <pbonzini at redhat.com> > Cc: Stefan Hajnoczi <stefanha at linux.vnet.ibm.com> > Cc: Zhi Yong Wu <wuzhy at cn.ibm.com> > Cc: Christoph Hellwig <hch at lst.de> > Cc: Hannes Reinecke <hare at suse.de> > Cc: <stable at vger.kernel.org> > Signed-off-by: Nicholas Bellinger <nab at linux-iscsi.org> > --- > drivers/scsi/virtio_scsi.c | 15 ++++++++++++--- > drivers/virtio/virtio.c | 5 ++++- > include/linux/virtio.h | 1 + > 3 files changed, 17 insertions(+), 4 deletions(-) > > diff --git a/drivers/scsi/virtio_scsi.c b/drivers/scsi/virtio_scsi.c > index 1b38431..391b30d 100644 > --- a/drivers/scsi/virtio_scsi.c > +++ b/drivers/scsi/virtio_scsi.c > @@ -481,9 +481,10 @@ static int __devinit virtscsi_probe(struct virtio_device *vdev) > err = scsi_add_host(shost, &vdev->dev); > if (err) > goto scsi_add_host_failed; > - > - scsi_scan_host(shost); > - > + /* > + * scsi_scan_host() happens in virtscsi_scan() via virtio_driver->scan() > + * after VIRTIO_CONFIG_S_DRIVER_OK has been set.. > + */ > return 0; > > scsi_add_host_failed: > @@ -493,6 +494,13 @@ virtscsi_init_failed: > return err; > } > > +static void virtscsi_scan(struct virtio_device *vdev) > +{ > + struct Scsi_Host *shost = (struct Scsi_Host *)vdev->priv; > + > + scsi_scan_host(shost); > +} > + > static void virtscsi_remove_vqs(struct virtio_device *vdev) > { > /* Stop all the virtqueues. */ > @@ -537,6 +545,7 @@ static struct virtio_driver virtio_scsi_driver = { > .driver.owner = THIS_MODULE, > .id_table = id_table, > .probe = virtscsi_probe, > + .scan = virtscsi_scan, > #ifdef CONFIG_PM > .freeze = virtscsi_freeze, > .restore = virtscsi_restore, > diff --git a/drivers/virtio/virtio.c b/drivers/virtio/virtio.c > index f355807..c3b3f7f 100644 > --- a/drivers/virtio/virtio.c > +++ b/drivers/virtio/virtio.c > @@ -141,8 +141,11 @@ static int virtio_dev_probe(struct device *_d) > err = drv->probe(dev); > if (err) > add_status(dev, VIRTIO_CONFIG_S_FAILED); > - else > + else { > add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK); > + if (drv->scan) > + drv->scan(dev); > + } > > return err; > } > diff --git a/include/linux/virtio.h b/include/linux/virtio.h > index 8efd28a..a1ba8bb 100644 > --- a/include/linux/virtio.h > +++ b/include/linux/virtio.h > @@ -92,6 +92,7 @@ struct virtio_driver { > const unsigned int *feature_table; > unsigned int feature_table_size; > int (*probe)(struct virtio_device *dev); > + void (*scan)(struct virtio_device *dev); > void (*remove)(struct virtio_device *dev); > void (*config_changed)(struct virtio_device *dev); > #ifdef CONFIG_PM
Nicholas A. Bellinger
2012-Jul-11 21:26 UTC
[PATCH] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
On Wed, 2012-07-11 at 19:37 +0100, James Bottomley wrote:> On Fri, 2012-07-06 at 20:15 +0000, Nicholas A. Bellinger wrote: > > From: Nicholas Bellinger <nab at linux-iscsi.org> > > > > This patch changes virtio-scsi to use a new virtio_driver->scan() callback > > so that scsi_scan_host() can be properly invoked once virtio_dev_probe() has > > set add_status(dev, VIRTIO_CONFIG_S_DRIVER_OK) to signal active virtio-ring > > operation, instead of from within virtscsi_probe(). > > > > This fixes a bug where SCSI LUN scanning for both virtio-scsi-raw and > > virtio-scsi/tcm_vhost setups was happening before VIRTIO_CONFIG_S_DRIVER_OK > > had been set, causing VIRTIO_SCSI_S_BAD_TARGET to occur. This fixes a bug > > with virtio-scsi/tcm_vhost where LUN scan was not detecting LUNs. > > > > Tested with virtio-scsi-raw + virtio-scsi/tcm_vhost w/ IBLOCK on 3.5-rc2 code. > > > > Reviewed-by: Paolo Bonzini <pbonzini at redhat.com> > > Cc: Stefan Hajnoczi <stefanha at linux.vnet.ibm.com> > > Cc: Zhi Yong Wu <wuzhy at cn.ibm.com> > > Cc: Christoph Hellwig <hch at lst.de> > > Cc: Hannes Reinecke <hare at suse.de> > > Cc: <stable at vger.kernel.org> > > Signed-off-by: Nicholas Bellinger <nab at linux-iscsi.org> > > --- > > drivers/scsi/virtio_scsi.c | 15 ++++++++++++--- > > drivers/virtio/virtio.c | 5 ++++- > > include/linux/virtio.h | 1 + > > 3 files changed, 17 insertions(+), 4 deletions(-) > > This doesn't apply: > > patching file drivers/scsi/virtio_scsi.c > Hunk #1 succeeded at 677 (offset 196 lines). > Hunk #2 FAILED at 494. > Hunk #3 succeeded at 736 (offset 198 lines). > 1 out of 3 hunks FAILED -- saving rejects to file > drivers/scsi/virtio_scsi.c.rej > > could you respin against scsi-misc head? >The updated patch is on it's way rebased against scsi.git/misc. Thanks James!
Reasonably Related Threads
- [PATCH] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
- [PATCH-v2] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
- [PATCH-v2] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
- [PATCH 0/6] tcm_vhost/virtio-scsi WIP code for-3.6
- [PATCH 0/6] tcm_vhost/virtio-scsi WIP code for-3.6