aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'io_uring-6.5-2023-07-28' of git://git.kernel.dk/linux

Browse Source 
Pull io_uring fix from Jens Axboe:
 "Just a single tweak to a patch from last week, to avoid having idle
  cqring waits be attributed as iowait"

* tag 'io_uring-6.5-2023-07-28' of git://git.kernel.dk/linux:
  io_uring: gate iowait schedule on having pending requests
This commit is contained in:
Linus Torvalds
2023-07-28 10:19:44 -07:00
parent 0299a13af0 7b72d661f1
commit 9c65505826
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
io_uring/io_uring.c
View File

@@ -2493,11 +2493,20 @@ int io_run_task_work_sig(struct io_ring_ctx *ctx)
return 0; return 0;
} }
static bool current_pending_io(void)
{
struct io_uring_task *tctx = current->io_uring;
if (!tctx)
return false;
return percpu_counter_read_positive(&tctx->inflight);
}
/* when returns >0, the caller should retry */ /* when returns >0, the caller should retry */
static inline int io_cqring_wait_schedule(struct io_ring_ctx *ctx, static inline int io_cqring_wait_schedule(struct io_ring_ctx *ctx,
struct io_wait_queue *iowq) struct io_wait_queue *iowq)
{ {
int token, ret; int io_wait, ret;
if (unlikely(READ_ONCE(ctx->check_cq))) if (unlikely(READ_ONCE(ctx->check_cq)))
return 1; return 1;
@@ -2511,17 +2520,19 @@ static inline int io_cqring_wait_schedule(struct io_ring_ctx *ctx,
return 0; return 0;
/* /*
* Use io_schedule_prepare/finish, so cpufreq can take into account * Mark us as being in io_wait if we have pending requests, so cpufreq
* that the task is waiting for IO - turns out to be important for low * can take into account that the task is waiting for IO - turns out
* QD IO. * to be important for low QD IO.
*/ */
token = io_schedule_prepare(); io_wait = current->in_iowait;
if (current_pending_io())
current->in_iowait = 1;
ret = 0; ret = 0;
if (iowq->timeout == KTIME_MAX) if (iowq->timeout == KTIME_MAX)
schedule(); schedule();
else if (!schedule_hrtimeout(&iowq->timeout, HRTIMER_MODE_ABS)) else if (!schedule_hrtimeout(&iowq->timeout, HRTIMER_MODE_ABS))
ret = -ETIME; ret = -ETIME;
io_schedule_finish(token); current->in_iowait = io_wait;
return ret; return ret;
} }