From: "Thomas Hellström" <thomas.hellstrom@linux.intel.com>
To: Maxime Ripard <mripard@redhat.com>
Cc: intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
"Christian König" <christian.koenig@amd.com>
Subject: Re: [Intel-xe] [PATCH 2/3] drm/tests/drm_exec: Add a test for object freeing within drm_exec_fini()
Date: Tue, 5 Sep 2023 15:42:58 +0200 [thread overview]
Message-ID: <5d25d6ea-3a96-3be1-3742-7e3c1b417d14@linux.intel.com> (raw)
In-Reply-To: <h4sw3wafjeuf46cvedvqy33q7rnbl7ghoango53hsewcgxnbwk@satazuly25lr>
Hi, Maxime
On 9/5/23 15:16, Maxime Ripard wrote:
> On Tue, Sep 05, 2023 at 02:32:38PM +0200, Thomas Hellström wrote:
>> Hi,
>>
>> On 9/5/23 14:05, Maxime Ripard wrote:
>>> Hi,
>>>
>>> On Tue, Sep 05, 2023 at 10:58:31AM +0200, Thomas Hellström wrote:
>>>> Check that object freeing from within drm_exec_fini() works as expected
>>>> and doesn't generate any warnings.
>>>>
>>>> Cc: Christian König <christian.koenig@amd.com>
>>>> Cc: dri-devel@lists.freedesktop.org
>>>> Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
>>>> ---
>>>> drivers/gpu/drm/tests/drm_exec_test.c | 47 +++++++++++++++++++++++++++
>>>> 1 file changed, 47 insertions(+)
>>>>
>>>> diff --git a/drivers/gpu/drm/tests/drm_exec_test.c b/drivers/gpu/drm/tests/drm_exec_test.c
>>>> index 563949d777dd..294c25f49cc7 100644
>>>> --- a/drivers/gpu/drm/tests/drm_exec_test.c
>>>> +++ b/drivers/gpu/drm/tests/drm_exec_test.c
>>>> @@ -170,6 +170,52 @@ static void test_prepare_array(struct kunit *test)
>>>> drm_gem_private_object_fini(&gobj2);
>>>> }
>>>> +static const struct drm_gem_object_funcs put_funcs = {
>>>> + .free = (void *)kfree,
>>>> +};
>>>> +
>>>> +/*
>>>> + * Check that freeing objects from within drm_exec_fini()
>>>> + * behaves as expected.
>>>> + */
>>>> +static void test_early_put(struct kunit *test)
>>>> +{
>>>> + struct drm_exec_priv *priv = test->priv;
>>>> + struct drm_gem_object *gobj1;
>>>> + struct drm_gem_object *gobj2;
>>>> + struct drm_gem_object *array[2];
>>>> + struct drm_exec exec;
>>>> + int ret;
>>>> +
>>>> + gobj1 = kzalloc(sizeof(*gobj1), GFP_KERNEL);
>>>> + KUNIT_EXPECT_NOT_ERR_OR_NULL(test, gobj1);
>>>> + if (!gobj1)
>>>> + return;
>>>> +
>>>> + gobj2 = kzalloc(sizeof(*gobj2), GFP_KERNEL);
>>>> + KUNIT_EXPECT_NOT_ERR_OR_NULL(test, gobj2);
>>>> + if (!gobj2) {
>>>> + kfree(gobj1);
>>>> + return;
>>>> + }
>>>> +
>>>> + gobj1->funcs = &put_funcs;
>>>> + gobj2->funcs = &put_funcs;
>>>> + array[0] = gobj1;
>>>> + array[1] = gobj2;
>>>> + drm_gem_private_object_init(priv->drm, gobj1, PAGE_SIZE);
>>>> + drm_gem_private_object_init(priv->drm, gobj2, PAGE_SIZE);
>>>> +
>>>> + drm_exec_init(&exec, DRM_EXEC_INTERRUPTIBLE_WAIT);
>>>> + drm_exec_until_all_locked(&exec)
>>>> + ret = drm_exec_prepare_array(&exec, array, ARRAY_SIZE(array),
>>>> + 1);
>>>> + KUNIT_EXPECT_EQ(test, ret, 0);
>>>> + drm_gem_object_put(gobj1);
>>>> + drm_gem_object_put(gobj2);
>>>> + drm_exec_fini(&exec);
>>> It doesn't look like you actually check that "freeing objects from
>>> within drm_exec_fini() behaves as expected." What is the expectation
>>> here, and how is it checked?
>> Hm. Good question, I've been manually checking dmesg for lockdep splats. Is
>> there a way to automate that?
> I'm not familiar with the drm_exec API, but judging by the code I'd
> assume you want to check that gobj1 and gobj2 are actually freed using
> kfree?
Actually not. What's important here is that the call to drm_exec_fini(),
which puts the last references to gobj1 and gobj2 doesn't trigger any
lockdep splats, like the one in the commit message of patch 3/3. So to
make more sense, the test could perhaps be conditioned on
CONFIG_DEBUG_LOCK_ALLOC. Still it would require manual checking of
dmesg() after being run.
/Thomas
next prev parent reply other threads:[~2023-09-05 13:43 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-05 8:58 [Intel-xe] [PATCH 0/3] drm/drm_exec, drm/drm_kunit: Fix / WA for uaf and lock alloc tracking Thomas Hellström
2023-09-05 8:58 ` [Intel-xe] [PATCH 1/3] drm/kunit: Avoid a driver uaf Thomas Hellström
2023-09-05 12:06 ` Maxime Ripard
2023-09-05 12:43 ` Thomas Hellström
2023-09-06 10:08 ` Maxime Ripard
2023-09-07 10:32 ` Thomas Hellström
2023-09-05 8:58 ` [Intel-xe] [PATCH 2/3] drm/tests/drm_exec: Add a test for object freeing within drm_exec_fini() Thomas Hellström
2023-09-05 12:05 ` Maxime Ripard
2023-09-05 12:32 ` Thomas Hellström
2023-09-05 13:16 ` Maxime Ripard
2023-09-05 13:42 ` Thomas Hellström [this message]
2023-09-06 10:07 ` Maxime Ripard
2023-09-05 8:58 ` [Intel-xe] [PATCH 3/3] drm/drm_exec: Work around a WW mutex lockdep oddity Thomas Hellström
2023-09-05 9:22 ` Boris Brezillon
2023-09-05 10:59 ` Danilo Krummrich
2023-09-05 13:14 ` Christian König
2023-09-05 14:29 ` Thomas Hellström
2023-09-06 8:34 ` Christian König
2023-09-07 8:59 ` Thomas Hellström
2023-09-05 9:01 ` [Intel-xe] ✓ CI.Patch_applied: success for drm/drm_exec, drm/drm_kunit: Fix / WA for uaf and lock alloc tracking Patchwork
2023-09-05 9:01 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-09-05 9:03 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-09-05 9:10 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-09-05 9:10 ` [Intel-xe] ✗ CI.Hooks: failure " Patchwork
2023-09-05 9:10 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-09-07 14:52 ` [Intel-xe] ✗ CI.Patch_applied: failure for drm/drm_exec, drm/drm_kunit: Fix / WA for uaf and lock alloc tracking. (rev2) Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5d25d6ea-3a96-3be1-3742-7e3c1b417d14@linux.intel.com \
--to=thomas.hellstrom@linux.intel.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-xe@lists.freedesktop.org \
--cc=mripard@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox