Skip to contentSkip to conversation

drm/test: drm_exec: fix memory leak on object prepare

PATCH In review Danilo Krummrich 2 participants 2 messages Jul 27, 2023 – Aug 8, 2023

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/test: drm_exec: fix memory leak on object prepare

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")
---
 drivers/gpu/drm/tests/drm_exec_test.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/tests/drm_exec_test.c +5 -2
index df31f89a7945..80761e734a15 100644
@@ -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[] = {
Signature · 1 line
2.41.0
#1 lore raw

Am 28.07.23 um 01:10 schrieb Danilo Krummrich:

Quoted 11 lines

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")

Thanks, can you please rebase on current drm-misc-next and re-send.

Thanks,
Christian.

Quoted 36 lines
---
  drivers/gpu/drm/tests/drm_exec_test.c | 7 +++++--
  1 file changed, 5 insertions(+), 2 deletions(-)
drivers/gpu/drm/tests/drm_exec_test.c +5 -2
index df31f89a7945..80761e734a15 100644
@@ -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[] = {