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>,
        Christoph Hellwig <hch@lst.de>
Subject: [PATCH V5 07/10] io_uring: switch to kernel_worker
Date:   Sun, 21 Nov 2021 11:49:27 -0600
Message-Id: <20211121174930.6690-8-michael.christie@oracle.com>
In-Reply-To: <20211121174930.6690-1-michael.christie@oracle.com>
References: <20211121174930.6690-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?Ql0aMF6qpFeFR3Nt4E9yjIzPrL6Z6WBD7djEyPlinIrErlgGzmkKuuLPdFDK?=
 =?us-ascii?Q?sMYTqsDXX0DHDkeUkk+4MiBcpBWoNF5qCZgYo1o7pntMW+2+3jRoRcAO9R1G?=
 =?us-ascii?Q?tepFBBhy56Ra+zvT1TNd+icOGF6Up2w6hhz9iJYl0OM8tV+5fdcnKspEnMdm?=
 =?us-ascii?Q?T8TpQ+IxIECmWGLTgnj/aBP4RgsqVw0n9APqMkiGjWxFyAmlqx91Q2GN5ZvD?=
 =?us-ascii?Q?GfLT8RoZfeD2UJcgxQY4D6GeaER4CBYmklF6lbD71uyx1tnM9wXW8G2i70+C?=
 =?us-ascii?Q?cvG7Sy7qHzdcav7mBKQ8CzvsNUso93Jdm67DQ+GyjGILtHx5lnZfAHnGwJn0?=
 =?us-ascii?Q?FJg1EFMARtacreoswozLeBDqeRWU2FViiX2Nu9exIAdF20VR6X1crIDEjjWw?=
 =?us-ascii?Q?02qvSrpo7nHl85r2y9RSTdoHiyA6KtNLnnZV9FCNFDJ5fIPQOkK/Wp6o5JtV?=
 =?us-ascii?Q?gIOQ1d9mKRWvmsegS59aENp0W5dDFfrVrHiEGhiM0YS8WV/PlLvwHQan+Y5h?=
 =?us-ascii?Q?Wxd+ESO/neCV3CfwPUx4xljO8nj74g1cEYT3Qyj6EhgaDsI2AvOJFR9QWnwO?=
 =?us-ascii?Q?pbYJqUgvrzZ2pI7UBn+U3+Hr2ytN9jVKpX3vu5HcmAhSI+ChRRqZe3F4XZyz?=
 =?us-ascii?Q?g67NorPv5M8FKCivydlyjoyp0zCIMpg2wqzN6acNXDnU0i4yliIQfgxd+QE0?=
 =?us-ascii?Q?wLalgWkIlyM7TbVP5nANWutZ2+rBe1q13s+SvrKwmmISFUSphSOmFknkiuAO?=
 =?us-ascii?Q?mycECAnhC8FqobfdEw65GU31gkPbNaGeqLNo3w5g0Q5n+VA1Ui0puefZ+Vvn?=
 =?us-ascii?Q?o5up0pvz/w+n4rBloer8rVQxb6qrHIMzsmj3xG/KSMWezWJnQ48Wjla5Bttm?=
 =?us-ascii?Q?PXINgctSCPGf/3Qzlpf97PzwqaE1CyY04AZ+TsLT/9aJhAZzTIV7DkNJ7i0J?=
 =?us-ascii?Q?AqQmhEOL7/XD22UiDSBPnyMVJdZIM2kXehwPSxqe6zcxidNdkRMUadETY01W?=
 =?us-ascii?Q?F7NRl3tnR8P/iUDkwIpvOXYqQIXIsrnPxrv/W+Q9fSym11Q1cWjslm0zjc8P?=
 =?us-ascii?Q?XckyjqXQicqaYuUqWnhND3V/oxFf0wJ8mE+AbkVRmrFRCsGNnJEhN1m0r5/6?=
 =?us-ascii?Q?ypx+asFz57c5MG6i3Sk3YKjmB6es9wyPF7vVruGFfqxKBaCA0RW1qsD7qGI5?=
 =?us-ascii?Q?u4P9MBLL5x3beXxhTeAlqubpGweAgr8zcoWX4nPTlX7kh+fuGuzL8KMa5N9M?=
 =?us-ascii?Q?/cJ0qj5MLkvK2G0Ns5LTQw5CHsqZXLgcIsZV+YMcle25GIKlz6nqxXT7ISmd?=
 =?us-ascii?Q?oN9QQlXM5060xDOQFGXcHwbHSQQiks3nzhHj7s7OcoO4Ut6cH9EDjLFDpniL?=
 =?us-ascii?Q?uZpjdE8b9m4nBvxSBtS6WrRPF5EeEtpaMq915QOAhvs8YQTz/DCGl/PWFhCK?=
 =?us-ascii?Q?g8+zxF4CO6eZW/SVgj7QqEMp01qEs2zjv8AotpS6HySFwWrj2rDvT/JKQuf+?=
 =?us-ascii?Q?e0NES7mtdRGaHVAx86eMmEzBlQe5uUiWsnHajbbhyV6neVJCIRkvk++lKZst?=
 =?us-ascii?Q?l448NHZlEkBr//r+aV9lLhDWQXtAoRRpv0egQBjt35RBIUjdYtQBKfmb6K9U?=
 =?us-ascii?Q?pgaL+lkbgjk4OjzQdAK41rxGmEqzFG12uuCvgclD5RhhDtiwjDO8w/rm5PEC?=
 =?us-ascii?Q?UoKTxA=3D=3D?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 0ef1ab5e-3479-4bfc-242a-08d9ad175044
X-MS-Exchange-CrossTenant-AuthSource: DM5PR10MB1466.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Nov 2021 17:49:49.3471
 (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: EtwmRTG+ARZE688MZlHMzhPvYjtuHedderyjSzqRPVABjYEMkh0IpYSP1pzpx38Ee/yA4Br8JAb9AOyuMo04jydnp3F/PYr5xPgOUL83fS8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB5055
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10175 signatures=668683
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 spamscore=0 phishscore=0 malwarescore=0
 mlxlogscore=999 bulkscore=0 mlxscore=0 suspectscore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2110150000
 definitions=main-2111210110
X-Proofpoint-GUID: G_kl9wNk__CWexunvymJeSEj5fgUr2Lm
X-Proofpoint-ORIG-GUID: G_kl9wNk__CWexunvymJeSEj5fgUr2Lm
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>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---
 fs/io-wq.c    | 15 ++++++++-------
 fs/io_uring.c | 11 +++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/fs/io-wq.c b/fs/io-wq.c
index 88202de519f6..b39cf045d6ce 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;
@@ -600,13 +603,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)) {
@@ -704,7 +703,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)
@@ -734,7 +733,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);
@@ -801,7 +801,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 b07196b4511c..d01eef85cc03 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -7431,12 +7431,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
@@ -8665,6 +8661,8 @@ static __cold 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 __cold 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 __cold 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) {
-- 
2.25.1