From nobody Tue Feb 10 02:43:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1618902563; cv=none; d=zohomail.com; s=zohoarc; b=mc9E1+H/09WQ9tRfmHt8ZuW8f3xc5/2D5GnC2n1IWlI/n5wSV3Gj3kytB3ry6Rt7mOStvL4P9SjzAvLOwwdTYiGLqD7PzErG34COZmLEGpiHDm0az8e5PY3Jp+xfl8brkkjVaG5QDdTDzPYpMLbbfw2LmQCuz5+4EHGGYBdc948= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618902563; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=elRKoidkMXebcdbd9ZIghzG6J08d5y4ZvF9mlxJO8i4=; b=QvKyer5pOKJk1QQEhsxwuFFLEk8GLvribmPVuqJNb55FJ3pYpY4GZnwXMfdRRy6kOzASi87t5Lnn2b7U5TG/p3scnnbfSTskM/Zn60ARg0VntOIpVVOo9ui+JwDko6hPHlskiYBgLl9gZCAtxqx8x+JWDk9HQ3iodyk7J8Akwg0= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1618902563086496.4766615130103; Tue, 20 Apr 2021 00:09:23 -0700 (PDT) Received: from localhost ([::1]:41364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYkVd-0000j3-Sv for importer@patchew.org; Tue, 20 Apr 2021 03:09:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59538) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYkSH-0003EC-5L for qemu-devel@nongnu.org; Tue, 20 Apr 2021 03:05:53 -0400 Received: from mga17.intel.com ([192.55.52.151]:17751) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYkSE-0002hb-MW for qemu-devel@nongnu.org; Tue, 20 Apr 2021 03:05:52 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2021 00:05:37 -0700 Received: from vkasired-desk2.fm.intel.com ([10.105.128.127]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Apr 2021 00:05:36 -0700 IronPort-SDR: SdQ1YoVOcTTA/HIPWP0oBQ+miIKvhYkycXwRqkRo7Vhkp+rzxPChLGEHbh+rkK3gaie4P+eZGD pe8cTn2tdSSQ== X-IronPort-AV: E=McAfee;i="6200,9189,9959"; a="175563724" X-IronPort-AV: E=Sophos;i="5.82,236,1613462400"; d="scan'208";a="175563724" IronPort-SDR: n04eybpKJ6g48wauMHmOcV3SCNpqecXTh5E+fuSx4swGxFVwYmWhhrUmUbBO6krxyx8L2nn5TK 2zIL5qYLOkiw== X-IronPort-AV: E=Sophos;i="5.82,236,1613462400"; d="scan'208";a="420293118" From: Vivek Kasireddy To: qemu-devel@nongnu.org Subject: [PATCH v2 02/12] virtio-gpu: Add udmabuf helpers Date: Mon, 19 Apr 2021 23:53:37 -0700 Message-Id: <20210420065347.2685768-3-vivek.kasireddy@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210420065347.2685768-1-vivek.kasireddy@intel.com> References: <20210420065347.2685768-1-vivek.kasireddy@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.55.52.151; envelope-from=vivek.kasireddy@intel.com; helo=mga17.intel.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Vivek Kasireddy , Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" Add helper functions to create a dmabuf for a resource and mmap it. To be able to create a dmabuf using the udmabuf driver, Qemu needs to be lauched with the memfd memory backend like this: qemu-system-x86_64 -m 8192m -object memory-backend-memfd,id=3Dmem1,size=3D8= 192M -machine memory-backend=3Dmem1 Based-on-patch-by: Gerd Hoffmann Signed-off-by: Vivek Kasireddy --- hw/display/meson.build | 2 +- hw/display/virtio-gpu-udmabuf.c | 183 +++++++++++++++++++++++ include/hw/virtio/virtio-gpu.h | 10 ++ include/standard-headers/linux/udmabuf.h | 32 ++++ scripts/update-linux-headers.sh | 3 + 5 files changed, 229 insertions(+), 1 deletion(-) create mode 100644 hw/display/virtio-gpu-udmabuf.c create mode 100644 include/standard-headers/linux/udmabuf.h diff --git a/hw/display/meson.build b/hw/display/meson.build index 9d79e3951d..e0fa88d62f 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -56,7 +56,7 @@ softmmu_ss.add(when: [pixman, 'CONFIG_ATI_VGA'], if_true:= files('ati.c', 'ati_2d if config_all_devices.has_key('CONFIG_VIRTIO_GPU') virtio_gpu_ss =3D ss.source_set() virtio_gpu_ss.add(when: 'CONFIG_VIRTIO_GPU', - if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c'), = pixman, virgl]) + if_true: [files('virtio-gpu-base.c', 'virtio-gpu.c', '= virtio-gpu-udmabuf.c'), pixman, virgl]) virtio_gpu_ss.add(when: ['CONFIG_VIRTIO_GPU', 'CONFIG_VIRGL'], if_true: [files('virtio-gpu-3d.c'), pixman, virgl]) virtio_gpu_ss.add(when: 'CONFIG_VHOST_USER_GPU', if_true: files('vhost-u= ser-gpu.c')) diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabu= f.c new file mode 100644 index 0000000000..2c0e7b2455 --- /dev/null +++ b/hw/display/virtio-gpu-udmabuf.c @@ -0,0 +1,183 @@ +/* + * Virtio GPU Device + * + * Copyright Red Hat, Inc. 2013-2014 + * + * Authors: + * Dave Airlie + * Gerd Hoffmann + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qemu/units.h" +#include "qemu-common.h" +#include "qemu/iov.h" +#include "ui/console.h" +#include "hw/virtio/virtio-gpu.h" +#include "hw/virtio/virtio-gpu-pixman.h" +#include "trace.h" + +#ifdef CONFIG_LINUX + +#include "exec/ramblock.h" +#include "sysemu/hostmem.h" +#include +#include +#include +#include "standard-headers/linux/udmabuf.h" + +static void virtio_gpu_create_udmabuf(struct virtio_gpu_simple_resource *r= es) +{ + struct udmabuf_create_list *list; + RAMBlock *rb; + ram_addr_t offset; + int udmabuf, i; + + udmabuf =3D udmabuf_fd(); + if (udmabuf < 0) { + return; + } + + list =3D g_malloc0(sizeof(struct udmabuf_create_list) + + sizeof(struct udmabuf_create_item) * res->iov_cnt); + + for (i =3D 0; i < res->iov_cnt; i++) { + rcu_read_lock(); + rb =3D qemu_ram_block_from_host(res->iov[i].iov_base, false, &offs= et); + rcu_read_unlock(); + + if (!rb || rb->fd < 0) { + g_free(list); + return; + } + + list->list[i].memfd =3D rb->fd; + list->list[i].offset =3D offset; + list->list[i].size =3D res->iov[i].iov_len; + } + + list->count =3D res->iov_cnt; + list->flags =3D UDMABUF_FLAGS_CLOEXEC; + + res->dmabuf_fd =3D ioctl(udmabuf, UDMABUF_CREATE_LIST, list); + if (res->dmabuf_fd < 0) { + warn_report("%s: UDMABUF_CREATE_LIST: %s", __func__, + strerror(errno)); + } + g_free(list); +} + +static void virtio_gpu_remap_udmabuf(struct virtio_gpu_simple_resource *re= s) +{ + res->remapsz =3D res->width * res->height * 4; + res->remapsz =3D QEMU_ALIGN_UP(res->remapsz, qemu_real_host_page_size); + + res->remapped =3D mmap(NULL, res->remapsz, PROT_READ, + MAP_SHARED, res->dmabuf_fd, 0); + if (res->remapped =3D=3D MAP_FAILED) { + warn_report("%s: dmabuf mmap failed: %s", __func__, + strerror(errno)); + res->remapped =3D NULL; + } +} + +static void virtio_gpu_destroy_udmabuf(struct virtio_gpu_simple_resource *= res) +{ + if (res->remapped) { + munmap(res->remapped, res->remapsz); + res->remapped =3D NULL; + } + if (res->dmabuf_fd >=3D 0) { + close(res->dmabuf_fd); + res->dmabuf_fd =3D -1; + } +} + +static int find_memory_backend_type(Object *obj, void *opaque) +{ + bool *memfd_backend =3D opaque; + int ret; + + if (object_dynamic_cast(obj, TYPE_MEMORY_BACKEND)) { + HostMemoryBackend *backend =3D MEMORY_BACKEND(obj); + RAMBlock *rb =3D backend->mr.ram_block; + + if (rb && rb->fd > 0) { + ret =3D fcntl(rb->fd, F_GET_SEALS); + if (ret > 0) { + *memfd_backend =3D true; + } + } + } + + return 0; +} + +bool virtio_gpu_have_udmabuf(void) +{ + Object *memdev_root; + int udmabuf; + bool memfd_backend =3D false; + + udmabuf =3D udmabuf_fd(); + if (udmabuf < 0) { + return false; + } + + memdev_root =3D object_resolve_path("/objects", NULL); + object_child_foreach(memdev_root, find_memory_backend_type, &memfd_bac= kend); + + return memfd_backend; +} + +void virtio_gpu_init_udmabuf(struct virtio_gpu_simple_resource *res) +{ + void *pdata =3D NULL; + + res->dmabuf_fd =3D -1; + if (res->iov_cnt =3D=3D 1) { + pdata =3D res->iov[0].iov_base; + } else { + virtio_gpu_create_udmabuf(res); + if (res->dmabuf_fd < 0) { + return; + } + virtio_gpu_remap_udmabuf(res); + if (!res->remapped) { + return; + } + pdata =3D res->remapped; + } + + (void) pdata; +} + +void virtio_gpu_fini_udmabuf(struct virtio_gpu_simple_resource *res) +{ + if (res->remapped) { + virtio_gpu_destroy_udmabuf(res); + } +} + +#else + +bool virtio_gpu_have_udmabuf(void) +{ + /* nothing (stub) */ + return false; +} + +void virtio_gpu_init_udmabuf(struct virtio_gpu_simple_resource *res) +{ + /* nothing (stub) */ +} + +void virtio_gpu_fini_udmabuf(struct virtio_gpu_simple_resource *res) +{ + /* nothing (stub) */ +} + +#endif diff --git a/include/hw/virtio/virtio-gpu.h b/include/hw/virtio/virtio-gpu.h index fae149235c..a4b7738d8a 100644 --- a/include/hw/virtio/virtio-gpu.h +++ b/include/hw/virtio/virtio-gpu.h @@ -47,6 +47,11 @@ struct virtio_gpu_simple_resource { uint32_t scanout_bitmask; pixman_image_t *image; uint64_t hostmem; + + int dmabuf_fd; + size_t remapsz; + uint8_t *remapped; + QTAILQ_ENTRY(virtio_gpu_simple_resource) next; }; =20 @@ -214,6 +219,11 @@ void virtio_gpu_cleanup_mapping_iov(VirtIOGPU *g, struct iovec *iov, uint32_t count); void virtio_gpu_process_cmdq(VirtIOGPU *g); =20 +/* virtio-gpu-udmabuf.c */ +bool virtio_gpu_have_udmabuf(void); +void virtio_gpu_init_udmabuf(struct virtio_gpu_simple_resource *res); +void virtio_gpu_fini_udmabuf(struct virtio_gpu_simple_resource *res); + /* virtio-gpu-3d.c */ void virtio_gpu_virgl_process_cmd(VirtIOGPU *g, struct virtio_gpu_ctrl_command *cmd); diff --git a/include/standard-headers/linux/udmabuf.h b/include/standard-he= aders/linux/udmabuf.h new file mode 100644 index 0000000000..e19eb5b5ce --- /dev/null +++ b/include/standard-headers/linux/udmabuf.h @@ -0,0 +1,32 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef _LINUX_UDMABUF_H +#define _LINUX_UDMABUF_H + +#include "standard-headers/linux/types.h" + +#define UDMABUF_FLAGS_CLOEXEC 0x01 + +struct udmabuf_create { + uint32_t memfd; + uint32_t flags; + uint64_t offset; + uint64_t size; +}; + +struct udmabuf_create_item { + uint32_t memfd; + uint32_t __pad; + uint64_t offset; + uint64_t size; +}; + +struct udmabuf_create_list { + uint32_t flags; + uint32_t count; + struct udmabuf_create_item list[]; +}; + +#define UDMABUF_CREATE _IOW('u', 0x42, struct udmabuf_create) +#define UDMABUF_CREATE_LIST _IOW('u', 0x43, struct udmabuf_create_list) + +#endif /* _LINUX_UDMABUF_H */ diff --git a/scripts/update-linux-headers.sh b/scripts/update-linux-headers= .sh index 1050e36169..fea4d6eb65 100755 --- a/scripts/update-linux-headers.sh +++ b/scripts/update-linux-headers.sh @@ -34,6 +34,7 @@ cp_portable() { if grep '#include' "$f" | grep -v -e 'linux/virtio' \ -e 'linux/types' \ + -e 'linux/ioctl' \ -e 'stdint' \ -e 'linux/if_ether' \ -e 'input-event-codes' \ @@ -66,6 +67,7 @@ cp_portable() { -e 's/__BITS_PER_LONG/HOST_LONG_BITS/' \ -e '/\"drm.h\"/d' \ -e '/sys\/ioctl.h/d' \ + -e '/linux\/ioctl.h/d' \ -e 's/SW_MAX/SW_MAX_/' \ -e 's/atomic_t/int/' \ -e 's/__kernel_long_t/long/' \ @@ -190,6 +192,7 @@ for i in "$tmpdir"/include/linux/*virtio*.h \ "$tmpdir/include/linux/fuse.h" \ "$tmpdir/include/linux/input.h" \ "$tmpdir/include/linux/input-event-codes.h" \ + "$tmpdir/include/linux/udmabuf.h" \ "$tmpdir/include/linux/pci_regs.h" \ "$tmpdir/include/linux/ethtool.h" \ "$tmpdir/include/linux/const.h" \ --=20 2.26.2