Skip to content

Commit 22b9e8e

Browse files
Lyudejannau
authored andcommitted
drm/gem/shmem: Extract drm_gem_shmem_release() from drm_gem_shmem_free()
At the moment the way that freeing gem shmem objects is not ideal for rust bindings. drm_gem_shmem_free() releases all of the associated memory with a gem shmem object with kfree(), which means that for us to correctly release a gem shmem object in rust we have to manually drop all of the contents of our gem object structure in-place by hand before finally calling drm_gem_shmem_free() to release the shmem resources and the allocation for the gem object. Since the only reason this is an issue is because of drm_gem_shmem_free() calling kfree(), we can fix this by splitting drm_gem_shmem_free() out into itself and drm_gem_shmem_release(), where drm_gem_shmem_release() releases the various gem shmem resources without freeing the structure itself. With this, we can safely re-acquire the KBox for the gem object's memory allocation and let rust handle cleaning up all of the other struct members automatically. Signed-off-by: Lyude Paul <lyude@redhat.com>
1 parent dd6a48f commit 22b9e8e

2 files changed

Lines changed: 19 additions & 5 deletions

File tree

drivers/gpu/drm/drm_gem_shmem_helper.c

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -175,13 +175,13 @@ struct drm_gem_shmem_object *drm_gem_shmem_create_with_mnt(struct drm_device *de
175175
EXPORT_SYMBOL_GPL(drm_gem_shmem_create_with_mnt);
176176

177177
/**
178-
* drm_gem_shmem_free - Free resources associated with a shmem GEM object
179-
* @shmem: shmem GEM object to free
178+
* drm_gem_shmem_release - Release resources associated with a shmem GEM object.
179+
* @shmem: shmem GEM object
180180
*
181-
* This function cleans up the GEM object state and frees the memory used to
182-
* store the object itself.
181+
* This function cleans up the GEM object state, but does not free the memory used to store the
182+
* object itself. This function is meant to be a dedicated helper for the Rust GEM bindings.
183183
*/
184-
void drm_gem_shmem_free(struct drm_gem_shmem_object *shmem)
184+
void drm_gem_shmem_release(struct drm_gem_shmem_object *shmem)
185185
{
186186
struct drm_gem_object *obj = &shmem->base;
187187

@@ -208,6 +208,19 @@ void drm_gem_shmem_free(struct drm_gem_shmem_object *shmem)
208208
}
209209

210210
drm_gem_object_release(obj);
211+
}
212+
EXPORT_SYMBOL_GPL(drm_gem_shmem_release);
213+
214+
/**
215+
* drm_gem_shmem_free - Free resources associated with a shmem GEM object
216+
* @shmem: shmem GEM object to free
217+
*
218+
* This function cleans up the GEM object state and frees the memory used to
219+
* store the object itself.
220+
*/
221+
void drm_gem_shmem_free(struct drm_gem_shmem_object *shmem)
222+
{
223+
drm_gem_shmem_release(shmem);
211224
kfree(shmem);
212225
}
213226
EXPORT_SYMBOL_GPL(drm_gem_shmem_free);

include/drm/drm_gem_shmem_helper.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ struct drm_gem_shmem_object *drm_gem_shmem_create(struct drm_device *dev, size_t
112112
struct drm_gem_shmem_object *drm_gem_shmem_create_with_mnt(struct drm_device *dev,
113113
size_t size,
114114
struct vfsmount *gemfs);
115+
void drm_gem_shmem_release(struct drm_gem_shmem_object *shmem);
115116
void drm_gem_shmem_free(struct drm_gem_shmem_object *shmem);
116117

117118
void drm_gem_shmem_put_pages_locked(struct drm_gem_shmem_object *shmem);

0 commit comments

Comments
 (0)