Hi,
On 9/7/23 16:49, Christian König wrote:
Am 07.09.23 um 16:47 schrieb Thomas Hellström:
Hi,
On 9/7/23 16:37, Christian König wrote:
Am 07.09.23 um 15:53 schrieb Thomas Hellström:
While trying to replicate a weird drm_exec lock alloc tracking warning
using the drm_exec kunit test, the warning was shadowed by a UAF
warning
from KASAN due to a bug in the drm kunit helpers.
Patch 1 fixes that drm kunit UAF.
Patch 2 introduces a drm_exec kunit subtest that fails if the
conditions
for the weird warning are met.
The series previously also had a patch with a drm_exec workaround
for the
warning but that patch has already been commited to
drm_misc_next_fixes.
Thinking more about this what happens when somebody calls
drm_exec_unlock_obj() on the first locked object?
Essentially the same thing. I've been thinking of the best way to
handle that, but not sure what's the best one.
Well what does lockdep store in that object in the first place? Could
we fix that somehow?
Lockdep maintains an array of held locks (lock classes) for each task.
Upon freeing, that list is traversed to see if the address matches the
stored memory address. This also has the interesting side effect that
IICR dma_resv_assert_held() checks if *any* dma_resv is held....
Ideally each object would have its own class instance, but I think some
applications would then exhaust the array size.
I'll dig a bit deeper into this.
Meanwhile for the unlock problem, looking at how the unlocks are used in
i915 it's typically locks that are grabbed during eviction and released
again once validation of a single object succeeded. The risk of them
ending up at the first lock is small, unless they are prelocked as the
contended lock. But for these "temporary" objects, the prelocked lock is
immediately dropped after locking and are only used to find something
suitable to wait for to relax the ww transaction.
If we were to implement something similar in drm_exec, we'd need an
interface to mark an object as "temporary" when locking, and make sure
we drop those objects if they end up as "prelocked". Personally I think
this solution works well and would be my preferred choice.
Yet another alternative would be to keep a reference even of the
unlocked objects...
But these workarounds ofc only push the problem out of drm_exec. Users
of raw dma-resv or ww mutexes would still wonder what's going on.
/Thomas
Christian.
/Thomas
Christian.
v2:
- Rewording of commit messages
- Add some commit message tags
v3:
- Remove an already committed patch
- Rework the test to not require dmesg inspection (Maxime Ripard)
- Condition the test on CONFIG_LOCK_ALLOC
- Update code comments and commit messages (Maxime Ripard)
Cc: Maxime Ripard <mripard@xxxxxxxxxx>
Cc: Christian König <christian.koenig@xxxxxxx>
Thomas Hellström (2):
drm/tests: helpers: Avoid a driver uaf
drm/tests/drm_exec: Add a test for object freeing within
drm_exec_fini()
drivers/gpu/drm/tests/drm_exec_test.c | 82
+++++++++++++++++++++++++++
include/drm/drm_kunit_helpers.h | 4 +-
2 files changed, 85 insertions(+), 1 deletion(-)
