[PATCH RESEND 1/1] Drivers: scsi: storvsc: Properly handle errors from the host

[PATCH RESEND 1/1] Drivers: scsi: storvsc: Properly handle errors from the host

[K. Y. Srinivasan]

If the host returns error for pass through commands, deal with them
appropriately. I would like to thank James for patiently helping
me with this patch.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
---
 drivers/scsi/storvsc_drv.c |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 83a1972..528d52b 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -785,12 +785,22 @@ static void storvsc_command_completion(struct storvsc_cmd_request *cmd_request)
 	/*
 	 * If there is an error; offline the device since all
 	 * error recovery strategies would have already been
-	 * deployed on the host side.
+	 * deployed on the host side. However, if the command
+	 * were a pass-through command deal with it appropriately.
 	 */
-	if (vm_srb->srb_status == SRB_STATUS_ERROR)
-		scmnd->result = DID_TARGET_FAILURE << 16;
-	else
-		scmnd->result = vm_srb->scsi_status;
+	scmnd->result = vm_srb->scsi_status;
+
+	if (vm_srb->srb_status == SRB_STATUS_ERROR) {
+		switch (scmnd->cmnd[0]) {
+		case ATA_16:
+		case ATA_12:
+			set_host_byte(scmnd, DID_PASSTHROUGH);
+			break;
+		default:
+			set_host_byte(scmnd, DID_TARGET_FAILURE);
+		}
+	}
+
 
 	/*
 	 * If the LUN is invalid; remove the device.
-- 
1.7.4.1

RE: [PATCH RESEND 1/1] Drivers: scsi: storvsc: Properly handle errors from the host

[KY Srinivasan]

> -----Original Message-----
> From: K. Y. Srinivasan [mailto:kys@microsoft.com]
> Sent: Thursday, April 05, 2012 3:27 PM
> To: gregkh@linuxfoundation.org; linux-kernel@vger.kernel.org;
> devel@linuxdriverproject.org; virtualization@lists.osdl.org; ohering@suse.com;
> jbottomley@parallels.com; hch@infradead.org; linux-scsi@vger.kernel.org;
> apw@canonical.com
> Cc: KY Srinivasan
> Subject: [PATCH RESEND 1/1] Drivers: scsi: storvsc: Properly handle errors from
> the host
> 
> If the host returns error for pass through commands, deal with them
> appropriately. I would like to thank James for patiently helping
> me with this patch.

James,

Thank you for suggesting the fix here. I hope this is what you were looking for.

Regards,

K. Y
> 
> Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
> Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
> ---
>  drivers/scsi/storvsc_drv.c |   20 +++++++++++++++-----
>  1 files changed, 15 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
> index 83a1972..528d52b 100644
> --- a/drivers/scsi/storvsc_drv.c
> +++ b/drivers/scsi/storvsc_drv.c
> @@ -785,12 +785,22 @@ static void storvsc_command_completion(struct
> storvsc_cmd_request *cmd_request)
>  	/*
>  	 * If there is an error; offline the device since all
>  	 * error recovery strategies would have already been
> -	 * deployed on the host side.
> +	 * deployed on the host side. However, if the command
> +	 * were a pass-through command deal with it appropriately.
>  	 */
> -	if (vm_srb->srb_status == SRB_STATUS_ERROR)
> -		scmnd->result = DID_TARGET_FAILURE << 16;
> -	else
> -		scmnd->result = vm_srb->scsi_status;
> +	scmnd->result = vm_srb->scsi_status;
> +
> +	if (vm_srb->srb_status == SRB_STATUS_ERROR) {
> +		switch (scmnd->cmnd[0]) {
> +		case ATA_16:
> +		case ATA_12:
> +			set_host_byte(scmnd, DID_PASSTHROUGH);
> +			break;
> +		default:
> +			set_host_byte(scmnd, DID_TARGET_FAILURE);
> +		}
> +	}
> +
> 
>  	/*
>  	 * If the LUN is invalid; remove the device.
> --
> 1.7.4.1
> 
> 
> 

RE: [PATCH RESEND 1/1] Drivers: scsi: storvsc: Properly handle errors from the host

[KY Srinivasan]

> -----Original Message-----
> From: KY Srinivasan
> Sent: Tuesday, April 10, 2012 11:14 AM
> To: KY Srinivasan; gregkh@linuxfoundation.org; linux-kernel@vger.kernel.org;
> devel@linuxdriverproject.org; virtualization@lists.osdl.org; ohering@suse.com;
> jbottomley@parallels.com; hch@infradead.org; linux-scsi@vger.kernel.org;
> apw@canonical.com
> Subject: RE: [PATCH RESEND 1/1] Drivers: scsi: storvsc: Properly handle errors
> from the host
> 
> 
> 
> > -----Original Message-----
> > From: K. Y. Srinivasan [mailto:kys@microsoft.com]
> > Sent: Thursday, April 05, 2012 3:27 PM
> > To: gregkh@linuxfoundation.org; linux-kernel@vger.kernel.org;
> > devel@linuxdriverproject.org; virtualization@lists.osdl.org; ohering@suse.com;
> > jbottomley@parallels.com; hch@infradead.org; linux-scsi@vger.kernel.org;
> > apw@canonical.com
> > Cc: KY Srinivasan
> > Subject: [PATCH RESEND 1/1] Drivers: scsi: storvsc: Properly handle errors from
> > the host
> >
> > If the host returns error for pass through commands, deal with them
> > appropriately. I would like to thank James for patiently helping
> > me with this patch.
> 
> James,
> 
> Thank you for suggesting the fix here. I hope this is what you were looking for.
> 
> Regards,
> 
> K. Y

Ping.

> >
> > Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
> > Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
> > ---
> >  drivers/scsi/storvsc_drv.c |   20 +++++++++++++++-----
> >  1 files changed, 15 insertions(+), 5 deletions(-)
> >
> > diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
> > index 83a1972..528d52b 100644
> > --- a/drivers/scsi/storvsc_drv.c
> > +++ b/drivers/scsi/storvsc_drv.c
> > @@ -785,12 +785,22 @@ static void storvsc_command_completion(struct
> > storvsc_cmd_request *cmd_request)
> >  	/*
> >  	 * If there is an error; offline the device since all
> >  	 * error recovery strategies would have already been
> > -	 * deployed on the host side.
> > +	 * deployed on the host side. However, if the command
> > +	 * were a pass-through command deal with it appropriately.
> >  	 */
> > -	if (vm_srb->srb_status == SRB_STATUS_ERROR)
> > -		scmnd->result = DID_TARGET_FAILURE << 16;
> > -	else
> > -		scmnd->result = vm_srb->scsi_status;
> > +	scmnd->result = vm_srb->scsi_status;
> > +
> > +	if (vm_srb->srb_status == SRB_STATUS_ERROR) {
> > +		switch (scmnd->cmnd[0]) {
> > +		case ATA_16:
> > +		case ATA_12:
> > +			set_host_byte(scmnd, DID_PASSTHROUGH);
> > +			break;
> > +		default:
> > +			set_host_byte(scmnd, DID_TARGET_FAILURE);
> > +		}
> > +	}
> > +
> >
> >  	/*
> >  	 * If the LUN is invalid; remove the device.
> > --
> > 1.7.4.1
> >
> >
> >

RE: [PATCH RESEND 1/1] Drivers: scsi: storvsc: Properly handle errors from the host

[James Bottomley]

On Wed, 2012-04-18 at 12:38 +0000, KY Srinivasan wrote:
> 
> > -----Original Message-----
> > From: KY Srinivasan
> > Sent: Tuesday, April 10, 2012 11:14 AM
> > To: KY Srinivasan; gregkh@linuxfoundation.org; linux-kernel@vger.kernel.org;
> > devel@linuxdriverproject.org; virtualization@lists.osdl.org; ohering@suse.com;
> > jbottomley@parallels.com; hch@infradead.org; linux-scsi@vger.kernel.org;
> > apw@canonical.com
> > Subject: RE: [PATCH RESEND 1/1] Drivers: scsi: storvsc: Properly handle errors
> > from the host
> > 
> > 
> > 
> > > -----Original Message-----
> > > From: K. Y. Srinivasan [mailto:kys@microsoft.com]
> > > Sent: Thursday, April 05, 2012 3:27 PM
> > > To: gregkh@linuxfoundation.org; linux-kernel@vger.kernel.org;
> > > devel@linuxdriverproject.org; virtualization@lists.osdl.org; ohering@suse.com;
> > > jbottomley@parallels.com; hch@infradead.org; linux-scsi@vger.kernel.org;
> > > apw@canonical.com
> > > Cc: KY Srinivasan
> > > Subject: [PATCH RESEND 1/1] Drivers: scsi: storvsc: Properly handle errors from
> > > the host
> > >
> > > If the host returns error for pass through commands, deal with them
> > > appropriately. I would like to thank James for patiently helping
> > > me with this patch.
> > 
> > James,
> > 
> > Thank you for suggesting the fix here. I hope this is what you were looking for.
> > 
> > Regards,
> > 
> > K. Y

OK, I have the patch, but the change log is a bit rubbish.  I changed it
to

Hyper-V cannot process some commands like ATA_12 and ATA_16. It also returns a
very generic error when this happens (SRB_STATUS_ERROR).  Most of the time we
treat SRB_STATUS_ERROR as DID_TARGET_FAILURE which causes error handler retry,
but in the case of pass through commands, they'll never succeed (and the error
handler will offline the device), so put a discriminating block in the command
completion routing and send the SRB_STATUS_ERROR upwards with DID_PASSTHROUGH
for commands we know should not be retried.

James

RE: [PATCH RESEND 1/1] Drivers: scsi: storvsc: Properly handle errors from the host

[KY Srinivasan]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 2734 bytes --]



> -----Original Message-----
> From: James Bottomley [mailto:James.Bottomley@HansenPartnership.com]
> Sent: Wednesday, April 25, 2012 4:53 AM
> To: KY Srinivasan
> Cc: gregkh@linuxfoundation.org; linux-kernel@vger.kernel.org;
> devel@linuxdriverproject.org; virtualization@lists.osdl.org; ohering@suse.com;
> hch@infradead.org; linux-scsi@vger.kernel.org; apw@canonical.com
> Subject: RE: [PATCH RESEND 1/1] Drivers: scsi: storvsc: Properly handle errors
> from the host
> 
> On Wed, 2012-04-18 at 12:38 +0000, KY Srinivasan wrote:
> >
> > > -----Original Message-----
> > > From: KY Srinivasan
> > > Sent: Tuesday, April 10, 2012 11:14 AM
> > > To: KY Srinivasan; gregkh@linuxfoundation.org; linux-
> kernel@vger.kernel.org;
> > > devel@linuxdriverproject.org; virtualization@lists.osdl.org;
> ohering@suse.com;
> > > jbottomley@parallels.com; hch@infradead.org; linux-scsi@vger.kernel.org;
> > > apw@canonical.com
> > > Subject: RE: [PATCH RESEND 1/1] Drivers: scsi: storvsc: Properly handle errors
> > > from the host
> > >
> > >
> > >
> > > > -----Original Message-----
> > > > From: K. Y. Srinivasan [mailto:kys@microsoft.com]
> > > > Sent: Thursday, April 05, 2012 3:27 PM
> > > > To: gregkh@linuxfoundation.org; linux-kernel@vger.kernel.org;
> > > > devel@linuxdriverproject.org; virtualization@lists.osdl.org;
> ohering@suse.com;
> > > > jbottomley@parallels.com; hch@infradead.org; linux-scsi@vger.kernel.org;
> > > > apw@canonical.com
> > > > Cc: KY Srinivasan
> > > > Subject: [PATCH RESEND 1/1] Drivers: scsi: storvsc: Properly handle errors
> from
> > > > the host
> > > >
> > > > If the host returns error for pass through commands, deal with them
> > > > appropriately. I would like to thank James for patiently helping
> > > > me with this patch.
> > >
> > > James,
> > >
> > > Thank you for suggesting the fix here. I hope this is what you were looking
> for.
> > >
> > > Regards,
> > >
> > > K. Y
> 
> OK, I have the patch, but the change log is a bit rubbish.  I changed it
> to
> 
> Hyper-V cannot process some commands like ATA_12 and ATA_16. It also returns
> a
> very generic error when this happens (SRB_STATUS_ERROR).  Most of the time
> we
> treat SRB_STATUS_ERROR as DID_TARGET_FAILURE which causes error handler
> retry,
> but in the case of pass through commands, they'll never succeed (and the error
> handler will offline the device), so put a discriminating block in the command
> completion routing and send the SRB_STATUS_ERROR upwards with
> DID_PASSTHROUGH
> for commands we know should not be retried.

Looks good; thanks James.

K. Y
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥