xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

io_uring: don't save/restore iowait state

Browse Source 
[ Upstream commit 6f0974eccbf78baead1735722c4f1ee3eb9422cd ]

This kind of state is per-syscall, and since we're doing the waiting off
entering the io_uring_enter(2) syscall, there's no way that iowait can
already be set for this case. Simplify it by setting it if we need to,
and always clearing it to 0 when done.

Fixes: 7b72d661f1f2 ("io_uring: gate iowait schedule on having pending requests")
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Jens Axboe
2024-03-11 13:30:43 -06:00
committed by Sasha Levin
parent ed71e73693
commit 2ddc931ccc
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
io_uring/io_uring.c
View File

@@ -7640,7 +7640,7 @@ static inline int io_cqring_wait_schedule(struct io_ring_ctx *ctx,
struct io_wait_queue *iowq, struct io_wait_queue *iowq,
ktime_t *timeout) ktime_t *timeout)
{ {
int io_wait, ret; int ret;
/* make sure we run task_work before checking for signals */ /* make sure we run task_work before checking for signals */
ret = io_run_task_work_sig(); ret = io_run_task_work_sig();
@@ -7655,13 +7655,12 @@ static inline int io_cqring_wait_schedule(struct io_ring_ctx *ctx,
* can take into account that the task is waiting for IO - turns out * can take into account that the task is waiting for IO - turns out
* to be important for low QD IO. * to be important for low QD IO.
*/ */
io_wait = current->in_iowait;
if (current_pending_io()) if (current_pending_io())
current->in_iowait = 1; current->in_iowait = 1;
ret = 1; ret = 1;
if (!schedule_hrtimeout(timeout, HRTIMER_MODE_ABS)) if (!schedule_hrtimeout(timeout, HRTIMER_MODE_ABS))
ret = -ETIME; ret = -ETIME;
current->in_iowait = io_wait; current->in_iowait = 0;
return ret; return ret;
} }