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 V3 6/9] io_uring: switch to kernel_worker
Date:   Mon,  4 Oct 2021 14:21:25 -0500
Message-Id: <20211004192128.381453-7-michael.christie@oracle.com>
In-Reply-To: <20211004192128.381453-1-michael.christie@oracle.com>
References: <20211004192128.381453-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?gHu6N1uyb7QmWV1S5VgGjYTZSgNRQatAFlQTJA6V42Egbumbgro6irsQjwoY?=
 =?us-ascii?Q?nJCjBzWMca4irBJaZ44PMEAwIY7wwA1bFkcWLxf4NmwIgiJufMy6WO8lyuZx?=
 =?us-ascii?Q?Pf/kYJgbEFp5dK3Vx02lV19Nwt0QxdausuytV/HGpTR6P2Lj7vxDXC8u48+b?=
 =?us-ascii?Q?bTQn5LI5WZ6lFx0IsKGlaNk6iAx8LWx+SvCzyFDmAvun4UKHgmKTF8610rxG?=
 =?us-ascii?Q?Q3nOx/XEc7VhiOfc4Fj2V9jcyJ7zj0Lado6LKt4+CfYKtdXtbf+IsPeSW4Ko?=
 =?us-ascii?Q?QGduznCttDRNRwxEDENgMcZO8JuPSM5/xFWsuGrrRWcm9D8PUWZhB4rQF+Kb?=
 =?us-ascii?Q?w17j60xEOVOuXqhGKbgSuHib58dwqZ4qMHQIq7KnK++zAcNSnJSlhhVO3/NH?=
 =?us-ascii?Q?PFp3DhEPfjmUlK6jmanESDaBQjP94+PenTq+pCjmC4DkaWkLpRPV2K3vVVit?=
 =?us-ascii?Q?Rzf+sqsjLwCZGAb7d+ivG6vmRxIwlCEVh3raaXzPRZo79mGbfmDAfIGYZ2kt?=
 =?us-ascii?Q?GTo6huCXleeS07V8BiTI59AMjeafsH8lBESeViavWjsTXjebpVU4wOnwaLqw?=
 =?us-ascii?Q?XVblyT1s+bcjlCiYKm0GJJH8IcSHATYF9CTsTKrCMNTbHzh4o2iuWbq+9dq9?=
 =?us-ascii?Q?fBg0Ags1dQ90HnF5qqUTki2SD4lvcnDsXk89Hz+ehARdjnSRSUvhDzKuCLwQ?=
 =?us-ascii?Q?IBNGC6AUDEwBaUTvTfrsJSrJlpQLv6QtFDpNscbPGWUAqgPedKANd08ezXo4?=
 =?us-ascii?Q?Yv+iSFvg133hIrvYfDucgnQMsi91g6I5scM0g9BAfzz9TQVOeWtUyGU9ihsB?=
 =?us-ascii?Q?E+pHuP6SlPeR3rtWEY2W9TIyPB0R9PJQ6930JJY2ynbpsPHwWyOYwX7tVKiP?=
 =?us-ascii?Q?7ohD4xE+BmmxBRZheH3tuz+q+18ulRY/gfb9+5eIPss/fEHhmCIinBiNMzhR?=
 =?us-ascii?Q?6uGNYhhn7MqwiXbT+4dGpaUKeeXKexKPoYYg9c1dG9tcu82pkOvhCh3nv/lb?=
 =?us-ascii?Q?el7SBoEglvGmpaLnl5RDI0OGERxIjdRISSkzgz8T5aE5O7R9JSrqhO6BXSXt?=
 =?us-ascii?Q?cdyEDRE91MfJjJAEkN8QzGu/ahO/7gUhWrpSwf6xer9nyOIMfZMApC6Eom/C?=
 =?us-ascii?Q?gUGxaJvJQoj52GB+Jx+2XlOiWa/vBkIZcgRDc/UHSMwgDEsc8rr4gnGA+mGd?=
 =?us-ascii?Q?89103VaD8ESlBB3h2BaXLh3F39Qj0mv9sGsvnEfAtgHTsVQCwrH4/7Vjudmv?=
 =?us-ascii?Q?DZS2W5VfYvC7kqn/E5PaYjOjOrP93ZKua6I9U7qCCfClm4ECsaGvG5Tc4pKj?=
 =?us-ascii?Q?3ifhyT3xbcWcfnC2UGVdm16z?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: db64f741-f12b-41f6-d439-08d9876c31f3
X-MS-Exchange-CrossTenant-AuthSource: DM5PR10MB1466.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2021 19:21:41.5695
 (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: ZUnSBt2utACz/TiiZtLz7XS8SKr7JOPOTxKlcPOvcViY0Cut5eAGBN/tP6NK+/TqYVRRLTGutMqLIhDVVyNapWR1qBQn2ZNP/7Wugs8gKFw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR10MB1548
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10127 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 suspectscore=0 adultscore=0
 mlxscore=0 phishscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109230001
 definitions=main-2110040131
X-Proofpoint-GUID: -gskAAu-sLLxkCJqTxwY5MMYVLtY0TBs
X-Proofpoint-ORIG-GUID: -gskAAu-sLLxkCJqTxwY5MMYVLtY0TBs
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>
---
 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 5bf8aa81715e..a31c260d39c3 100644
--- a/fs/io-wq.c
+++ b/fs/io-wq.c
@@ -69,6 +69,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;
@@ -549,13 +552,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);
-
 	while (!test_bit(IO_WQ_BIT_EXIT, &wq->state)) {
 		long ret;
 
@@ -650,7 +649,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)
@@ -680,7 +679,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);
@@ -750,7 +750,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 6b9e70208782..a5970fc182b7 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -7401,12 +7401,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
@@ -8626,6 +8622,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;
@@ -8667,7 +8665,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;
@@ -8675,7 +8674,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 ba0499b6627c..781abbc1c288 100644
--- a/include/linux/sched/task.h
+++ b/include/linux/sched/task.h
@@ -87,7 +87,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 *i), 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