[PATCH v2 0/2] fix memleaks in virtio_9p_device_unrealize

[PATCH v2 0/2] fix memleaks in virtio_9p_device_unrealize

[pannengyuan]

From: Pan Nengyuan <pannengyuan@huawei.com>

v1: fix memleaks in virtio_9p_device_unrealize
v2: split patch to make it easier for stable branches to merge

Pan Nengyuan (2):
  virtio-9p-device: fix memleak in virtio_9p_device_unrealize
  virtio-9p-device: convert to new virtio_delete_queue

 hw/9pfs/virtio-9p-device.c | 1 +
 1 file changed, 1 insertion(+)

-- 
2.21.0.windows.1

[PATCH v2 1/2] virtio-9p-device: fix memleak in virtio_9p_device_unrealize

[pannengyuan]

From: Pan Nengyuan <pannengyuan@huawei.com>

v->vq forgot to cleanup in virtio_9p_device_unrealize, the memory leak
stack is as follow:

Direct leak of 14336 byte(s) in 2 object(s) allocated from:
  #0 0x7f819ae43970 (/lib64/libasan.so.5+0xef970)  ??:?
  #1 0x7f819872f49d (/lib64/libglib-2.0.so.0+0x5249d)  ??:?
  #2 0x55a3a58da624 (./x86_64-softmmu/qemu-system-x86_64+0x2c14624)  /mnt/sdb/qemu/hw/virtio/virtio.c:2327
  #3 0x55a3a571bac7 (./x86_64-softmmu/qemu-system-x86_64+0x2a55ac7)  /mnt/sdb/qemu/hw/9pfs/virtio-9p-device.c:209
  #4 0x55a3a58e7bc6 (./x86_64-softmmu/qemu-system-x86_64+0x2c21bc6)  /mnt/sdb/qemu/hw/virtio/virtio.c:3504
  #5 0x55a3a5ebfb37 (./x86_64-softmmu/qemu-system-x86_64+0x31f9b37)  /mnt/sdb/qemu/hw/core/qdev.c:876

Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
---
Changes V2 to V1:
- use old function virtio_del_queue to make it easier for stable branch
to merge (suggested by Christian Schoenebeck)
---
 hw/9pfs/virtio-9p-device.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index b5a7c03f26..910dc5045e 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -215,6 +215,7 @@ static void virtio_9p_device_unrealize(DeviceState *dev, Error **errp)
     V9fsVirtioState *v = VIRTIO_9P(dev);
     V9fsState *s = &v->state;
 
+    virtio_del_queue(vdev, 0);
     virtio_cleanup(vdev);
     v9fs_device_unrealize_common(s, errp);
 }
-- 
2.21.0.windows.1

[PATCH v2 2/2] virtio-9p-device: convert to new virtio_delete_queue

[pannengyuan]

From: Pan Nengyuan <pannengyuan@huawei.com>

Use virtio_delete_queue to make it more clear.

Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
---
Changes V2 to V1:
- replace virtio_del_queue to virtio_delete_queue to make it more clear.
---
 hw/9pfs/virtio-9p-device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index 910dc5045e..b146387ae2 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -215,7 +215,7 @@ static void virtio_9p_device_unrealize(DeviceState *dev, Error **errp)
     V9fsVirtioState *v = VIRTIO_9P(dev);
     V9fsState *s = &v->state;
 
-    virtio_del_queue(vdev, 0);
+    virtio_delete_queue(v->vq);
     virtio_cleanup(vdev);
     v9fs_device_unrealize_common(s, errp);
 }
-- 
2.21.0.windows.1

Re: [PATCH v2 1/2] virtio-9p-device: fix memleak in virtio_9p_device_unrealize

[Christian Schoenebeck]

On Freitag, 17. Januar 2020 07:09:26 CET pannengyuan@huawei.com wrote:
> From: Pan Nengyuan <pannengyuan@huawei.com>
> 
> v->vq forgot to cleanup in virtio_9p_device_unrealize, the memory leak
> stack is as follow:
> 
> Direct leak of 14336 byte(s) in 2 object(s) allocated from:
>   #0 0x7f819ae43970 (/lib64/libasan.so.5+0xef970)  ??:?
>   #1 0x7f819872f49d (/lib64/libglib-2.0.so.0+0x5249d)  ??:?
>   #2 0x55a3a58da624 (./x86_64-softmmu/qemu-system-x86_64+0x2c14624) 
> /mnt/sdb/qemu/hw/virtio/virtio.c:2327 #3 0x55a3a571bac7
> (./x86_64-softmmu/qemu-system-x86_64+0x2a55ac7) 
> /mnt/sdb/qemu/hw/9pfs/virtio-9p-device.c:209 #4 0x55a3a58e7bc6
> (./x86_64-softmmu/qemu-system-x86_64+0x2c21bc6) 
> /mnt/sdb/qemu/hw/virtio/virtio.c:3504 #5 0x55a3a5ebfb37
> (./x86_64-softmmu/qemu-system-x86_64+0x31f9b37) 
> /mnt/sdb/qemu/hw/core/qdev.c:876
> 
> Reported-by: Euler Robot <euler.robot@huawei.com>
> Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>

Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>

Maybe you could add this patch to your revised PR Greg?

> ---
> Changes V2 to V1:
> - use old function virtio_del_queue to make it easier for stable branch
> to merge (suggested by Christian Schoenebeck)
> ---
>  hw/9pfs/virtio-9p-device.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
> index b5a7c03f26..910dc5045e 100644
> --- a/hw/9pfs/virtio-9p-device.c
> +++ b/hw/9pfs/virtio-9p-device.c
> @@ -215,6 +215,7 @@ static void virtio_9p_device_unrealize(DeviceState *dev,
> Error **errp) V9fsVirtioState *v = VIRTIO_9P(dev);
>      V9fsState *s = &v->state;
> 
> +    virtio_del_queue(vdev, 0);
>      virtio_cleanup(vdev);
>      v9fs_device_unrealize_common(s, errp);
>  }

Re: [PATCH v2 2/2] virtio-9p-device: convert to new virtio_delete_queue

[Christian Schoenebeck]

On Freitag, 17. Januar 2020 07:09:27 CET pannengyuan@huawei.com wrote:
> From: Pan Nengyuan <pannengyuan@huawei.com>
> 
> Use virtio_delete_queue to make it more clear.
> 
> Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
> ---
> Changes V2 to V1:
> - replace virtio_del_queue to virtio_delete_queue to make it more clear.
> ---
>  hw/9pfs/virtio-9p-device.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
> index 910dc5045e..b146387ae2 100644
> --- a/hw/9pfs/virtio-9p-device.c
> +++ b/hw/9pfs/virtio-9p-device.c
> @@ -215,7 +215,7 @@ static void virtio_9p_device_unrealize(DeviceState *dev,
> Error **errp) V9fsVirtioState *v = VIRTIO_9P(dev);
>      V9fsState *s = &v->state;
> 
> -    virtio_del_queue(vdev, 0);
> +    virtio_delete_queue(v->vq);
>      virtio_cleanup(vdev);
>      v9fs_device_unrealize_common(s, errp);
>  }

No idea what the deprecation plans of virtio_del_queue() are; no behaviour 
change, so this patch is certainly not high priority. On the other hand though 
this change most certainly will be required on day.

I can imagine Greg might want to see a more verbose commit message, but that's 
beyond my personal detail level, so from my side

Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com>

Re: [PATCH v2 1/2] virtio-9p-device: fix memleak in virtio_9p_device_unrealize

[Michael S. Tsirkin]

On Fri, Jan 17, 2020 at 01:52:53PM +0100, Christian Schoenebeck wrote:
> On Freitag, 17. Januar 2020 07:09:26 CET pannengyuan@huawei.com wrote:
> > From: Pan Nengyuan <pannengyuan@huawei.com>
> > 
> > v->vq forgot to cleanup in virtio_9p_device_unrealize, the memory leak
> > stack is as follow:
> > 
> > Direct leak of 14336 byte(s) in 2 object(s) allocated from:
> >   #0 0x7f819ae43970 (/lib64/libasan.so.5+0xef970)  ??:?
> >   #1 0x7f819872f49d (/lib64/libglib-2.0.so.0+0x5249d)  ??:?
> >   #2 0x55a3a58da624 (./x86_64-softmmu/qemu-system-x86_64+0x2c14624) 
> > /mnt/sdb/qemu/hw/virtio/virtio.c:2327 #3 0x55a3a571bac7
> > (./x86_64-softmmu/qemu-system-x86_64+0x2a55ac7) 
> > /mnt/sdb/qemu/hw/9pfs/virtio-9p-device.c:209 #4 0x55a3a58e7bc6
> > (./x86_64-softmmu/qemu-system-x86_64+0x2c21bc6) 
> > /mnt/sdb/qemu/hw/virtio/virtio.c:3504 #5 0x55a3a5ebfb37
> > (./x86_64-softmmu/qemu-system-x86_64+0x31f9b37) 
> > /mnt/sdb/qemu/hw/core/qdev.c:876
> > 
> > Reported-by: Euler Robot <euler.robot@huawei.com>
> > Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
> 
> Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
> 
> Maybe you could add this patch to your revised PR Greg?

I'm testing all the related virtio changes and they will be
in my next PR.

> > ---
> > Changes V2 to V1:
> > - use old function virtio_del_queue to make it easier for stable branch
> > to merge (suggested by Christian Schoenebeck)
> > ---
> >  hw/9pfs/virtio-9p-device.c | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
> > index b5a7c03f26..910dc5045e 100644
> > --- a/hw/9pfs/virtio-9p-device.c
> > +++ b/hw/9pfs/virtio-9p-device.c
> > @@ -215,6 +215,7 @@ static void virtio_9p_device_unrealize(DeviceState *dev,
> > Error **errp) V9fsVirtioState *v = VIRTIO_9P(dev);
> >      V9fsState *s = &v->state;
> > 
> > +    virtio_del_queue(vdev, 0);
> >      virtio_cleanup(vdev);
> >      v9fs_device_unrealize_common(s, errp);
> >  }
> 
> 
> 

Re: [PATCH v2 1/2] virtio-9p-device: fix memleak in virtio_9p_device_unrealize

[Greg Kurz]

On Fri, 17 Jan 2020 08:43:42 -0500
"Michael S. Tsirkin" <mst@redhat.com> wrote:

> On Fri, Jan 17, 2020 at 01:52:53PM +0100, Christian Schoenebeck wrote:
> > On Freitag, 17. Januar 2020 07:09:26 CET pannengyuan@huawei.com wrote:
> > > From: Pan Nengyuan <pannengyuan@huawei.com>
> > > 
> > > v->vq forgot to cleanup in virtio_9p_device_unrealize, the memory leak
> > > stack is as follow:
> > > 
> > > Direct leak of 14336 byte(s) in 2 object(s) allocated from:
> > >   #0 0x7f819ae43970 (/lib64/libasan.so.5+0xef970)  ??:?
> > >   #1 0x7f819872f49d (/lib64/libglib-2.0.so.0+0x5249d)  ??:?
> > >   #2 0x55a3a58da624 (./x86_64-softmmu/qemu-system-x86_64+0x2c14624) 
> > > /mnt/sdb/qemu/hw/virtio/virtio.c:2327 #3 0x55a3a571bac7
> > > (./x86_64-softmmu/qemu-system-x86_64+0x2a55ac7) 
> > > /mnt/sdb/qemu/hw/9pfs/virtio-9p-device.c:209 #4 0x55a3a58e7bc6
> > > (./x86_64-softmmu/qemu-system-x86_64+0x2c21bc6) 
> > > /mnt/sdb/qemu/hw/virtio/virtio.c:3504 #5 0x55a3a5ebfb37
> > > (./x86_64-softmmu/qemu-system-x86_64+0x31f9b37) 
> > > /mnt/sdb/qemu/hw/core/qdev.c:876
> > > 
> > > Reported-by: Euler Robot <euler.robot@huawei.com>
> > > Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
> > 
> > Reviewed-by: Christian Schoenebeck <qemu_oss@crudebyte.com>
> > 
> > Maybe you could add this patch to your revised PR Greg?
> 
> I'm testing all the related virtio changes and they will be
> in my next PR.
> 

Thanks Michael.

You can add this tag for the whole series:

Acked-by: Greg Kurz <groug@kaod.org>

> > > ---
> > > Changes V2 to V1:
> > > - use old function virtio_del_queue to make it easier for stable branch
> > > to merge (suggested by Christian Schoenebeck)
> > > ---
> > >  hw/9pfs/virtio-9p-device.c | 1 +
> > >  1 file changed, 1 insertion(+)
> > > 
> > > diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
> > > index b5a7c03f26..910dc5045e 100644
> > > --- a/hw/9pfs/virtio-9p-device.c
> > > +++ b/hw/9pfs/virtio-9p-device.c
> > > @@ -215,6 +215,7 @@ static void virtio_9p_device_unrealize(DeviceState *dev,
> > > Error **errp) V9fsVirtioState *v = VIRTIO_9P(dev);
> > >      V9fsState *s = &v->state;
> > > 
> > > +    virtio_del_queue(vdev, 0);
> > >      virtio_cleanup(vdev);
> > >      v9fs_device_unrealize_common(s, errp);
> > >  }
> > 
> > 
> > 
>