From: Vipin Sharma <vipinsh@google.com>
To: pbonzini@redhat.com, seanjc@google.com
Cc: mkoutny@suse.com, tj@kernel.org, lizefan.x@bytedance.com,
hannes@cmpxchg.org, dmatlack@google.com, jiangshanlai@gmail.com,
kvm@vger.kernel.org, cgroups@vger.kernel.org,
linux-kernel@vger.kernel.org, Vipin Sharma <vipinsh@google.com>
Subject: [PATCH v3] KVM: Move VM's worker kthreads back to the original cgroup before exiting.
Date: Thu, 17 Feb 2022 06:16:16 +0000 [thread overview]
Message-ID: <20220217061616.3303271-1-vipinsh@google.com> (raw)
VM worker kthreads can linger in the VM process's cgroup for sometime
after KVM terminates the VM process.
KVM terminates the worker kthreads by calling kthread_stop() which waits
on the 'exited' completion, triggered by exit_mm(), via mm_release(), in
do_exit() during the kthread's exit. However, these kthreads are
removed from the cgroup using the cgroup_exit() which happens after the
exit_mm(). Therefore, a VM process can terminate in between the
exit_mm() and cgroup_exit() calls, leaving only worker kthreads in the
cgroup.
Moving worker kthreads back to the original cgroup (kthreadd_task's
cgroup) makes sure that the cgroup is empty as soon as the main VM
process is terminated.
Signed-off-by: Vipin Sharma <vipinsh@google.com>
---
v3:
- Use 'current->real_parent' (kthreadd_task) in the
cgroup_attach_task_all() call.
- Revert cgroup APIs changes in v2. Now, patch does not touch cgroup
APIs.
- Update commit and comment message
v2: https://lore.kernel.org/lkml/20211222225350.1912249-1-vipinsh@google.com/
- Use kthreadd_task in the cgroup API to avoid build issue.
v1: https://lore.kernel.org/lkml/20211214050708.4040200-1-vipinsh@google.com/
virt/kvm/kvm_main.c | 21 +++++++++++++++++++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 83c57bcc6eb6..2c9dcfffb606 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -5813,7 +5813,7 @@ static int kvm_vm_worker_thread(void *context)
struct kvm *kvm = init_context->kvm;
kvm_vm_thread_fn_t thread_fn = init_context->thread_fn;
uintptr_t data = init_context->data;
- int err;
+ int err, reattach_err;
err = kthread_park(current);
/* kthread_park(current) is never supposed to return an error */
@@ -5836,7 +5836,7 @@ static int kvm_vm_worker_thread(void *context)
init_context = NULL;
if (err)
- return err;
+ goto out;
/* Wait to be woken up by the spawner before proceeding. */
kthread_parkme();
@@ -5844,6 +5844,23 @@ static int kvm_vm_worker_thread(void *context)
if (!kthread_should_stop())
err = thread_fn(kvm, data);
+out:
+ /*
+ * Move kthread back to its original cgroup to prevent it lingering in
+ * the cgroup of the VM process, after the latter finishes its
+ * execution.
+ *
+ * kthread_stop() waits on the 'exited' completion condition which is
+ * set in exit_mm(), via mm_release(), in do_exit(). However, the
+ * kthread is removed from the cgroup in the cgroup_exit() which is
+ * called after the exit_mm(). This causes the kthread_stop() to return
+ * before the kthread actually quits the cgroup.
+ */
+ reattach_err = cgroup_attach_task_all(current->real_parent, current);
+ if (reattach_err) {
+ kvm_err("%s: cgroup_attach_task_all failed on reattach with err %d\n",
+ __func__, reattach_err);
+ }
return err;
}
base-commit: db6e7adf8de9b3b99a9856acb73870cc3a70e3ca
--
2.35.1.265.g69c8d7142f-goog
next reply other threads:[~2022-02-17 6:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-17 6:16 Vipin Sharma [this message]
2022-02-17 12:34 ` [PATCH v3] KVM: Move VM's worker kthreads back to the original cgroup before exiting kernel test robot
2022-02-17 16:05 ` Paolo Bonzini
2022-02-19 0:30 ` Sean Christopherson
2022-02-19 7:55 ` Paolo Bonzini
2022-02-17 19:47 ` kernel test robot
2022-02-17 23:22 ` kernel test robot
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=20220217061616.3303271-1-vipinsh@google.com \
--to=vipinsh@google.com \
--cc=cgroups@vger.kernel.org \
--cc=dmatlack@google.com \
--cc=hannes@cmpxchg.org \
--cc=jiangshanlai@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lizefan.x@bytedance.com \
--cc=mkoutny@suse.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=tj@kernel.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;
as well as URLs for NNTP newsgroup(s).