From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72BC7524F; Fri, 22 Nov 2024 11:59:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=178.60.130.6 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732276802; cv=none; b=L8DlB1Vxw2BND96jVWtliYk7dhI/KT2n7eQ1e6MJ+FW6ilNWZDVd9YWRy78ML6Jb218SKp+5lnG3WkCXmC7fibL6IiYzM7h0Hxs3S1yLE71Fz6Jx/e77n/X3EvYjO6jKBiQFd2Mfcyq+AJFWSANBxF9MK7Imnznj5Vjdx/3X0fo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1732276802; c=relaxed/simple; bh=lX1IY5r7v5tsoLMf2bcVbuVbOPd1MvuOHDlxoiOVVQA=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=LALLDBBi0djVAH9DB72r9qBOATqu7NEdy8NXYTGH6QH9RJqHxMFdGhbdOCAvnTquYx16fj6a/cCGhsCsEFiQWVVNDu1Xu8FP9wOg9huX7aZ+62alnzQqZRhjWLDyTtHGSrZExZG5rTHt5TgXw/7JDrLNjKxZUI/0I0TQJ5Mqcko= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=igalia.com; spf=pass smtp.mailfrom=igalia.com; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b=HtnHBx3e; arc=none smtp.client-ip=178.60.130.6 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=igalia.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=igalia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=igalia.com header.i=@igalia.com header.b="HtnHBx3e" DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:Content-Type:In-Reply-To:From: References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender:Reply-To: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=o8WeUfkNhuU0xebIZYnnpfdPy1pYAgywRjfJ3vGwYgk=; b=HtnHBx3e6l+svFqC2GJZCgVr6b F4IQLw9wKNnWVVWnWHq2Bt+/UYpnu47b6Xr2Y2Pv5n9/I14omt526ZAHefefR32bR52texkq6IqRj Svreeer6Dz1JzD6jbPp/pJVbZgEf3RPOb8Bv3Z55FxYwFJozdLGw/igKT/1rQdwBp1wB2JViEcip8 eqVssdOaXdbR1OytUowUc/Eq9b564xRa2kM3CjzrU2nN8kTc6AGFiQ5sjWxiu+1OE3af5nG77ypkm yCNCvXzDukboVxIj0Jl7eEVEnwNyylqd2zOlF3k0JY4ZaPHx1dlf6jAcRb3eH9tfm7xRuPh0elinJ Bmz7r6Gg==; Received: from [187.36.213.55] (helo=[192.168.1.103]) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_128_GCM:128) (Exim) id 1tESKB-00AvjT-G3; Fri, 22 Nov 2024 12:59:47 +0100 Message-ID: Date: Fri, 22 Nov 2024 08:59:41 -0300 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] drm/v3d: Stop active perfmon if it is being destroyed To: Christian Gmeiner , Melissa Wen , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , "Juan A. Suarez Romero" Cc: kernel-dev@igalia.com, Christian Gmeiner , stable@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org References: <20241118221948.1758130-1-christian.gmeiner@gmail.com> Content-Language: en-US From: =?UTF-8?Q?Ma=C3=ADra_Canal?= In-Reply-To: <20241118221948.1758130-1-christian.gmeiner@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi Christian, On 18/11/24 19:19, Christian Gmeiner wrote: > From: Christian Gmeiner > > 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 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;