[PATCH] staging: hv: storvsc: ignore SET_WINDOW scsi command

[PATCH] staging: hv: storvsc: ignore SET_WINDOW scsi command

[Olaf Hering]

Some commands sent by smartd will offline the device.
With this change applied, smartd sill not monitor the device anymore.

Signed-off-by: Olaf Hering <olaf@aepfle.de>

---
 drivers/staging/hv/storvsc_drv.c |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -1122,6 +1122,22 @@ static void storvsc_command_completion(s
 	kmem_cache_free(host_dev->request_pool, cmd_request);
 }
 
+static bool storvsc_check_scsi_cmd(struct scsi_cmnd *scmnd)
+{
+	bool allowed = true;
+	u8 scsi_op = scmnd->cmnd[0];
+
+	switch (scsi_op) {
+		/* smartd sends this command, which will offline the device */
+		case SET_WINDOW:
+			scmnd->result = DID_ERROR << 16;
+			allowed = false;
+			break;
+		default:
+			break;
+	}
+	return allowed;
+}
 
 /*
  * storvsc_queuecommand - Initiate command processing
@@ -1141,6 +1157,10 @@ static int storvsc_queuecommand_lck(stru
 	unsigned int sg_count = 0;
 	struct vmscsi_request *vm_srb;
 
+	if (storvsc_check_scsi_cmd(scmnd) == false) {
+		done(scmnd);
+		return 0;
+	}
 
 	/* If retrying, no need to prep the cmd */
 	if (scmnd->host_scribble) {

RE: [PATCH] staging: hv: storvsc: ignore SET_WINDOW scsi command

[KY Srinivasan]

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



> -----Original Message-----
> From: Olaf Hering [mailto:olaf@aepfle.de]
> Sent: Monday, October 10, 2011 3:38 AM
> To: KY Srinivasan
> Cc: gregkh@suse.de; linux-kernel@vger.kernel.org;
> devel@linuxdriverproject.org; virtualization@lists.osdl.org; Haiyang Zhang
> Subject: [PATCH] staging: hv: storvsc: ignore SET_WINDOW scsi command
> 
> Some commands sent by smartd will offline the device.
> With this change applied, smartd sill not monitor the device anymore.
> 
> Signed-off-by: Olaf Hering <olaf@aepfle.de>
> 
> ---
>  drivers/staging/hv/storvsc_drv.c |   20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> --- a/drivers/staging/hv/storvsc_drv.c
> +++ b/drivers/staging/hv/storvsc_drv.c
> @@ -1122,6 +1122,22 @@ static void storvsc_command_completion(s
>  	kmem_cache_free(host_dev->request_pool, cmd_request);
>  }
> 
> +static bool storvsc_check_scsi_cmd(struct scsi_cmnd *scmnd)
> +{
> +	bool allowed = true;
> +	u8 scsi_op = scmnd->cmnd[0];
> +
> +	switch (scsi_op) {
> +		/* smartd sends this command, which will offline the device */
> +		case SET_WINDOW:
> +			scmnd->result = DID_ERROR << 16;
> +			allowed = false;
> +			break;
> +		default:
> +			break;
> +	}
> +	return allowed;
> +}
> 
>  /*
>   * storvsc_queuecommand - Initiate command processing
> @@ -1141,6 +1157,10 @@ static int storvsc_queuecommand_lck(stru
>  	unsigned int sg_count = 0;
>  	struct vmscsi_request *vm_srb;
> 
> +	if (storvsc_check_scsi_cmd(scmnd) == false) {
> +		done(scmnd);
> +		return 0;
> +	}
> 
>  	/* If retrying, no need to prep the cmd */
>  	if (scmnd->host_scribble) {

Acked-by: K. Y. Srinivasan <kys@microsoft.com>

Regards,

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¥