Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f2b20d436534f22ccc3f5ad172499fcb013bb315

Authored by Dan Williams
Committed by Jens Axboe
1 parent 609f6ea1c9
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

block: fix blk_queue_end_tag() 

Commit 5e081591 "block: warn if tag is greater than real_max_depth"
cleaned up blk_queue_end_tag() to warn when the tag is truly invalid
(greater than real_max_depth).  However, it changed behavior in the tag <
max_depth case to not end the request.  Leading to triggering of
BUG_ON(blk_queued_rq(rq)) in the request completion path:

  http://marc.info/?l=linux-kernel&m=132204370518629&w=2

In order to allow blk_queue_resize_tags() to shrink the tag space
blk_queue_end_tag() must always complete tags with a value less than
real_max_depth regardless of the current max_depth.  The comment about
"handling the shrink case" seems to be what prompted changes in this
space, so remove it and BUG on all invalid tags (made even simpler by
Matthew's suggestion to use an unsigned compare).

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Cc: Tao Ma <boyu.mt@taobao.com>
Cc: Matthew Wilcox <matthew@wil.cx>
Reported-by: Meelis Roos <mroos@ut.ee>
Reported-by: Ed Nadolski <edmund.nadolski@intel.com>
Cc: Tejun Heo <tj@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

Showing 1 changed file with 2 additions and 11 deletions Side-by-side Diff

... ... @@ -282,18 +282,9 @@
282 282 void blk_queue_end_tag(struct request_queue *q, struct request *rq)
283 283 {
284 284 struct blk_queue_tag *bqt = q->queue_tags;
285   - int tag = rq->tag;
  285 + unsigned tag = rq->tag; /* negative tags invalid */
286 286  
287   - BUG_ON(tag == -1);
288   -
289   - if (unlikely(tag >= bqt->max_depth)) {
290   - /*
291   - * This can happen after tag depth has been reduced.
292   - * But tag shouldn't be larger than real_max_depth.
293   - */
294   - WARN_ON(tag >= bqt->real_max_depth);
295   - return;
296   - }
  287 + BUG_ON(tag >= bqt->real_max_depth);
297 288  
298 289 list_del_init(&rq->queuelist);
299 290 rq->cmd_flags &= ~REQ_QUEUED;