From: Tomeu Vizoso <tomeu.vizoso@collabora.com> To: linux-kernel@vger.kernel.org Cc: Zach Reizner <zachr@google.com>, kernel@collabora.com, Tomeu Vizoso <tomeu.vizoso@collabora.com>, David Airlie <airlied@linux.ie>, Gerd Hoffmann <kraxel@redhat.com>, dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org Subject: [PATCH v3 2/2] drm/virtio: Handle buffers from the compositor Date: Fri, 26 Jan 2018 14:58:02 +0100 [thread overview] Message-ID: <20180126135803.29781-3-tomeu.vizoso@collabora.com> (raw) In-Reply-To: <20180126135803.29781-1-tomeu.vizoso@collabora.com> When retrieving queued messages from the compositor in the host for clients in the guest, handle buffers that may be passed. These buffers should have been mapped to the guest's address space, for example via the KVM_SET_USER_MEMORY_REGION ioctl. Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> --- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 54 ++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c index d4230b1fa91d..57b1ad51d251 100644 --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c @@ -545,14 +545,58 @@ static unsigned int winsrv_poll(struct file *filp, return mask; } +struct virtio_gpu_winsrv_region { + uint64_t pfn; + size_t size; +}; + +static int winsrv_fd_mmap(struct file *filp, struct vm_area_struct *vma) +{ + struct virtio_gpu_winsrv_region *region = filp->private_data; + unsigned long vm_size = vma->vm_end - vma->vm_start; + int ret = 0; + + if (vm_size + + (vma->vm_pgoff << PAGE_SHIFT) > PAGE_ALIGN(region->size)) + return -EINVAL; + + ret = io_remap_pfn_range(vma, vma->vm_start, region->pfn, vm_size, + vma->vm_page_prot); + if (ret) + return ret; + + vma->vm_flags |= VM_PFNMAP | VM_IO | VM_DONTEXPAND | VM_DONTDUMP; + + return ret; +} + +static int winsrv_fd_release(struct inode *inodep, struct file *filp) +{ + struct virtio_gpu_winsrv_region *region = filp->private_data; + + kfree(region); + + return 0; +} + +static const struct file_operations winsrv_fd_fops = { + .mmap = winsrv_fd_mmap, + .release = winsrv_fd_release, +}; + static int winsrv_ioctl_rx(struct virtio_gpu_device *vgdev, struct virtio_gpu_winsrv_conn *conn, struct drm_virtgpu_winsrv *cmd) { struct virtio_gpu_winsrv_rx_qentry *qentry, *tmp; struct virtio_gpu_winsrv_rx *virtio_cmd; + struct virtio_gpu_winsrv_region *region; int available_len = cmd->len; int read_count = 0; + int i; + + for (i = 0; i < VIRTGPU_WINSRV_MAX_ALLOCS; i++) + cmd->fds[i] = -1; list_for_each_entry_safe(qentry, tmp, &conn->cmdq, next) { virtio_cmd = qentry->cmd; @@ -567,6 +611,16 @@ static int winsrv_ioctl_rx(struct virtio_gpu_device *vgdev, return -EFAULT; } + for (i = 0; virtio_cmd->pfns[i]; i++) { + region = kmalloc(sizeof(*region), GFP_KERNEL); + region->pfn = virtio_cmd->pfns[i]; + region->size = virtio_cmd->lens[i]; + cmd->fds[i] = anon_inode_getfd("[winsrv_fd]", + &winsrv_fd_fops, + region, + O_CLOEXEC | O_RDWR); + } + available_len -= virtio_cmd->len; read_count += virtio_cmd->len; -- 2.14.3
WARNING: multiple messages have this Message-ID (diff)
From: Tomeu Vizoso <tomeu.vizoso@collabora.com> To: linux-kernel@vger.kernel.org Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>, David Airlie <airlied@linux.ie>, dri-devel@lists.freedesktop.org, virtualization@lists.linux-foundation.org, Zach Reizner <zachr@google.com>, kernel@collabora.com Subject: [PATCH v3 2/2] drm/virtio: Handle buffers from the compositor Date: Fri, 26 Jan 2018 14:58:02 +0100 [thread overview] Message-ID: <20180126135803.29781-3-tomeu.vizoso@collabora.com> (raw) In-Reply-To: <20180126135803.29781-1-tomeu.vizoso@collabora.com> When retrieving queued messages from the compositor in the host for clients in the guest, handle buffers that may be passed. These buffers should have been mapped to the guest's address space, for example via the KVM_SET_USER_MEMORY_REGION ioctl. Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> --- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 54 ++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c index d4230b1fa91d..57b1ad51d251 100644 --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c @@ -545,14 +545,58 @@ static unsigned int winsrv_poll(struct file *filp, return mask; } +struct virtio_gpu_winsrv_region { + uint64_t pfn; + size_t size; +}; + +static int winsrv_fd_mmap(struct file *filp, struct vm_area_struct *vma) +{ + struct virtio_gpu_winsrv_region *region = filp->private_data; + unsigned long vm_size = vma->vm_end - vma->vm_start; + int ret = 0; + + if (vm_size + + (vma->vm_pgoff << PAGE_SHIFT) > PAGE_ALIGN(region->size)) + return -EINVAL; + + ret = io_remap_pfn_range(vma, vma->vm_start, region->pfn, vm_size, + vma->vm_page_prot); + if (ret) + return ret; + + vma->vm_flags |= VM_PFNMAP | VM_IO | VM_DONTEXPAND | VM_DONTDUMP; + + return ret; +} + +static int winsrv_fd_release(struct inode *inodep, struct file *filp) +{ + struct virtio_gpu_winsrv_region *region = filp->private_data; + + kfree(region); + + return 0; +} + +static const struct file_operations winsrv_fd_fops = { + .mmap = winsrv_fd_mmap, + .release = winsrv_fd_release, +}; + static int winsrv_ioctl_rx(struct virtio_gpu_device *vgdev, struct virtio_gpu_winsrv_conn *conn, struct drm_virtgpu_winsrv *cmd) { struct virtio_gpu_winsrv_rx_qentry *qentry, *tmp; struct virtio_gpu_winsrv_rx *virtio_cmd; + struct virtio_gpu_winsrv_region *region; int available_len = cmd->len; int read_count = 0; + int i; + + for (i = 0; i < VIRTGPU_WINSRV_MAX_ALLOCS; i++) + cmd->fds[i] = -1; list_for_each_entry_safe(qentry, tmp, &conn->cmdq, next) { virtio_cmd = qentry->cmd; @@ -567,6 +611,16 @@ static int winsrv_ioctl_rx(struct virtio_gpu_device *vgdev, return -EFAULT; } + for (i = 0; virtio_cmd->pfns[i]; i++) { + region = kmalloc(sizeof(*region), GFP_KERNEL); + region->pfn = virtio_cmd->pfns[i]; + region->size = virtio_cmd->lens[i]; + cmd->fds[i] = anon_inode_getfd("[winsrv_fd]", + &winsrv_fd_fops, + region, + O_CLOEXEC | O_RDWR); + } + available_len -= virtio_cmd->len; read_count += virtio_cmd->len; -- 2.14.3
next prev parent reply other threads:[~2018-01-26 13:58 UTC|newest] Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-26 13:58 [PATCH v3 0/2] drm/virtio: Add window server support Tomeu Vizoso 2018-01-26 13:58 ` Tomeu Vizoso 2018-01-26 13:58 ` [PATCH v3 1/2] " Tomeu Vizoso 2018-01-26 13:58 ` Tomeu Vizoso 2018-02-01 16:36 ` Gerd Hoffmann 2018-02-01 16:36 ` Gerd Hoffmann 2018-02-05 8:19 ` Tomeu Vizoso 2018-02-05 8:19 ` Tomeu Vizoso 2018-02-05 8:19 ` Tomeu Vizoso 2018-02-05 12:20 ` Gerd Hoffmann 2018-02-05 14:46 ` Tomeu Vizoso 2018-02-05 14:46 ` Tomeu Vizoso 2018-02-05 16:03 ` Gerd Hoffmann 2018-02-05 16:03 ` Gerd Hoffmann 2018-02-06 12:41 ` Tomeu Vizoso 2018-02-06 12:41 ` Tomeu Vizoso 2018-02-06 14:23 ` Gerd Hoffmann 2018-02-06 14:23 ` Gerd Hoffmann 2018-02-07 1:09 ` Michael S. Tsirkin 2018-02-07 7:41 ` Tomeu Vizoso 2018-02-07 7:41 ` Tomeu Vizoso 2018-02-07 1:09 ` Michael S. Tsirkin 2018-02-07 9:49 ` Tomeu Vizoso 2018-02-07 9:49 ` Tomeu Vizoso 2018-02-09 11:14 ` Tomeu Vizoso 2018-02-09 11:14 ` Tomeu Vizoso 2018-02-12 11:52 ` Gerd Hoffmann 2018-02-12 11:52 ` Gerd Hoffmann 2018-02-12 14:00 ` Tomeu Vizoso 2018-02-12 14:00 ` Tomeu Vizoso 2018-02-12 14:00 ` Tomeu Vizoso 2018-02-12 14:27 ` Gerd Hoffmann 2018-02-12 14:27 ` Gerd Hoffmann 2018-02-12 14:42 ` Tomeu Vizoso 2018-02-12 14:42 ` Tomeu Vizoso 2018-02-12 15:29 ` Gerd Hoffmann 2018-02-12 15:29 ` Gerd Hoffmann 2018-02-12 15:29 ` Gerd Hoffmann 2018-02-12 14:42 ` Tomeu Vizoso 2018-02-12 11:45 ` Gerd Hoffmann 2018-02-12 11:45 ` Gerd Hoffmann 2018-02-12 11:45 ` Gerd Hoffmann 2018-02-13 7:41 ` Pekka Paalanen 2018-02-13 7:41 ` Pekka Paalanen 2018-02-13 7:41 ` Pekka Paalanen 2018-02-13 14:27 ` Tomeu Vizoso 2018-02-13 14:27 ` Tomeu Vizoso 2018-02-16 10:48 ` Gerd Hoffmann 2018-02-16 10:48 ` Gerd Hoffmann 2018-02-16 10:48 ` Gerd Hoffmann 2018-02-13 14:27 ` Tomeu Vizoso 2018-02-15 15:28 ` Tomeu Vizoso 2018-02-15 15:28 ` Tomeu Vizoso 2018-02-15 15:28 ` Tomeu Vizoso 2018-02-06 14:23 ` Gerd Hoffmann 2018-02-06 12:41 ` Tomeu Vizoso 2018-02-06 15:00 ` Pekka Paalanen 2018-02-06 15:00 ` Pekka Paalanen 2018-02-06 15:00 ` Pekka Paalanen 2018-02-05 16:03 ` Gerd Hoffmann 2018-02-05 14:46 ` Tomeu Vizoso 2018-02-05 12:20 ` Gerd Hoffmann 2019-03-18 12:47 ` Tomeu Vizoso 2019-03-18 12:47 ` Tomeu Vizoso 2019-03-18 12:47 ` Tomeu Vizoso 2018-01-26 13:58 ` Tomeu Vizoso [this message] 2018-01-26 13:58 ` [PATCH v3 2/2] drm/virtio: Handle buffers from the compositor Tomeu Vizoso
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180126135803.29781-3-tomeu.vizoso@collabora.com \ --to=tomeu.vizoso@collabora.com \ --cc=airlied@linux.ie \ --cc=dri-devel@lists.freedesktop.org \ --cc=kernel@collabora.com \ --cc=kraxel@redhat.com \ --cc=linux-kernel@vger.kernel.org \ --cc=virtualization@lists.linux-foundation.org \ --cc=zachr@google.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.