From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C18A8C3F2D7 for ; Mon, 2 Mar 2020 17:19:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8773D222C4 for ; Mon, 2 Mar 2020 17:19:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="n8LQQRee" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727385AbgCBRT4 (ORCPT ); Mon, 2 Mar 2020 12:19:56 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:38370 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726451AbgCBRTz (ORCPT ); Mon, 2 Mar 2020 12:19:55 -0500 Received: by mail-lf1-f66.google.com with SMTP id w22so188563lfk.5 for ; Mon, 02 Mar 2020 09:19:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=mh25Tn0NVBkPeT5RPZ+4oavaskR/W4VBUnNVJVqelAs=; b=n8LQQReeuRW9yN+Gv397bengB3/JggQF7g+SESyU+JzFogcuU/IYgCgfQvUbFr1n/O 5iG1onCuCQPyiIXiUguLMNfxMSmSRTo+4Z1sK3DFP/dWh8IID71O+T4gBmmtGWce6E0l nTa+5tY99sQ0Xms0Hb0D/sD1gKBMta2+pLF2w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=mh25Tn0NVBkPeT5RPZ+4oavaskR/W4VBUnNVJVqelAs=; b=SFYBZsbB34XQhAu1X25FhmsaBP8ltc8yDK3Thh0cMw7wrptW1tGYdfLLnmZEERb+ju ADDbLjP1bcrZZ2S/ePR8j62JBefRqXUYScCk3E6f8621IdsyxivYS3frOpp74DPwHgcC 8eMGQuP8qjffqoPxJxL7QzFcQXbWEPwJc9/lx7ps7jKpxBzEfN75BCP+vp7KZ7dxEUpQ R/3BphM5lZFC8XJeiAHWl4ePB8obrjLLMFnYgk7vVDIHOOK5Luq2ybM3lftVuK5ZrN/X zg8ts32iv03LYBJPrzdWkN5+4PR4FFvd5aRecPzgYchRmRtd1GVUp9UjfnAFIRdWoHdk KArg== X-Gm-Message-State: ANhLgQ21dnjL5PFYAYiKJjukDdV7k6p/6Qi11o2rQn/2vD4AkC9VGn1e bxG0vYlnj+C2YQoNUhO0q+46M0VgEOI= X-Google-Smtp-Source: ADFU+vsNKu84KLr0k62V6FPJlEREq2/jlec67DxeNnPoSSh3TueneZOTqqr3tymbKy7TUiIvKjLXCQ== X-Received: by 2002:a05:6512:3ab:: with SMTP id v11mr105159lfp.82.1583169592116; Mon, 02 Mar 2020 09:19:52 -0800 (PST) Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com. [209.85.208.173]) by smtp.gmail.com with ESMTPSA id t1sm11427550lji.98.2020.03.02.09.19.51 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 02 Mar 2020 09:19:51 -0800 (PST) Received: by mail-lj1-f173.google.com with SMTP id e3so298865lja.10 for ; Mon, 02 Mar 2020 09:19:51 -0800 (PST) X-Received: by 2002:a05:651c:50a:: with SMTP id o10mr11509481ljp.189.1583169590652; Mon, 02 Mar 2020 09:19:50 -0800 (PST) MIME-Version: 1.0 References: <20200302121524.7543-1-stevensd@chromium.org> <20200302121524.7543-5-stevensd@chromium.org> In-Reply-To: <20200302121524.7543-5-stevensd@chromium.org> From: Gurchetan Singh Date: Mon, 2 Mar 2020 09:19:38 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [virtio-dev] [PATCH v2 4/4] drm/virtio: Support virtgpu exported resources To: David Stevens Cc: Gerd Hoffmann , David Airlie , Daniel Vetter , "Michael S . Tsirkin" , Jason Wang , Sumit Semwal , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , open list , ML dri-devel , "open list:VIRTIO GPU DRIVER" , Linux Media Mailing List , linaro-mm-sig@lists.linaro.org, virtio-dev@lists.oasis-open.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Mar 2, 2020 at 4:15 AM David Stevens wrote: > > Add 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. > > Signed-off-by: David Stevens > --- > drivers/gpu/drm/virtio/virtgpu_drv.c | 3 ++ > drivers/gpu/drm/virtio/virtgpu_drv.h | 19 ++++++++ > drivers/gpu/drm/virtio/virtgpu_kms.c | 4 ++ > drivers/gpu/drm/virtio/virtgpu_prime.c | 48 ++++++++++++++++++-- > drivers/gpu/drm/virtio/virtgpu_vq.c | 62 ++++++++++++++++++++++++++ > 5 files changed, 133 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c > index ab4bed78e656..776e6667042e 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.c > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c > @@ -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,7 +203,9 @@ 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_sg_table = virtgpu_gem_prime_import_sg_table, > + .gem_prime_get_uuid = virtgpu_gem_prime_get_uuid, > > .gem_create_object = virtio_gpu_create_object, > .fops = &virtio_gpu_driver_fops, > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h > index af9403e1cf78..4be84de73d86 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.h > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h > @@ -49,6 +49,11 @@ > #define DRIVER_MINOR 1 > #define DRIVER_PATCHLEVEL 0 > > +#define UUID_NOT_INITIALIZED 0 > +#define UUID_INITIALIZING 1 > +#define UUID_INITIALIZED 2 > +#define UUID_INITIALIZATION_FAILED 3 > + > struct virtio_gpu_object_params { > uint32_t format; > uint32_t width; > @@ -75,6 +80,9 @@ struct virtio_gpu_object { > > 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) > @@ -196,6 +204,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; > > @@ -206,6 +215,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 { > @@ -338,6 +349,10 @@ void virtio_gpu_dequeue_fence_func(struct work_struct *work); > void virtio_gpu_disable_notify(struct virtio_gpu_device *vgdev); > void virtio_gpu_enable_notify(struct virtio_gpu_device *vgdev); > > +int > +virtio_gpu_cmd_resource_assign_uuid(struct virtio_gpu_device *vgdev, > + struct virtio_gpu_object *bo); > + > /* virtio_gpu_display.c */ > void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev); > void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev); > @@ -366,6 +381,10 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, > struct virtio_gpu_object **bo_ptr, > struct virtio_gpu_fence *fence); > /* virtgpu_prime.c */ > +struct dma_buf *virtgpu_gem_prime_export(struct drm_gem_object *obj, > + int flags); > +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); > diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c > index 4009c2f97d08..5a2aeb6d2f35 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_kms.c > +++ b/drivers/gpu/drm/virtio/virtgpu_kms.c > @@ -134,6 +134,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); > @@ -162,6 +163,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 ? '+' : '-', > diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c > index 050d24c39a8f..12ceda34b4f9 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_prime.c > +++ b/drivers/gpu/drm/virtio/virtgpu_prime.c > @@ -26,9 +26,51 @@ > > #include "virtgpu_drv.h" > > -/* Empty Implementations as there should not be any other driver for a virtual > - * device that might share buffers with virtgpu > - */ > +int virtgpu_gem_prime_get_uuid(struct drm_gem_object *obj, > + uuid_t *uuid) > +{ > + struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj); > + struct virtio_gpu_device *vgdev = obj->dev->dev_private; > + > + // The state should have changed when the buffer was exported. > + WARN_ON(bo->uuid_state == UUID_NOT_INITIALIZED); > + > + wait_event(vgdev->resp_wq, bo->uuid_state != UUID_INITIALIZING); > + if (bo->uuid_state != UUID_INITIALIZED) > + return -ENODEV; > + > + uuid_copy(uuid, &bo->uuid); > + > + return 0; > +} > + > +struct dma_buf *virtgpu_gem_prime_export(struct drm_gem_object *obj, > + int flags) > +{ > + struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj); > + struct virtio_gpu_device *vgdev = obj->dev->dev_private; > + bool needs_init = false; > + int ret = 0; > + > + if (vgdev->has_resource_assign_uuid) { > + spin_lock(&vgdev->resource_export_lock); > + if (bo->uuid_state == UUID_NOT_INITIALIZED) { > + bo->uuid_state = UUID_INITIALIZING; > + needs_init = true; > + } > + spin_unlock(&vgdev->resource_export_lock); > + > + if (needs_init) { > + ret = virtio_gpu_cmd_resource_assign_uuid(vgdev, bo); > + if (ret) > + return ERR_PTR(ret); > + } > + } else { > + bo->uuid_state = UUID_INITIALIZATION_FAILED; > + } > + > + return drm_gem_prime_export(obj, flags); > +} > > struct drm_gem_object *virtgpu_gem_prime_import_sg_table( > struct drm_device *dev, struct dma_buf_attachment *attach, > diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c > index cfe9c54f87a3..e692098fc573 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_vq.c > +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c > @@ -1111,3 +1111,65 @@ void virtio_gpu_cursor_ping(struct virtio_gpu_device *vgdev, > memcpy(cur_p, &output->cursor, sizeof(output->cursor)); > virtio_gpu_queue_cursor(vgdev, vbuf); > } > + > +static void virtio_gpu_cmd_resource_uuid_cb(struct virtio_gpu_device *vgdev, > + struct virtio_gpu_vbuffer *vbuf) > +{ > + struct virtio_gpu_resp_resource_uuid *resp = > + (struct virtio_gpu_resp_resource_uuid *)vbuf->resp_buf; > + struct virtio_gpu_object *obj = > + (struct virtio_gpu_object *)vbuf->data_buf; > + uint32_t resp_type = le32_to_cpu(resp->hdr.type); > + > + /* > + * Keeps the data_buf, which points to this virtio_gpu_object, from > + * getting kfree'd after this cb returns. > + */ > + vbuf->data_buf = NULL; > + > + spin_lock(&vgdev->resource_export_lock); > + WARN_ON(obj->uuid_state != UUID_INITIALIZING); > + > + if (resp_type == VIRTIO_GPU_RESP_OK_RESOURCE_UUID && > + obj->uuid_state == UUID_INITIALIZING) { > + memcpy(&obj->uuid.b, resp->uuid, sizeof(obj->uuid.b)); > + obj->uuid_state = UUID_INITIALIZED; > + } else { > + obj->uuid_state = UUID_INITIALIZATION_FAILED; > + } > + spin_unlock(&vgdev->resource_export_lock); > + > + drm_gem_object_put_unlocked(&obj->base.base); > + wake_up_all(&vgdev->resp_wq); > +} > + > +int > +virtio_gpu_cmd_resource_assign_uuid(struct virtio_gpu_device *vgdev, > + struct virtio_gpu_object *bo) > +{ > + struct virtio_gpu_resource_assign_uuid *cmd_p; > + struct virtio_gpu_vbuffer *vbuf; > + struct virtio_gpu_resp_resource_uuid *resp_buf; > + > + resp_buf = kzalloc(sizeof(*resp_buf), GFP_KERNEL); > + if (!resp_buf) { > + spin_lock(&vgdev->resource_export_lock); > + bo->uuid_state = UUID_INITIALIZATION_FAILED; > + spin_unlock(&vgdev->resource_export_lock); > + return -ENOMEM; > + } > + > + cmd_p = virtio_gpu_alloc_cmd_resp(vgdev, > + virtio_gpu_cmd_resource_uuid_cb, &vbuf, sizeof(*cmd_p), > + sizeof(struct virtio_gpu_resp_resource_uuid), resp_buf); > + memset(cmd_p, 0, sizeof(*cmd_p)); > + > + cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID); cmd_p->hdr.ctx_id = Before this completion of this hypercall, this resource can be considered context local, while afterward it can be considered "exported". > + cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle); > + > + /* Reuse the data_buf pointer for the object pointer. */ > + vbuf->data_buf = bo; > + drm_gem_object_get(&bo->base.base); vbuf->objs? > + virtio_gpu_queue_ctrl_buffer(vgdev, vbuf); > + return 0; > +} > -- > 2.25.0.265.gbab2e86ba0-goog > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org > For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Gurchetan Singh Subject: Re: [virtio-dev] [PATCH v2 4/4] drm/virtio: Support virtgpu exported resources Date: Mon, 2 Mar 2020 09:19:38 -0800 Message-ID: References: <20200302121524.7543-1-stevensd@chromium.org> <20200302121524.7543-5-stevensd@chromium.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Return-path: In-Reply-To: <20200302121524.7543-5-stevensd@chromium.org> Sender: linux-media-owner@vger.kernel.org To: David Stevens Cc: Gerd Hoffmann , David Airlie , Daniel Vetter , "Michael S . Tsirkin" , Jason Wang , Sumit Semwal , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , open list , ML dri-devel , "open list:VIRTIO GPU DRIVER" , Linux Media Mailing List , linaro-mm-sig@lists.linaro.org, virtio-dev@lists.oasis-open.org List-Id: virtualization@lists.linuxfoundation.org On Mon, Mar 2, 2020 at 4:15 AM David Stevens wrote: > > Add 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. > > Signed-off-by: David Stevens > --- > drivers/gpu/drm/virtio/virtgpu_drv.c | 3 ++ > drivers/gpu/drm/virtio/virtgpu_drv.h | 19 ++++++++ > drivers/gpu/drm/virtio/virtgpu_kms.c | 4 ++ > drivers/gpu/drm/virtio/virtgpu_prime.c | 48 ++++++++++++++++++-- > drivers/gpu/drm/virtio/virtgpu_vq.c | 62 ++++++++++++++++++++++++++ > 5 files changed, 133 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c > index ab4bed78e656..776e6667042e 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.c > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c > @@ -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,7 +203,9 @@ 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_sg_table = virtgpu_gem_prime_import_sg_table, > + .gem_prime_get_uuid = virtgpu_gem_prime_get_uuid, > > .gem_create_object = virtio_gpu_create_object, > .fops = &virtio_gpu_driver_fops, > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h > index af9403e1cf78..4be84de73d86 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.h > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h > @@ -49,6 +49,11 @@ > #define DRIVER_MINOR 1 > #define DRIVER_PATCHLEVEL 0 > > +#define UUID_NOT_INITIALIZED 0 > +#define UUID_INITIALIZING 1 > +#define UUID_INITIALIZED 2 > +#define UUID_INITIALIZATION_FAILED 3 > + > struct virtio_gpu_object_params { > uint32_t format; > uint32_t width; > @@ -75,6 +80,9 @@ struct virtio_gpu_object { > > 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) > @@ -196,6 +204,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; > > @@ -206,6 +215,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 { > @@ -338,6 +349,10 @@ void virtio_gpu_dequeue_fence_func(struct work_struct *work); > void virtio_gpu_disable_notify(struct virtio_gpu_device *vgdev); > void virtio_gpu_enable_notify(struct virtio_gpu_device *vgdev); > > +int > +virtio_gpu_cmd_resource_assign_uuid(struct virtio_gpu_device *vgdev, > + struct virtio_gpu_object *bo); > + > /* virtio_gpu_display.c */ > void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev); > void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev); > @@ -366,6 +381,10 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, > struct virtio_gpu_object **bo_ptr, > struct virtio_gpu_fence *fence); > /* virtgpu_prime.c */ > +struct dma_buf *virtgpu_gem_prime_export(struct drm_gem_object *obj, > + int flags); > +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); > diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c > index 4009c2f97d08..5a2aeb6d2f35 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_kms.c > +++ b/drivers/gpu/drm/virtio/virtgpu_kms.c > @@ -134,6 +134,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); > @@ -162,6 +163,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 ? '+' : '-', > diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c > index 050d24c39a8f..12ceda34b4f9 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_prime.c > +++ b/drivers/gpu/drm/virtio/virtgpu_prime.c > @@ -26,9 +26,51 @@ > > #include "virtgpu_drv.h" > > -/* Empty Implementations as there should not be any other driver for a virtual > - * device that might share buffers with virtgpu > - */ > +int virtgpu_gem_prime_get_uuid(struct drm_gem_object *obj, > + uuid_t *uuid) > +{ > + struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj); > + struct virtio_gpu_device *vgdev = obj->dev->dev_private; > + > + // The state should have changed when the buffer was exported. > + WARN_ON(bo->uuid_state == UUID_NOT_INITIALIZED); > + > + wait_event(vgdev->resp_wq, bo->uuid_state != UUID_INITIALIZING); > + if (bo->uuid_state != UUID_INITIALIZED) > + return -ENODEV; > + > + uuid_copy(uuid, &bo->uuid); > + > + return 0; > +} > + > +struct dma_buf *virtgpu_gem_prime_export(struct drm_gem_object *obj, > + int flags) > +{ > + struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj); > + struct virtio_gpu_device *vgdev = obj->dev->dev_private; > + bool needs_init = false; > + int ret = 0; > + > + if (vgdev->has_resource_assign_uuid) { > + spin_lock(&vgdev->resource_export_lock); > + if (bo->uuid_state == UUID_NOT_INITIALIZED) { > + bo->uuid_state = UUID_INITIALIZING; > + needs_init = true; > + } > + spin_unlock(&vgdev->resource_export_lock); > + > + if (needs_init) { > + ret = virtio_gpu_cmd_resource_assign_uuid(vgdev, bo); > + if (ret) > + return ERR_PTR(ret); > + } > + } else { > + bo->uuid_state = UUID_INITIALIZATION_FAILED; > + } > + > + return drm_gem_prime_export(obj, flags); > +} > > struct drm_gem_object *virtgpu_gem_prime_import_sg_table( > struct drm_device *dev, struct dma_buf_attachment *attach, > diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c > index cfe9c54f87a3..e692098fc573 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_vq.c > +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c > @@ -1111,3 +1111,65 @@ void virtio_gpu_cursor_ping(struct virtio_gpu_device *vgdev, > memcpy(cur_p, &output->cursor, sizeof(output->cursor)); > virtio_gpu_queue_cursor(vgdev, vbuf); > } > + > +static void virtio_gpu_cmd_resource_uuid_cb(struct virtio_gpu_device *vgdev, > + struct virtio_gpu_vbuffer *vbuf) > +{ > + struct virtio_gpu_resp_resource_uuid *resp = > + (struct virtio_gpu_resp_resource_uuid *)vbuf->resp_buf; > + struct virtio_gpu_object *obj = > + (struct virtio_gpu_object *)vbuf->data_buf; > + uint32_t resp_type = le32_to_cpu(resp->hdr.type); > + > + /* > + * Keeps the data_buf, which points to this virtio_gpu_object, from > + * getting kfree'd after this cb returns. > + */ > + vbuf->data_buf = NULL; > + > + spin_lock(&vgdev->resource_export_lock); > + WARN_ON(obj->uuid_state != UUID_INITIALIZING); > + > + if (resp_type == VIRTIO_GPU_RESP_OK_RESOURCE_UUID && > + obj->uuid_state == UUID_INITIALIZING) { > + memcpy(&obj->uuid.b, resp->uuid, sizeof(obj->uuid.b)); > + obj->uuid_state = UUID_INITIALIZED; > + } else { > + obj->uuid_state = UUID_INITIALIZATION_FAILED; > + } > + spin_unlock(&vgdev->resource_export_lock); > + > + drm_gem_object_put_unlocked(&obj->base.base); > + wake_up_all(&vgdev->resp_wq); > +} > + > +int > +virtio_gpu_cmd_resource_assign_uuid(struct virtio_gpu_device *vgdev, > + struct virtio_gpu_object *bo) > +{ > + struct virtio_gpu_resource_assign_uuid *cmd_p; > + struct virtio_gpu_vbuffer *vbuf; > + struct virtio_gpu_resp_resource_uuid *resp_buf; > + > + resp_buf = kzalloc(sizeof(*resp_buf), GFP_KERNEL); > + if (!resp_buf) { > + spin_lock(&vgdev->resource_export_lock); > + bo->uuid_state = UUID_INITIALIZATION_FAILED; > + spin_unlock(&vgdev->resource_export_lock); > + return -ENOMEM; > + } > + > + cmd_p = virtio_gpu_alloc_cmd_resp(vgdev, > + virtio_gpu_cmd_resource_uuid_cb, &vbuf, sizeof(*cmd_p), > + sizeof(struct virtio_gpu_resp_resource_uuid), resp_buf); > + memset(cmd_p, 0, sizeof(*cmd_p)); > + > + cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID); cmd_p->hdr.ctx_id = Before this completion of this hypercall, this resource can be considered context local, while afterward it can be considered "exported". > + cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle); > + > + /* Reuse the data_buf pointer for the object pointer. */ > + vbuf->data_buf = bo; > + drm_gem_object_get(&bo->base.base); vbuf->objs? > + virtio_gpu_queue_ctrl_buffer(vgdev, vbuf); > + return 0; > +} > -- > 2.25.0.265.gbab2e86ba0-goog > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org > For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3CF8C3F2D8 for ; Mon, 2 Mar 2020 17:19:57 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8C35122B48 for ; Mon, 2 Mar 2020 17:19:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="n8LQQRee" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C35122B48 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7CBB06E042; Mon, 2 Mar 2020 17:19:56 +0000 (UTC) Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9655E6E042 for ; Mon, 2 Mar 2020 17:19:54 +0000 (UTC) Received: by mail-lj1-x243.google.com with SMTP id h18so278675ljl.13 for ; Mon, 02 Mar 2020 09:19:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=mh25Tn0NVBkPeT5RPZ+4oavaskR/W4VBUnNVJVqelAs=; b=n8LQQReeuRW9yN+Gv397bengB3/JggQF7g+SESyU+JzFogcuU/IYgCgfQvUbFr1n/O 5iG1onCuCQPyiIXiUguLMNfxMSmSRTo+4Z1sK3DFP/dWh8IID71O+T4gBmmtGWce6E0l nTa+5tY99sQ0Xms0Hb0D/sD1gKBMta2+pLF2w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=mh25Tn0NVBkPeT5RPZ+4oavaskR/W4VBUnNVJVqelAs=; b=SvOR9s1JKj26JgLP0Cb9sh0M+OKKU98L6OefWw4OflfPKfR/QhGtUjhiOLbDX8jv4x bOlDgKSCVgEhcI3IS+VcRjXdC4A09Mejx8RN1JA6VABKoQjUqGkVO58mpByfIROkibOs WX6/PuRc1fyRoCD7XKk6I3o4vHOfRk7dnSoxdc2eTCrNsHLLqcNbCPXPrx5LZYu0oUaE 8nx58Umf6QtQPGpQKpNkv6fGDS8nTK/avCMXPvTK30fQVy8Ls+3hgMTbKgTTXO9VpCbG Ryz53R+wunAXVwKGY83b5qhndlgowLC2SbJ0ESCHAa9BP4ZXMD9O/zCvS8QaKUWX6gwD uYSQ== X-Gm-Message-State: ANhLgQ3YJjCZ91+44pkMdnb28sbn+/M4G3Kk72PFGVTjtZY1de+xZZ46 YhqzX88I5hDtiaFB10O4DjnNU/+E5No= X-Google-Smtp-Source: ADFU+vuiBxXznpMiDv08uKPaENI2j1biA9bLL0mK4Gf4b954nJo0JJcB9KCaAbGnIJVUVgkfe3yx7g== X-Received: by 2002:a05:651c:3cc:: with SMTP id f12mr1764762ljp.163.1583169592227; Mon, 02 Mar 2020 09:19:52 -0800 (PST) Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com. [209.85.208.169]) by smtp.gmail.com with ESMTPSA id q6sm10694554lfo.69.2020.03.02.09.19.51 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 02 Mar 2020 09:19:51 -0800 (PST) Received: by mail-lj1-f169.google.com with SMTP id a10so290654ljp.11 for ; Mon, 02 Mar 2020 09:19:51 -0800 (PST) X-Received: by 2002:a05:651c:50a:: with SMTP id o10mr11509481ljp.189.1583169590652; Mon, 02 Mar 2020 09:19:50 -0800 (PST) MIME-Version: 1.0 References: <20200302121524.7543-1-stevensd@chromium.org> <20200302121524.7543-5-stevensd@chromium.org> In-Reply-To: <20200302121524.7543-5-stevensd@chromium.org> From: Gurchetan Singh Date: Mon, 2 Mar 2020 09:19:38 -0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [virtio-dev] [PATCH v2 4/4] drm/virtio: Support virtgpu exported resources To: David Stevens X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ML dri-devel , virtio-dev@lists.oasis-open.org, Thomas Zimmermann , "Michael S . Tsirkin" , David Airlie , Jason Wang , open list , "open list:VIRTIO GPU DRIVER" , linaro-mm-sig@lists.linaro.org, Gerd Hoffmann , Linux Media Mailing List Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Mon, Mar 2, 2020 at 4:15 AM David Stevens wrote: > > Add 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. > > Signed-off-by: David Stevens > --- > drivers/gpu/drm/virtio/virtgpu_drv.c | 3 ++ > drivers/gpu/drm/virtio/virtgpu_drv.h | 19 ++++++++ > drivers/gpu/drm/virtio/virtgpu_kms.c | 4 ++ > drivers/gpu/drm/virtio/virtgpu_prime.c | 48 ++++++++++++++++++-- > drivers/gpu/drm/virtio/virtgpu_vq.c | 62 ++++++++++++++++++++++++++ > 5 files changed, 133 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c > index ab4bed78e656..776e6667042e 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.c > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c > @@ -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,7 +203,9 @@ 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_sg_table = virtgpu_gem_prime_import_sg_table, > + .gem_prime_get_uuid = virtgpu_gem_prime_get_uuid, > > .gem_create_object = virtio_gpu_create_object, > .fops = &virtio_gpu_driver_fops, > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virtio/virtgpu_drv.h > index af9403e1cf78..4be84de73d86 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.h > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h > @@ -49,6 +49,11 @@ > #define DRIVER_MINOR 1 > #define DRIVER_PATCHLEVEL 0 > > +#define UUID_NOT_INITIALIZED 0 > +#define UUID_INITIALIZING 1 > +#define UUID_INITIALIZED 2 > +#define UUID_INITIALIZATION_FAILED 3 > + > struct virtio_gpu_object_params { > uint32_t format; > uint32_t width; > @@ -75,6 +80,9 @@ struct virtio_gpu_object { > > 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) > @@ -196,6 +204,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; > > @@ -206,6 +215,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 { > @@ -338,6 +349,10 @@ void virtio_gpu_dequeue_fence_func(struct work_struct *work); > void virtio_gpu_disable_notify(struct virtio_gpu_device *vgdev); > void virtio_gpu_enable_notify(struct virtio_gpu_device *vgdev); > > +int > +virtio_gpu_cmd_resource_assign_uuid(struct virtio_gpu_device *vgdev, > + struct virtio_gpu_object *bo); > + > /* virtio_gpu_display.c */ > void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev); > void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev); > @@ -366,6 +381,10 @@ int virtio_gpu_object_create(struct virtio_gpu_device *vgdev, > struct virtio_gpu_object **bo_ptr, > struct virtio_gpu_fence *fence); > /* virtgpu_prime.c */ > +struct dma_buf *virtgpu_gem_prime_export(struct drm_gem_object *obj, > + int flags); > +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); > diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c > index 4009c2f97d08..5a2aeb6d2f35 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_kms.c > +++ b/drivers/gpu/drm/virtio/virtgpu_kms.c > @@ -134,6 +134,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); > @@ -162,6 +163,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 ? '+' : '-', > diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/virtio/virtgpu_prime.c > index 050d24c39a8f..12ceda34b4f9 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_prime.c > +++ b/drivers/gpu/drm/virtio/virtgpu_prime.c > @@ -26,9 +26,51 @@ > > #include "virtgpu_drv.h" > > -/* Empty Implementations as there should not be any other driver for a virtual > - * device that might share buffers with virtgpu > - */ > +int virtgpu_gem_prime_get_uuid(struct drm_gem_object *obj, > + uuid_t *uuid) > +{ > + struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj); > + struct virtio_gpu_device *vgdev = obj->dev->dev_private; > + > + // The state should have changed when the buffer was exported. > + WARN_ON(bo->uuid_state == UUID_NOT_INITIALIZED); > + > + wait_event(vgdev->resp_wq, bo->uuid_state != UUID_INITIALIZING); > + if (bo->uuid_state != UUID_INITIALIZED) > + return -ENODEV; > + > + uuid_copy(uuid, &bo->uuid); > + > + return 0; > +} > + > +struct dma_buf *virtgpu_gem_prime_export(struct drm_gem_object *obj, > + int flags) > +{ > + struct virtio_gpu_object *bo = gem_to_virtio_gpu_obj(obj); > + struct virtio_gpu_device *vgdev = obj->dev->dev_private; > + bool needs_init = false; > + int ret = 0; > + > + if (vgdev->has_resource_assign_uuid) { > + spin_lock(&vgdev->resource_export_lock); > + if (bo->uuid_state == UUID_NOT_INITIALIZED) { > + bo->uuid_state = UUID_INITIALIZING; > + needs_init = true; > + } > + spin_unlock(&vgdev->resource_export_lock); > + > + if (needs_init) { > + ret = virtio_gpu_cmd_resource_assign_uuid(vgdev, bo); > + if (ret) > + return ERR_PTR(ret); > + } > + } else { > + bo->uuid_state = UUID_INITIALIZATION_FAILED; > + } > + > + return drm_gem_prime_export(obj, flags); > +} > > struct drm_gem_object *virtgpu_gem_prime_import_sg_table( > struct drm_device *dev, struct dma_buf_attachment *attach, > diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio/virtgpu_vq.c > index cfe9c54f87a3..e692098fc573 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_vq.c > +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c > @@ -1111,3 +1111,65 @@ void virtio_gpu_cursor_ping(struct virtio_gpu_device *vgdev, > memcpy(cur_p, &output->cursor, sizeof(output->cursor)); > virtio_gpu_queue_cursor(vgdev, vbuf); > } > + > +static void virtio_gpu_cmd_resource_uuid_cb(struct virtio_gpu_device *vgdev, > + struct virtio_gpu_vbuffer *vbuf) > +{ > + struct virtio_gpu_resp_resource_uuid *resp = > + (struct virtio_gpu_resp_resource_uuid *)vbuf->resp_buf; > + struct virtio_gpu_object *obj = > + (struct virtio_gpu_object *)vbuf->data_buf; > + uint32_t resp_type = le32_to_cpu(resp->hdr.type); > + > + /* > + * Keeps the data_buf, which points to this virtio_gpu_object, from > + * getting kfree'd after this cb returns. > + */ > + vbuf->data_buf = NULL; > + > + spin_lock(&vgdev->resource_export_lock); > + WARN_ON(obj->uuid_state != UUID_INITIALIZING); > + > + if (resp_type == VIRTIO_GPU_RESP_OK_RESOURCE_UUID && > + obj->uuid_state == UUID_INITIALIZING) { > + memcpy(&obj->uuid.b, resp->uuid, sizeof(obj->uuid.b)); > + obj->uuid_state = UUID_INITIALIZED; > + } else { > + obj->uuid_state = UUID_INITIALIZATION_FAILED; > + } > + spin_unlock(&vgdev->resource_export_lock); > + > + drm_gem_object_put_unlocked(&obj->base.base); > + wake_up_all(&vgdev->resp_wq); > +} > + > +int > +virtio_gpu_cmd_resource_assign_uuid(struct virtio_gpu_device *vgdev, > + struct virtio_gpu_object *bo) > +{ > + struct virtio_gpu_resource_assign_uuid *cmd_p; > + struct virtio_gpu_vbuffer *vbuf; > + struct virtio_gpu_resp_resource_uuid *resp_buf; > + > + resp_buf = kzalloc(sizeof(*resp_buf), GFP_KERNEL); > + if (!resp_buf) { > + spin_lock(&vgdev->resource_export_lock); > + bo->uuid_state = UUID_INITIALIZATION_FAILED; > + spin_unlock(&vgdev->resource_export_lock); > + return -ENOMEM; > + } > + > + cmd_p = virtio_gpu_alloc_cmd_resp(vgdev, > + virtio_gpu_cmd_resource_uuid_cb, &vbuf, sizeof(*cmd_p), > + sizeof(struct virtio_gpu_resp_resource_uuid), resp_buf); > + memset(cmd_p, 0, sizeof(*cmd_p)); > + > + cmd_p->hdr.type = cpu_to_le32(VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID); cmd_p->hdr.ctx_id = Before this completion of this hypercall, this resource can be considered context local, while afterward it can be considered "exported". > + cmd_p->resource_id = cpu_to_le32(bo->hw_res_handle); > + > + /* Reuse the data_buf pointer for the object pointer. */ > + vbuf->data_buf = bo; > + drm_gem_object_get(&bo->base.base); vbuf->objs? > + virtio_gpu_queue_ctrl_buffer(vgdev, vbuf); > + return 0; > +} > -- > 2.25.0.265.gbab2e86ba0-goog > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org > For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org > _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: virtio-dev-return-6868-cohuck=redhat.com@lists.oasis-open.org Sender: List-Post: List-Help: List-Unsubscribe: List-Subscribe: Received: from lists.oasis-open.org (oasis-open.org [10.110.1.242]) by lists.oasis-open.org (Postfix) with ESMTP id 5BDCC985CF2 for ; Mon, 2 Mar 2020 17:25:09 +0000 (UTC) MIME-Version: 1.0 References: <20200302121524.7543-1-stevensd@chromium.org> <20200302121524.7543-5-stevensd@chromium.org> In-Reply-To: <20200302121524.7543-5-stevensd@chromium.org> From: Gurchetan Singh Date: Mon, 2 Mar 2020 09:19:38 -0800 Message-ID: Subject: Re: [virtio-dev] [PATCH v2 4/4] drm/virtio: Support virtgpu exported resources Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable To: David Stevens Cc: Gerd Hoffmann , David Airlie , Daniel Vetter , "Michael S . Tsirkin" , Jason Wang , Sumit Semwal , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , open list , ML dri-devel , "open list:VIRTIO GPU DRIVER" , Linux Media Mailing List , linaro-mm-sig@lists.linaro.org, virtio-dev@lists.oasis-open.org List-ID: On Mon, Mar 2, 2020 at 4:15 AM David Stevens wrote: > > Add 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. > > Signed-off-by: David Stevens > --- > drivers/gpu/drm/virtio/virtgpu_drv.c | 3 ++ > drivers/gpu/drm/virtio/virtgpu_drv.h | 19 ++++++++ > drivers/gpu/drm/virtio/virtgpu_kms.c | 4 ++ > drivers/gpu/drm/virtio/virtgpu_prime.c | 48 ++++++++++++++++++-- > drivers/gpu/drm/virtio/virtgpu_vq.c | 62 ++++++++++++++++++++++++++ > 5 files changed, 133 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virti= o/virtgpu_drv.c > index ab4bed78e656..776e6667042e 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.c > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c > @@ -165,6 +165,7 @@ static unsigned int features[] =3D { > VIRTIO_GPU_F_VIRGL, > #endif > VIRTIO_GPU_F_EDID, > + VIRTIO_GPU_F_RESOURCE_UUID, > }; > static struct virtio_driver virtio_gpu_driver =3D { > .feature_table =3D features, > @@ -202,7 +203,9 @@ static struct drm_driver driver =3D { > .prime_handle_to_fd =3D drm_gem_prime_handle_to_fd, > .prime_fd_to_handle =3D drm_gem_prime_fd_to_handle, > .gem_prime_mmap =3D drm_gem_prime_mmap, > + .gem_prime_export =3D virtgpu_gem_prime_export, > .gem_prime_import_sg_table =3D virtgpu_gem_prime_import_sg_table, > + .gem_prime_get_uuid =3D virtgpu_gem_prime_get_uuid, > > .gem_create_object =3D virtio_gpu_create_object, > .fops =3D &virtio_gpu_driver_fops, > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.h b/drivers/gpu/drm/virti= o/virtgpu_drv.h > index af9403e1cf78..4be84de73d86 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.h > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.h > @@ -49,6 +49,11 @@ > #define DRIVER_MINOR 1 > #define DRIVER_PATCHLEVEL 0 > > +#define UUID_NOT_INITIALIZED 0 > +#define UUID_INITIALIZING 1 > +#define UUID_INITIALIZED 2 > +#define UUID_INITIALIZATION_FAILED 3 > + > struct virtio_gpu_object_params { > uint32_t format; > uint32_t width; > @@ -75,6 +80,9 @@ struct virtio_gpu_object { > > 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) > @@ -196,6 +204,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; > > @@ -206,6 +215,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 { > @@ -338,6 +349,10 @@ void virtio_gpu_dequeue_fence_func(struct work_struc= t *work); > void virtio_gpu_disable_notify(struct virtio_gpu_device *vgdev); > void virtio_gpu_enable_notify(struct virtio_gpu_device *vgdev); > > +int > +virtio_gpu_cmd_resource_assign_uuid(struct virtio_gpu_device *vgdev, > + struct virtio_gpu_object *bo); > + > /* virtio_gpu_display.c */ > void virtio_gpu_modeset_init(struct virtio_gpu_device *vgdev); > void virtio_gpu_modeset_fini(struct virtio_gpu_device *vgdev); > @@ -366,6 +381,10 @@ int virtio_gpu_object_create(struct virtio_gpu_devic= e *vgdev, > struct virtio_gpu_object **bo_ptr, > struct virtio_gpu_fence *fence); > /* virtgpu_prime.c */ > +struct dma_buf *virtgpu_gem_prime_export(struct drm_gem_object *obj, > + int flags); > +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); > diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virti= o/virtgpu_kms.c > index 4009c2f97d08..5a2aeb6d2f35 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_kms.c > +++ b/drivers/gpu/drm/virtio/virtgpu_kms.c > @@ -134,6 +134,7 @@ int virtio_gpu_init(struct drm_device *dev) > vgdev->dev =3D 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); > @@ -162,6 +163,9 @@ int virtio_gpu_init(struct drm_device *dev) > if (virtio_has_feature(vgdev->vdev, VIRTIO_RING_F_INDIRECT_DESC))= { > vgdev->has_indirect =3D true; > } > + if (virtio_has_feature(vgdev->vdev, VIRTIO_GPU_F_RESOURCE_UUID)) = { > + vgdev->has_resource_assign_uuid =3D true; > + } > > DRM_INFO("features: %cvirgl %cedid\n", > vgdev->has_virgl_3d ? '+' : '-', > diff --git a/drivers/gpu/drm/virtio/virtgpu_prime.c b/drivers/gpu/drm/vir= tio/virtgpu_prime.c > index 050d24c39a8f..12ceda34b4f9 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_prime.c > +++ b/drivers/gpu/drm/virtio/virtgpu_prime.c > @@ -26,9 +26,51 @@ > > #include "virtgpu_drv.h" > > -/* Empty Implementations as there should not be any other driver for a v= irtual > - * device that might share buffers with virtgpu > - */ > +int virtgpu_gem_prime_get_uuid(struct drm_gem_object *obj, > + uuid_t *uuid) > +{ > + struct virtio_gpu_object *bo =3D gem_to_virtio_gpu_obj(obj); > + struct virtio_gpu_device *vgdev =3D obj->dev->dev_private; > + > + // The state should have changed when the buffer was exported. > + WARN_ON(bo->uuid_state =3D=3D UUID_NOT_INITIALIZED); > + > + wait_event(vgdev->resp_wq, bo->uuid_state !=3D UUID_INITIALIZING)= ; > + if (bo->uuid_state !=3D UUID_INITIALIZED) > + return -ENODEV; > + > + uuid_copy(uuid, &bo->uuid); > + > + return 0; > +} > + > +struct dma_buf *virtgpu_gem_prime_export(struct drm_gem_object *obj, > + int flags) > +{ > + struct virtio_gpu_object *bo =3D gem_to_virtio_gpu_obj(obj); > + struct virtio_gpu_device *vgdev =3D obj->dev->dev_private; > + bool needs_init =3D false; > + int ret =3D 0; > + > + if (vgdev->has_resource_assign_uuid) { > + spin_lock(&vgdev->resource_export_lock); > + if (bo->uuid_state =3D=3D UUID_NOT_INITIALIZED) { > + bo->uuid_state =3D UUID_INITIALIZING; > + needs_init =3D true; > + } > + spin_unlock(&vgdev->resource_export_lock); > + > + if (needs_init) { > + ret =3D virtio_gpu_cmd_resource_assign_uuid(vgdev= , bo); > + if (ret) > + return ERR_PTR(ret); > + } > + } else { > + bo->uuid_state =3D UUID_INITIALIZATION_FAILED; > + } > + > + return drm_gem_prime_export(obj, flags); > +} > > struct drm_gem_object *virtgpu_gem_prime_import_sg_table( > struct drm_device *dev, struct dma_buf_attachment *attach, > diff --git a/drivers/gpu/drm/virtio/virtgpu_vq.c b/drivers/gpu/drm/virtio= /virtgpu_vq.c > index cfe9c54f87a3..e692098fc573 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_vq.c > +++ b/drivers/gpu/drm/virtio/virtgpu_vq.c > @@ -1111,3 +1111,65 @@ void virtio_gpu_cursor_ping(struct virtio_gpu_devi= ce *vgdev, > memcpy(cur_p, &output->cursor, sizeof(output->cursor)); > virtio_gpu_queue_cursor(vgdev, vbuf); > } > + > +static void virtio_gpu_cmd_resource_uuid_cb(struct virtio_gpu_device *vg= dev, > + struct virtio_gpu_vbuffer *vb= uf) > +{ > + struct virtio_gpu_resp_resource_uuid *resp =3D > + (struct virtio_gpu_resp_resource_uuid *)vbuf->resp_buf; > + struct virtio_gpu_object *obj =3D > + (struct virtio_gpu_object *)vbuf->data_buf; > + uint32_t resp_type =3D le32_to_cpu(resp->hdr.type); > + > + /* > + * Keeps the data_buf, which points to this virtio_gpu_object, fr= om > + * getting kfree'd after this cb returns. > + */ > + vbuf->data_buf =3D NULL; > + > + spin_lock(&vgdev->resource_export_lock); > + WARN_ON(obj->uuid_state !=3D UUID_INITIALIZING); > + > + if (resp_type =3D=3D VIRTIO_GPU_RESP_OK_RESOURCE_UUID && > + obj->uuid_state =3D=3D UUID_INITIALIZING) { > + memcpy(&obj->uuid.b, resp->uuid, sizeof(obj->uuid.b)); > + obj->uuid_state =3D UUID_INITIALIZED; > + } else { > + obj->uuid_state =3D UUID_INITIALIZATION_FAILED; > + } > + spin_unlock(&vgdev->resource_export_lock); > + > + drm_gem_object_put_unlocked(&obj->base.base); > + wake_up_all(&vgdev->resp_wq); > +} > + > +int > +virtio_gpu_cmd_resource_assign_uuid(struct virtio_gpu_device *vgdev, > + struct virtio_gpu_object *bo) > +{ > + struct virtio_gpu_resource_assign_uuid *cmd_p; > + struct virtio_gpu_vbuffer *vbuf; > + struct virtio_gpu_resp_resource_uuid *resp_buf; > + > + resp_buf =3D kzalloc(sizeof(*resp_buf), GFP_KERNEL); > + if (!resp_buf) { > + spin_lock(&vgdev->resource_export_lock); > + bo->uuid_state =3D UUID_INITIALIZATION_FAILED; > + spin_unlock(&vgdev->resource_export_lock); > + return -ENOMEM; > + } > + > + cmd_p =3D virtio_gpu_alloc_cmd_resp(vgdev, > + virtio_gpu_cmd_resource_uuid_cb, &vbuf, sizeof(*cmd_p), > + sizeof(struct virtio_gpu_resp_resource_uuid), resp_buf); > + memset(cmd_p, 0, sizeof(*cmd_p)); > + > + cmd_p->hdr.type =3D cpu_to_le32(VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UU= ID); cmd_p->hdr.ctx_id =3D Before this completion of this hypercall, this resource can be considered context local, while afterward it can be considered "exported". > + cmd_p->resource_id =3D cpu_to_le32(bo->hw_res_handle); > + > + /* Reuse the data_buf pointer for the object pointer. */ > + vbuf->data_buf =3D bo; > + drm_gem_object_get(&bo->base.base); vbuf->objs? > + virtio_gpu_queue_ctrl_buffer(vgdev, vbuf); > + return 0; > +} > -- > 2.25.0.265.gbab2e86ba0-goog > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org > For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org > --------------------------------------------------------------------- To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org