| Message ID | 20230727231038.4943-1-dakr@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/test: drm_exec: fix memory leak on object prepare | expand |
Am 28.07.23 um 01:10 schrieb Danilo Krummrich: > drm_exec_prepare_obj() and drm_exec_prepare_array() both reserve > dma-fence slots and hence a dma_resv_list without ever freeing it. > > Make sure to call drm_gem_private_object_fini() for each GEM object > passed to drm_exec_prepare_obj()/drm_exec_prepare_array() throughout the > test to fix this up. > > While at it, remove some trailing empty lines. > > Fixes: 9710631cc8f3 ("drm: add drm_exec selftests v4") > Signed-off-by: Danilo Krummrich <dakr@redhat.com> Thanks, can you please rebase on current drm-misc-next and re-send. Thanks, Christian. > --- > drivers/gpu/drm/tests/drm_exec_test.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/tests/drm_exec_test.c b/drivers/gpu/drm/tests/drm_exec_test.c > index df31f89a7945..80761e734a15 100644 > --- a/drivers/gpu/drm/tests/drm_exec_test.c > +++ b/drivers/gpu/drm/tests/drm_exec_test.c > @@ -118,8 +118,6 @@ static void test_duplicates(struct kunit *test) > drm_exec_fini(&exec); > } > > - > - > static void test_prepare(struct kunit *test) > { > struct drm_gem_object gobj = { }; > @@ -137,6 +135,8 @@ static void test_prepare(struct kunit *test) > break; > } > drm_exec_fini(&exec); > + > + drm_gem_private_object_fini(&gobj); > } > > static void test_prepare_array(struct kunit *test) > @@ -156,6 +156,9 @@ static void test_prepare_array(struct kunit *test) > 1); > KUNIT_EXPECT_EQ(test, ret, 0); > drm_exec_fini(&exec); > + > + drm_gem_private_object_fini(&gobj1); > + drm_gem_private_object_fini(&gobj2); > } > > static struct kunit_case drm_exec_tests[] = {
diff --git a/drivers/gpu/drm/tests/drm_exec_test.c b/drivers/gpu/drm/tests/drm_exec_test.c index df31f89a7945..80761e734a15 100644 --- a/drivers/gpu/drm/tests/drm_exec_test.c +++ b/drivers/gpu/drm/tests/drm_exec_test.c @@ -118,8 +118,6 @@ static void test_duplicates(struct kunit *test) drm_exec_fini(&exec); } - - static void test_prepare(struct kunit *test) { struct drm_gem_object gobj = { }; @@ -137,6 +135,8 @@ static void test_prepare(struct kunit *test) break; } drm_exec_fini(&exec); + + drm_gem_private_object_fini(&gobj); } static void test_prepare_array(struct kunit *test) @@ -156,6 +156,9 @@ static void test_prepare_array(struct kunit *test) 1); KUNIT_EXPECT_EQ(test, ret, 0); drm_exec_fini(&exec); + + drm_gem_private_object_fini(&gobj1); + drm_gem_private_object_fini(&gobj2); } static struct kunit_case drm_exec_tests[] = {
drm_exec_prepare_obj() and drm_exec_prepare_array() both reserve dma-fence slots and hence a dma_resv_list without ever freeing it. Make sure to call drm_gem_private_object_fini() for each GEM object passed to drm_exec_prepare_obj()/drm_exec_prepare_array() throughout the test to fix this up. While at it, remove some trailing empty lines. Fixes: 9710631cc8f3 ("drm: add drm_exec selftests v4") Signed-off-by: Danilo Krummrich <dakr@redhat.com> --- drivers/gpu/drm/tests/drm_exec_test.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)