From: "Maíra Canal" <mcanal@igalia.com>
To: Christian Gmeiner <christian.gmeiner@gmail.com>,
Melissa Wen <mwen@igalia.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>, Simona Vetter <simona@ffwll.ch>,
"Juan A. Suarez Romero" <jasuarez@igalia.com>
Cc: kernel-dev@igalia.com, Christian Gmeiner <cgmeiner@igalia.com>,
stable@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] drm/v3d: Stop active perfmon if it is being destroyed
Date: Fri, 22 Nov 2024 08:59:41 -0300 [thread overview]
Message-ID: <c00c6436-8abf-4b8d-a5a1-dfcab45b6f7d@igalia.com> (raw)
In-Reply-To: <20241118221948.1758130-1-christian.gmeiner@gmail.com>
Hi Christian,
On 18/11/24 19:19, Christian Gmeiner wrote:
> From: Christian Gmeiner <cgmeiner@igalia.com>
>
> If the active performance monitor (v3d->active_perfmon) is being
> destroyed, stop it first. Currently, the active perfmon is not
> stopped during destruction, leaving the v3d->active_perfmon pointer
> stale. This can lead to undefined behavior and instability.
>
> This patch ensures that the active perfmon is stopped before being
> destroyed, aligning with the behavior introduced in commit
> 7d1fd3638ee3 ("drm/v3d: Stop the active perfmon before being destroyed").
>
> Cc: stable@vger.kernel.org # v5.15+
> Fixes: 26a4dc29b74a ("drm/v3d: Expose performance counters to userspace")
> Signed-off-by: Christian Gmeiner <cgmeiner@igalia.com>
Applied to misc/kernel.git (drm-misc-next).
Maxime, Thomas, if possible, could you cherry-pick this commit to be
included in 6.13? Thanks!
Best Regards,
- Maíra
> ---
> drivers/gpu/drm/v3d/v3d_perfmon.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/v3d/v3d_perfmon.c b/drivers/gpu/drm/v3d/v3d_perfmon.c
> index 00cd081d7873..909288d43f2f 100644
> --- a/drivers/gpu/drm/v3d/v3d_perfmon.c
> +++ b/drivers/gpu/drm/v3d/v3d_perfmon.c
> @@ -383,6 +383,7 @@ int v3d_perfmon_destroy_ioctl(struct drm_device *dev, void *data,
> {
> struct v3d_file_priv *v3d_priv = file_priv->driver_priv;
> struct drm_v3d_perfmon_destroy *req = data;
> + struct v3d_dev *v3d = v3d_priv->v3d;
> struct v3d_perfmon *perfmon;
>
> mutex_lock(&v3d_priv->perfmon.lock);
> @@ -392,6 +393,10 @@ int v3d_perfmon_destroy_ioctl(struct drm_device *dev, void *data,
> if (!perfmon)
> return -EINVAL;
>
> + /* If the active perfmon is being destroyed, stop it first */
> + if (perfmon == v3d->active_perfmon)
> + v3d_perfmon_stop(v3d, perfmon, false);
> +
> v3d_perfmon_put(perfmon);
>
> return 0;
prev parent reply other threads:[~2024-11-22 11:59 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-18 22:19 Christian Gmeiner
2024-11-22 11:59 ` Maíra Canal [this message]
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=c00c6436-8abf-4b8d-a5a1-dfcab45b6f7d@igalia.com \
--to=mcanal@igalia.com \
--cc=airlied@gmail.com \
--cc=cgmeiner@igalia.com \
--cc=christian.gmeiner@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=jasuarez@igalia.com \
--cc=kernel-dev@igalia.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=mwen@igalia.com \
--cc=simona@ffwll.ch \
--cc=stable@vger.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®