drm/prime: keep a reference from the handle to exported dma-buf (v3)
Subsystems (2)
Dave Airlie
maintainerPATCH 1/1 drm/prime: keep a reference from the handle to exported dma-buf (v3)
Currently we have a problem with this:
1. i915: create gem object
2. i915: export gem object to prime
3. radeon: import gem object
4. close prime fd
5. radeon: unref object
6. i915: unref object
i915 has an imported object reference in its file priv, that isn't cleaned up properly until fd close. The reference gets added at step 2, but at step 6 we don't have enough info to clean it up.
The solution is to take a reference on the dma-buf when we export it, and drop the reference when the gem handle goes away.
So when we export a dma_buf from a gem object, we keep track of it with the handle, we take a reference to the dma_buf. When we close the handle (i.e. userspace is finished with the buffer), we drop the reference to the dma_buf, and it gets collected.
This patch isn't meant to fix any other problem or bikesheds, and it doesn't fix any races with other scenarios.
v1.1: move export symbol line back up.
v2: okay I had to do a bit more, as the first patch showed a leak on one of my tests, that I found using the dma-buf debugfs support, the problem case is exporting a buffer twice with the same handle, we'd add another export handle for it unnecessarily, however
we now fail if we try to export the same object with a different gem handle, however I'm not sure if that is a case I want to support, and I've gotten the code to WARN_ON if we hit something like that.
v2.1: rebase this patch, write better commit msg.
v3: cleanup error handling, track import vs export in linked list, these two patches were separate previously, but seem to work better like this.
--- drivers/gpu/drm/drm_gem.c | 4 +- drivers/gpu/drm/drm_prime.c | 100 +++++++++++++++++++++++++++++--------------- include/drm/drmP.h | 4 +- 3 files changed, 71 insertions(+), 37 deletions(-)
drivers/gpu/drm/drm_gem.c +2 -2
@@ -205,11 +205,11 @@ static void drm_gem_remove_prime_handles(struct drm_gem_object *obj, struct drm_file *filp) {if (obj->import_attach) { -drm_prime_remove_imported_buf_handle (&filp->prime, +drm_prime_remove_buf_handle (&filp->prime, obj->import_attach->dmabuf); }if (obj->export_dma_buf) { -drm_prime_remove_imported_buf_handle (&filp->prime, +drm_prime_remove_buf_handle (&filp->prime, obj->export_dma_buf); } }
drivers/gpu/drm/drm_prime.c +67 -33
177 lines not on this page · raw message
include/drm/drmP.h +2 -2
@@ -1594,8 +1594,8 @@ extern void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *svoid 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);int drm_prime_add_imported_buf_handle (struct drm_prime_file_private *prime_fpriv,struct dma_buf *dma_buf,uint32_t handle); -int drm_prime_lookup_imported_buf_handle (struct drm_prime_file_private *prime_fpriv,struct dma_buf *dma_buf,uint32_t *handle); -void drm_prime_remove_imported_buf_handle (struct drm_prime_file_private *prime_fpriv,struct dma_buf *dma_buf); +int drm_prime_lookup_buf_handle (struct drm_prime_file_private *prime_fpriv,struct dma_buf *dma_buf,uint32_t *handle); +void drm_prime_remove_buf_handle (struct drm_prime_file_private *prime_fpriv,struct dma_buf *dma_buf);int drm_prime_add_dma_buf (struct drm_device *dev,struct drm_gem_object *obj); int drm_prime_lookup_obj(struct drm_device *dev, struct dma_buf *buf,
Signature · 1 line
1.8.2