Patch "sd: Fix rw_max for devices that report an optimal xfer size" has been added to the 4.4-stable tree

Patch "sd: Fix rw_max for devices that report an optimal xfer size" has been added to the 4.4-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    sd: Fix rw_max for devices that report an optimal xfer size

to the 4.4-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     sd-fix-rw_max-for-devices-that-report-an-optimal-xfer-size.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From 6b7e9cde49691e04314342b7dce90c67ad567fcc Mon Sep 17 00:00:00 2001
From: "Martin K. Petersen" <martin.petersen@oracle.com>
Date: Thu, 12 May 2016 22:17:34 -0400
Subject: sd: Fix rw_max for devices that report an optimal xfer size

From: Martin K. Petersen <martin.petersen@oracle.com>

commit 6b7e9cde49691e04314342b7dce90c67ad567fcc upstream.

For historic reasons, io_opt is in bytes and max_sectors in block layer
sectors. This interface inconsistency is error prone and should be
fixed. But for 4.4--4.7 let's make the unit difference explicit via a
wrapper function.

Fixes: d0eb20a863ba ("sd: Optimal I/O size is in bytes, not sectors")
Reported-by: Fam Zheng <famz@redhat.com>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Andrew Patterson <andrew.patterson@hpe.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Juerg Haefliger <juerg.haefliger@hpe.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/scsi/sd.c |    8 ++++----
 drivers/scsi/sd.h |    5 +++++
 2 files changed, 9 insertions(+), 4 deletions(-)

--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -2879,10 +2879,10 @@ static int sd_revalidate_disk(struct gen
 	if (sdkp->opt_xfer_blocks &&
 	    sdkp->opt_xfer_blocks <= dev_max &&
 	    sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS &&
-	    sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_CACHE_SIZE)
-		rw_max = q->limits.io_opt =
-			sdkp->opt_xfer_blocks * sdp->sector_size;
-	else
+	    logical_to_bytes(sdp, sdkp->opt_xfer_blocks) >= PAGE_CACHE_SIZE) {
+		q->limits.io_opt = logical_to_bytes(sdp, sdkp->opt_xfer_blocks);
+		rw_max = logical_to_sectors(sdp, sdkp->opt_xfer_blocks);
+	} else
 		rw_max = BLK_DEF_MAX_SECTORS;
 
 	/* Combine with controller limits */
--- a/drivers/scsi/sd.h
+++ b/drivers/scsi/sd.h
@@ -151,6 +151,11 @@ static inline sector_t logical_to_sector
 	return blocks << (ilog2(sdev->sector_size) - 9);
 }
 
+static inline unsigned int logical_to_bytes(struct scsi_device *sdev, sector_t blocks)
+{
+	return blocks * sdev->sector_size;
+}
+
 /*
  * A DIF-capable target device can be formatted with different
  * protection schemes.  Currently 0 through 3 are defined:


Patches currently in stable-queue which might be from martin.petersen@oracle.com are

queue-4.4/zfcp-fix-els-gs-request-response-length-for-hardware-data-router.patch
queue-4.4/zfcp-trace-on-request-for-open-and-close-of-wka-port.patch
queue-4.4/zfcp-close-window-with-unblocked-rport-during-rport-gone.patch
queue-4.4/zfcp-retain-trace-level-for-scsi-and-hba-fsf-response-records.patch
queue-4.4/zfcp-restore-dont-use-0-to-indicate-invalid-lun-in-rec-trace.patch
queue-4.4/zfcp-fix-fc_host-port_type-with-npiv.patch
queue-4.4/sd-fix-rw_max-for-devices-that-report-an-optimal-xfer-size.patch
queue-4.4/zfcp-fix-d_id-field-with-actual-value-on-tracing-san-responses.patch
queue-4.4/zfcp-fix-payload-trace-length-for-san-request-response.patch
queue-4.4/scsi-zfcp-spin_lock_irqsave-is-not-nestable.patch
queue-4.4/zfcp-restore-tracing-of-handle-for-port-and-lun-with-hba-records.patch
queue-4.4/zfcp-trace-full-payload-of-all-san-records-req-resp-iels.patch
queue-4.4/hpsa-correct-skipping-masked-peripherals.patch
queue-4.4/scsi-fix-use-after-free.patch