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:     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 4/8] fork: move PF_IO_WORKER's kernel frame setup to new flag
Date:   Thu, 16 Sep 2021 16:20:47 -0500
Message-Id: <20210916212051.6918-5-michael.christie@oracle.com>
In-Reply-To: <20210916212051.6918-1-michael.christie@oracle.com>
References: <20210916212051.6918-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?hD6Cs6wYiQZCtoPvX5ziMrNPHyjbDJGtTdayA0gDFdInTemgPtaMyxtOgz6B?=
 =?us-ascii?Q?vyPei14zZaZ+AEA9GkvnX7AAOxSPWmKQD5clKyYkkvkcySI3Oih7r+UfQ67g?=
 =?us-ascii?Q?uBasC9LgVkJ8K+a9X6a/AadAIf0qFUksLFM60/Ag5ufPCyxElBUDbCMgxiUa?=
 =?us-ascii?Q?uO4gbVV9YpDb+l8RQ6co4e0aFOqssYTCl8wds3F5naXOlUgVtO9b+zTI0xLQ?=
 =?us-ascii?Q?2OWtmdxnHfKKcHoA+lYCePijV7tLB6jdYepmn3+vEOeQB5DK5F6EGyFHLtKY?=
 =?us-ascii?Q?wswd0yy7Qub7Kpu5dZU0xoovOpCA70+EOdIQ94ujexlh558YTLvV1gcj3NdS?=
 =?us-ascii?Q?UU6bV6izu1UWo6oKc7duzBe1dgFoZxdSwHaxPApqbcf7V1dX45sk7wZBMEuA?=
 =?us-ascii?Q?oXy8Pyk7o/Gl0H3fG4GHGmWblZpTIlFG80EZzmFoATGLBmO5NkzOVBPmioM2?=
 =?us-ascii?Q?3QNob3Fe4E1xv8hD9zcszUQ8m9vUSQu+gW6gc9oHJOnmRB0mMUJLZ1Gphyeu?=
 =?us-ascii?Q?85R9wv1/RWt1iKZJtJPHv5hw8nosi5eC0QnHBYtV5+olADQeRI+uhoCtwBME?=
 =?us-ascii?Q?HN+diRQrvZBD4M9l97bGMB2rvBlWeO0RdSWlH0dIgDOOimPkHsI+UVHr1wRP?=
 =?us-ascii?Q?9elDHcTUJs6OHX1uOQHVVgodBW3KvTjW9OSgeV296ySgM8qyZZTwWNt5QjKq?=
 =?us-ascii?Q?RLzLb564kol/j91l4muzKkmpDjRCdHQ57OMxLC2jfxPl5XyuaI23Wwh5iIfc?=
 =?us-ascii?Q?dkE9WWSQ4dIZ/wTMxKRCll0i1vhdq7AoR0+UPGHd2iQ60ejcxIAJquBEtMe5?=
 =?us-ascii?Q?aGMLK7vj59/uZGfRlnS1L+DejLI1of7wF1jsKU10Kjl5cO+tIRaH1ggh3NS7?=
 =?us-ascii?Q?srj4H9+0Jvjtdk6uk3hQo2iTkueYj0HFOHaAi9GGHqth+PxAbKUe5u1JlSnA?=
 =?us-ascii?Q?khgcpXxtvDt1xQt2/fC9mSvvkmbsm3n6S8tNIL97mzjZcB0vgVSGW4dd2vCv?=
 =?us-ascii?Q?l3QbMzGi+cWk4H42CHwDqaT9tMh67PcwQddA470pgavbdcKtFbQ2GPViJdUt?=
 =?us-ascii?Q?hXxu64+g2Y732fTxeAgteL3Lr2tUj1ms7c6f7WIDdJTDoljI1gKrOxyM4gnX?=
 =?us-ascii?Q?7lHDVmkFvQstNriXAz8zIftojpmNCTUuT5a0dCi+7gVapzgLLH/8JWh6rcMR?=
 =?us-ascii?Q?lIFeF6cF7hyQTRqZtwcR3ofGUlGYcgOyTcd1lfkm1iDO4UB6Wj8Zi+UYmMQw?=
 =?us-ascii?Q?YZz25w8qGDI9SEvlEQ9N8YoQSJdsA8km2rbtpbXCPJ6VjUj5mRJmpUCNYLzr?=
 =?us-ascii?Q?IKWmHyxQJZu2ufS0TsmTk7hv?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 47a084f8-e98a-45df-22e2-08d97957e517
X-MS-Exchange-CrossTenant-AuthSource: BYAPR10MB3573.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Sep 2021 21:21:06.3839
 (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: fgBdk4Wru0cVmz45BAyteG5NOySMUmKIM2OybbNOYsuGNaPo4zq3fCkJtYvJE9aG6TquvrhDGl+V5YudH5cjDMLNJSGb+I4rE8er4BsDVFE=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB2935
X-Proofpoint-Virus-Version: vendor=nai engine=6300 definitions=10109 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 adultscore=0 phishscore=0
 mlxlogscore=999 suspectscore=0 spamscore=0 bulkscore=0 malwarescore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2109030001
 definitions=main-2109160122
X-Proofpoint-GUID: xe3eTQGHDo0YBAmlrS7i9QmOwSptnW1T
X-Proofpoint-ORIG-GUID: xe3eTQGHDo0YBAmlrS7i9QmOwSptnW1T
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The vhost worker threads need the same frame setup as io_uring's worker
threads, but do not handle signals and may not even be executing IO. This
moves the setup part to a new flag.

Signed-off-by: Mike Christie <michael.christie@oracle.com>
---
 arch/x86/kernel/process.c  | 4 ++--
 include/linux/sched.h      | 1 +
 include/linux/sched/task.h | 1 +
 kernel/fork.c              | 3 +++
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 1d9463e3096b..ccdec11cd120 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -178,9 +178,9 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, unsigned long arg,
 	task_user_gs(p) = get_user_gs(current_pt_regs());
 #endif
 
-	if (unlikely(p->flags & PF_IO_WORKER)) {
+	if (unlikely(p->flags & PF_USER_WORKER)) {
 		/*
-		 * An IO thread is a user space thread, but it doesn't
+		 * An user worker thread is a user space thread, but it doesn't
 		 * return to ret_after_fork().
 		 *
 		 * In order to indicate that to tools like gdb,
diff --git a/include/linux/sched.h b/include/linux/sched.h
index e12b524426b0..817d3a7bec77 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1664,6 +1664,7 @@ extern struct pid *cad_pid;
 #define PF_VCPU			0x00000001	/* I'm a virtual CPU */
 #define PF_IDLE			0x00000002	/* I am an IDLE thread */
 #define PF_EXITING		0x00000004	/* Getting shut down */
+#define PF_USER_WORKER		0x00000008	/* Userspace kernel worker */
 #define PF_IO_WORKER		0x00000010	/* Task is an IO worker */
 #define PF_WQ_WORKER		0x00000020	/* I'm a workqueue worker */
 #define PF_FORKNOEXEC		0x00000040	/* Forked but didn't exec */
diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h
index d0b0872f56cc..4a6100a24894 100644
--- a/include/linux/sched/task.h
+++ b/include/linux/sched/task.h
@@ -33,6 +33,7 @@ struct kernel_clone_args {
 	int cgroup;
 	int io_thread;
 	int no_files;
+	int user_worker;
 	struct cgroup *cgrp;
 	struct css_set *cset;
 };
diff --git a/kernel/fork.c b/kernel/fork.c
index a0468e30b27e..1dda1d4ea77b 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -2041,6 +2041,8 @@ static __latent_entropy struct task_struct *copy_process(
 		siginitsetinv(&p->blocked, sigmask(SIGKILL)|sigmask(SIGSTOP));
 	}
 
+	if (args->user_worker)
+		p->flags |= PF_USER_WORKER;
 	/*
 	 * This _must_ happen before we call free_task(), i.e. before we jump
 	 * to any of the bad_fork_* labels. This is to avoid freeing
@@ -2563,6 +2565,7 @@ struct task_struct *kernel_copy_process(int (*fn)(void *), void *arg, int node,
 		.stack_size	= (unsigned long)arg,
 		.io_thread	= io_thread,
 		.no_files	= no_files,
+		.user_worker	= 1,
 	};
 
 	return copy_process(NULL, 0, node, &args);
-- 
2.25.1