[3/3] ui/console: add methods for allocating, intializing and accessing QemuDmaBuf

Commit Message

Kim, Dongwon March 20, 2024, 8:50 p.m. UTC

From: Dongwon Kim <[e-mail]>

This commit introduces new methods within ui/console to handle the allocation,
initialization, and field retrieval of QemuDmaBuf. By isolating these
operations within ui/console, it enhances safety and encapsulation of
the struct.

Cc: Philippe Mathieu-Daudé <[e-mail]>
Cc: Marc-André Lureau <[e-mail]>
Cc: Vivek Kasireddy <[e-mail]>
Signed-off-by: Dongwon Kim <[e-mail]>
---
 include/ui/console.h | 10 ++++++++
 ui/console.c         | 55 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 65 insertions(+)

Comments

Philippe Mathieu-Daudé March 21, 2024, 9:58 a.m. UTC | #1

On 20/3/24 21:50, [e-mail] wrote:
> From: Dongwon Kim <[e-mail]>
> 
> This commit introduces new methods within ui/console to handle the allocation,
> initialization, and field retrieval of QemuDmaBuf. By isolating these
> operations within ui/console, it enhances safety and encapsulation of
> the struct.
> 
> Cc: Philippe Mathieu-Daudé <[e-mail]>
> Cc: Marc-André Lureau <[e-mail]>
> Cc: Vivek Kasireddy <[e-mail]>
> Signed-off-by: Dongwon Kim <[e-mail]>
> ---
>   include/ui/console.h | 10 ++++++++
>   ui/console.c         | 55 ++++++++++++++++++++++++++++++++++++++++++++
>   2 files changed, 65 insertions(+)


>   void dpy_gl_release_dmabuf(QemuConsole *con,
>                             QemuDmaBuf *dmabuf)
>   {
> @@ -1145,6 +1199,7 @@ void dpy_gl_release_dmabuf(QemuConsole *con,
>           if (dcl->ops->dpy_gl_release_dmabuf) {
>               dcl->ops->dpy_gl_release_dmabuf(dcl, dmabuf);
>           }
> +        g_free(dmabuf);

This makes vhost_user_gpu_handle_display() crash, see VhostUserGPU.

>       }
>   }
>

Patch

diff --git a/include/ui/console.h b/include/ui/console.h
index 0bc7a00ac0..70903f1b0d 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -279,6 +279,7 @@  typedef struct DisplayChangeListenerOps {
     /* optional */
     void (*dpy_gl_cursor_position)(DisplayChangeListener *dcl,
                                    uint32_t pos_x, uint32_t pos_y);
+
     /* optional */
     void (*dpy_gl_release_dmabuf)(DisplayChangeListener *dcl,
                                   QemuDmaBuf *dmabuf);
@@ -358,6 +359,15 @@  void dpy_gl_cursor_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf,
                           bool have_hot, uint32_t hot_x, uint32_t hot_y);
 void dpy_gl_cursor_position(QemuConsole *con,
                             uint32_t pos_x, uint32_t pos_y);
+QemuDmaBuf *dpy_gl_create_dmabuf(uint32_t width, uint32_t height,
+                                 uint32_t stride, uint32_t x,
+                                 uint32_t y, uint32_t backing_width,
+                                 uint32_t backing_height, uint32_t fourcc,
+                                 uint32_t modifier, uint32_t dmabuf_fd,
+                                 bool allow_fences);
+uint32_t dpy_gl_dmabuf_get_width(QemuDmaBuf *dmabuf);
+uint32_t dpy_gl_dmabuf_get_height(QemuDmaBuf *dmabuf);
+int32_t dpy_gl_dmabuf_get_fd(QemuDmaBuf *dmabuf);
 void dpy_gl_release_dmabuf(QemuConsole *con,
                            QemuDmaBuf *dmabuf);
 void dpy_gl_update(QemuConsole *con,
diff --git a/ui/console.c b/ui/console.c
index 43226c5c14..bac24756f0 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -1132,6 +1132,60 @@  void dpy_gl_cursor_position(QemuConsole *con,
     }
 }
 
+QemuDmaBuf *dpy_gl_create_dmabuf(uint32_t width, uint32_t height,
+                                 uint32_t stride, uint32_t x,
+                                 uint32_t y, uint32_t backing_width,
+                                 uint32_t backing_height, uint32_t fourcc,
+                                 uint32_t modifier, uint32_t dmabuf_fd,
+                                 bool allow_fences)
+{
+    QemuDmaBuf *dmabuf;
+
+    dmabuf = g_new0(QemuDmaBuf, 1);
+
+    dmabuf->width = width;
+    dmabuf->height = height;
+    dmabuf->stride = stride;
+    dmabuf->x = x;
+    dmabuf->y = y;
+    dmabuf->backing_width = backing_width;
+    dmabuf->backing_height = backing_height;
+    dmabuf->fourcc = fourcc;
+    dmabuf->modifier = modifier;
+    dmabuf->fd = dmabuf_fd;
+    dmabuf->allow_fences = allow_fences;
+    dmabuf->fence_fd = -1;
+
+    return dmabuf;
+}
+
+uint32_t dpy_gl_dmabuf_get_width(QemuDmaBuf *dmabuf)
+{
+    if (dmabuf) {
+        return dmabuf->width;
+    }
+
+    return 0;
+}
+
+uint32_t dpy_gl_dmabuf_get_height(QemuDmaBuf *dmabuf)
+{
+    if (dmabuf) {
+        return dmabuf->height;
+    }
+
+    return 0;
+}
+
+int32_t dpy_gl_dmabuf_get_fd(QemuDmaBuf *dmabuf)
+{
+    if (dmabuf) {
+        return dmabuf->fd;
+    }
+
+    return -1;
+}
+
 void dpy_gl_release_dmabuf(QemuConsole *con,
                           QemuDmaBuf *dmabuf)
 {
@@ -1145,6 +1199,7 @@  void dpy_gl_release_dmabuf(QemuConsole *con,
         if (dcl->ops->dpy_gl_release_dmabuf) {
             dcl->ops->dpy_gl_release_dmabuf(dcl, dmabuf);
         }
+        g_free(dmabuf);
     }
 }