redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

blk-wbt: fix has-sleeper queueing check 

We need to do this inside the loop as well, or we can allow new
IO to supersede previous IO.

Tested-by: Anchal Agarwal <anchalag@amazon.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
hifive-unleashed-5.1
Jens Axboe 2018-08-20 13:22:27 -06:00
parent b78820937b
commit c45e6a037a
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
block/blk-wbt.c
View File

@ -492,16 +492,17 @@ static void __wbt_wait(struct rq_wb *rwb, enum wbt_flags wb_acct,
{ {
struct rq_wait *rqw = get_rq_wait(rwb, wb_acct); struct rq_wait *rqw = get_rq_wait(rwb, wb_acct);
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
bool has_sleeper;
if (!wq_has_sleeper(&rqw->wait) && has_sleeper = wq_has_sleeper(&rqw->wait);
rq_wait_inc_below(rqw, get_limit(rwb, rw))) if (!has_sleeper && rq_wait_inc_below(rqw, get_limit(rwb, rw)))
return; return;
add_wait_queue_exclusive(&rqw->wait, &wait); add_wait_queue_exclusive(&rqw->wait, &wait);
do { do {
set_current_state(TASK_UNINTERRUPTIBLE); set_current_state(TASK_UNINTERRUPTIBLE);
if (rq_wait_inc_below(rqw, get_limit(rwb, rw))) if (!has_sleeper && rq_wait_inc_below(rqw, get_limit(rwb, rw)))
break; break;
if (lock) { if (lock) {
@ -510,6 +511,7 @@ static void __wbt_wait(struct rq_wb *rwb, enum wbt_flags wb_acct,
spin_lock_irq(lock); spin_lock_irq(lock);
} else } else
io_schedule(); io_schedule();
has_sleeper = false;
} while (1); } while (1);
__set_current_state(TASK_RUNNING); __set_current_state(TASK_RUNNING);