From: suijingfeng <suijingfeng@loongson.cn>
To: Maxime Ripard <mripard@kernel.org>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Thomas Zimmermann <tzimmermann@suse.de>,
Emma Anholt <emma@anholt.net>
Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: Re: [05/11] drm/tests: helpers: Create an helper to allocate a locking ctx
Date: Tue, 18 Jul 2023 01:08:12 +0800 [thread overview]
Message-ID: <fbbc08de-043a-2622-7cd4-fa485129edaf@loongson.cn> (raw)
In-Reply-To: <20230710-kms-kunit-actions-rework-v1-5-722c58d72c72@kernel.org>
Hi,
On 2023/7/10 15:47, Maxime Ripard wrote:
> As we get more and more tests, the locking context initialisation
> creates more and more boilerplate, both at creation and destruction.
>
> Let's create a helper that will allocate, initialise a context, and
> register kunit actions to clean up once the test is done.
>
> Signed-off-by: Maxime Ripard <mripard@kernel.org>
> ---
> drivers/gpu/drm/tests/drm_kunit_helpers.c | 41 +++++++++++++++++++++++++++++++
> include/drm/drm_kunit_helpers.h | 2 ++
> 2 files changed, 43 insertions(+)
>
> diff --git a/drivers/gpu/drm/tests/drm_kunit_helpers.c b/drivers/gpu/drm/tests/drm_kunit_helpers.c
> index 38211fea9ae6..40a27c78d692 100644
> --- a/drivers/gpu/drm/tests/drm_kunit_helpers.c
> +++ b/drivers/gpu/drm/tests/drm_kunit_helpers.c
> @@ -124,5 +124,46 @@ __drm_kunit_helper_alloc_drm_device_with_driver(struct kunit *test,
> }
> EXPORT_SYMBOL_GPL(__drm_kunit_helper_alloc_drm_device_with_driver);
>
> +static void action_drm_release_context(void *ptr)
> +{
> + struct drm_modeset_acquire_ctx *ctx = ptr;
> +
> + drm_modeset_drop_locks(ctx);
> + drm_modeset_acquire_fini(ctx);
> +}
> +
> +/**
> + * drm_kunit_helper_context_alloc - Allocates an acquire context
> + * @test: The test context object
> + *
> + * Allocates and initializes a modeset acquire context.
> + *
> + * The context is tied to the kunit test context, so we must not call
> + * drm_modeset_acquire_fini() on it, it will be done so automatically.
> + *
> + * Returns:
> + * An ERR_PTR on error, a pointer to the newly allocated context otherwise
> + */
> +struct drm_modeset_acquire_ctx *
> +drm_kunit_helper_acquire_ctx_alloc(struct kunit *test)
> +{
> + struct drm_modeset_acquire_ctx *ctx;
> + int ret;
> +
> + ctx = kunit_kzalloc(test, sizeof(*ctx), GFP_KERNEL);
Because kunit_kzalloc() is also managed,
Is there any possibility that kfree(ctx) get called before
action_drm_release_context(ctx) ?
Currently, I can't find where the order is guaranteed.
> + KUNIT_ASSERT_NOT_NULL(test, ctx);
> +
> + drm_modeset_acquire_init(ctx, 0);
> +
> + ret = kunit_add_action_or_reset(test,
> + action_drm_release_context,
> + ctx);
> + if (ret)
> + return ERR_PTR(ret);
> +
> + return ctx;
> +}
> +EXPORT_SYMBOL_GPL(drm_kunit_helper_acquire_ctx_alloc);
> +
> MODULE_AUTHOR("Maxime Ripard <maxime@cerno.tech>");
> MODULE_LICENSE("GPL");
> diff --git a/include/drm/drm_kunit_helpers.h b/include/drm/drm_kunit_helpers.h
> index ed013fdcc1ff..4ba5e10653c6 100644
> --- a/include/drm/drm_kunit_helpers.h
> +++ b/include/drm/drm_kunit_helpers.h
> @@ -87,5 +87,7 @@ __drm_kunit_helper_alloc_drm_device(struct kunit *test,
> sizeof(_type), \
> offsetof(_type, _member), \
> _feat))
> +struct drm_modeset_acquire_ctx *
> +drm_kunit_helper_acquire_ctx_alloc(struct kunit *test);
>
> #endif // DRM_KUNIT_HELPERS_H_
next prev parent reply other threads:[~2023-07-17 17:08 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-10 7:47 [PATCH 00/11] drm: kunit: Switch to kunit actions Maxime Ripard
2023-07-10 7:47 ` [PATCH 01/11] drm/tests: helpers: " Maxime Ripard
2023-07-19 18:42 ` Javier Martinez Canillas
2023-07-20 8:51 ` Maxime Ripard
2023-07-10 7:47 ` [PATCH 02/11] drm/tests: client-modeset: Remove call to drm_kunit_helper_free_device() Maxime Ripard
2023-07-19 18:54 ` Javier Martinez Canillas
2023-07-10 7:47 ` [PATCH 03/11] drm/tests: modes: " Maxime Ripard
2023-07-19 18:55 ` Javier Martinez Canillas
2023-07-10 7:47 ` [PATCH 04/11] drm/tests: probe-helper: " Maxime Ripard
2023-07-19 18:56 ` Javier Martinez Canillas
2023-07-10 7:47 ` [PATCH 05/11] drm/tests: helpers: Create an helper to allocate a locking ctx Maxime Ripard
2023-07-17 16:50 ` [05/11] " suijingfeng
2023-07-19 19:12 ` Javier Martinez Canillas
2023-07-20 10:07 ` Maxime Ripard
2023-07-20 10:21 ` suijingfeng
2023-07-17 17:08 ` suijingfeng [this message]
2023-07-19 19:24 ` Javier Martinez Canillas
2023-07-19 19:11 ` [PATCH 05/11] " Javier Martinez Canillas
2023-07-10 7:47 ` [PATCH 06/11] drm/tests: helpers: Create an helper to allocate an atomic state Maxime Ripard
2023-07-19 20:01 ` Javier Martinez Canillas
2023-07-10 7:47 ` [PATCH 07/11] drm/vc4: tests: pv-muxing: Remove call to drm_kunit_helper_free_device() Maxime Ripard
2023-07-19 20:01 ` Javier Martinez Canillas
2023-07-10 7:47 ` [PATCH 08/11] drm/vc4: tests: mock: Use a kunit action to unregister DRM device Maxime Ripard
2023-07-19 20:03 ` Javier Martinez Canillas
2023-07-10 7:47 ` [PATCH 09/11] drm/vc4: tests: pv-muxing: Switch to managed locking init Maxime Ripard
2023-07-17 17:24 ` [09/11] " suijingfeng
2023-07-20 11:06 ` Maxime Ripard
2023-07-19 20:04 ` [PATCH 09/11] " Javier Martinez Canillas
2023-07-10 7:47 ` [PATCH 10/11] drm/vc4: tests: Switch to atomic state allocation helper Maxime Ripard
2023-07-19 20:07 ` Javier Martinez Canillas
2023-07-10 7:47 ` [PATCH 11/11] drm/vc4: tests: pv-muxing: Document test scenario Maxime Ripard
2023-07-19 20:08 ` Javier Martinez Canillas
2023-07-17 15:24 ` [PATCH 00/11] drm: kunit: Switch to kunit actions suijingfeng
2023-07-20 8:19 ` Maxime Ripard
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=fbbc08de-043a-2622-7cd4-fa485129edaf@loongson.cn \
--to=suijingfeng@loongson.cn \
--cc=airlied@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=emma@anholt.net \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=tzimmermann@suse.de \
/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
all inboxes | Powered by JetHome®