From: Gurchetan Singh <gurchetansingh@chromium.org> To: dri-devel@lists.freedesktop.org, virtio-dev@lists.oasis-open.org Cc: sebastien.boeuf@intel.com, kraxel@redhat.com, vgoyal@redhat.com, mst@redhat.com Subject: [PATCH 01/24] drm/virtio: Revert "drm/virtio: Call the right shmem helpers" Date: Thu, 13 Aug 2020 19:39:37 -0700 [thread overview] Message-ID: <20200814024000.2485-2-gurchetansingh@chromium.org> (raw) In-Reply-To: <20200814024000.2485-1-gurchetansingh@chromium.org> This reverts commit d323bb44e4d23802eb25d13de1f93f2335bd60d0. Fixes a double-free regression: [ 4.357928] drm_gem_shmem_free_object+0xb4/0x100 [ 4.358983] virtio_gpu_dequeue_ctrl_func+0xd9/0x290 [ 4.360343] process_one_work+0x1d2/0x3a0 [ 4.361581] worker_thread+0x45/0x3c0 [ 4.362645] kthread+0xf6/0x130 [ 4.363543] ? process_one_work+0x3a0/0x3a0 [ 4.364770] ? kthread_park+0x80/0x80 [ 4.365799] ret_from_fork+0x35/0x40 [ 4.367103] Modules linked in: [ 4.367958] CR2: 0000000000000018 [ 4.368857] ---[ end trace db84f7a2974d5c79 ]--- [ 4.370118] RIP: 0010:dma_direct_unmap_sg+0x1f/0x60 In addition, virtio has it's own set of dma-ops so there's not an obviously clean way to transition to shmem helpers. Fixes: d323bb44e4d2 ("drm/virtio: Call the right shmem helpers") Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org> --- drivers/gpu/drm/virtio/virtgpu_object.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c index 346cef5ce251..1359eb8f1a02 100644 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@ -150,7 +150,13 @@ static int virtio_gpu_object_shmem_init(struct virtio_gpu_device *vgdev, if (ret < 0) return -EINVAL; - shmem->pages = drm_gem_shmem_get_pages_sgt(&bo->base.base); + /* + * virtio_gpu uses drm_gem_shmem_get_sg_table instead of + * drm_gem_shmem_get_pages_sgt because virtio has it's own set of + * dma-ops. This is discouraged for other drivers, but should be fine + * since virtio_gpu doesn't support dma-buf import from other devices. + */ + shmem->pages = drm_gem_shmem_get_sg_table(&bo->base.base); if (!shmem->pages) { drm_gem_shmem_unpin(&bo->base.base); return -EINVAL; -- 2.24.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
WARNING: multiple messages have this Message-ID (diff)
From: Gurchetan Singh <gurchetansingh@chromium.org> To: dri-devel@lists.freedesktop.org, virtio-dev@lists.oasis-open.org Cc: kraxel@redhat.com, mst@redhat.com, vgoyal@redhat.com, sebastien.boeuf@intel.com Subject: [virtio-dev] [PATCH 01/24] drm/virtio: Revert "drm/virtio: Call the right shmem helpers" Date: Thu, 13 Aug 2020 19:39:37 -0700 [thread overview] Message-ID: <20200814024000.2485-2-gurchetansingh@chromium.org> (raw) In-Reply-To: <20200814024000.2485-1-gurchetansingh@chromium.org> This reverts commit d323bb44e4d23802eb25d13de1f93f2335bd60d0. Fixes a double-free regression: [ 4.357928] drm_gem_shmem_free_object+0xb4/0x100 [ 4.358983] virtio_gpu_dequeue_ctrl_func+0xd9/0x290 [ 4.360343] process_one_work+0x1d2/0x3a0 [ 4.361581] worker_thread+0x45/0x3c0 [ 4.362645] kthread+0xf6/0x130 [ 4.363543] ? process_one_work+0x3a0/0x3a0 [ 4.364770] ? kthread_park+0x80/0x80 [ 4.365799] ret_from_fork+0x35/0x40 [ 4.367103] Modules linked in: [ 4.367958] CR2: 0000000000000018 [ 4.368857] ---[ end trace db84f7a2974d5c79 ]--- [ 4.370118] RIP: 0010:dma_direct_unmap_sg+0x1f/0x60 In addition, virtio has it's own set of dma-ops so there's not an obviously clean way to transition to shmem helpers. Fixes: d323bb44e4d2 ("drm/virtio: Call the right shmem helpers") Signed-off-by: Gurchetan Singh <gurchetansingh@chromium.org> --- drivers/gpu/drm/virtio/virtgpu_object.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/virtio/virtgpu_object.c b/drivers/gpu/drm/virtio/virtgpu_object.c index 346cef5ce251..1359eb8f1a02 100644 --- a/drivers/gpu/drm/virtio/virtgpu_object.c +++ b/drivers/gpu/drm/virtio/virtgpu_object.c @@ -150,7 +150,13 @@ static int virtio_gpu_object_shmem_init(struct virtio_gpu_device *vgdev, if (ret < 0) return -EINVAL; - shmem->pages = drm_gem_shmem_get_pages_sgt(&bo->base.base); + /* + * virtio_gpu uses drm_gem_shmem_get_sg_table instead of + * drm_gem_shmem_get_pages_sgt because virtio has it's own set of + * dma-ops. This is discouraged for other drivers, but should be fine + * since virtio_gpu doesn't support dma-buf import from other devices. + */ + shmem->pages = drm_gem_shmem_get_sg_table(&bo->base.base); if (!shmem->pages) { drm_gem_shmem_unpin(&bo->base.base); return -EINVAL; -- 2.24.1 --------------------------------------------------------------------- To unsubscribe, e-mail: virtio-dev-unsubscribe@lists.oasis-open.org For additional commands, e-mail: virtio-dev-help@lists.oasis-open.org
next prev parent reply other threads:[~2020-08-14 2:40 UTC|newest] Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-14 2:39 [PATCH 00/24] Blob prerequisites + blob resources Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` Gurchetan Singh [this message] 2020-08-14 2:39 ` [virtio-dev] [PATCH 01/24] drm/virtio: Revert "drm/virtio: Call the right shmem helpers" Gurchetan Singh 2020-08-14 2:39 ` [PATCH 02/24] virtio: add dma-buf support for exported objects Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 03/24] virtio-gpu: add VIRTIO_GPU_F_RESOURCE_UUID feature Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 04/24] drm/virtio: Support virtgpu exported resources Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 05/24] virtio: Add get_shm_region method Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 06/24] virtio: Implement get_shm_region for PCI transport Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 07/24] virtio: Implement get_shm_region for MMIO transport Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 08/24] drm/virtio: blob prep: refactor getting pages and attaching backing Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 09/24] drm/virtio: blob prep: make CPU responses more generic Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 10/24] virtio-gpu api: blob resources Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 11/24] virtio-gpu api: host visible feature Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 12/24] virtio-gpu api: cross-device feature Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 13/24] drm/virtio: implement blob resources: probe for the feature Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 14/24] drm/virtio: implement blob resources: probe for host visible region Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-16 13:10 ` kernel test robot 2020-08-16 13:10 ` kernel test robot 2020-08-14 2:39 ` [PATCH 15/24] drm/virtio: implement blob resources: expose virtio_gpu_resource_id_get Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 16/24] drm/virtio: implement blob resources: add new fields to internal structs Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 17/24] drm/virtio: implement blob resources: implement vram object Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 5:39 ` kernel test robot 2020-08-14 5:39 ` kernel test robot 2020-08-14 2:39 ` [PATCH 18/24] drm/virtio: implement blob resources: hypercall interface Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 6:12 ` kernel test robot 2020-08-14 6:12 ` kernel test robot 2020-08-14 2:39 ` [PATCH 19/24] drm/virtio: implement blob resources: blob display integration Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 20/24] drm/virtio: implement blob resources: refactor UUID code somewhat Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 21/24] drm/virtio: implement blob resources: fix stride discrepancy Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 22/24] drm/virtio: implement blob resources: report blob mem to userspace Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-14 2:39 ` [PATCH 23/24] drm/virtio: implement blob resources: resource create blob ioctl Gurchetan Singh 2020-08-14 2:39 ` [virtio-dev] " Gurchetan Singh 2020-08-17 17:46 ` Anthoine Bourgeois 2020-08-14 2:40 ` [PATCH 24/24] drm/virtio: advertise features to userspace Gurchetan Singh 2020-08-14 2:40 ` [virtio-dev] " Gurchetan Singh
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=20200814024000.2485-2-gurchetansingh@chromium.org \ --to=gurchetansingh@chromium.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=kraxel@redhat.com \ --cc=mst@redhat.com \ --cc=sebastien.boeuf@intel.com \ --cc=vgoyal@redhat.com \ --cc=virtio-dev@lists.oasis-open.org \ /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.