Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Mike Christie <michael.christie@oracle.com>
To:     geert@linux-m68k.org, vverma@digitalocean.com, hdanton@sina.com,
        hch@infradead.org, stefanha@redhat.com, jasowang@redhat.com,
        mst@redhat.com, sgarzare@redhat.com,
        virtualization@lists.linux-foundation.org,
        christian.brauner@ubuntu.com, axboe@kernel.dk,
        linux-kernel@vger.kernel.org
Cc:     Mike Christie <michael.christie@oracle.com>
Subject: [PATCH V4 6/8] io_uring: switch to kernel_worker
Date:   Thu,  7 Oct 2021 16:44:46 -0500
Message-Id: <20211007214448.6282-7-michael.christie@oracle.com>
In-Reply-To: <20211007214448.6282-1-michael.christie@oracle.com>
References: <20211007214448.6282-1-michael.christie@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?tTufB9vnWXR6oV8N9+RweSpW4/6+Rxui8dinqYU0zpuM1kYKW4CETyXt9JpY?=
 =?us-ascii?Q?A3WPruTnH3+U/U1CInIZNcmqkHniIg7dzydjg7vIVSkvwq5IypaoCLwE8Gav?=
 =?us-ascii?Q?BUDbJIeJT/ng46U7fe53ueChrpafSVnoO4kLBI+x0bFXevg6WQPyF2QfomRI?=
 =?us-ascii?Q?sK3d1EibKdfLo9pwTqlTL57jc6p4duVDuM53Rl/jKavXJVcFGGs5VOM4aRgv?=
 =?us-ascii?Q?rHa31MRHWdmHnR//8TNmmX0abG2kDxxn2rEsVvBR0plg6W66IXlWaQw6mvGd?=
 =?us-ascii?Q?hZiEVV80h3AtbAftUdGmNTOiol34M0wylIlBH0AyDtyeQ3YhLMFaEIC092HL?=
 =?us-ascii?Q?1uQeB4vAQMvs++uzMN2pqIWU+/p/bbwg0FHkYSloOSz0OX2hkw+aEAfspED1?=
 =?us-ascii?Q?XBMEdxYPXTb3sMbe1pmt4+RQJnku0wTL7ENEH3dd+OO+z1kUgUr+454Kwt7Y?=
 =?us-ascii?Q?c1uEFvr6Hxk2GkVDIsclujCia4BpBTjEoj6EBDKEKeFjyBJ66ipeJYBwYuZn?=
 =?us-ascii?Q?ZiLv5qh3QJ01+Z7081FF9wLjzT1hN2AEMeVnHvUf+xZRm/bopxSBpSxcYRZ/?=
 =?us-ascii?Q?BaS2O0LkvCCJulwyps0JwvWuIdHxnFUUPNIx1y409y2KcNxm6kMK0ZHdpzF9?=
 =?us-ascii?Q?zKF3SGJ2vqoIFW4n8V/VcCvTf6LNZDFjuF8m9U8+6oJZdI+6bQXlSB50Nbme?=
 =?us-ascii?Q?fDb1K9P7RluuqON1LXhiJ2KypwIDBeVAGamXMAKACD1YWYNok6giRsfrLzoz?=
 =?us-ascii?Q?diK2oQq3+PblifhizddIXM9byJwaSv8xm3VyBBLuKjD5h21aj7IklQCf8zga?=
 =?us-ascii?Q?xxUuSs5WucGi9HsptQiNDMxm7nfMi5IqF3QE3hYoL8K2m9lOnTST0+cNMlLH?=
 =?us-ascii?Q?xiAVGLiIgsB6ZbrE+yAXaQzS8SE69+8Um5nuXaVF3nus2I2du3L7wwjvWYyW?=
 =?us-ascii?Q?zqXR3BwDBjUAXNBg2AirhRnL3Uug5YkUSpQQoHe5MjUmW8Ft4YLSWAYUqYob?=
 =?us-ascii?Q?+hczuoug+FZSmt9l68kNjZ26wIHI7DqiOi8d5rSvdRILHRZUejxNUl66zxv1?=
 =?us-ascii?Q?F6tIzGgKWYbpFbNZLGN6qW9z/6/utTJ9tFJa4/hX+grmcb9HWVSkllPr4LTt?=
 =?us-ascii?Q?p5TH8V0kgh7JIFbypEaiDz911NFhNqjoXvFeyjS/r7ZNBIQlHwzvmI07VPnx?=
 =?us-ascii?Q?YmA8fZakp2kM3Iwy3aRXpl3qOSEHc0CN3yz6kVGRsERIVm/B1OIZZ7lmB+kb?=
 =?us-ascii?Q?y0NmpIgblaRWvXjken0oGj6+etShLEL1+LqaZFKc416SF/S3JeiWD69K2kPF?=
 =?us-ascii?Q?2xiOx3LAyMglqVYrL2XHUOo7?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4b404032-a458-44be-4557-08d989dbb63e
X-MS-Exchange-CrossTenant-AuthSource: DM5PR10MB1466.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2021 21:44:59.9762
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 0lAkFq0dj9tzZZM9YVjcA24xyIXB/0uSLJXpzildS9em4EYN5s6gUavDkE40nmhgzv9xHk6Tud1C/TKdPm/gs9U9DVbcwKuZGQr9mdq4R9A=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR10MB1612
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10130 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 mlxlogscore=999 adultscore=0
 bulkscore=0 suspectscore=0 malwarescore=0 spamscore=0 phishscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001
 definitions=main-2110070137
X-Proofpoint-ORIG-GUID: RMa7bo0EhCjCU04KXZcmyePOUBv03VVJ
X-Proofpoint-GUID: RMa7bo0EhCjCU04KXZcmyePOUBv03VVJ
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Convert io_uring and io-wq to use kernel_worker.

Signed-off-by: Mike Christie <michael.christie@oracle.com>
Reviewed-by: Christian Brauner <christian.brauner@ubuntu.com>
Reviewed-by: Jens Axboe <axboe@kernel.dk>
---

Note: To avoid patch application conflicts this patch was made over
linux-next which has Jens Axboe's block tree's for-next branch and Paul
Moore's selinux tree's next branch because:

commit: 5bd2182d58e9 ("audit,io_uring,io-wq: add some basic audit
support to io_uring")

from Paul's tree had conflicts.

 fs/io-wq.c                 | 15 ++++++++-------
 fs/io_uring.c              | 11 +++++------
 include/linux/sched/task.h |  1 -
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/fs/io-wq.c b/fs/io-wq.c
index 962952951126..32b140754496 100644
--- a/fs/io-wq.c
+++ b/fs/io-wq.c
@@ -70,6 +70,9 @@ struct io_worker {
 
 #define IO_WQ_NR_HASH_BUCKETS	(1u << IO_WQ_HASH_ORDER)
 
+#define IO_WQ_CLONE_FLAGS	(CLONE_FS | CLONE_FILES | CLONE_SIGHAND | \
+				 CLONE_THREAD | CLONE_IO)
+
 struct io_wqe_acct {
 	unsigned nr_workers;
 	unsigned max_workers;
@@ -550,13 +553,9 @@ static int io_wqe_worker(void *data)
 	struct io_wqe *wqe = worker->wqe;
 	struct io_wq *wq = wqe->wq;
 	bool last_timeout = false;
-	char buf[TASK_COMM_LEN];
 
 	worker->flags |= (IO_WORKER_F_UP | IO_WORKER_F_RUNNING);
 
-	snprintf(buf, sizeof(buf), "iou-wrk-%d", wq->task->pid);
-	set_task_comm(current, buf);
-
 	audit_alloc_kernel(current);
 
 	while (!test_bit(IO_WQ_BIT_EXIT, &wq->state)) {
@@ -654,7 +653,7 @@ static void io_init_new_worker(struct io_wqe *wqe, struct io_worker *worker,
 	list_add_tail_rcu(&worker->all_list, &wqe->all_list);
 	worker->flags |= IO_WORKER_F_FREE;
 	raw_spin_unlock(&wqe->lock);
-	wake_up_new_task(tsk);
+	kernel_worker_start(tsk, "iou-wrk-%d", wqe->wq->task->pid);
 }
 
 static bool io_wq_work_match_all(struct io_wq_work *work, void *data)
@@ -684,7 +683,8 @@ static void create_worker_cont(struct callback_head *cb)
 	worker = container_of(cb, struct io_worker, create_work);
 	clear_bit_unlock(0, &worker->create_state);
 	wqe = worker->wqe;
-	tsk = create_io_thread(io_wqe_worker, worker, wqe->node);
+	tsk = kernel_worker(io_wqe_worker, worker, wqe->node,
+			    IO_WQ_CLONE_FLAGS, KERN_WORKER_IO);
 	if (!IS_ERR(tsk)) {
 		io_init_new_worker(wqe, worker, tsk);
 		io_worker_release(worker);
@@ -754,7 +754,8 @@ static bool create_io_worker(struct io_wq *wq, struct io_wqe *wqe, int index)
 	if (index == IO_WQ_ACCT_BOUND)
 		worker->flags |= IO_WORKER_F_BOUND;
 
-	tsk = create_io_thread(io_wqe_worker, worker, wqe->node);
+	tsk = kernel_worker(io_wqe_worker, worker, wqe->node, IO_WQ_CLONE_FLAGS,
+			    KERN_WORKER_IO);
 	if (!IS_ERR(tsk)) {
 		io_init_new_worker(wqe, worker, tsk);
 	} else if (!io_should_retry_thread(PTR_ERR(tsk))) {
diff --git a/fs/io_uring.c b/fs/io_uring.c
index 488aa14da287..5e21ae6d4ff4 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -7440,12 +7440,8 @@ static int io_sq_thread(void *data)
 	struct io_sq_data *sqd = data;
 	struct io_ring_ctx *ctx;
 	unsigned long timeout = 0;
-	char buf[TASK_COMM_LEN];
 	DEFINE_WAIT(wait);
 
-	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
@@ -8669,6 +8665,8 @@ static int io_sq_offload_create(struct io_ring_ctx *ctx,
 		fdput(f);
 	}
 	if (ctx->flags & IORING_SETUP_SQPOLL) {
+		unsigned long flags = CLONE_FS | CLONE_FILES | CLONE_SIGHAND |
+					CLONE_THREAD | CLONE_IO;
 		struct task_struct *tsk;
 		struct io_sq_data *sqd;
 		bool attached;
@@ -8710,7 +8708,8 @@ static int io_sq_offload_create(struct io_ring_ctx *ctx,
 
 		sqd->task_pid = current->pid;
 		sqd->task_tgid = current->tgid;
-		tsk = create_io_thread(io_sq_thread, sqd, NUMA_NO_NODE);
+		tsk = kernel_worker(io_sq_thread, sqd, NUMA_NO_NODE,
+				    flags, KERN_WORKER_IO);
 		if (IS_ERR(tsk)) {
 			ret = PTR_ERR(tsk);
 			goto err_sqpoll;
@@ -8718,7 +8717,7 @@ static int io_sq_offload_create(struct io_ring_ctx *ctx,
 
 		sqd->thread = tsk;
 		ret = io_uring_alloc_task_context(tsk, ctx);
-		wake_up_new_task(tsk);
+		kernel_worker_start(tsk, "iou-sqp-%d", sqd->task_pid);
 		if (ret)
 			goto err;
 	} else if (p->flags & IORING_SETUP_SQ_AFF) {
diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h
index 2bfc0629c868..c8ab90e28f11 100644
--- a/include/linux/sched/task.h
+++ b/include/linux/sched/task.h
@@ -88,7 +88,6 @@ extern void exit_files(struct task_struct *);
 extern void exit_itimers(struct signal_struct *);
 
 extern pid_t kernel_clone(struct kernel_clone_args *kargs);
-struct task_struct *create_io_thread(int (*fn)(void *), void *arg, int node);
 struct task_struct *kernel_worker(int (*fn)(void *), void *arg, int node,
 				  unsigned long clone_flags, u32 worker_flags);
 __printf(2, 3)
-- 
2.25.1