From: Martin K. Petersen Date: Fri, 13 May 2016 02:17:34 +0000 (-0400) Subject: sd: Fix rw_max for devices that report an optimal xfer size X-Git-Tag: v4.1.12-92~105^2~1 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=bd65655ab3dd2416cebfc349b1831d505f967524;p=users%2Fjedix%2Flinux-maple.git sd: Fix rw_max for devices that report an optimal xfer size Orabug: 23615929 (commit 6b7e9cde49691e04314342b7dce90c67ad567fcc of 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") Cc: stable@vger.kernel.org # 4.4+ Reported-by: Fam Zheng Reviewed-by: Bart Van Assche Reviewed-by: Christoph Hellwig Tested-by: Andrew Patterson Signed-off-by: Martin K. Petersen Signed-off-by: Joe Jin --- diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 464b782b3dae..28ccf8eb78c5 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -2769,10 +2769,10 @@ static int sd_revalidate_disk(struct gendisk *disk) 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_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 */ diff --git a/drivers/scsi/sd.h b/drivers/scsi/sd.h index 0264936a855a..aa739490becb 100644 --- a/drivers/scsi/sd.h +++ b/drivers/scsi/sd.h @@ -150,6 +150,11 @@ static inline sector_t logical_to_sectors(struct scsi_device *sdev, sector_t blo 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: