From: <pannengyuan@huawei.com>
To: <mst@redhat.com>, <pbonzini@redhat.com>, <fam@euphon.net>
Cc: Euler Robot <euler.robot@huawei.com>,
Pan Nengyuan <pannengyuan@huawei.com>,
qemu-devel@nongnu.org, zhang.zhanghailiang@huawei.com
Subject: [PATCH 1/2] virtio-scsi: delete vqs in unrealize to avoid memleaks
Date: Fri, 17 Jan 2020 15:55:46 +0800 [thread overview]
Message-ID: <20200117075547.60864-2-pannengyuan@huawei.com> (raw)
In-Reply-To: <20200117075547.60864-1-pannengyuan@huawei.com>
From: Pan Nengyuan <pannengyuan@huawei.com>
This patch fix memleaks when attaching/detaching virtio-scsi device, the
memory leak stack is as follow:
Direct leak of 21504 byte(s) in 3 object(s) allocated from:
#0 0x7f491f2f2970 (/lib64/libasan.so.5+0xef970) ??:?
#1 0x7f491e94649d (/lib64/libglib-2.0.so.0+0x5249d) ??:?
#2 0x564d0f3919fa (./x86_64-softmmu/qemu-system-x86_64+0x2c3e9fa) /mnt/sdb/qemu/hw/virtio/virtio.c:2333
#3 0x564d0f2eca55 (./x86_64-softmmu/qemu-system-x86_64+0x2b99a55) /mnt/sdb/qemu/hw/scsi/virtio-scsi.c:912
#4 0x564d0f2ece7b (./x86_64-softmmu/qemu-system-x86_64+0x2b99e7b) /mnt/sdb/qemu/hw/scsi/virtio-scsi.c:924
#5 0x564d0f39ee47 (./x86_64-softmmu/qemu-system-x86_64+0x2c4be47) /mnt/sdb/qemu/hw/virtio/virtio.c:3531
#6 0x564d0f980224 (./x86_64-softmmu/qemu-system-x86_64+0x322d224) /mnt/sdb/qemu/hw/core/qdev.c:865
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
---
hw/scsi/virtio-scsi.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 4bc73a370e..858b3aaccb 100644
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -943,7 +943,13 @@ void virtio_scsi_common_unrealize(DeviceState *dev)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIOSCSICommon *vs = VIRTIO_SCSI_COMMON(dev);
+ int i;
+ virtio_del_queue(vdev, 0);
+ virtio_del_queue(vdev, 1);
+ for (i = 0; i < vs->conf.num_queues; i++) {
+ virtio_del_queue(vdev, i + 2);
+ }
g_free(vs->cmd_vqs);
virtio_cleanup(vdev);
}
--
2.21.0.windows.1
next prev parent reply other threads:[~2020-01-17 7:57 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-17 7:55 [PATCH 0/2] delete virtio queues in virtio_scsi_unrealize pannengyuan
2020-01-17 7:55 ` pannengyuan [this message]
2020-01-17 7:55 ` [PATCH 2/2] virtio-scsi: convert to new virtio_delete_queue pannengyuan
2020-01-20 14:35 ` [PATCH 0/2] delete virtio queues in virtio_scsi_unrealize Stefan Hajnoczi
2020-01-21 16:23 ` Paolo Bonzini
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=20200117075547.60864-2-pannengyuan@huawei.com \
--to=pannengyuan@huawei.com \
--cc=euler.robot@huawei.com \
--cc=fam@euphon.net \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=zhang.zhanghailiang@huawei.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.