qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Li Qiang <liq3ea@gmail.com>, Gerd Hoffmann <kraxel@redhat.com>,
	"Michael S. Tsirkin" <mst@redhat.com>
Subject: [Qemu-devel] [PULL 3/5] virtio-gpu: call cleanup mapping function in resource destroy
Date: Tue,  3 Jan 2017 15:52:32 +0100	[thread overview]
Message-ID: <1483455154-8106-4-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1483455154-8106-1-git-send-email-kraxel@redhat.com>

From: Li Qiang <liq3ea@gmail.com>

If the guest destroy the resource before detach banking, the 'iov'
and 'addrs' field in resource is not freed thus leading memory
leak issue. This patch avoid this.

Signed-off-by: Li Qiang <liq3ea@gmail.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 1480386565-10077-1-git-send-email-liq3ea@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hw/display/virtio-gpu.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index ed2b6d3..6a26258 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -28,6 +28,8 @@
 static struct virtio_gpu_simple_resource*
 virtio_gpu_find_resource(VirtIOGPU *g, uint32_t resource_id);
 
+static void virtio_gpu_cleanup_mapping(struct virtio_gpu_simple_resource *res);
+
 #ifdef CONFIG_VIRGL
 #include <virglrenderer.h>
 #define VIRGL(_g, _virgl, _simple, ...)                     \
@@ -364,6 +366,7 @@ static void virtio_gpu_resource_destroy(VirtIOGPU *g,
                                         struct virtio_gpu_simple_resource *res)
 {
     pixman_image_unref(res->image);
+    virtio_gpu_cleanup_mapping(res);
     QTAILQ_REMOVE(&g->reslist, res, next);
     g->hostmem -= res->hostmem;
     g_free(res);
-- 
1.8.3.1

  parent reply	other threads:[~2017-01-03 14:52 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-03 14:52 [Qemu-devel] [PULL 0/5] virtio-gpu: misc bugfixes Gerd Hoffmann
2017-01-03 14:52 ` [Qemu-devel] [PULL 1/5] display: virtio-gpu-3d: check virgl capabilities max_size Gerd Hoffmann
2017-01-03 14:52 ` [Qemu-devel] [PULL 2/5] virtio-gpu: track and limit host memory allocations Gerd Hoffmann
2017-01-03 14:52 ` Gerd Hoffmann [this message]
2017-01-03 14:52 ` [Qemu-devel] [PULL 4/5] virtio-gpu-3d: fix memory leak in resource attach backing Gerd Hoffmann
2017-01-03 14:52 ` [Qemu-devel] [PULL 5/5] virtio-gpu: " Gerd Hoffmann
2017-01-05 10:53 ` [Qemu-devel] [PULL 0/5] virtio-gpu: misc bugfixes Peter Maydell

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=1483455154-8106-4-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=liq3ea@gmail.com \
    --cc=mst@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).