From: Cindy Lu <lulu@redhat.com>
To: lulu@redhat.com, jasowang@redhat.com, mst@redhat.com,
michael.christie@oracle.com, sgarzare@redhat.com,
linux-kernel@vger.kernel.org,
virtualization@lists.linux-foundation.org,
netdev@vger.kernel.org
Subject: [PATCH v3 3/9] vhost: Add the cgroup related function
Date: Tue, 5 Nov 2024 15:25:22 +0800 [thread overview]
Message-ID: <20241105072642.898710-4-lulu@redhat.com> (raw)
In-Reply-To: <20241105072642.898710-1-lulu@redhat.com>
Add back the previously removed cgroup function to support the kthread
The biggest change for this part is in vhost_attach_cgroups() and
vhost_worker_cgroups_kthread(). This is because of the change in
struct dev->worker_xa.
The old function was remove in
commit 6e890c5d5021 ("vhost: use vhost_tasks for worker threads")
Signed-off-by: Cindy Lu <lulu@redhat.com>
---
drivers/vhost/vhost.c | 52 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c
index 65fda810b96e..e40cef3a1fa5 100644
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
@@ -22,6 +22,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/kthread.h>
+#include <linux/cgroup.h>
#include <linux/module.h>
#include <linux/sort.h>
#include <linux/sched/mm.h>
@@ -621,6 +622,57 @@ long vhost_dev_check_owner(struct vhost_dev *dev)
}
EXPORT_SYMBOL_GPL(vhost_dev_check_owner);
+struct vhost_attach_cgroups_struct {
+ struct vhost_work work;
+ struct task_struct *owner;
+ int ret;
+};
+
+static void vhost_attach_cgroups_work(struct vhost_work *work)
+{
+ struct vhost_attach_cgroups_struct *s;
+
+ s = container_of(work, struct vhost_attach_cgroups_struct, work);
+ s->ret = cgroup_attach_task_all(s->owner, current);
+}
+
+static int vhost_worker_cgroups_kthread(struct vhost_worker *worker)
+{
+ struct vhost_flush_struct flush;
+ struct vhost_attach_cgroups_struct attach;
+
+ attach.owner = current;
+
+ vhost_work_init(&attach.work, vhost_attach_cgroups_work);
+ vhost_worker_queue(worker, &attach.work);
+
+ init_completion(&flush.wait_event);
+ vhost_work_init(&flush.work, vhost_flush_work);
+ vhost_worker_queue(worker, &flush.work);
+ wait_for_completion(&flush.wait_event);
+
+ return attach.ret;
+}
+
+static int vhost_attach_cgroups(struct vhost_dev *dev)
+{
+ struct vhost_worker *worker;
+ unsigned long i;
+ int ret;
+
+ /*
+ * Free the default worker we created and cleanup workers userspace
+ * created but couldn't clean up (it forgot or crashed).
+ */
+
+ xa_for_each(&dev->worker_xa, i, worker) {
+ ret = vhost_worker_cgroups_kthread(worker);
+ if (ret)
+ return ret;
+ }
+ return ret;
+}
+
/* Caller should have device mutex */
bool vhost_dev_has_owner(struct vhost_dev *dev)
{
--
2.45.0
next prev parent reply other threads:[~2024-11-05 7:27 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-05 7:25 [PATCH v3 0/9] vhost: Add support of kthread API Cindy Lu
2024-11-05 7:25 ` [PATCH v3 1/9] vhost: Add a new parameter to allow user select kthread Cindy Lu
2024-11-05 9:32 ` Jason Wang
2024-11-05 7:25 ` [PATCH v3 2/9] vhost: Add the vhost_worker to support kthread Cindy Lu
2024-11-05 7:25 ` Cindy Lu [this message]
2024-11-25 15:22 ` [PATCH v3 3/9] vhost: Add the cgroup related function Mike Christie
2024-11-27 6:44 ` Cindy Lu
2024-11-05 7:25 ` [PATCH v3 4/9] vhost: Add kthread support in function vhost_worker_create Cindy Lu
2024-11-05 9:36 ` Jason Wang
2024-11-06 9:21 ` Cindy Lu
2024-11-26 21:19 ` michael.christie
2024-11-27 6:43 ` Cindy Lu
2024-11-05 7:25 ` [PATCH v3 5/9] vhost: Add kthread support in function vhost_worker_queue() Cindy Lu
2024-11-05 9:37 ` Jason Wang
2024-11-07 10:38 ` Dan Carpenter
2024-11-07 11:12 ` Dan Carpenter
2024-11-05 7:25 ` [PATCH v3 6/9] vhost: Add kthread support in function vhost_worker_destroy() Cindy Lu
2024-11-07 11:24 ` Dan Carpenter
2024-11-05 7:25 ` [PATCH v3 7/9] vhost: Add new UAPI to support change to task mode Cindy Lu
2024-11-05 9:39 ` Jason Wang
2024-11-25 15:19 ` Mike Christie
2024-11-05 10:31 ` Stefano Garzarella
2024-11-07 7:12 ` Cindy Lu
2024-11-07 10:03 ` Stefano Garzarella
2024-11-07 11:50 ` Cindy Lu
2024-11-06 7:31 ` Michael S. Tsirkin
2024-11-06 7:33 ` Michael S. Tsirkin
2024-11-05 7:25 ` [PATCH v3 8/9] vhost_scsi: Add check for inherit_owner status Cindy Lu
2024-11-25 15:00 ` Mike Christie
2024-11-05 7:25 ` [PATCH v3 9/9] vhost: Expose the modparam inherit_owner_default Cindy Lu
2024-12-10 11:09 ` [PATCH v3 0/9] vhost: Add support of kthread API Lei Yang
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=20241105072642.898710-4-lulu@redhat.com \
--to=lulu@redhat.com \
--cc=jasowang@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.christie@oracle.com \
--cc=mst@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sgarzare@redhat.com \
--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®