From patchwork Thu Jan 23 22:53:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Adri=C3=A1n_Larumbe?= X-Patchwork-Id: 13948720 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 32FA6C02182 for ; Thu, 23 Jan 2025 22:54:28 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AE12F10E3F8; Thu, 23 Jan 2025 22:54:27 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=collabora.com header.i=adrian.larumbe@collabora.com header.b="a2TBWf4I"; dkim-atps=neutral Received: from sender4-pp-f112.zoho.com (sender4-pp-f112.zoho.com [136.143.188.112]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7A4E110E3F8 for ; Thu, 23 Jan 2025 22:54:26 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; t=1737672853; cv=none; d=zohomail.com; s=zohoarc; b=Gi13GXaRLRU9maRWP86+GFXOTgMCviEs00iZbWy3TCqNSAK8sriqMlWCuCya1eI/4l0puh2A3EAzf1Ke+VZWHhbsRffM8qxVx0fEjQRVQyDdA48BNhEOKUr+3SEyewVp9zmG9lizLTEpy0IcNHa8zuRJraHR0/p9h5mNW1E1/aw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1737672853; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=SD1qJSXUTw4kumBr+488Guiyeg2rLONe4Exc4Pgmzw8=; b=YaaKbKigMC4fNgWniugVlzLkoB/ebOAYIQTFawhjO9LiRWCYcWikvAvqDQKo6n3w3YU29SAkrpp8QNOwYk6AFRuCbT6r2g0bHoURsu3ev6E5twpwbMksZvxPqYjAr6UETsvOXUEyzmT9LmZBBL7dO7dmHop2LdNlAZk/x6Wb7vg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=collabora.com; spf=pass smtp.mailfrom=adrian.larumbe@collabora.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1737672853; s=zohomail; d=collabora.com; i=adrian.larumbe@collabora.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=SD1qJSXUTw4kumBr+488Guiyeg2rLONe4Exc4Pgmzw8=; b=a2TBWf4Igvgr6FUPCtcoJsnj0DpccKq3sJgIjUN7sr9IO5xDn4t0JBYz8mOUy8Rp WAlrJgFEZZ/5ncsIoYB2t4mLAFjS4k403zgUG+IbXB0RElZ16XHtb26UlvR0zPR2uOy Hr8aUgqe5OVT/hR9tSIktgzKjfe8d1DIi1Kshv9M= Received: by mx.zohomail.com with SMTPS id 1737672848684325.30265129996076; Thu, 23 Jan 2025 14:54:08 -0800 (PST) From: =?utf-8?q?Adri=C3=A1n_Larumbe?= To: David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet , Boris Brezillon , Steven Price , Liviu Dudau Cc: kernel@collabora.com, Tvrtko Ursulin , Tvrtko Ursulin , dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Adri?= =?utf-8?q?=C3=A1n_Larumbe?= Subject: [PATCH v9 5/5] drm/panthor: Fix race condition when gathering fdinfo group samples Date: Thu, 23 Jan 2025 22:53:02 +0000 Message-ID: <20250123225325.3271764-6-adrian.larumbe@collabora.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250123225325.3271764-1-adrian.larumbe@collabora.com> References: <20250123225325.3271764-1-adrian.larumbe@collabora.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Commit e16635d88fa0 ("drm/panthor: add DRM fdinfo support") failed to protect access to groups with an xarray lock, which could lead to use-after-free errors. Signed-off-by: Adrián Larumbe Fixes: e16635d88fa0 ("drm/panthor: add DRM fdinfo support") Reviewed-by: Boris Brezillon Reviewed-by: Steven Price --- drivers/gpu/drm/panthor/panthor_sched.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/gpu/drm/panthor/panthor_sched.c b/drivers/gpu/drm/panthor/panthor_sched.c index e6c08a694e41..1d283b4bab86 100644 --- a/drivers/gpu/drm/panthor/panthor_sched.c +++ b/drivers/gpu/drm/panthor/panthor_sched.c @@ -2865,6 +2865,7 @@ void panthor_fdinfo_gather_group_samples(struct panthor_file *pfile) if (IS_ERR_OR_NULL(gpool)) return; + xa_lock(&gpool->xa); xa_for_each(&gpool->xa, i, group) { mutex_lock(&group->fdinfo.lock); pfile->stats.cycles += group->fdinfo.data.cycles; @@ -2873,6 +2874,7 @@ void panthor_fdinfo_gather_group_samples(struct panthor_file *pfile) group->fdinfo.data.time = 0; mutex_unlock(&group->fdinfo.lock); } + xa_unlock(&gpool->xa); } static void group_sync_upd_work(struct work_struct *work)