From: Hao Xu <haoxu@linux.alibaba.com> To: Jens Axboe <axboe@kernel.dk>, Zefan Li <lizefan.x@bytedance.com>, Tejun Heo <tj@kernel.org>, Johannes Weiner <hannes@cmpxchg.org>, Pavel Begunkov <asml.silence@gmail.com> Cc: io-uring@vger.kernel.org, cgroups@vger.kernel.org, Joseph Qi <joseph.qi@linux.alibaba.com> Subject: [PATCH 2/2] io_uring: consider cgroup setting when binding sqpoll cpu Date: Wed, 1 Sep 2021 18:18:33 +0800 [thread overview] Message-ID: <20210901101833.69535-3-haoxu@linux.alibaba.com> (raw) In-Reply-To: <20210901101833.69535-1-haoxu@linux.alibaba.com> Since sqthread is userspace like thread now, it should respect cgroup setting, thus we should consider current allowed cpuset when doing cpu binding for sqthread. Signed-off-by: Hao Xu <haoxu@linux.alibaba.com> --- fs/io_uring.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 7cc458e0b636..414dfedf79a7 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -79,6 +79,7 @@ #include <linux/pagemap.h> #include <linux/io_uring.h> #include <linux/tracehook.h> +#include <linux/cpuset.h> #define CREATE_TRACE_POINTS #include <trace/events/io_uring.h> @@ -7102,6 +7103,14 @@ static bool io_sqd_handle_event(struct io_sq_data *sqd) return did_sig || test_bit(IO_SQ_THREAD_SHOULD_STOP, &sqd->state); } +static inline int io_sq_bind_cpu(int cpu) +{ + if (test_cpu_in_current_cpuset(cpu)) + set_cpus_allowed_ptr(current, cpumask_of(cpu)); + + return 0; +} + static int io_sq_thread(void *data) { struct io_sq_data *sqd = data; @@ -7112,11 +7121,9 @@ static int io_sq_thread(void *data) snprintf(buf, sizeof(buf), "iou-sqp-%d", sqd->task_pid); set_task_comm(current, buf); - if (sqd->sq_cpu != -1) - set_cpus_allowed_ptr(current, cpumask_of(sqd->sq_cpu)); - else - set_cpus_allowed_ptr(current, cpu_online_mask); + io_sq_bind_cpu(sqd->sq_cpu); + current->flags |= PF_NO_SETAFFINITY; mutex_lock(&sqd->lock); @@ -8310,8 +8317,10 @@ static int io_sq_offload_create(struct io_ring_ctx *ctx, int cpu = p->sq_thread_cpu; ret = -EINVAL; - if (cpu >= nr_cpu_ids || !cpu_online(cpu)) + if (cpu >= nr_cpu_ids || !cpu_online(cpu) || + !test_cpu_in_current_cpuset(cpu)) goto err_sqpoll; + sqd->sq_cpu = cpu; } else { sqd->sq_cpu = -1; -- 2.24.4
WARNING: multiple messages have this Message-ID (diff)
From: Hao Xu <haoxu-KPsoFbNs7GizrGE5bRqYAgC/G2K4zDHf@public.gmane.org> To: Jens Axboe <axboe-tSWWG44O7X1aa/9Udqfwiw@public.gmane.org>, Zefan Li <lizefan.x-EC8Uxl6Npydl57MIdRCFDg@public.gmane.org>, Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Johannes Weiner <hannes-druUgvl0LCNAfugRpC6u6w@public.gmane.org>, Pavel Begunkov <asml.silence-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Cc: io-uring-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, cgroups-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Joseph Qi <joseph.qi-KPsoFbNs7GizrGE5bRqYAgC/G2K4zDHf@public.gmane.org> Subject: [PATCH 2/2] io_uring: consider cgroup setting when binding sqpoll cpu Date: Wed, 1 Sep 2021 18:18:33 +0800 [thread overview] Message-ID: <20210901101833.69535-3-haoxu@linux.alibaba.com> (raw) In-Reply-To: <20210901101833.69535-1-haoxu-KPsoFbNs7GizrGE5bRqYAgC/G2K4zDHf@public.gmane.org> Since sqthread is userspace like thread now, it should respect cgroup setting, thus we should consider current allowed cpuset when doing cpu binding for sqthread. Signed-off-by: Hao Xu <haoxu-KPsoFbNs7GizrGE5bRqYAgC/G2K4zDHf@public.gmane.org> --- fs/io_uring.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 7cc458e0b636..414dfedf79a7 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -79,6 +79,7 @@ #include <linux/pagemap.h> #include <linux/io_uring.h> #include <linux/tracehook.h> +#include <linux/cpuset.h> #define CREATE_TRACE_POINTS #include <trace/events/io_uring.h> @@ -7102,6 +7103,14 @@ static bool io_sqd_handle_event(struct io_sq_data *sqd) return did_sig || test_bit(IO_SQ_THREAD_SHOULD_STOP, &sqd->state); } +static inline int io_sq_bind_cpu(int cpu) +{ + if (test_cpu_in_current_cpuset(cpu)) + set_cpus_allowed_ptr(current, cpumask_of(cpu)); + + return 0; +} + static int io_sq_thread(void *data) { struct io_sq_data *sqd = data; @@ -7112,11 +7121,9 @@ static int io_sq_thread(void *data) snprintf(buf, sizeof(buf), "iou-sqp-%d", sqd->task_pid); set_task_comm(current, buf); - if (sqd->sq_cpu != -1) - set_cpus_allowed_ptr(current, cpumask_of(sqd->sq_cpu)); - else - set_cpus_allowed_ptr(current, cpu_online_mask); + io_sq_bind_cpu(sqd->sq_cpu); + current->flags |= PF_NO_SETAFFINITY; mutex_lock(&sqd->lock); @@ -8310,8 +8317,10 @@ static int io_sq_offload_create(struct io_ring_ctx *ctx, int cpu = p->sq_thread_cpu; ret = -EINVAL; - if (cpu >= nr_cpu_ids || !cpu_online(cpu)) + if (cpu >= nr_cpu_ids || !cpu_online(cpu) || + !test_cpu_in_current_cpuset(cpu)) goto err_sqpoll; + sqd->sq_cpu = cpu; } else { sqd->sq_cpu = -1; -- 2.24.4
next prev parent reply other threads:[~2021-09-01 10:18 UTC|newest] Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-01 10:18 [PATCH v3 0/2] refactor sqthread cpu binding logic Hao Xu 2021-09-01 10:18 ` Hao Xu 2021-09-01 10:18 ` [PATCH 1/2] cpuset: add a helper to check if cpu in cpuset of current task Hao Xu 2021-09-01 10:18 ` Hao Xu [this message] 2021-09-01 10:18 ` [PATCH 2/2] io_uring: consider cgroup setting when binding sqpoll cpu Hao Xu 2021-09-01 12:31 ` Hao Xu 2021-09-01 12:43 [PATCH v4 0/2] refactor sqthread cpu binding logic Hao Xu 2021-09-01 12:43 ` [PATCH 2/2] io_uring: consider cgroup setting when binding sqpoll cpu Hao Xu 2021-09-01 12:43 ` Hao Xu 2021-09-01 16:41 ` Tejun Heo 2021-09-01 16:41 ` Tejun Heo 2021-09-01 16:42 ` Tejun Heo 2021-09-03 15:04 ` Hao Xu 2021-09-03 15:04 ` Hao Xu 2021-09-07 16:54 ` Tejun Heo 2021-09-07 16:54 ` Tejun Heo 2021-09-07 19:28 ` Hao Xu 2021-09-07 19:28 ` Hao Xu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210901101833.69535-3-haoxu@linux.alibaba.com \ --to=haoxu@linux.alibaba.com \ --cc=asml.silence@gmail.com \ --cc=axboe@kernel.dk \ --cc=cgroups@vger.kernel.org \ --cc=hannes@cmpxchg.org \ --cc=io-uring@vger.kernel.org \ --cc=joseph.qi@linux.alibaba.com \ --cc=lizefan.x@bytedance.com \ --cc=tj@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.