Re: [Qemu-devel] [PATCH v6 00/11] vhost-user for input & GPU

[Marc-André Lureau]

Hi

On Wed, Apr 24, 2019 at 3:29 PM Michael S. Tsirkin <address@hidden> wrote:
>
> On Tue, Apr 23, 2019 at 03:19:53PM +0200, Marc-André Lureau wrote:
> > Hi,
> >
> > vhost-user allows to drive a virtio device in a seperate
> > process. After vhost-user-net, we have seen
> > vhost-user-{scsi,blk,crypto} added more recently.
> >
> > This series, initially proposed ~3 years ago, time flies
> > (https://lists.gnu.org/archive/html/qemu-devel/2016-06/msg01905.html)
> > contributes with vhost-user-input and vhost-user-gpu.
>
>
> Pls note asan errors reported by patchew.

Those are pre-existing, and I thought we had patches on the list for
them, but I can't find them.

A quick fix could be:

diff --git a/contrib/libvhost-user/libvhost-user.c
b/contrib/libvhost-user/libvhost-user.c
index c9823a1354..944d5c9c4f 100644
--- a/contrib/libvhost-user/libvhost-user.c
+++ b/contrib/libvhost-user/libvhost-user.c
@@ -543,7 +543,7 @@ static bool
 vu_set_mem_table_exec_postcopy(VuDev *dev, VhostUserMsg *vmsg)
 {
     int i;
-    VhostUserMemory *memory = &vmsg->payload.memory;
+    VhostUserMemory m = vmsg->payload.memory, *memory = &m;
     dev->nregions = memory->nregions;

     DPRINT("Nregions: %d\n", memory->nregions);
@@ -685,7 +685,7 @@ static bool
 vu_set_mem_table_exec(VuDev *dev, VhostUserMsg *vmsg)
 {
     int i;
-    VhostUserMemory *memory = &vmsg->payload.memory;
+    VhostUserMemory m = vmsg->payload.memory, *memory = &m;

     for (i = 0; i < dev->nregions; i++) {
         VuDevRegion *r = &dev->regions[i];
@@ -814,7 +814,7 @@ vu_set_vring_num_exec(VuDev *dev, VhostUserMsg *vmsg)
 static bool
 vu_set_vring_addr_exec(VuDev *dev, VhostUserMsg *vmsg)
 {
-    struct vhost_vring_addr *vra = &vmsg->payload.addr;
+    struct vhost_vring_addr addr = vmsg->payload.addr, *vra = &addr;
     unsigned int index = vra->index;
     VuVirtq *vq = &dev->vq[index];


>
>
> > You may start a vhost-user-gpu with virgl rendering in a separate
> > process like this:
> >
> > $ ./vhost-user-gpu --virgl -s vgpu.sock &
> > $ qemu...
> >   -chardev socket,id=chr,path=vgpu.sock
> >   -device vhost-user-vga,chardev=chr
> >
> > v6:
> >  - do not install vhost-user-input
> >  - install vhost-user-gpu and json file following the spec
> >  - fix the build when drm-intel-devel missing
> >  - rebase (& resend without already applied patches)
> >
> > v5:
> >  - remove user-creatable version of vhost-user-backend
> >  - remove optinal management of sub-process in vhost-user-backend
> >  - removed daemonize/pid code
> >  - drop introduction of new input & gpu messages for PCI config space
> >    handling, instead use VHOST_USER_PROTOCOL_F_CONFIG
> >  - plain mem & udmabuf fallback for 2d rendering
> >  - rebased, kconfig-ify, rst-ify
> >
> > Marc-André Lureau (11):
> >   Add vhost-user-backend
> >   Add vhost-user-input-pci
> >   libvhost-user: add PROTOCOL_F_CONFIG if {set,get}_config
> >   contrib: add vhost-user-input
> >   vhost-user: add vhost_user_gpu_set_socket()
> >   virtio: add virtio-gpu bswap helpers header
> >   util: compile drm.o on Linux
> >   contrib: add vhost-user-gpu
> >   virtio-gpu: split virtio-gpu, introduce virtio-gpu-base
> >   virtio-gpu: split virtio-gpu-pci & virtio-vga
> >   hw/display: add vhost-user-vga & gpu-pci
> >
> >  contrib/libvhost-user/libvhost-user.h      |    1 +
> >  contrib/vhost-user-gpu/drm.h               |   72 ++
> >  contrib/vhost-user-gpu/virgl.h             |   25 +
> >  contrib/vhost-user-gpu/vugpu.h             |  170 +++
> >  hw/display/virtio-vga.h                    |   32 +
> >  include/hw/virtio/vhost-backend.h          |    2 +
> >  include/hw/virtio/virtio-gpu-bswap.h       |   61 +
> >  include/hw/virtio/virtio-gpu-pci.h         |   40 +
> >  include/hw/virtio/virtio-gpu.h             |   92 +-
> >  include/hw/virtio/virtio-input.h           |   14 +
> >  include/sysemu/vhost-user-backend.h        |   57 +
> >  backends/vhost-user.c                      |  209 ++++
> >  contrib/libvhost-user/libvhost-user.c      |    5 +
> >  contrib/vhost-user-gpu/drm.c               |  341 ++++++
> >  contrib/vhost-user-gpu/main.c              | 1236 ++++++++++++++++++++
> >  contrib/vhost-user-gpu/virgl.c             |  579 +++++++++
> >  contrib/vhost-user-input/main.c            |  427 +++++++
> >  hw/display/vhost-user-gpu-pci.c            |   51 +
> >  hw/display/vhost-user-gpu.c                |  572 +++++++++
> >  hw/display/vhost-user-vga.c                |   52 +
> >  hw/display/virtio-gpu-3d.c                 |   49 +-
> >  hw/display/virtio-gpu-base.c               |  268 +++++
> >  hw/display/virtio-gpu-pci.c                |   55 +-
> >  hw/display/virtio-gpu.c                    |  415 ++-----
> >  hw/display/virtio-vga.c                    |  138 +--
> >  hw/input/vhost-user-input.c                |  129 ++
> >  hw/virtio/vhost-user-input-pci.c           |   53 +
> >  hw/virtio/vhost-user.c                     |   11 +
> >  vl.c                                       |    1 +
> >  MAINTAINERS                                |   14 +-
> >  Makefile                                   |   27 +-
> >  Makefile.objs                              |    2 +
> >  backends/Makefile.objs                     |    2 +
> >  configure                                  |   29 +
> >  contrib/vhost-user-gpu/50-qemu-gpu.json.in |    5 +
> >  contrib/vhost-user-gpu/Makefile.objs       |   10 +
> >  contrib/vhost-user-input/Makefile.objs     |    1 +
> >  docs/interop/index.rst                     |    2 +-
> >  docs/interop/vhost-user-gpu.rst            |  238 ++++
> >  docs/interop/vhost-user.txt                |    9 +
> >  hw/display/Kconfig                         |   10 +
> >  hw/display/Makefile.objs                   |    5 +-
> >  hw/input/Kconfig                           |    5 +
> >  hw/input/Makefile.objs                     |    1 +
> >  hw/virtio/Makefile.objs                    |    1 +
> >  rules.mak                                  |    9 +-
> >  util/Makefile.objs                         |    2 +-
> >  47 files changed, 5070 insertions(+), 459 deletions(-)
> >  create mode 100644 contrib/vhost-user-gpu/drm.h
> >  create mode 100644 contrib/vhost-user-gpu/virgl.h
> >  create mode 100644 contrib/vhost-user-gpu/vugpu.h
> >  create mode 100644 hw/display/virtio-vga.h
> >  create mode 100644 include/hw/virtio/virtio-gpu-bswap.h
> >  create mode 100644 include/hw/virtio/virtio-gpu-pci.h
> >  create mode 100644 include/sysemu/vhost-user-backend.h
> >  create mode 100644 backends/vhost-user.c
> >  create mode 100644 contrib/vhost-user-gpu/drm.c
> >  create mode 100644 contrib/vhost-user-gpu/main.c
> >  create mode 100644 contrib/vhost-user-gpu/virgl.c
> >  create mode 100644 contrib/vhost-user-input/main.c
> >  create mode 100644 hw/display/vhost-user-gpu-pci.c
> >  create mode 100644 hw/display/vhost-user-gpu.c
> >  create mode 100644 hw/display/vhost-user-vga.c
> >  create mode 100644 hw/display/virtio-gpu-base.c
> >  create mode 100644 hw/input/vhost-user-input.c
> >  create mode 100644 hw/virtio/vhost-user-input-pci.c
> >  create mode 100644 contrib/vhost-user-gpu/50-qemu-gpu.json.in
> >  create mode 100644 contrib/vhost-user-gpu/Makefile.objs
> >  create mode 100644 contrib/vhost-user-input/Makefile.objs
> >  create mode 100644 docs/interop/vhost-user-gpu.rst
> >
> > --
> > 2.21.0.313.ge35b8cb8e2
>


-- 
Marc-André Lureau