Skip to contentSkip to conversation

drm/panfrost: Use drm_gem_dump_map_offset()

PATCH In review Steven Price 3 participants 5 messages May 13, 2019

Subsystems (3)
lore
Share & tools
lore

Steven Price

author maintainer
#0 lore raw

PATCH 1/1 drm/panfrost: Use drm_gem_dump_map_offset()

panfrost_ioctl_mmap_bo() contains a reimplementation of drm_gem_dump_map_offset() but with a bug - it allows mapping imported objects (without going through the exporter). Fix this by switching to use the generic drm_gem_dump_map_offset() function instead which has the bonus of simplifying the code.

CC Alyssa Rosenzweig <[email protected]>
---
 drivers/gpu/drm/panfrost/panfrost_drv.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)
drivers/gpu/drm/panfrost/panfrost_drv.c +2 -14
index 94b0819ad50b..d048250ad8ab 100644
@@ -254,26 +254,14 @@ static int panfrost_ioctl_mmap_bo(struct drm_device *dev, void *data,
 		      struct drm_file *file_priv)
 {
 	struct drm_panfrost_mmap_bo *args = data;
-	struct drm_gem_object *gem_obj;
-	int ret;
 
 	if (args->flags != 0) {
 		DRM_INFO("unknown mmap_bo flags: %d\n", args->flags);
 		return -EINVAL;
 	}
 
-	gem_obj = drm_gem_object_lookup(file_priv, args->handle);
-	if (!gem_obj) {
-		DRM_DEBUG("Failed to look up GEM BO %d\n", args->handle);
-		return -ENOENT;
-	}
-
-	ret = drm_gem_create_mmap_offset(gem_obj);
-	if (ret == 0)
-		args->offset = drm_vma_node_offset_addr(&gem_obj->vma_node);
-	drm_gem_object_put_unlocked(gem_obj);
-
-	return ret;
+	return drm_gem_dumb_map_offset(file_priv, dev, args->handle,
+				       &args->offset);
 }
 
 static int panfrost_ioctl_get_bo_offset(struct drm_device *dev, void *data,
Signature · 1 line
2.20.1
#1 lore raw
Quoted 5 lines · Steven Price

panfrost_ioctl_mmap_bo() contains a reimplementation of drm_gem_dump_map_offset() but with a bug - it allows mapping imported objects (without going through the exporter). Fix this by switching to use the generic drm_gem_dump_map_offset() function instead which has the bonus of simplifying the code.

gem_dumb stuff is for kms drivers, panfrost is a render driver. We're generally trying to separate these two worlds somewhat cleanly.

I think it'd be good to have a non-dumb version of this in the core, and use that. Or upgrade the dumb version to be that helper for everyone (and drop the _dumb).
-Daniel

Quoted 42 lines
CC Alyssa Rosenzweig <[email protected]>
---
 drivers/gpu/drm/panfrost/panfrost_drv.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)
drivers/gpu/drm/panfrost/panfrost_drv.c +2 -14
index 94b0819ad50b..d048250ad8ab 100644
@@ -254,26 +254,14 @@ static int panfrost_ioctl_mmap_bo(struct drm_device *dev, void *data,
 		      struct drm_file *file_priv)
 {
 	struct drm_panfrost_mmap_bo *args = data;
-	struct drm_gem_object *gem_obj;
-	int ret;
 
 	if (args->flags != 0) {
 		DRM_INFO("unknown mmap_bo flags: %d\n", args->flags);
 		return -EINVAL;
 	}
 
-	gem_obj = drm_gem_object_lookup(file_priv, args->handle);
-	if (!gem_obj) {
-		DRM_DEBUG("Failed to look up GEM BO %d\n", args->handle);
-		return -ENOENT;
-	}
-
-	ret = drm_gem_create_mmap_offset(gem_obj);
-	if (ret == 0)
-		args->offset = drm_vma_node_offset_addr(&gem_obj->vma_node);
-	drm_gem_object_put_unlocked(gem_obj);
-
-	return ret;
+	return drm_gem_dumb_map_offset(file_priv, dev, args->handle,
+				       &args->offset);
 }
 
 static int panfrost_ioctl_get_bo_offset(struct drm_device *dev, void *data,
Signature · 1 line
2.20.1
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#2 lore raw

Quoting Daniel Vetter (2019-05-13 15:39:21)

Quoted 7 lines · Steven Price
Quoted 5 lines

panfrost_ioctl_mmap_bo() contains a reimplementation of drm_gem_dump_map_offset() but with a bug - it allows mapping imported objects (without going through the exporter). Fix this by switching to use the generic drm_gem_dump_map_offset() function instead which has the bonus of simplifying the code.

Quoted 6 lines

gem_dumb stuff is for kms drivers, panfrost is a render driver. We're generally trying to separate these two worlds somewhat cleanly.

I think it'd be good to have a non-dumb version of this in the core, and use that. Or upgrade the dumb version to be that helper for everyone (and drop the _dumb).

More specifically, since panfrost is using the drm_gem_shmem helper and vm_ops, it too can provide the wrapper as it is the drm_gem_shmem layer that implies that trying to mmap an imported object is an issue as that is not a universal problem.
-Chris
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

author maintainer
#3 lore raw
Quoted 14 lines · Chris Wilson

Quoting Daniel Vetter (2019-05-13 15:39:21)

Quoted 13 lines · Steven Price
Quoted 5 lines

panfrost_ioctl_mmap_bo() contains a reimplementation of drm_gem_dump_map_offset() but with a bug - it allows mapping imported objects (without going through the exporter). Fix this by switching to use the generic drm_gem_dump_map_offset() function instead which has the bonus of simplifying the code.

gem_dumb stuff is for kms drivers, panfrost is a render driver. We're generally trying to separate these two worlds somewhat cleanly.

I think it'd be good to have a non-dumb version of this in the core, and use that. Or upgrade the dumb version to be that helper for everyone (and drop the _dumb).

I'm slightly confused by what you think is the best course of action here.

I can create a patch dropping the '_dumb' from drm_gem_dump_map_offset() if that's the objection. Or do you want a helper function with two callers (the 'dump' and the 'shmem' versions)?

Quoted 4 lines

More specifically, since panfrost is using the drm_gem_shmem helper and vm_ops, it too can provide the wrapper as it is the drm_gem_shmem layer that implies that trying to mmap an imported object is an issue as that is not a universal problem.

mmap'ing an imported object isn't a problem as such. But rather than going behind the exporter's back we would need to call dma_buf_mmap() to ensure that the exporter can do whatever is necessary.

I could add a wrapper in drm_gem_shmem_helper, but I'm not sure what the benefit of a wrapper here is?

Steve

#4 lore raw

Quoting Steven Price (2019-05-13 16:14:01)

Quoted 26 lines · Chris Wilson
Quoted 14 lines

Quoting Daniel Vetter (2019-05-13 15:39:21)

Quoted 13 lines · Steven Price
Quoted 5 lines

panfrost_ioctl_mmap_bo() contains a reimplementation of drm_gem_dump_map_offset() but with a bug - it allows mapping imported objects (without going through the exporter). Fix this by switching to use the generic drm_gem_dump_map_offset() function instead which has the bonus of simplifying the code.

gem_dumb stuff is for kms drivers, panfrost is a render driver. We're generally trying to separate these two worlds somewhat cleanly.

I think it'd be good to have a non-dumb version of this in the core, and use that. Or upgrade the dumb version to be that helper for everyone (and drop the _dumb).

I'm slightly confused by what you think is the best course of action here.

I can create a patch dropping the '_dumb' from drm_gem_dump_map_offset() if that's the objection. Or do you want a helper function with two callers (the 'dump' and the 'shmem' versions)?

Quoted 4 lines

More specifically, since panfrost is using the drm_gem_shmem helper and vm_ops, it too can provide the wrapper as it is the drm_gem_shmem layer that implies that trying to mmap an imported object is an issue as that is not a universal problem.

Quoted 6 lines

mmap'ing an imported object isn't a problem as such. But rather than going behind the exporter's back we would need to call dma_buf_mmap() to ensure that the exporter can do whatever is necessary.

I could add a wrapper in drm_gem_shmem_helper, but I'm not sure what the benefit of a wrapper here is?

No, my point is that the pagefaulting is being provided by drm_gem_shmem and that is relying on direct access to struct page, hence that is imposing the restriction that it can only handle its own shmem objects. The driver should not guess the helper, but ask the helper if it can perform an mmap of this object, and since this object is not an shmem object it will say no.

Different drivers can use their HW to fault in indirect access to dmabuf (treating the dmabuf as a conveyance of a sglist and not struct page) and so do not need to different/reject foreign objects from their specialised mmap routines and are oblivious to them.
-Chris