lkml.org 
[lkml]   [2015]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 101/221] dm io: deal with wandering queue limits when handling REQ_DISCARD and REQ_WRITE_SAME
    3.2.69-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: "Darrick J. Wong" <darrick.wong@oracle.com>

    commit e5db29806b99ce2b2640d2e4d4fcb983cea115c5 upstream.

    Since it's possible for the discard and write same queue limits to
    change while the upper level command is being sliced and diced, fix up
    both of them (a) to reject IO if the special command is unsupported at
    the start of the function and (b) read the limits once and let the
    commands error out on their own if the status happens to change.

    Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
    Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
    Signed-off-by: Mike Snitzer <snitzer@redhat.com>
    [bwh: Backported to 3.2: adjust context; drop the write_same handling]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/md/dm-io.c | 15 +++++++++++----
    1 file changed, 11 insertions(+), 4 deletions(-)

    --- a/drivers/md/dm-io.c
    +++ b/drivers/md/dm-io.c
    @@ -299,11 +299,15 @@ static void do_region(int rw, unsigned r
    sector_t remaining = where->count;
    struct request_queue *q = bdev_get_queue(where->bdev);
    sector_t discard_sectors;
    + unsigned int uninitialized_var(special_cmd_max_sectors);

    /* Reject unsupported discard requests */
    - if ((rw & REQ_DISCARD) && !blk_queue_discard(q)) {
    - dec_count(io, region, -EOPNOTSUPP);
    - return;
    + if (rw & REQ_DISCARD) {
    + special_cmd_max_sectors = q->limits.max_discard_sectors;
    + if (special_cmd_max_sectors == 0) {
    + dec_count(io, region, -EOPNOTSUPP);
    + return;
    + }
    }

    /*
    @@ -328,7 +332,7 @@ static void do_region(int rw, unsigned r
    store_io_and_region_in_bio(bio, io, region);

    if (rw & REQ_DISCARD) {
    - discard_sectors = min_t(sector_t, q->limits.max_discard_sectors, remaining);
    + discard_sectors = min_t(sector_t, special_cmd_max_sectors, remaining);
    bio->bi_size = discard_sectors << SECTOR_SHIFT;
    remaining -= discard_sectors;
    } else while (remaining) {


    \
     
     \ /
      Last update: 2015-05-05 04:01    [W:7.440 / U:0.096 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site