Skip to contentSkip to conversation

virtio: Cancel and join threads when exiting devices

PATCH Applied Eduardo Bart 2 participants 3 messages Nov 17, 2023 – Nov 21, 2023 KVM

lore
Share & tools
lore
#0 lore raw

v2 cover virtio: Cancel and join threads when exiting devices

Hello,

This is v2 of my patch fixing possible crashes in extra threads of kvmtool after powering off guest machines.

I've addressed changes requested by Jean-Philippe Brucker and Will Deacon.

Eduardo Bart (1):
virtio: Cancel and join threads when exiting devices

 include/kvm/virtio-9p.h |  1 +
 include/kvm/virtio.h    |  1 +
 virtio/9p.c             | 14 ++++++++++++++
 virtio/balloon.c        | 10 ++++++++++
 virtio/blk.c            |  1 +
 virtio/console.c        |  2 ++
 virtio/core.c           |  6 ++++++
 virtio/net.c            |  3 +++
 virtio/rng.c            | 10 +++++++++-
 9 files changed, 47 insertions(+), 1 deletion(-)
Signature · 1 line
2.42.0
#1 lore raw

PATCH v2 1/1 virtio: Cancel and join threads when exiting devices devices

---
 include/kvm/virtio-9p.h |  1 +
 include/kvm/virtio.h    |  1 +
 virtio/9p.c             | 14 ++++++++++++++
 virtio/balloon.c        | 10 ++++++++++
 virtio/blk.c            |  1 +
 virtio/console.c        |  2 ++
 virtio/core.c           |  6 ++++++
 virtio/net.c            |  3 +++
 virtio/rng.c            | 10 +++++++++-
 9 files changed, 47 insertions(+), 1 deletion(-)
include/kvm/virtio-9p.h +1 -0
index 1dffc95..09f7e46 100644
@@ -70,6 +70,7 @@ int virtio_9p_rootdir_parser(const struct option *opt, const char *arg, int unse
 int virtio_9p_img_name_parser(const struct option *opt, const char *arg, int unset);
 int virtio_9p__register(struct kvm *kvm, const char *root, const char *tag_name);
 int virtio_9p__init(struct kvm *kvm);
+int virtio_9p__exit(struct kvm *kvm);
 int virtio_p9_pdu_readf(struct p9_pdu *pdu, const char *fmt, ...);
 int virtio_p9_pdu_writef(struct p9_pdu *pdu, const char *fmt, ...);
 
include/kvm/virtio.h +1 -0
index 95b5142..8b7ec1b 100644
@@ -251,6 +251,7 @@ struct virtio_ops {
 int __must_check virtio_init(struct kvm *kvm, void *dev, struct virtio_device *vdev,
 			     struct virtio_ops *ops, enum virtio_trans trans,
 			     int device_id, int subsys_id, int class);
+void virtio_exit(struct kvm *kvm, struct virtio_device *vdev);
 int virtio_compat_add_message(const char *device, const char *config);
 const char* virtio_trans_name(enum virtio_trans trans);
 void virtio_init_device_vq(struct kvm *kvm, struct virtio_device *vdev,
virtio/9p.c +14 -0
index 513164e..2fa6f28 100644
@@ -1562,6 +1562,20 @@ int virtio_9p__init(struct kvm *kvm)
 }
 virtio_dev_init(virtio_9p__init);
 
+int virtio_9p__exit(struct kvm *kvm)
+{
+	struct p9_dev *p9dev, *tmp;
+
+	list_for_each_entry_safe(p9dev, tmp, &devs, list) {
+		list_del(&p9dev->list);
+		virtio_exit(kvm, &p9dev->vdev);
+		free(p9dev);
+	}
+
+	return 0;
+}
+virtio_dev_exit(virtio_9p__exit);
+
 int virtio_9p__register(struct kvm *kvm, const char *root, const char *tag_name)
 {
 	struct p9_dev *p9dev;
virtio/balloon.c +10 -0
index 01d1982..5b3e062 100644
@@ -221,6 +221,13 @@ static int init_vq(struct kvm *kvm, void *dev, u32 vq)
 	return 0;
 }
 
+static void exit_vq(struct kvm *kvm, void *dev, u32 vq)
+{
+	struct bln_dev *bdev = dev;
+
+	thread_pool__cancel_job(&bdev->jobs[vq]);
+}
+
 static int notify_vq(struct kvm *kvm, void *dev, u32 vq)
 {
 	struct bln_dev *bdev = dev;
@@ -258,6 +265,7 @@ struct virtio_ops bln_dev_virtio_ops = {
 	.get_config_size	= get_config_size,
 	.get_host_features	= get_host_features,
 	.init_vq		= init_vq,
+	.exit_vq		= exit_vq,
 	.notify_vq		= notify_vq,
 	.get_vq			= get_vq,
 	.get_size_vq		= get_size_vq,
@@ -293,6 +301,8 @@ virtio_dev_init(virtio_bln__init);
 
 int virtio_bln__exit(struct kvm *kvm)
 {
+	virtio_exit(kvm, &bdev.vdev);
+
 	return 0;
 }
 virtio_dev_exit(virtio_bln__exit);
virtio/blk.c +1 -0
index a58c745..b2d6180 100644
@@ -345,6 +345,7 @@ static int virtio_blk__init_one(struct kvm *kvm, struct disk_image *disk)
 static int virtio_blk__exit_one(struct kvm *kvm, struct blk_dev *bdev)
 {
 	list_del(&bdev->list);
+	virtio_exit(kvm, &bdev->vdev);
 	free(bdev);
 
 	return 0;
virtio/console.c +2 -0
index ebfbaf0..9a775f2 100644
@@ -243,6 +243,8 @@ virtio_dev_init(virtio_console__init);
 
 int virtio_console__exit(struct kvm *kvm)
 {
+	virtio_exit(kvm, &cdev.vdev);
+
 	return 0;
 }
 virtio_dev_exit(virtio_console__exit);
virtio/core.c +6 -0
index a77e23b..b77e987 100644
@@ -400,6 +400,12 @@ int virtio_init(struct kvm *kvm, void *dev, struct virtio_device *vdev,
 	return r;
 }
 
+void virtio_exit(struct kvm *kvm, struct virtio_device *vdev)
+{
+	if (vdev->ops && vdev->ops->exit)
+		vdev->ops->exit(kvm, vdev);
+}
+
 int virtio_compat_add_message(const char *device, const char *config)
 {
 	int len = 1024;
virtio/net.c +3 -0
index f09dd0a..492c576 100644
@@ -969,10 +969,13 @@ int virtio_net__exit(struct kvm *kvm)
 		if (ndev->mode == NET_MODE_TAP &&
 		    strcmp(params->downscript, "none"))
 			virtio_net_exec_script(params->downscript, ndev->tap_name);
+		virtio_net_stop(ndev);
 
 		list_del(&ndev->list);
+		virtio_exit(kvm, &ndev->vdev);
 		free(ndev);
 	}
+
 	return 0;
 }
 virtio_dev_exit(virtio_net__exit);
virtio/rng.c +9 -1
index 6b36655..505c4b2 100644
@@ -122,6 +122,13 @@ static int init_vq(struct kvm *kvm, void *dev, u32 vq)
 	return 0;
 }
 
+static void exit_vq(struct kvm *kvm, void *dev, u32 vq)
+{
+	struct rng_dev *rdev = dev;
+
+	thread_pool__cancel_job(&rdev->jobs[vq].job_id);
+}
+
 static int notify_vq(struct kvm *kvm, void *dev, u32 vq)
 {
 	struct rng_dev *rdev = dev;
@@ -159,6 +166,7 @@ static struct virtio_ops rng_dev_virtio_ops = {
 	.get_config_size	= get_config_size,
 	.get_host_features	= get_host_features,
 	.init_vq		= init_vq,
+	.exit_vq		= exit_vq,
 	.notify_vq		= notify_vq,
 	.get_vq			= get_vq,
 	.get_size_vq		= get_size_vq,
@@ -209,7 +217,7 @@ int virtio_rng__exit(struct kvm *kvm)
 
 	list_for_each_entry_safe(rdev, tmp, &rdevs, list) {
 		list_del(&rdev->list);
-		rdev->vdev.ops->exit(kvm, &rdev->vdev);
+		virtio_exit(kvm, &rdev->vdev);
 		free(rdev);
 	}
 
Signature · 1 line
2.42.0
Applied
#2 lore raw
In reply to Eduardo Bart
Quoted 9 lines · Eduardo Bart

This is v2 of my patch fixing possible crashes in extra threads of kvmtool after powering off guest machines.

I've addressed changes requested by Jean-Philippe Brucker and Will Deacon.

Eduardo Bart (1):
virtio: Cancel and join threads when exiting devices

[...]

Applied to kvmtool (master), thanks!

[1/1] virtio: Cancel and join threads when exiting devices devices

      https://git.kernel.org/will/kvmtool/c/74af1456dfa0

Cheers,

Signature · 5 lines
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev