From: Mike Christie <michael.christie@oracle.com>
To: hch@infradead.org, stefanha@redhat.com, jasowang@redhat.com,
mst@redhat.com, sgarzare@redhat.com,
virtualization@lists.linux-foundation.org, brauner@kernel.org,
ebiederm@xmission.com, torvalds@linux-foundation.org,
konrad.wilk@oracle.com, linux-kernel@vger.kernel.org
Cc: Mike Christie <michael.christie@oracle.com>,
Christoph Hellwig <hch@lst.de>
Subject: [PATCH 06/11] fork: add kernel_clone_args flag to not dup/clone files
Date: Fri, 10 Mar 2023 16:03:27 -0600 [thread overview]
Message-ID: <20230310220332.5309-7-michael.christie@oracle.com> (raw)
In-Reply-To: <20230310220332.5309-1-michael.christie@oracle.com>
Each vhost device gets a thread that is used to perform IO and management
operations. Instead of a thread that is accessing a device, the thread is
part of the device, so when it creates a thread using a helper based on
copy_process we can't dup or clone the parent's files/FDS because it
would do an extra increment on ourself.
Later, when we do:
Qemu process exits:
do_exit -> exit_files -> put_files_struct -> close_files
we would leak the device's resources because of that extra refcount
on the fd or file_struct.
This patch adds a no_files option so these worker threads can prevent
taking an extra refcount on themselves.
Signed-off-by: Mike Christie <michael.christie@oracle.com>
Acked-by: Christian Brauner <brauner@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
---
include/linux/sched/task.h | 1 +
kernel/fork.c | 10 ++++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h
index 2950e83d5382..4f816048794f 100644
--- a/include/linux/sched/task.h
+++ b/include/linux/sched/task.h
@@ -28,6 +28,7 @@ struct kernel_clone_args {
u32 kthread:1;
u32 io_thread:1;
u32 user_worker:1;
+ u32 no_files:1;
unsigned long stack;
unsigned long stack_size;
unsigned long tls;
diff --git a/kernel/fork.c b/kernel/fork.c
index 0dec38276363..258163ea5cd2 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1624,7 +1624,8 @@ static int copy_fs(unsigned long clone_flags, struct task_struct *tsk)
return 0;
}
-static int copy_files(unsigned long clone_flags, struct task_struct *tsk)
+static int copy_files(unsigned long clone_flags, struct task_struct *tsk,
+ int no_files)
{
struct files_struct *oldf, *newf;
int error = 0;
@@ -1636,6 +1637,11 @@ static int copy_files(unsigned long clone_flags, struct task_struct *tsk)
if (!oldf)
goto out;
+ if (no_files) {
+ tsk->files = NULL;
+ goto out;
+ }
+
if (clone_flags & CLONE_FILES) {
atomic_inc(&oldf->count);
goto out;
@@ -2256,7 +2262,7 @@ static __latent_entropy struct task_struct *copy_process(
retval = copy_semundo(clone_flags, p);
if (retval)
goto bad_fork_cleanup_security;
- retval = copy_files(clone_flags, p);
+ retval = copy_files(clone_flags, p, args->no_files);
if (retval)
goto bad_fork_cleanup_semundo;
retval = copy_fs(clone_flags, p);
--
2.25.1
next prev parent reply other threads:[~2023-03-10 22:06 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-10 22:03 [PATCH 00/11] Use copy_process in vhost layer Mike Christie
2023-03-10 22:03 ` [PATCH 01/11] csky: Remove kernel_thread declaration Mike Christie
2023-03-10 22:03 ` [PATCH 02/11] kernel: Allow a kernel thread's name to be set in copy_process Mike Christie
2023-03-10 22:03 ` [PATCH 03/11] kthread: Pass in the thread's name during creation Mike Christie
2023-03-11 8:53 ` Christian Brauner
2023-03-11 16:11 ` michael.christie
2023-03-12 1:48 ` Mike Christie
2023-03-10 22:03 ` [PATCH 04/11] kernel: Make io_thread and kthread bit fields Mike Christie
2023-03-10 22:03 ` [PATCH 05/11] fork/vm: Move common PF_IO_WORKER behavior to new flag Mike Christie
2023-03-10 22:03 ` Mike Christie [this message]
2023-03-10 22:03 ` [PATCH 07/11] fork: Add kernel_clone_args flag to ignore signals Mike Christie
2023-03-10 22:03 ` [PATCH 08/11] fork: allow kernel code to call copy_process Mike Christie
2023-03-10 22:03 ` [PATCH 09/11] vhost_task: Allow vhost layer to use copy_process Mike Christie
2023-03-10 22:03 ` [PATCH 10/11] vhost: move worker thread fields to new struct Mike Christie
2023-03-10 22:03 ` [PATCH 11/11] vhost: use vhost_tasks for worker threads Mike Christie
2023-03-11 17:21 ` [PATCH 00/11] Use copy_process in vhost layer Linus Torvalds
2023-03-11 17:49 ` Mike Christie
2023-03-11 19:15 ` Michael S. Tsirkin
2023-03-12 10:07 ` Christian Brauner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230310220332.5309-7-michael.christie@oracle.com \
--to=michael.christie@oracle.com \
--cc=brauner@kernel.org \
--cc=ebiederm@xmission.com \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=jasowang@redhat.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=sgarzare@redhat.com \
--cc=stefanha@redhat.com \
--cc=torvalds@linux-foundation.org \
--cc=virtualization@lists.linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®