From: Josef Bacik <josef@toxicpanda.com>
Date: Tue, 16 Jul 2019 20:19:28 +0000 (-0400)
Subject: rq-qos: set ourself TASK_UNINTERRUPTIBLE after we schedule
X-Git-Tag: v5.2.9~84
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=32d1d7051c67ecd8f070c45785efab0322380db3;p=users%2Fdwmw2%2Flinux.git

rq-qos: set ourself TASK_UNINTERRUPTIBLE after we schedule

[ Upstream commit d14a9b389a86a5154b704bc88ce8dd37c701456a ]

In case we get a spurious wakeup we need to make sure to re-set
ourselves to TASK_UNINTERRUPTIBLE so we don't busy wait.

Reviewed-by: Oleg Nesterov <oleg@redhat.com>
Signed-off-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/block/blk-rq-qos.c b/block/blk-rq-qos.c
index e5d75280b431e..e3ab75e4df9ea 100644
--- a/block/blk-rq-qos.c
+++ b/block/blk-rq-qos.c
@@ -261,6 +261,7 @@ void rq_qos_wait(struct rq_wait *rqw, void *private_data,
 		}
 		io_schedule();
 		has_sleeper = true;
+		set_current_state(TASK_UNINTERRUPTIBLE);
 	} while (1);
 	finish_wait(&rqw->wait, &data.wq);
 }