| Message ID | 1452318719-25490-2-git-send-email-kys@microsoft.com (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On 01/09/2016 06:51 AM, K. Y. Srinivasan wrote: > The current code assumes that there is only one target in device lookup. > Fix this bug. This will alow us to correctly handle hot reomoval of LUNs. > > Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> > --- > drivers/scsi/storvsc_drv.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c > index 622f64a..5faf357 100644 > --- a/drivers/scsi/storvsc_drv.c > +++ b/drivers/scsi/storvsc_drv.c > @@ -479,6 +479,7 @@ struct storvsc_scan_work { > struct work_struct work; > struct Scsi_Host *host; > uint lun; > + uint tgt_id; > }; > > static void storvsc_device_scan(struct work_struct *work) > @@ -490,7 +491,7 @@ static void storvsc_device_scan(struct work_struct *work) > wrk = container_of(work, struct storvsc_scan_work, work); > lun = wrk->lun; > > - sdev = scsi_device_lookup(wrk->host, 0, 0, lun); > + sdev = scsi_device_lookup(wrk->host, 0, wrk->tgt_id, lun); > if (!sdev) > goto done; > scsi_rescan_device(&sdev->sdev_gendev); > @@ -541,7 +542,7 @@ static void storvsc_remove_lun(struct work_struct *work) > if (!scsi_host_get(wrk->host)) > goto done; > > - sdev = scsi_device_lookup(wrk->host, 0, 0, wrk->lun); > + sdev = scsi_device_lookup(wrk->host, 0, wrk->tgt_id, wrk->lun); > > if (sdev) { > scsi_remove_device(sdev); > @@ -941,6 +942,7 @@ static void storvsc_handle_error(struct vmscsi_request *vm_srb, > > wrk->host = host; > wrk->lun = vm_srb->lun; > + wrk->tgt_id = vm_srb->target_id; > INIT_WORK(&wrk->work, process_err_fn); > schedule_work(&wrk->work); > } > As a side note, are these really 32-bit values? Both the LUN and the target? Cheers, Hannes
> -----Original Message----- > From: Hannes Reinecke [mailto:hare@suse.de] > Sent: Sunday, January 10, 2016 11:10 PM > To: KY Srinivasan <kys@microsoft.com>; gregkh@linuxfoundation.org; linux- > kernel@vger.kernel.org; devel@linuxdriverproject.org; ohering@suse.com; > jbottomley@parallels.com; hch@infradead.org; linux-scsi@vger.kernel.org; > apw@canonical.com; vkuznets@redhat.com; jasowang@redhat.com; > martin.petersen@oracle.com > Subject: Re: [PATCH 2/2] scsi: storvsc: Use the specified target ID in device > lookup > > On 01/09/2016 06:51 AM, K. Y. Srinivasan wrote: > > The current code assumes that there is only one target in device lookup. > > Fix this bug. This will alow us to correctly handle hot reomoval of LUNs. > > > > Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> > > --- > > drivers/scsi/storvsc_drv.c | 6 ++++-- > > 1 files changed, 4 insertions(+), 2 deletions(-) > > > > diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c > > index 622f64a..5faf357 100644 > > --- a/drivers/scsi/storvsc_drv.c > > +++ b/drivers/scsi/storvsc_drv.c > > @@ -479,6 +479,7 @@ struct storvsc_scan_work { > > struct work_struct work; > > struct Scsi_Host *host; > > uint lun; > > + uint tgt_id; > > }; > > > > static void storvsc_device_scan(struct work_struct *work) > > @@ -490,7 +491,7 @@ static void storvsc_device_scan(struct work_struct > *work) > > wrk = container_of(work, struct storvsc_scan_work, work); > > lun = wrk->lun; > > > > - sdev = scsi_device_lookup(wrk->host, 0, 0, lun); > > + sdev = scsi_device_lookup(wrk->host, 0, wrk->tgt_id, lun); > > if (!sdev) > > goto done; > > scsi_rescan_device(&sdev->sdev_gendev); > > @@ -541,7 +542,7 @@ static void storvsc_remove_lun(struct work_struct > *work) > > if (!scsi_host_get(wrk->host)) > > goto done; > > > > - sdev = scsi_device_lookup(wrk->host, 0, 0, wrk->lun); > > + sdev = scsi_device_lookup(wrk->host, 0, wrk->tgt_id, wrk->lun); > > > > if (sdev) { > > scsi_remove_device(sdev); > > @@ -941,6 +942,7 @@ static void storvsc_handle_error(struct > vmscsi_request *vm_srb, > > > > wrk->host = host; > > wrk->lun = vm_srb->lun; > > + wrk->tgt_id = vm_srb->target_id; > > INIT_WORK(&wrk->work, process_err_fn); > > schedule_work(&wrk->work); > > } > > > As a side note, are these really 32-bit values? > Both the LUN and the target? No, these are 8 bit values as communicated in the vmscsi_request. Regards, K. Y > > Cheers, > > Hannes > -- > Dr. Hannes Reinecke zSeries & Storage > hare@suse.de +49 911 74053 688 > SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg > GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton > HRB 21284 (AG Nürnberg) -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c index 622f64a..5faf357 100644 --- a/drivers/scsi/storvsc_drv.c +++ b/drivers/scsi/storvsc_drv.c @@ -479,6 +479,7 @@ struct storvsc_scan_work { struct work_struct work; struct Scsi_Host *host; uint lun; + uint tgt_id; }; static void storvsc_device_scan(struct work_struct *work) @@ -490,7 +491,7 @@ static void storvsc_device_scan(struct work_struct *work) wrk = container_of(work, struct storvsc_scan_work, work); lun = wrk->lun; - sdev = scsi_device_lookup(wrk->host, 0, 0, lun); + sdev = scsi_device_lookup(wrk->host, 0, wrk->tgt_id, lun); if (!sdev) goto done; scsi_rescan_device(&sdev->sdev_gendev); @@ -541,7 +542,7 @@ static void storvsc_remove_lun(struct work_struct *work) if (!scsi_host_get(wrk->host)) goto done; - sdev = scsi_device_lookup(wrk->host, 0, 0, wrk->lun); + sdev = scsi_device_lookup(wrk->host, 0, wrk->tgt_id, wrk->lun); if (sdev) { scsi_remove_device(sdev); @@ -941,6 +942,7 @@ static void storvsc_handle_error(struct vmscsi_request *vm_srb, wrk->host = host; wrk->lun = vm_srb->lun; + wrk->tgt_id = vm_srb->target_id; INIT_WORK(&wrk->work, process_err_fn); schedule_work(&wrk->work); }
The current code assumes that there is only one target in device lookup. Fix this bug. This will alow us to correctly handle hot reomoval of LUNs. Signed-off-by: K. Y. Srinivasan <kys@microsoft.com> --- drivers/scsi/storvsc_drv.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)