archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-08 03:24:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

drm/tests: shmem: Hold reservation lock around purge

Browse source 
Acquire and release the GEM object's reservation lock around calls
to the object's purge operation. The tests use
drm_gem_shmem_purge_locked(), which led to errors such as show below.

[   58.709128] WARNING: CPU: 1 PID: 1354 at drivers/gpu/drm/drm_gem_shmem_helper.c:515 drm_gem_shmem_purge_locked+0x51c/0x740

Only export the new helper drm_gem_shmem_purge() for Kunit tests.
This is not an interface for regular drivers.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Fixes: 954907f714 ("drm/shmem-helper: Refactor locked/unlocked functions")
Cc: dri-devel@lists.freedesktop.org
Cc: <stable@vger.kernel.org> # v6.16+
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Link: https://patch.msgid.link/20251212160317.287409-6-tzimmermann@suse.de
This commit is contained in:
Thomas Zimmermann 2025-12-12 17:00:36 +01:00
parent 607d07d8cc
commit 3f41307d58
3 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
drivers/gpu/drm/drm_gem_shmem_helper.c
View file

@ -947,6 +947,21 @@ int drm_gem_shmem_madvise(struct drm_gem_shmem_object *shmem, int madv)
return ret;
}
EXPORT_SYMBOL_IF_KUNIT(drm_gem_shmem_madvise);
int drm_gem_shmem_purge(struct drm_gem_shmem_object *shmem)
{
struct drm_gem_object *obj = &shmem->base;
int ret;
ret = dma_resv_lock_interruptible(obj->resv, NULL);
if (ret)
return ret;
drm_gem_shmem_purge_locked(shmem);
dma_resv_unlock(obj->resv);
return 0;
}
EXPORT_SYMBOL_IF_KUNIT(drm_gem_shmem_purge);
#endif
MODULE_DESCRIPTION("DRM SHMEM memory-management helpers");

4
drivers/gpu/drm/tests/drm_gem_shmem_test.c
View file

@ -340,7 +340,9 @@ static void drm_gem_shmem_test_purge(struct kunit *test)
ret = drm_gem_shmem_is_purgeable(shmem);
KUNIT_EXPECT_TRUE(test, ret);
drm_gem_shmem_purge_locked(shmem);
ret = drm_gem_shmem_purge(shmem);
KUNIT_ASSERT_EQ(test, ret, 0);
KUNIT_EXPECT_NULL(test, shmem->pages);
KUNIT_EXPECT_NULL(test, shmem->sgt);
KUNIT_EXPECT_EQ(test, shmem->madv, -1);

1
include/drm/drm_gem_shmem_helper.h
View file

@ -308,6 +308,7 @@ struct drm_gem_object *drm_gem_shmem_prime_import_no_map(struct drm_device *dev,
int drm_gem_shmem_vmap(struct drm_gem_shmem_object *shmem, struct iosys_map *map);
void drm_gem_shmem_vunmap(struct drm_gem_shmem_object *shmem, struct iosys_map *map);
int drm_gem_shmem_madvise(struct drm_gem_shmem_object *shmem, int madv);
int drm_gem_shmem_purge(struct drm_gem_shmem_object *shmem);
#endif
#endif /* __DRM_GEM_SHMEM_HELPER_H__ */