Patch "sd: Fix rw_max for devices that report an optimal xfer size" has been added to the 4.6-stable tree
Subsystems (2)
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.6-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.6 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
6b7e9cde49691e04314342b7dce90c67ad567fccMon Sep 17 00:00:00 2001
From: "Martin K. Petersen" <[email protected]>
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 <[email protected]>
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.
--- drivers/scsi/sd.c | 8 ++++---- drivers/scsi/sd.h | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-)
drivers/scsi/sd.c +4 -4
@@ -2862,10 +2862,10 @@ static int sd_revalidate_disk(struct genif (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_SIZE ) - rw_max = q->limits.io_opt = - sdkp->opt_xfer_blocks * sdp->sector_size; -else +logical_to_bytes (sdp, sdkp->opt_xfer_blocks) >=PAGE_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 */
drivers/scsi/sd.h +5 -0
@@ -151,6 +151,11 @@ static inline sector_t logical_to_sectorreturn 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 [email protected] are
queue-4.6/sd-fix-rw_max-for-devices-that-report-an-optimal-xfer-size.patch