[PATCH] storvsc: remove bogus code to transfer struct scatterlist

[PATCH] storvsc: remove bogus code to transfer struct scatterlist

[Christoph Hellwig]

Remove a piece of code in storvsc_queuecommand that tries to pass the
physical address of the kernel struct scatterlist pointer to the host.

Fortunately the code can't ever be reached anyway.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/scsi/storvsc_drv.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 05526b7..62f4545 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -1511,13 +1511,6 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd)
 				page_to_pfn(sg_page((cur_sgl)));
 			cur_sgl = sg_next(cur_sgl);
 		}
-
-	} else if (scsi_sglist(scmnd)) {
-		payload->range.len = length;
-		payload->range.offset =
-			virt_to_phys(scsi_sglist(scmnd)) & (PAGE_SIZE-1);
-		payload->range.pfn_array[0] =
-			virt_to_phys(scsi_sglist(scmnd)) >> PAGE_SHIFT;
 	}
 
 	cmd_request->payload = payload;
-- 
2.1.4

Re: [PATCH] storvsc: remove bogus code to transfer struct scatterlist

[Bart Van Assche]

On Sun, 2017-01-29 at 10:12 +0100, Christoph Hellwig wrote:
> Remove a piece of code in storvsc_queuecommand that tries to pass the
> physical address of the kernel struct scatterlist pointer to the host.
> 
> Fortunately the code can't ever be reached anyway.

Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>

RE: [PATCH] storvsc: remove bogus code to transfer struct scatterlist

[KY Srinivasan]

> -----Original Message-----
> From: Christoph Hellwig [mailto:hch@lst.de]
> Sent: Sunday, January 29, 2017 1:12 AM
> To: KY Srinivasan <kys@microsoft.com>; Haiyang Zhang
> <haiyangz@microsoft.com>; Stephen Hemminger
> <sthemmin@microsoft.com>
> Cc: linux-scsi@vger.kernel.org
> Subject: [PATCH] storvsc: remove bogus code to transfer struct scatterlist
> 
> Remove a piece of code in storvsc_queuecommand that tries to pass the
> physical address of the kernel struct scatterlist pointer to the host.
> 
> Fortunately the code can't ever be reached anyway.

Thanks Christoph.

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

K. Y

> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  drivers/scsi/storvsc_drv.c | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
> index 05526b7..62f4545 100644
> --- a/drivers/scsi/storvsc_drv.c
> +++ b/drivers/scsi/storvsc_drv.c
> @@ -1511,13 +1511,6 @@ static int storvsc_queuecommand(struct Scsi_Host
> *host, struct scsi_cmnd *scmnd)
>  				page_to_pfn(sg_page((cur_sgl)));
>  			cur_sgl = sg_next(cur_sgl);
>  		}
> -
> -	} else if (scsi_sglist(scmnd)) {
> -		payload->range.len = length;
> -		payload->range.offset =
> -			virt_to_phys(scsi_sglist(scmnd)) & (PAGE_SIZE-1);
> -		payload->range.pfn_array[0] =
> -			virt_to_phys(scsi_sglist(scmnd)) >> PAGE_SHIFT;
>  	}
> 
>  	cmd_request->payload = payload;
> --
> 2.1.4

Re: [PATCH] storvsc: remove bogus code to transfer struct scatterlist

[Stephen Hemminger]

On Sun, 29 Jan 2017 01:12:18 -0800
"Christoph Hellwig" <hch@lst.de> wrote:

> Remove a piece of code in storvsc_queuecommand that tries to pass the
> physical address of the kernel struct scatterlist pointer to the host.
> 
> Fortunately the code can't ever be reached anyway.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  drivers/scsi/storvsc_drv.c | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
> index 05526b7..62f4545 100644
> --- a/drivers/scsi/storvsc_drv.c
> +++ b/drivers/scsi/storvsc_drv.c
> @@ -1511,13 +1511,6 @@ static int storvsc_queuecommand(struct Scsi_Host
> *host, struct scsi_cmnd *scmnd)
>  				page_to_pfn(sg_page((cur_sgl)));
>  			cur_sgl = sg_next(cur_sgl);
>  		}
> -
> -	} else if (scsi_sglist(scmnd)) {
> -		payload->range.len = length;
> -		payload->range.offset =
> -			virt_to_phys(scsi_sglist(scmnd)) & (PAGE_SIZE-1);
> -		payload->range.pfn_array[0] =
> -			virt_to_phys(scsi_sglist(scmnd)) >> PAGE_SHIFT;
>  	}
>  
>  	cmd_request->payload = payload;

Looks like something that has been around from first versions of hyper-v support.

Re: [PATCH] storvsc: remove bogus code to transfer struct scatterlist

[Martin K. Petersen]

>>>>> "Christoph" == Christoph Hellwig <hch@lst.de> writes:

Christoph> Remove a piece of code in storvsc_queuecommand that tries to
Christoph> pass the physical address of the kernel struct scatterlist
Christoph> pointer to the host.

Christoph> Fortunately the code can't ever be reached anyway.

Applied to 4.11/scsi-queue.

-- 
Martin K. Petersen	Oracle Linux Engineering