Hi,
Thanks for the rework
On Tue, Dec 05, 2023 at 02:22:10AM +0100, Michał Winiarski wrote:
> Add a simple test that checks whether the action is indeed called right
> away and that it is not called on the final drm_dev_put().
>
> Signed-off-by: Michał Winiarski <michal.winiarski@xxxxxxxxx>
> ---
> drivers/gpu/drm/tests/drm_managed_test.c | 24 ++++++++++++++++++++++++
> 1 file changed, 24 insertions(+)
>
> diff --git a/drivers/gpu/drm/tests/drm_managed_test.c b/drivers/gpu/drm/tests/drm_managed_test.c
> index cabe6360aef71..8dfbea21c35c5 100644
> --- a/drivers/gpu/drm/tests/drm_managed_test.c
> +++ b/drivers/gpu/drm/tests/drm_managed_test.c
> @@ -44,6 +44,29 @@ static void drm_test_managed_run_action(struct kunit *test)
> KUNIT_EXPECT_GT(test, ret, 0);
> }
>
We should have a description of the intent of the test here.
> +static void drm_test_managed_release_action(struct kunit *test)
> +{
> + struct managed_test_priv *priv = test->priv;
> + int ret;
> +
> + ret = drmm_add_action_or_reset(&priv->drm, drm_action, priv);
> + KUNIT_EXPECT_EQ(test, ret, 0);
> +
> + ret = drm_dev_register(&priv->drm, 0);
> + KUNIT_ASSERT_EQ(test, ret, 0);
> +
> + drmm_release_action(&priv->drm, drm_action, priv);
> + KUNIT_EXPECT_TRUE(test, priv->action_done);
> + priv->action_done = false;
> +
> + drm_dev_unregister(&priv->drm);
> + drm_kunit_helper_free_device(test, priv->drm.dev);
> +
> + ret = wait_event_interruptible_timeout(priv->action_wq, priv->action_done,
> + msecs_to_jiffies(TEST_TIMEOUT_MS));
> + KUNIT_EXPECT_EQ(test, ret, 0);
This tests that we have reached the timeout, thus the action never ran.
It's not clear to me what your intent is here.
This test is:
- Registering an action
- Registering the DRM device
- Calling drmm_release_action on the previously registered action
- Checking that the action has been run
- Clearing the flag saying the action has been run
- Unregistering the DRM device
- Freeing the DRM device
- Waiting for the action to run, but expecting it to never do?
I guess something like
static void drm_test_managed_release_action(struct kunit *test)
{
struct managed_test_priv *priv = test->priv;
int ret;
ret = drmm_add_action_or_reset(&priv->drm, drm_action, priv);
KUNIT_ASSERT_EQ(test, ret, 0);
KUNIT_ASSERT_FALSE(test, priv->action_done);
drmm_release_action(&priv->drm, drm_action, priv);
ret = wait_event_interruptible_timeout(priv->action_wq, priv->action_done,
msecs_to_jiffies(TEST_TIMEOUT_MS));
KUNIT_EXPECT_GT(test, ret, 0);
KUNIT_EXPECT_TRUE(test, priv->action_done);
}
would be enough?
> +}
> +
> static int drm_managed_test_init(struct kunit *test)
> {
> struct managed_test_priv *priv;
> @@ -65,6 +88,7 @@ static int drm_managed_test_init(struct kunit *test)
>
> static struct kunit_case drm_managed_tests[] = {
> KUNIT_CASE(drm_test_managed_run_action),
> + KUNIT_CASE(drm_test_managed_release_action),
Also, tests should be organized by alphabetical order
Maxime
Attachment:
signature.asc
Description: PGP signature
