* [PATCH v3 0/3] virtio: fix memory leak in virtio-balloon/virtio-serial-bus
@ 2019-12-09 2:00 pannengyuan
2019-12-09 2:00 ` [PATCH v3 1/3] virtio: add ability to delete vq through a pointer pannengyuan
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: pannengyuan @ 2019-12-09 2:00 UTC (permalink / raw)
To: mst; +Cc: liyiting, kuhn.chenqun, Pan Nengyuan, qemu-devel, zhang.zhanghailiang
From: Pan Nengyuan <pannengyuan@huawei.com>
This series add a new function to cleanup vqueue through a vq pointer, and fix memory
leaks in virtio-balloon and virtio-serial-bus.
---
Changes v2 to v1:
- add a new function to cleanup vqueue through a vq pointer.
---
Changes v3 to v2:
- change function name from virtio_delete_queue to virtio_queue_cleanup.
Michael S. Tsirkin(1)
virtio: add ability to delete vq through a pointer
Pan Nengyuan (2):
virtio-balloon: fix memory leak while attach virtio-balloon device
virtio-serial-bus: fix memory leak while attach virtio-serial-bus
hw/char/virtio-serial-bus.c | 8 ++++++++
hw/virtio/virtio-balloon.c | 7 +++++++
hw/virtio/virtio.c | 16 +++++++++++-----
include/hw/virtio/virtio.h | 2 ++
4 files changed, 28 insertions(+), 5 deletions(-)
--
2.7.2.windows.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v3 1/3] virtio: add ability to delete vq through a pointer
2019-12-09 2:00 [PATCH v3 0/3] virtio: fix memory leak in virtio-balloon/virtio-serial-bus pannengyuan
@ 2019-12-09 2:00 ` pannengyuan
2019-12-09 3:04 ` Pan Nengyuan
2019-12-12 14:51 ` David Hildenbrand
2019-12-09 2:00 ` [PATCH v3 2/3] virtio-balloon: fix memory leak while attach virtio-balloon device pannengyuan
2019-12-09 2:00 ` [PATCH v3 3/3] virtio-serial-bus: fix memory leak while attach virtio-serial-bus pannengyuan
2 siblings, 2 replies; 7+ messages in thread
From: pannengyuan @ 2019-12-09 2:00 UTC (permalink / raw)
To: mst
Cc: liyiting, zhang.zhanghailiang, Amit Shah, Pan Nengyuan,
qemu-devel, kuhn.chenqun
From: Michael S. Tsirkin <mst@redhat.com>
Devices tend to maintain vq pointers, allow deleting them through a vq
pointer.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
[PMM: change function name to virtio_queue_cleanup; set used_elems to NULL after free]
Cc: Amit Shah <amit@kernel.org>
Reviewed-by: Pankaj Gupta <pagupta@redhat.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
---
Changes v2 to v1:
- use virtio_delete_queue to cleanup vq through a vq pointer
---
Changes v3 to v2:
- change function name from virtio_delete_queue to virtio_queue_cleanup
---
hw/virtio/virtio.c | 16 +++++++++++-----
include/hw/virtio/virtio.h | 2 ++
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 04716b5..2743258 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -2330,17 +2330,23 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
return &vdev->vq[i];
}
+void virtio_queue_cleanup(VirtQueue *vq)
+{
+ vq->vring.num = 0;
+ vq->vring.num_default = 0;
+ vq->handle_output = NULL;
+ vq->handle_aio_output = NULL;
+ g_free(vq->used_elems);
+ vq->used_elems = NULL;
+}
+
void virtio_del_queue(VirtIODevice *vdev, int n)
{
if (n < 0 || n >= VIRTIO_QUEUE_MAX) {
abort();
}
- vdev->vq[n].vring.num = 0;
- vdev->vq[n].vring.num_default = 0;
- vdev->vq[n].handle_output = NULL;
- vdev->vq[n].handle_aio_output = NULL;
- g_free(vdev->vq[n].used_elems);
+ virtio_queue_cleanup(&vdev->vq[n]);
}
static void virtio_set_isr(VirtIODevice *vdev, int value)
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index c32a815..cc0b3f0 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -183,6 +183,8 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
void virtio_del_queue(VirtIODevice *vdev, int n);
+void virtio_queue_cleanup(VirtQueue *vq);
+
void virtqueue_push(VirtQueue *vq, const VirtQueueElement *elem,
unsigned int len);
void virtqueue_flush(VirtQueue *vq, unsigned int count);
--
2.7.2.windows.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 2/3] virtio-balloon: fix memory leak while attach virtio-balloon device
2019-12-09 2:00 [PATCH v3 0/3] virtio: fix memory leak in virtio-balloon/virtio-serial-bus pannengyuan
2019-12-09 2:00 ` [PATCH v3 1/3] virtio: add ability to delete vq through a pointer pannengyuan
@ 2019-12-09 2:00 ` pannengyuan
2019-12-12 14:51 ` David Hildenbrand
2019-12-09 2:00 ` [PATCH v3 3/3] virtio-serial-bus: fix memory leak while attach virtio-serial-bus pannengyuan
2 siblings, 1 reply; 7+ messages in thread
From: pannengyuan @ 2019-12-09 2:00 UTC (permalink / raw)
To: mst
Cc: liyiting, zhang.zhanghailiang, Amit Shah, Pan Nengyuan,
qemu-devel, kuhn.chenqun
From: Pan Nengyuan <pannengyuan@huawei.com>
ivq/dvq/svq/free_page_vq forgot to cleanup in
virtio_balloon_device_unrealize, the memory leak stack is as follow:
Direct leak of 14336 byte(s) in 2 object(s) allocated from:
#0 0x7f99fd9d8560 in calloc (/usr/lib64/libasan.so.3+0xc7560)
#1 0x7f99fcb20015 in g_malloc0 (/usr/lib64/libglib-2.0.so.0+0x50015)
#2 0x557d90638437 in virtio_add_queue hw/virtio/virtio.c:2327
#3 0x557d9064401d in virtio_balloon_device_realize hw/virtio/virtio-balloon.c:793
#4 0x557d906356f7 in virtio_device_realize hw/virtio/virtio.c:3504
#5 0x557d9073f081 in device_set_realized hw/core/qdev.c:876
#6 0x557d908b1f4d in property_set_bool qom/object.c:2080
#7 0x557d908b655e in object_property_set_qobject qom/qom-qobject.c:26
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
Cc: Amit Shah <amit@kernel.org>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
---
Changes v2 to v1:
- use virtio_delete_queue to cleanup vq through a vq pointer (suggested by
Michael S. Tsirkin)
---
Changes v3 to v2:
- change virtio_delete_queue to virtio_queue_cleanup
---
hw/virtio/virtio-balloon.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 40b04f5..681a2b2 100644
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -831,6 +831,13 @@ static void virtio_balloon_device_unrealize(DeviceState *dev, Error **errp)
}
balloon_stats_destroy_timer(s);
qemu_remove_balloon_handler(s);
+
+ virtio_queue_cleanup(s->ivq);
+ virtio_queue_cleanup(s->dvq);
+ virtio_queue_cleanup(s->svq);
+ if (s->free_page_vq) {
+ virtio_queue_cleanup(s->free_page_vq);
+ }
virtio_cleanup(vdev);
}
--
2.7.2.windows.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 3/3] virtio-serial-bus: fix memory leak while attach virtio-serial-bus
2019-12-09 2:00 [PATCH v3 0/3] virtio: fix memory leak in virtio-balloon/virtio-serial-bus pannengyuan
2019-12-09 2:00 ` [PATCH v3 1/3] virtio: add ability to delete vq through a pointer pannengyuan
2019-12-09 2:00 ` [PATCH v3 2/3] virtio-balloon: fix memory leak while attach virtio-balloon device pannengyuan
@ 2019-12-09 2:00 ` pannengyuan
2 siblings, 0 replies; 7+ messages in thread
From: pannengyuan @ 2019-12-09 2:00 UTC (permalink / raw)
To: mst
Cc: liyiting, Laurent Vivier, zhang.zhanghailiang, Amit Shah,
Pan Nengyuan, qemu-devel, Paolo Bonzini, Marc-André Lureau,
kuhn.chenqun
From: Pan Nengyuan <pannengyuan@huawei.com>
ivqs/ovqs/c_ivq/c_ovq forgot to cleanup in
virtio_serial_device_unrealize, the memory leak stack is as below:
Direct leak of 1290240 byte(s) in 180 object(s) allocated from:
#0 0x7fc9bfc27560 in calloc (/usr/lib64/libasan.so.3+0xc7560)
#1 0x7fc9bed6f015 in g_malloc0 (/usr/lib64/libglib-2.0.so.0+0x50015)
#2 0x5650e02b83e7 in virtio_add_queue hw/virtio/virtio.c:2327
#3 0x5650e02847b5 in virtio_serial_device_realize hw/char/virtio-serial-bus.c:1089
#4 0x5650e02b56a7 in virtio_device_realize hw/virtio/virtio.c:3504
#5 0x5650e03bf031 in device_set_realized hw/core/qdev.c:876
#6 0x5650e0531efd in property_set_bool qom/object.c:2080
#7 0x5650e053650e in object_property_set_qobject qom/qom-qobject.c:26
#8 0x5650e0533e14 in object_property_set_bool qom/object.c:1338
#9 0x5650e04c0e37 in virtio_pci_realize hw/virtio/virtio-pci.c:1801
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Cc: Laurent Vivier <lvivier@redhat.com>
Cc: Amit Shah <amit@kernel.org>
Cc: "Marc-André Lureau" <marcandre.lureau@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
---
Changes v2 to v1:
- use virtio_delete_queue to cleanup vq through a vq pointer (suggested by
Michael S. Tsirkin)
Changes v3 to v1:
- change virtio_delete_queue to virtio_queue_cleanup.
---
hw/char/virtio-serial-bus.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index 3325904..f63dc46 100644
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -1126,9 +1126,17 @@ static void virtio_serial_device_unrealize(DeviceState *dev, Error **errp)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIOSerial *vser = VIRTIO_SERIAL(dev);
+ int i;
QLIST_REMOVE(vser, next);
+ virtio_queue_cleanup(vser->c_ivq);
+ virtio_queue_cleanup(vser->c_ovq);
+ for (i = 0; i < vser->bus.max_nr_ports; i++) {
+ virtio_queue_cleanup(vser->ivqs[i]);
+ virtio_queue_cleanup(vser->ovqs[i]);
+ }
+
g_free(vser->ivqs);
g_free(vser->ovqs);
g_free(vser->ports_map);
--
2.7.2.windows.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/3] virtio: add ability to delete vq through a pointer
2019-12-09 2:00 ` [PATCH v3 1/3] virtio: add ability to delete vq through a pointer pannengyuan
@ 2019-12-09 3:04 ` Pan Nengyuan
2019-12-12 14:51 ` David Hildenbrand
1 sibling, 0 replies; 7+ messages in thread
From: Pan Nengyuan @ 2019-12-09 3:04 UTC (permalink / raw)
To: mst; +Cc: liyiting, kuhn.chenqun, Amit Shah, qemu-devel, zhang.zhanghailiang
On 2019/12/9 10:00, pannengyuan@huawei.com wrote:
> From: Michael S. Tsirkin <mst@redhat.com>
>
> Devices tend to maintain vq pointers, allow deleting them through a vq
> pointer.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
> [PMM: change function name to virtio_queue_cleanup; set used_elems to NULL after free]
Oh. I'm sorry. Here is PNM (not PMM).
> Cc: Amit Shah <amit@kernel.org>
> Reviewed-by: Pankaj Gupta <pagupta@redhat.com>
> Reviewed-by: Laurent Vivier <lvivier@redhat.com>
> ---
> Changes v2 to v1:
> - use virtio_delete_queue to cleanup vq through a vq pointer
> ---
> Changes v3 to v2:
> - change function name from virtio_delete_queue to virtio_queue_cleanup
> ---
> hw/virtio/virtio.c | 16 +++++++++++-----
> include/hw/virtio/virtio.h | 2 ++
> 2 files changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
> index 04716b5..2743258 100644
> --- a/hw/virtio/virtio.c
> +++ b/hw/virtio/virtio.c
> @@ -2330,17 +2330,23 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
> return &vdev->vq[i];
> }
>
> +void virtio_queue_cleanup(VirtQueue *vq)
> +{
> + vq->vring.num = 0;
> + vq->vring.num_default = 0;
> + vq->handle_output = NULL;
> + vq->handle_aio_output = NULL;
> + g_free(vq->used_elems);
> + vq->used_elems = NULL;
> +}
> +
> void virtio_del_queue(VirtIODevice *vdev, int n)
> {
> if (n < 0 || n >= VIRTIO_QUEUE_MAX) {
> abort();
> }
>
> - vdev->vq[n].vring.num = 0;
> - vdev->vq[n].vring.num_default = 0;
> - vdev->vq[n].handle_output = NULL;
> - vdev->vq[n].handle_aio_output = NULL;
> - g_free(vdev->vq[n].used_elems);
> + virtio_queue_cleanup(&vdev->vq[n]);
> }
>
> static void virtio_set_isr(VirtIODevice *vdev, int value)
> diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
> index c32a815..cc0b3f0 100644
> --- a/include/hw/virtio/virtio.h
> +++ b/include/hw/virtio/virtio.h
> @@ -183,6 +183,8 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
>
> void virtio_del_queue(VirtIODevice *vdev, int n);
>
> +void virtio_queue_cleanup(VirtQueue *vq);
> +
> void virtqueue_push(VirtQueue *vq, const VirtQueueElement *elem,
> unsigned int len);
> void virtqueue_flush(VirtQueue *vq, unsigned int count);
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 2/3] virtio-balloon: fix memory leak while attach virtio-balloon device
2019-12-09 2:00 ` [PATCH v3 2/3] virtio-balloon: fix memory leak while attach virtio-balloon device pannengyuan
@ 2019-12-12 14:51 ` David Hildenbrand
0 siblings, 0 replies; 7+ messages in thread
From: David Hildenbrand @ 2019-12-12 14:51 UTC (permalink / raw)
To: pannengyuan, mst
Cc: liyiting, kuhn.chenqun, qemu-devel, zhang.zhanghailiang, Amit Shah
On 09.12.19 03:00, pannengyuan@huawei.com wrote:
> From: Pan Nengyuan <pannengyuan@huawei.com>
>
> ivq/dvq/svq/free_page_vq forgot to cleanup in
> virtio_balloon_device_unrealize, the memory leak stack is as follow:
>
> Direct leak of 14336 byte(s) in 2 object(s) allocated from:
> #0 0x7f99fd9d8560 in calloc (/usr/lib64/libasan.so.3+0xc7560)
> #1 0x7f99fcb20015 in g_malloc0 (/usr/lib64/libglib-2.0.so.0+0x50015)
> #2 0x557d90638437 in virtio_add_queue hw/virtio/virtio.c:2327
> #3 0x557d9064401d in virtio_balloon_device_realize hw/virtio/virtio-balloon.c:793
> #4 0x557d906356f7 in virtio_device_realize hw/virtio/virtio.c:3504
> #5 0x557d9073f081 in device_set_realized hw/core/qdev.c:876
> #6 0x557d908b1f4d in property_set_bool qom/object.c:2080
> #7 0x557d908b655e in object_property_set_qobject qom/qom-qobject.c:26
>
> Reported-by: Euler Robot <euler.robot@huawei.com>
> Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
> Cc: Amit Shah <amit@kernel.org>
> Reviewed-by: Laurent Vivier <lvivier@redhat.com>
> ---
> Changes v2 to v1:
> - use virtio_delete_queue to cleanup vq through a vq pointer (suggested by
> Michael S. Tsirkin)
> ---
> Changes v3 to v2:
> - change virtio_delete_queue to virtio_queue_cleanup
> ---
> hw/virtio/virtio-balloon.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
> index 40b04f5..681a2b2 100644
> --- a/hw/virtio/virtio-balloon.c
> +++ b/hw/virtio/virtio-balloon.c
> @@ -831,6 +831,13 @@ static void virtio_balloon_device_unrealize(DeviceState *dev, Error **errp)
> }
> balloon_stats_destroy_timer(s);
> qemu_remove_balloon_handler(s);
> +
> + virtio_queue_cleanup(s->ivq);
> + virtio_queue_cleanup(s->dvq);
> + virtio_queue_cleanup(s->svq);
> + if (s->free_page_vq) {
> + virtio_queue_cleanup(s->free_page_vq);
> + }
> virtio_cleanup(vdev);
> }
>
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v3 1/3] virtio: add ability to delete vq through a pointer
2019-12-09 2:00 ` [PATCH v3 1/3] virtio: add ability to delete vq through a pointer pannengyuan
2019-12-09 3:04 ` Pan Nengyuan
@ 2019-12-12 14:51 ` David Hildenbrand
1 sibling, 0 replies; 7+ messages in thread
From: David Hildenbrand @ 2019-12-12 14:51 UTC (permalink / raw)
To: pannengyuan, mst
Cc: liyiting, kuhn.chenqun, qemu-devel, zhang.zhanghailiang, Amit Shah
On 09.12.19 03:00, pannengyuan@huawei.com wrote:
> From: Michael S. Tsirkin <mst@redhat.com>
>
> Devices tend to maintain vq pointers, allow deleting them through a vq
> pointer.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
> [PMM: change function name to virtio_queue_cleanup; set used_elems to NULL after free]
> Cc: Amit Shah <amit@kernel.org>
> Reviewed-by: Pankaj Gupta <pagupta@redhat.com>
> Reviewed-by: Laurent Vivier <lvivier@redhat.com>
> ---
> Changes v2 to v1:
> - use virtio_delete_queue to cleanup vq through a vq pointer
> ---
> Changes v3 to v2:
> - change function name from virtio_delete_queue to virtio_queue_cleanup
> ---
> hw/virtio/virtio.c | 16 +++++++++++-----
> include/hw/virtio/virtio.h | 2 ++
> 2 files changed, 13 insertions(+), 5 deletions(-)
>
> diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
> index 04716b5..2743258 100644
> --- a/hw/virtio/virtio.c
> +++ b/hw/virtio/virtio.c
> @@ -2330,17 +2330,23 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
> return &vdev->vq[i];
> }
>
> +void virtio_queue_cleanup(VirtQueue *vq)
> +{
> + vq->vring.num = 0;
> + vq->vring.num_default = 0;
> + vq->handle_output = NULL;
> + vq->handle_aio_output = NULL;
> + g_free(vq->used_elems);
> + vq->used_elems = NULL;
> +}
> +
> void virtio_del_queue(VirtIODevice *vdev, int n)
> {
> if (n < 0 || n >= VIRTIO_QUEUE_MAX) {
> abort();
> }
>
> - vdev->vq[n].vring.num = 0;
> - vdev->vq[n].vring.num_default = 0;
> - vdev->vq[n].handle_output = NULL;
> - vdev->vq[n].handle_aio_output = NULL;
> - g_free(vdev->vq[n].used_elems);
> + virtio_queue_cleanup(&vdev->vq[n]);
> }
>
> static void virtio_set_isr(VirtIODevice *vdev, int value)
> diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
> index c32a815..cc0b3f0 100644
> --- a/include/hw/virtio/virtio.h
> +++ b/include/hw/virtio/virtio.h
> @@ -183,6 +183,8 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
>
> void virtio_del_queue(VirtIODevice *vdev, int n);
>
> +void virtio_queue_cleanup(VirtQueue *vq);
> +
> void virtqueue_push(VirtQueue *vq, const VirtQueueElement *elem,
> unsigned int len);
> void virtqueue_flush(VirtQueue *vq, unsigned int count);
>
Reviewed-by: David Hildenbrand <david@redhat.com>
--
Thanks,
David / dhildenb
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2019-12-12 14:53 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-09 2:00 [PATCH v3 0/3] virtio: fix memory leak in virtio-balloon/virtio-serial-bus pannengyuan
2019-12-09 2:00 ` [PATCH v3 1/3] virtio: add ability to delete vq through a pointer pannengyuan
2019-12-09 3:04 ` Pan Nengyuan
2019-12-12 14:51 ` David Hildenbrand
2019-12-09 2:00 ` [PATCH v3 2/3] virtio-balloon: fix memory leak while attach virtio-balloon device pannengyuan
2019-12-12 14:51 ` David Hildenbrand
2019-12-09 2:00 ` [PATCH v3 3/3] virtio-serial-bus: fix memory leak while attach virtio-serial-bus pannengyuan
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.