Support virtio cross-device resources
Subsystems (5)
v6 cover Support virtio cross-device resources
This patchset implements the current proposal for virtio cross-device resource sharing [1]. It will be used to import virtio resources into the virtio-video driver currently under discussion [2]. The patch under consideration to add support in the virtio-video driver is [3]. It uses the APIs from v3 of this series, but the changes to update it are relatively minor.
This patchset adds a new flavor of dma-bufs that supports querying the underlying virtio object UUID, as well as adding support for exporting resources from virtgpu.
[1] https://markmail.org/thread/2ypjt5cfeu3m6lxu
[2] https://markmail.org/thread/p5d3k566srtdtute
[3] https://markmail.org/thread/j4xlqaaim266qpks
v5 -> v6 changes:
- Fix >80 character comment
David Stevens (3):
virtio: add dma-buf support for exported objects
virtio-gpu: add VIRTIO_GPU_F_RESOURCE_UUID feature drm/virtio: Support virtgpu exported resources
drivers/gpu/drm/virtio/virtgpu_drv.c | 3 + drivers/gpu/drm/virtio/virtgpu_drv.h | 20 ++++++ drivers/gpu/drm/virtio/virtgpu_kms.c | 4 ++ drivers/gpu/drm/virtio/virtgpu_prime.c | 96 +++++++++++++++++++++++++- drivers/gpu/drm/virtio/virtgpu_vq.c | 55 +++++++++++++++ drivers/virtio/Makefile | 2 +- drivers/virtio/virtio.c | 6 ++ drivers/virtio/virtio_dma_buf.c | 82 ++++++++++++++++++++++ include/linux/virtio.h | 1 + include/linux/virtio_dma_buf.h | 37 ++++++++++ include/uapi/linux/virtio_gpu.h | 19 +++++ 11 files changed, 321 insertions(+), 4 deletions(-) create mode 100644 drivers/virtio/virtio_dma_buf.c create mode 100644 include/linux/virtio_dma_buf.h
Signature · 6 lines
2.28.0.220.ged08abb693-goog --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
PATCH v6 1/3 virtio: add dma-buf support for exported objects
This change adds a new flavor of dma-bufs that can be used by virtio drivers to share exported objects. A virtio dma-buf can be queried by virtio drivers to obtain the UUID which identifies the underlying exported object.
--- drivers/virtio/Makefile | 2 +- drivers/virtio/virtio.c | 6 +++ drivers/virtio/virtio_dma_buf.c | 82 +++++++++++++++++++++++++++++++++ include/linux/virtio.h | 1 + include/linux/virtio_dma_buf.h | 37 +++++++++++++++ 5 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 drivers/virtio/virtio_dma_buf.c create mode 100644 include/linux/virtio_dma_buf.h
drivers/virtio/Makefile +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_VIRTIO) += virtio.o virtio_ring.o +obj-$(CONFIG_VIRTIO) += virtio.o virtio_ring.o virtio_dma_buf.o obj-$(CONFIG_VIRTIO_MMIO) += virtio_mmio.o obj-$(CONFIG_VIRTIO_PCI) += virtio_pci.o virtio_pci-y := virtio_pci_modern.o virtio_pci_common.o
drivers/virtio/virtio.c +6 -0
@@ -357,6 +357,12 @@ int register_virtio_device(struct virtio_device *dev) }EXPORT_SYMBOL_GPL (register_virtio_device); +bool is_virtio_device (struct device *dev) +{ +return dev->bus == &virtio_bus; +} +EXPORT_SYMBOL_GPL (is_virtio_device); +void unregister_virtio_device (struct virtio_device *dev) {int index = dev->index;/* save for after device release */
drivers/virtio/virtio_dma_buf.c new file +82 -0
82 lines not on this page · raw message
include/linux/virtio.h +1 -0
@@ -128,6 +128,7 @@ static inline struct virtio_device *dev_to_virtio(struct device *_dev)void virtio_add_status (struct virtio_device *dev,unsigned int status);int register_virtio_device (struct virtio_device *dev);void unregister_virtio_device (struct virtio_device *dev); +bool is_virtio_device (struct device *dev);void virtio_break_device (struct virtio_device *dev);
include/linux/virtio_dma_buf.h new file +37 -0
@@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* dma-bufs for virtio exported objects +* +* Copyright (C) 2020 Google, Inc. +*/ + +#ifndef _LINUX_VIRTIO_DMA_BUF_H +#define _LINUX_VIRTIO_DMA_BUF_H + +#include <linux/dma-buf.h> +#include <linux/uuid.h> +#include <linux/virtio.h> + +/** +* struct virtio_dma_buf_ops - operations possible on exported object dma-buf +* @ops: the base dma_buf_ops. ops.attach MUST be virtio_dma_buf_attach. +* @device_attach: [optional] callback invoked by virtio_dma_buf_attach during +* all attach operations. +* @get_uid: [required] callback to get the uuid of the exported object. +*/ +struct virtio_dma_buf_ops { +struct dma_buf_ops ops; +int (*device_attach)(struct dma_buf *dma_buf, +struct dma_buf_attachment *attach); +int (*get_uuid)(struct dma_buf *dma_buf,uuid_t *uuid); +}; + +int virtio_dma_buf_attach (struct dma_buf *dma_buf, +struct dma_buf_attachment *attach); + +struct dma_buf *virtio_dma_buf_export ( +const struct dma_buf_export_info *exp_info); +bool is_virtio_dma_buf (struct dma_buf *dma_buf); +int virtio_dma_buf_get_uuid (struct dma_buf *dma_buf,uuid_t *uuid); + +#endif /* _LINUX_VIRTIO_DMA_BUF_H */
Signature · 6 lines
2.28.0.220.ged08abb693-goog --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
PATCH v6 2/3 virtio-gpu: add VIRTIO_GPU_F_RESOURCE_UUID feature
In reply to David StevensThis feature allows the guest to request a UUID from the host for a particular virtio_gpu resource. The UUID can then be shared with other virtio devices, to allow the other host devices to access the virtio_gpu's corresponding host resource.
--- include/uapi/linux/virtio_gpu.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
include/uapi/linux/virtio_gpu.h +19 -0
@@ -50,6 +50,10 @@* VIRTIO_GPU_CMD_GET_EDID */ #define VIRTIO_GPU_F_EDID 1 +/* +* VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID +*/ +#define VIRTIO_GPU_F_RESOURCE_UUID 2enum virtio_gpu_ctrl_type {VIRTIO_GPU_UNDEFINED =0 ,
@@ -66,6 +70,7 @@ enum virtio_gpu_ctrl_type {VIRTIO_GPU_CMD_GET_CAPSET_INFO ,VIRTIO_GPU_CMD_GET_CAPSET ,VIRTIO_GPU_CMD_GET_EDID , +VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID ,/* 3d commands */ VIRTIO_GPU_CMD_CTX_CREATE = 0x0200,
@@ -87,6 +92,7 @@ enum virtio_gpu_ctrl_type {VIRTIO_GPU_RESP_OK_CAPSET_INFO ,VIRTIO_GPU_RESP_OK_CAPSET ,VIRTIO_GPU_RESP_OK_EDID , +VIRTIO_GPU_RESP_OK_RESOURCE_UUID ,/* error responses */ VIRTIO_GPU_RESP_ERR_UNSPEC = 0x1200,
@@ -340,4 +346,17 @@ enum virtio_gpu_formats { VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM = 134, }; +/* VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID */ +struct virtio_gpu_resource_assign_uuid { +struct virtio_gpu_ctrl_hdr hdr; +__le32 resource_id; +__le32 padding; +}; + +/* VIRTIO_GPU_RESP_OK_RESOURCE_UUID */ +struct virtio_gpu_resp_resource_uuid { +struct virtio_gpu_ctrl_hdr hdr; +__u8 uuid[16 ]; +}; +#endif
Signature · 6 lines
2.28.0.220.ged08abb693-goog --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
PATCH v6 3/3 drm/virtio: Support virtgpu exported resources
In reply to David StevensAdd support for UUID-based resource sharing mechanism to virtgpu. This implements the new virtgpu commands and hooks them up to dma-buf's get_uuid callback.
--- drivers/gpu/drm/virtio/virtgpu_drv.c | 3 + drivers/gpu/drm/virtio/virtgpu_drv.h | 20 ++++++ drivers/gpu/drm/virtio/virtgpu_kms.c | 4 ++ drivers/gpu/drm/virtio/virtgpu_prime.c | 96 +++++++++++++++++++++++++- drivers/gpu/drm/virtio/virtgpu_vq.c | 55 +++++++++++++++ 5 files changed, 175 insertions(+), 3 deletions(-)
drivers/gpu/drm/virtio/virtgpu_drv.c +3 -0
@@ -165,6 +165,7 @@ static unsigned int features[] = { VIRTIO_GPU_F_VIRGL, #endif VIRTIO_GPU_F_EDID, + VIRTIO_GPU_F_RESOURCE_UUID, }; static struct virtio_driver virtio_gpu_driver = { .feature_table = features,
@@ -202,6 +203,8 @@ static struct drm_driver driver = { .prime_handle_to_fd = drm_gem_prime_handle_to_fd, .prime_fd_to_handle = drm_gem_prime_fd_to_handle, .gem_prime_mmap = drm_gem_prime_mmap, + .gem_prime_export = virtgpu_gem_prime_export, + .gem_prime_import = virtgpu_gem_prime_import, .gem_prime_import_sg_table = virtgpu_gem_prime_import_sg_table, .gem_create_object = virtio_gpu_create_object,
drivers/gpu/drm/virtio/virtgpu_drv.h +20 -0
@@ -49,6 +49,10 @@#define DRIVER_MINOR 1#define DRIVER_PATCHLEVEL 0 +#define UUID_INITIALIZING 0 +#define UUID_INITIALIZED 1 +#define UUID_INITIALIZATION_FAILED 2 +struct virtio_gpu_object_params {uint32_t format;uint32_t width;
@@ -71,6 +75,9 @@ struct virtio_gpu_object {uint32_t hw_res_handle;bool dumb;bool created; + +int uuid_state; +uuid_t uuid; };#define gem_to_virtio_gpu_obj (gobj) \ container_of((gobj), struct virtio_gpu_object, base.base)
@@ -200,6 +207,7 @@ struct virtio_gpu_device {bool has_virgl_3d;bool has_edid;bool has_indirect; +bool has_resource_assign_uuid;struct work_struct config_changed_work;
@@ -210,6 +218,8 @@ struct virtio_gpu_device {struct virtio_gpu_drv_capset *capsets;uint32_t num_capsets;struct list_head cap_cache; + +spinlock_t resource_export_lock; };struct virtio_gpu_fpriv {
@@ -335,6 +345,10 @@ void virtio_gpu_dequeue_fence_func(struct work_struct *work);void virtio_gpu_notify (struct virtio_gpu_device *vgdev); +int +virtio_gpu_cmd_resource_assign_uuid (struct virtio_gpu_device *vgdev, +struct virtio_gpu_object_array *objs); +/* virtgpu_display.c */ void virtio_gpu_modeset_init (struct virtio_gpu_device *vgdev);void virtio_gpu_modeset_fini (struct virtio_gpu_device *vgdev);
@@ -366,6 +380,12 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev,bool virtio_gpu_is_shmem (struct virtio_gpu_object *bo);/* virtgpu_prime.c */ +struct dma_buf *virtgpu_gem_prime_export (struct drm_gem_object *obj, +int flags); +struct drm_gem_object *virtgpu_gem_prime_import (struct drm_device *dev, +struct dma_buf *buf); +int virtgpu_gem_prime_get_uuid (struct drm_gem_object *obj, +uuid_t *uuid);struct drm_gem_object *virtgpu_gem_prime_import_sg_table (struct drm_device *dev,struct dma_buf_attachment *attach,struct sg_table *sgt);
drivers/gpu/drm/virtio/virtgpu_kms.c +4 -0
@@ -125,6 +125,7 @@ int virtio_gpu_init(struct drm_device *dev) vgdev->dev = dev->dev;spin_lock_init (&vgdev->display_info_lock); +spin_lock_init (&vgdev->resource_export_lock);ida_init (&vgdev->ctx_id_ida);ida_init (&vgdev->resource_ida);init_waitqueue_head (&vgdev->resp_wq);
@@ -153,6 +154,9 @@ int virtio_gpu_init(struct drm_device *dev)if (virtio_has_feature (vgdev->vdev,VIRTIO_RING_F_INDIRECT_DESC )) { vgdev->has_indirect = true; } +if (virtio_has_feature (vgdev->vdev,VIRTIO_GPU_F_RESOURCE_UUID )) { + vgdev->has_resource_assign_uuid = true; + } DRM_INFO("features: %cvirgl %cedid\n", vgdev->has_virgl_3d ? '+' : '-',
drivers/gpu/drm/virtio/virtgpu_prime.c +93 -3
105 lines not on this page · raw message
drivers/gpu/drm/virtio/virtgpu_vq.c +55 -0
58 lines not on this page · raw message
Signature · 6 lines
2.28.0.220.ged08abb693-goog --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
Gerd Hoffmann
maintainerQuoted 11 lines · David Stevens
This patchset implements the current proposal for virtio cross-device resource sharing [1]. It will be used to import virtio resources into the virtio-video driver currently under discussion [2]. The patch under consideration to add support in the virtio-video driver is [3]. It uses the APIs from v3 of this series, but the changes to update it are relatively minor.
This patchset adds a new flavor of dma-bufs that supports querying the underlying virtio object UUID, as well as adding support for exporting resources from virtgpu.
Quoted 6 lines
[1] https://markmail.org/thread/2ypjt5cfeu3m6lxu
[2] https://markmail.org/thread/p5d3k566srtdtute
[3] https://markmail.org/thread/j4xlqaaim266qpksv5 -> v6 changes:
- Fix >80 character comment
Hmm, checkpatch still complains, full log below.
IIRC "dim checkpatch" runs scripts/checkpatch.pl with --strict so it is a bit more picky ...
The FILE_PATH_CHANGES isn't a problem given that the new file is covered by existing wildcard.
take care,
Gerd
---------------------------------------------------------------
+ dim checkpatch drm-misc-next..drm-qemu-next drm-miscee194dc222ae virtio: add dma-buf support for exported objects
-:29: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #29:
new file mode 100644
-:65: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #65: FILE: include/linux/virtio_dma_buf.h:32:
+struct dma_buf *virtio_dma_buf_export(
-:112: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #112: FILE: drivers/virtio/virtio_dma_buf.c:19:
+struct dma_buf *virtio_dma_buf_export(
-:115: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #115: FILE: drivers/virtio/virtio_dma_buf.c:22:
+ const struct virtio_dma_buf_ops *virtio_ops = container_of(
-:119: CHECK:LOGICAL_CONTINUATIONS: Logical continuations should be on the previous line #119: FILE: drivers/virtio/virtio_dma_buf.c:26:
+ if (!exp_info->ops
+ || exp_info->ops->attach != &virtio_dma_buf_attach
-:120: CHECK:LOGICAL_CONTINUATIONS: Logical continuations should be on the previous line #120: FILE: drivers/virtio/virtio_dma_buf.c:27:
+ || exp_info->ops->attach != &virtio_dma_buf_attach
+ || !virtio_ops->get_uuid) {-:135: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #135: FILE: drivers/virtio/virtio_dma_buf.c:42:
+ const struct virtio_dma_buf_ops *ops = container_of(
-:167: CHECK:OPEN_ENDED_LINE: Lines should not end with a '(' #167: FILE: drivers/virtio/virtio_dma_buf.c:74:
+ const struct virtio_dma_buf_ops *ops = container_of(
total: 0 errors, 1 warnings, 7 checks, 144 lines checked76c9c2abbe6b virtio-gpu: add VIRTIO_GPU_F_RESOURCE_UUID feature9c3f3edd1cc4 (HEAD -> drm-qemu-next, kraxel.org/drm-qemu-next) drm/virtio: Support virtgpu exported resources -:53: CHECK:UNCOMMENTED_DEFINITION: spinlock_t definition without comment
#53: FILE: drivers/gpu/drm/virtio/virtgpu_drv.h:222:
+ spinlock_t resource_export_lock;
-:250: CHECK:PREFER_KERNEL_TYPES: Prefer kernel type 'u32' over 'uint32_t' #250: FILE: drivers/gpu/drm/virtio/virtgpu_vq.c:1118:
+ uint32_t resp_type = le32_to_cpu(resp->hdr.type);
-:256: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #256: FILE: drivers/gpu/drm/virtio/virtgpu_vq.c:1124:
+ if (resp_type == VIRTIO_GPU_RESP_OK_RESOURCE_UUID &&
+ obj->uuid_state == UUID_INITIALIZING) {
-:286: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #286: FILE: drivers/gpu/drm/virtio/virtgpu_vq.c:1154:
+ cmd_p = virtio_gpu_alloc_cmd_resp(vgdev,
+ virtio_gpu_cmd_resource_uuid_cb, &vbuf, sizeof(*cmd_p),
total: 0 errors, 0 warnings, 4 checks, 250 lines checked
+ exit 1
Quoted 4 lines
Hmm, checkpatch still complains, full log below.
IIRC "dim checkpatch" runs
scripts/checkpatch.plwith --strict so it is a bit more picky ...
Ah, I didn't know --strict was being used. I'll send an update momentarily. Sorry for the churn.
Quoted 4 lines
-:250: CHECK:PREFER_KERNEL_TYPES: Prefer kernel type 'u32' over '
uint32_t' #250: FILE:drivers/gpu/drm/virtio/virtgpu_vq.c:1118:
+uint32_tresp_type=le32_to_cpu(resp->hdr.type);
For consistency with the rest of the virtgpu code, I'll leave uint32_t.
Cheers,
David
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]