lkml.org 
[lkml]   [2017]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.10 36/69] scsi: sd: Consider max_xfer_blocks if opt_xfer_blocks is unusable
    Date
    4.10-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Fam Zheng <famz@redhat.com>

    commit 6780414519f91c2a84da9baa963a940ac916f803 upstream.

    If device reports a small max_xfer_blocks and a zero opt_xfer_blocks, we
    end up using BLK_DEF_MAX_SECTORS, which is wrong and r/w of that size
    may get error.

    [mkp: tweaked to avoid setting rw_max twice and added typecast]

    Fixes: ca369d51b3e ("block/sd: Fix device-imposed transfer length limits")
    Signed-off-by: Fam Zheng <famz@redhat.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/scsi/sd.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/scsi/sd.c
    +++ b/drivers/scsi/sd.c
    @@ -2963,7 +2963,8 @@ static int sd_revalidate_disk(struct gen
    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;
    + rw_max = min_not_zero(logical_to_sectors(sdp, dev_max),
    + (sector_t)BLK_DEF_MAX_SECTORS);

    /* Combine with controller limits */
    q->limits.max_sectors = min(rw_max, queue_max_hw_sectors(q));

    \
     
     \ /
      Last update: 2017-04-19 17:20    [W:4.065 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site