2023-08-10 00:54:58

by Danilo Krummrich

Subject: [PATCH drm-misc-next] 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")
Signed-off-by: Danilo Krummrich <[email protected]>
---
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 f79c9f0359aa..9ccf0dd9ca89 100644
--- a/drivers/gpu/drm/tests/drm_exec_test.c
+++ b/drivers/gpu/drm/tests/drm_exec_test.c
@@ -125,8 +125,6 @@ static void test_duplicates(struct kunit *test)
drm_exec_fini(&exec);
}

-
-
static void test_prepare(struct kunit *test)
{
struct drm_exec_priv *priv = test->priv;
@@ -145,6 +143,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)
@@ -165,6 +165,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[] = {

base-commit: e05f3938c5a7896d09736e3381675a57ffee7a0a
--
2.41.0

2023-08-10 09:03:56

by Christian König

Subject: Re: [PATCH drm-misc-next] drm/test: drm_exec: fix memory leak on object prepare

Am 10.08.23 um 00:50 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 <[email protected]>

Reviewed and pushed to drm-misc-next.

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 f79c9f0359aa..9ccf0dd9ca89 100644
> --- a/drivers/gpu/drm/tests/drm_exec_test.c
> +++ b/drivers/gpu/drm/tests/drm_exec_test.c
> @@ -125,8 +125,6 @@ static void test_duplicates(struct kunit *test)
> drm_exec_fini(&exec);
> }
>
> -
> -
> static void test_prepare(struct kunit *test)
> {
> struct drm_exec_priv *priv = test->priv;
> @@ -145,6 +143,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)
> @@ -165,6 +165,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[] = {
>
> base-commit: e05f3938c5a7896d09736e3381675a57ffee7a0a