From:   Mike Christie <michael.christie@oracle.com>
To:     brauner@kernel.org, ebiederm@xmission.com,
        torvalds@linux-foundation.org, linux-kernel@vger.kernel.org
Cc:     Mike Christie <michael.christie@oracle.com>
Subject: [PATCH 3/5] io_uring: Convert to use setup_thread_fn callout
Date:   Sun, 12 Feb 2023 19:00:18 -0600
Message-Id: <20230213010020.1813-4-michael.christie@oracle.com>
In-Reply-To: <20230213010020.1813-1-michael.christie@oracle.com>
References: <20230213010020.1813-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?oRdayw9nelWJdnw8gPSSATlqgyVtC9J1exRbgUt1wP3r1RWlvl4I3fxb64c8?=
 =?us-ascii?Q?Oq0XnOFyMoah1VEru744OSYTJ7T+McWf5Dh3lF0ePQVi573130wlqCyswA2n?=
 =?us-ascii?Q?2l74KDEzGzTeRSSoGzvdZbwtCvOabCqr1uOIKTDGGlpN1bLNF5oLfjykXIm4?=
 =?us-ascii?Q?JwI73Q3j9gib5BHxi19VpHtHqTfrahOWpBr0R8h8NKZodxDIkMimXLoHmPeG?=
 =?us-ascii?Q?VU5GVZfjIzym9+QM1r0ViNPfQyqEoIKlcJtyI/Wm+5M522CCce2lqoYm19vH?=
 =?us-ascii?Q?I18TttWcmcj4UE78XvlLgJL2NtDNTXZJCmB2AWvsFwWl1wuPx8Csk+Q754Ot?=
 =?us-ascii?Q?lduslAef/Q/0YdMQtDM7CCbDi6ycVNJtiQq7HZ4MpS4E8wd95bWBlO3nDhdM?=
 =?us-ascii?Q?AFzyJ9KMYI01z/R6Z2qz+YiMqJb/UyNs7yOS9u12KXw9R8N0G0HQ1LOMpN4h?=
 =?us-ascii?Q?f8+es9TTyhkArtTabHi0aHGfz4cLACvw+ikB1z+IWYJuNqNVZgXz6sJ/Ae94?=
 =?us-ascii?Q?lgwdDjPYKhcpzYmOmkR6U6O9nZpg7WN/oyRCsmOmZZj6nr+bf3/umnsJUbV7?=
 =?us-ascii?Q?9KUyfkBt3zIggu5ULq3u/a10jdgSsqk3pKNbHlRW6G2Ps867XrEWFTfKSfAS?=
 =?us-ascii?Q?LLyNFASa3yfWVWSJPBdc6jC5lzaqo0M+I4g+JsTzS3w/a8tVwAfJ7IT/hjG4?=
 =?us-ascii?Q?iVqNvw5eNX/TLMV+VNx/JzHuN9qYwNJ7koGfjboXVkqiC0D5f0GWwZiq53wB?=
 =?us-ascii?Q?cn2NZkhLkJVoM8r81TTbUa4eb6rp7b7zlHi21f4ew71Qk7NDLU4kmYjAu4TP?=
 =?us-ascii?Q?g3v2UJy08lnFec0iFAFF7gG/LHRemEV9Qek8zITkAAZuuuE+DSff8L2TDiO4?=
 =?us-ascii?Q?YoJptvOpC2E7vIVv99Vfnk8zhj7LwM6UeSSYhcX66yENEHv7PmJswAkyEcgW?=
 =?us-ascii?Q?dbm5NBHo21PwFUbNPSMhxA+vexgWlKrJcBm+bucGbBOhjMH5r67LcNLnyJfj?=
 =?us-ascii?Q?1f4iTTS7vjM5Ze/ahcFaSI7ZSl8+qVk4bc4Qdfi9VIavcnwjqde/Bm06PLtH?=
 =?us-ascii?Q?PLdm18zh/3PgQ08V3+L6TipQAbnG4SKmjPe/i6Q42NNdZGclbCqr1ij+dgJc?=
 =?us-ascii?Q?KmXvtzESgwuEVFjmkUf1m00b2QeodGZ6iSuJCQLntjpC0QSqtu8wK9E+rAjL?=
 =?us-ascii?Q?5IggcgAy5vzO+1q1SHlcmVApbBdmkaI9PPRRzZTos86VFze8DMyVqf7mZq+j?=
 =?us-ascii?Q?zvvbaLCmZzeE6tg3Eympmjw9YbcqUTfuKll9sx2RDrhJOF2RXN+nywzbinWe?=
 =?us-ascii?Q?4jAiHZlrVbXpaVcZDAcy/1yjhM4zBhcnK8qeXF0/6ZXxmTKgUvvVT/NgkpVm?=
 =?us-ascii?Q?rPMKQYTSgf9Zao4i1k3Hj+HVDieif0l2Jc7PQqkwBFrP1YxIuQ26CnNtfqgS?=
 =?us-ascii?Q?Sr26jrLbQJsK71jjteod1dAyx3iCnVIxzsb4ltQC/aVoT1lfKcU8nnMlmQ4E?=
 =?us-ascii?Q?Q/tPmWwq4Gd47VbMeqzFntiat1BNjkoSzkx/vVawAx0dp/5NVUNn9Mo4hnoW?=
 =?us-ascii?Q?nyKKvIVmRG0TOX0Svsri7b/3RQNYsejcl4lks9yMnZV8qMwZm9K6+np3AonN?=
 =?us-ascii?Q?5w=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 9zLUP5YlpUPq+fiLRuQAODeMZM7dcBVB5Q9pGG8G8X7jtz7tG5L5/pH9D4NdFIoMcWVeYwuitqUr0je24hs8gh4P1058jdVWa3GdxO54aJtpeH5ycqReHkiglaHIwKbu070GEVNOd3IK0YCpdlTtLnxFMV2ztFHFdfoJ5hd2EHJnbaQYrz4WWv3DdXH9qWSHQ08xVB+u4gkgOrdXv3P8IdYOcsZ6NfmjBmdP4WrsSwCtSXVvpfpWUtgiQAVpzsaqcY/hTipnGdR8G3sLjj3+FveeBgzJCTc9GZD88aEkRCHFg7q3wNSh7mzoSqi0J2Xih0Mye647IZJPSbJd0KvEVIy6hkluaB4ko05Qywdv1jp0Sv8Mpy0xIW2v46GlKKs5DgeEO9cbA/Mdnp9uGniLTJJ1ut1wl1ONcm0OYMcFRX5zPMQ1WySllRvBZaHtV9aXRCSyUTZL+A6OsWfGRg0YNW4+wC9py3E1MdrcYq0i3kMFHo3N0tFiFwDBJ4+7B5MSIMLaBcfFusHDhGiSFwXtH2x5eSWYNgwt2JG8zUDiBq/D2YVocwlgth8YsakkcYWbnQ+IAooduw24ApFtEUe4vaF4HeBJarUxha1Q5++UOPcwIi/c3G4FVzzswjPQIXmaNIKyDT06332arhy7B1P7KLRBegFzkxpIowrSSBd21u8K3nTZvl8/JiBrhuqlp+1S1CMhblwgPUleMw0c8NFTvUFSHIkOzeiQlrJqh/0RfOiXx2prgfSv+dEG4Bb9ElRGBsV4m406Kicxjqn1erlZQueGwwvketx8rDi8zVrAaWhK7ltVXJzdb1SFsBn1e1fB1Ea9QtzMC12HLkcihssI7DF4MP7uBcD2gb8owU0QlZydWOnd8ijB+vyBDZi+iYjA
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8ad58e4d-fb23-40f1-7d71-08db0d5db58e
X-MS-Exchange-CrossTenant-AuthSource: DM5PR10MB1466.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Feb 2023 01:00:33.4222
 (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: cuZB7SzMb4+srIpoPK5HJoFaL0BT/gKeXYhd4HPXZEAX1dqnyEcoULW/AYHdRHeyKlZ+6dzUvl5I5It3uz/8NYLQ+QjqU/qW7ZerStf0mAw=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR10MB4921
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22
 definitions=2023-02-12_12,2023-02-09_03,2023-02-09_01
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 adultscore=0 suspectscore=0
 phishscore=0 spamscore=0 bulkscore=0 mlxlogscore=999 malwarescore=0
 mlxscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2212070000 definitions=main-2302130007
X-Proofpoint-GUID: dK3k9qoANbA3NVhSlHf5BtciUWtzrcAr
X-Proofpoint-ORIG-GUID: dK3k9qoANbA3NVhSlHf5BtciUWtzrcAr
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

This converts io_uring to use the setup_thread_fn callout so it can set
the task's name during copy_process. It then doesn't need the temp buffer
and will work like kthread and vhost.

Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
 io_uring/io-wq.c  | 11 +++++++----
 io_uring/sqpoll.c | 13 +++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/io_uring/io-wq.c b/io_uring/io-wq.c
index 455df0c0deb5..4981bfd5581f 100644
--- a/io_uring/io-wq.c
+++ b/io_uring/io-wq.c
@@ -617,13 +617,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;
 
@@ -739,8 +735,15 @@ static inline bool io_should_retry_thread(long err)
 	}
 }
 
+static int io_wqe_setup_thread(struct task_struct *tsk, void *data)
+{
+	snprintf(tsk->comm, TASK_COMM_LEN, "iou-wrk-%d", tsk->pid);
+	return 0;
+}
+
 static struct kernel_clone_fns io_wqe_clone_fns = {
 	.thread_fn	= io_wqe_worker,
+	.setup_thread_fn = io_wqe_setup_thread,
 };
 
 static void create_worker_cont(struct callback_head *cb)
diff --git a/io_uring/sqpoll.c b/io_uring/sqpoll.c
index 8d60b9775798..373067a714dc 100644
--- a/io_uring/sqpoll.c
+++ b/io_uring/sqpoll.c
@@ -223,12 +223,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
@@ -312,8 +308,17 @@ static int io_sq_thread(void *data)
 	do_exit(0);
 }
 
+static int io_sq_setup_thread(struct task_struct *tsk, void *data)
+{
+	struct io_sq_data *sqd = data;
+
+	snprintf(tsk->comm, TASK_COMM_LEN, "iou-sqp-%d", sqd->task_pid);
+	return 0;
+}
+
 static struct kernel_clone_fns io_sq_clone_fns = {
 	.thread_fn	= io_sq_thread,
+	.setup_thread_fn = io_sq_setup_thread,
 };
 
 int io_sqpoll_wait_sq(struct io_ring_ctx *ctx)
-- 
2.25.1