Skip to content

Commit ba07cf5

Browse files
panny060mstsirkin
authored andcommitted
vhost-user-fs: do delete virtio_queues in unrealize
Similar to other virtio device(https://patchwork.kernel.org/patch/11399237/), virtio queues forgot to delete in unrealize, and aslo error path in realize, this patch fix these memleaks, the leak stack is as follow: Direct leak of 57344 byte(s) in 1 object(s) allocated from: #0 0x7f15784fb970 in __interceptor_calloc (/lib64/libasan.so.5+0xef970) #1 0x7f157790849d in g_malloc0 (/lib64/libglib-2.0.so.0+0x5249d) #2 0x55587a1bf859 in virtio_add_queue /mnt/sdb/qemu-new/qemu_test/qemu/hw/virtio/virtio.c:2333 #3 0x55587a2071d5 in vuf_device_realize /mnt/sdb/qemu-new/qemu_test/qemu/hw/virtio/vhost-user-fs.c:212 #4 0x55587a1ae360 in virtio_device_realize /mnt/sdb/qemu-new/qemu_test/qemu/hw/virtio/virtio.c:3531 #5 0x55587a63fb7b in device_set_realized /mnt/sdb/qemu-new/qemu_test/qemu/hw/core/qdev.c:891 #6 0x55587acf03f5 in property_set_bool /mnt/sdb/qemu-new/qemu_test/qemu/qom/object.c:2238 #7 0x55587acfce0d in object_property_set_qobject /mnt/sdb/qemu-new/qemu_test/qemu/qom/qom-qobject.c:26 #8 0x55587acf5c8c in object_property_set_bool /mnt/sdb/qemu-new/qemu_test/qemu/qom/object.c:1390 #9 0x55587a8e22a2 in pci_qdev_realize /mnt/sdb/qemu-new/qemu_test/qemu/hw/pci/pci.c:2095 #10 0x55587a63fb7b in device_set_realized /mnt/sdb/qemu-new/qemu_test/qemu/hw/core/qdev.c:891 #11 0x55587acf03f5 in property_set_bool /mnt/sdb/qemu-new/qemu_test/qemu/qom/object.c:2238 #12 0x55587acfce0d in object_property_set_qobject /mnt/sdb/qemu-new/qemu_test/qemu/qom/qom-qobject.c:26 #13 0x55587acf5c8c in object_property_set_bool /mnt/sdb/qemu-new/qemu_test/qemu/qom/object.c:1390 #14 0x55587a496d65 in qdev_device_add /mnt/sdb/qemu-new/qemu_test/qemu/qdev-monitor.c:679 Reported-by: Euler Robot <[email protected]> Signed-off-by: Pan Nengyuan <[email protected]> Cc: "Dr. David Alan Gilbert" <[email protected]> Cc: Stefan Hajnoczi <[email protected]> Message-Id: <[email protected]> Reviewed-by: Michael S. Tsirkin <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]>
1 parent 6ab425d commit ba07cf5

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

hw/virtio/vhost-user-fs.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,10 @@ static void vuf_device_realize(DeviceState *dev, Error **errp)
230230

231231
err_virtio:
232232
vhost_user_cleanup(&fs->vhost_user);
233+
virtio_del_queue(vdev, 0);
234+
for (i = 0; i < fs->conf.num_request_queues; i++) {
235+
virtio_del_queue(vdev, i + 1);
236+
}
233237
virtio_cleanup(vdev);
234238
g_free(fs->vhost_dev.vqs);
235239
return;
@@ -239,6 +243,7 @@ static void vuf_device_unrealize(DeviceState *dev, Error **errp)
239243
{
240244
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
241245
VHostUserFS *fs = VHOST_USER_FS(dev);
246+
int i;
242247

243248
/* This will stop vhost backend if appropriate. */
244249
vuf_set_status(vdev, 0);
@@ -247,6 +252,10 @@ static void vuf_device_unrealize(DeviceState *dev, Error **errp)
247252

248253
vhost_user_cleanup(&fs->vhost_user);
249254

255+
virtio_del_queue(vdev, 0);
256+
for (i = 0; i < fs->conf.num_request_queues; i++) {
257+
virtio_del_queue(vdev, i + 1);
258+
}
250259
virtio_cleanup(vdev);
251260
g_free(fs->vhost_dev.vqs);
252261
fs->vhost_dev.vqs = NULL;

0 commit comments

Comments
 (0)