• Tejun Heo's avatar
    ubd: fix incorrect sector handling during request restart · 47526903
    Tejun Heo authored
    Commit f81f2f7c (ubd: drop unnecessary rq->sector manipulation)
    dropped request->sector manipulation in preparation for global request
    handling cleanup; unfortunately, it incorrectly assumed that the
    updated sector wasn't being used.
    
    ubd tries to issue as many requests as possible to io_thread.  When
    issuing fails due to memory pressure or other reasons, the device is
    put on the restart list and issuing stops.  On IO completion, devices
    on the restart list are scanned and IO issuing is restarted.
    
    ubd issues IOs sg-by-sg and issuing can be stopped in the middle of a
    request, so each device on the restart queue needs to remember where
    to restart in its current request.  ubd needs to keep track of the
    issue position itself because,
    
    * blk_rq_pos(req) is now updated by the block layer to keep track of
      _completion_ position.
    
    * Multiple io_req's for the current request may be in flight, so it's
      difficult to tell where blk_rq_pos(req) currently is.
    
    Add ubd->rq_pos to keep track of the issue position and use it to
    correctly restart io_req issue.
    Signed-off-by: default avatarTejun Heo <tj@kernel.org>
    Reported-by: default avatarRichard Weinberger <richard@nod.at>
    Tested-by: default avatarRichard Weinberger <richard@nod.at>
    Tested-by: default avatarChris Frey <cdfrey@foursquare.net>
    Cc: stable@kernel.org
    Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
    47526903
ubd_kern.c 33.3 KB