drm/prime/gem: drm_gem_object_release_handle by handle
Subsystems (4)
PATCH 1/1 drm/prime/gem: drm_gem_object_release_handle by handle
The drm_gem_handle_delete is called by DRM_IOCTL_GEM_CLOSE from userspace.
drm_gem_handle_delete(handle)
drm_gem_object_release_handle(handle)
drm_gem_remove_prime_handles() drm_prime_remove_buf_handle_locked() if (member->dma_buf == dma_buf) free member return
The api description of drm_gem_handle_delete says to delete the given file-private handle.
But the drm_gem_remove_prime_handles seems to remove *handles* from rbtree of drm file-private structure.
And then the drm_gem_remove_prime_handles only remove the first handle lookuped from rbtree, as following codes:
rb = prime_fpriv->dmabufs.rb_node;
while (rb) {
struct drm_prime_member *member;
member = rb_entry(rb, struct drm_prime_member, dmabuf_rb);
if (member->dma_buf == dma_buf) {
rb_erase(&member->handle_rb, &prime_fpriv->handles);
rb_erase(&member->dmabuf_rb, &prime_fpriv->dmabufs);
dma_buf_put(dma_buf);
kfree(member);
return;
}This patch fixes to remove the rbtree member by given handle.
Test
handle_1 = drm_alloc(1MB)fd_1 = drm_handle_to_fd(handle_1)name_1 = drm get flink name from handle(handle_1) // DRM_IOCTL_GEM_FLINK
handle_2 = drm get handle,size_2 from flink name(name_1) // DRM_IOCTL_GEM_OPENfd_2 = drm_handle_to_fd(handle_2)
handle_3 = drm get handle,size_3 from flink name(name_1) // DRM_IOCTL_GEM_OPENfd_3 = drm_handle_to_fd(handle_3)
drm close handle(handle_3) // DRM_IOCTL_GEM_CLOSE
handle_4 = drm_alloc(4MB)fd_4 = drm_handle_to_fd(handle_4)
We find that the fd_4 dmabuf size is 1MB. Tested by following:
handle_5 = drm_fd_to_handle(fd_4)name_5 = drm get flink name from handle(handle_5) // DRM_IOCTL_GEM_FLINKhandle_3 = drm get handle,size_5 from flink name(name_5) // DRM_IOCTL_GEM_OPEN
Without this patch, the size_5 = 1MB
With this patch, the size_5 = 4MB
--- drivers/gpu/drm/drm_gem.c | 7 ++++--- drivers/gpu/drm/drm_internal.h | 2 +- drivers/gpu/drm/drm_prime.c | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-)
drivers/gpu/drm/drm_gem.c +4 -3
@@ -168,7 +168,8 @@ void drm_gem_private_object_init(struct drm_device *dev,EXPORT_SYMBOL (drm_gem_private_object_init);static void -drm_gem_remove_prime_handles (struct drm_gem_object *obj,struct drm_file *filp) +drm_gem_remove_prime_handle (struct drm_gem_object *obj,struct drm_file *filp, +int handle) {/* * Note: obj->dma_buf can't disappear as long as we still hold a
@@ -177,7 +178,7 @@ drm_gem_remove_prime_handles(struct drm_gem_object *obj, struct drm_file *filp)mutex_lock (&filp->prime.lock);if (obj->dma_buf) {drm_prime_remove_buf_handle_locked (&filp->prime, - obj->dma_buf); + obj->dma_buf, handle); }mutex_unlock (&filp->prime.lock); }
@@ -252,7 +253,7 @@ drm_gem_object_release_handle(int id, void *ptr, void *data)if (obj->funcs->close) obj->funcs->close (obj, file_priv); -drm_gem_remove_prime_handles (obj, file_priv); +drm_gem_remove_prime_handle (obj, file_priv, id);drm_vma_node_revoke (&obj->vma_node, file_priv);drm_gem_object_handle_put_unlocked (obj);
drivers/gpu/drm/drm_internal.h +1 -1
@@ -75,7 +75,7 @@ int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data,void drm_prime_init_file_private (struct drm_prime_file_private *prime_fpriv);void drm_prime_destroy_file_private (struct drm_prime_file_private *prime_fpriv);void drm_prime_remove_buf_handle_locked (struct drm_prime_file_private *prime_fpriv, -struct dma_buf *dma_buf); +struct dma_buf *dma_bufi,int handle);/* drm_drv.c */ struct drm_minor *drm_minor_acquire (unsigned int minor_id);
drivers/gpu/drm/drm_prime.c +2 -2
@@ -188,7 +188,7 @@ static int drm_prime_lookup_buf_handle(struct drm_prime_file_private *prime_fpri }void drm_prime_remove_buf_handle_locked (struct drm_prime_file_private *prime_fpriv, -struct dma_buf *dma_buf) +struct dma_buf *dma_buf,int handle) {struct rb_node *rb;
@@ -197,7 +197,7 @@ void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fprstruct drm_prime_member *member; member = rb_entry(rb, struct drm_prime_member, dmabuf_rb); -if (member->dma_buf == dma_buf) { +if ((member->dma_buf == dma_buf) && (member->handle == handle)) {rb_erase (&member->handle_rb, &prime_fpriv->handles);rb_erase (&member->dmabuf_rb, &prime_fpriv->dmabufs);
Signature · 9 lines
2.25.1 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip