summaryrefslogtreecommitdiffstats
path: root/io_uring
diff options
context:
space:
mode:
authorWenwen Chen <wenwen.chen@samsung.com>2023-05-25 16:26:26 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-06-21 16:00:53 +0200
commitc9c205945033a41f3e5e38ffefd24270bb2bc393 (patch)
tree04fd611587cacca274f6d9723e25fcf0ae74f639 /io_uring
parent8ca9880735b0a33a4ff54328d6c5eb60fe2b0a6d (diff)
downloadlinux-stable-c9c205945033a41f3e5e38ffefd24270bb2bc393.tar.gz
linux-stable-c9c205945033a41f3e5e38ffefd24270bb2bc393.tar.bz2
linux-stable-c9c205945033a41f3e5e38ffefd24270bb2bc393.zip
io_uring: unlock sqd->lock before sq thread release CPU
[ Upstream commit 533ab73f5b5c95dcb4152b52d5482abcc824c690 ] The sq thread actively releases CPU resources by calling the cond_resched() and schedule() interfaces when it is idle. Therefore, more resources are available for other threads to run. There exists a problem in sq thread: it does not unlock sqd->lock before releasing CPU resources every time. This makes other threads pending on sqd->lock for a long time. For example, the following interfaces all require sqd->lock: io_sq_offload_create(), io_register_iowq_max_workers() and io_ring_exit_work(). Before the sq thread releases CPU resources, unlocking sqd->lock will provide the user a better experience because it can respond quickly to user requests. Signed-off-by: Kanchan Joshi<joshi.k@samsung.com> Signed-off-by: Wenwen Chen<wenwen.chen@samsung.com> Link: https://lore.kernel.org/r/20230525082626.577862-1-wenwen.chen@samsung.com Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'io_uring')
-rw-r--r--io_uring/sqpoll.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/io_uring/sqpoll.c b/io_uring/sqpoll.c
index 559652380672..6ffa5cf1bbb8 100644
--- a/io_uring/sqpoll.c
+++ b/io_uring/sqpoll.c
@@ -256,9 +256,13 @@ static int io_sq_thread(void *data)
sqt_spin = true;
if (sqt_spin || !time_after(jiffies, timeout)) {
- cond_resched();
if (sqt_spin)
timeout = jiffies + sqd->sq_thread_idle;
+ if (unlikely(need_resched())) {
+ mutex_unlock(&sqd->lock);
+ cond_resched();
+ mutex_lock(&sqd->lock);
+ }
continue;
}