From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 DFEC03EFFD4; Wed, 1 Jul 2026 08:59:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782896384; cv=none; b=F0j5GvXR3jwEtJL49kOrwKLh0JV5uz95yaVhce0665VrsZxTqdSFvFc93tt+GDJ648GaeOebLnDcl3vDbuZ/Njf8FKHukrFNU9j/OzEOFd2Gi+d2YoXMHQ+4Ybt3ElknkDOygawjrhCtvJVqHr1JCpFk8H860Gg7mC226gul50s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782896384; c=relaxed/simple; bh=C0zqSXZ4AuItRGAfhY1/njMw23vg/zqbo9biCVBDSgE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WlhTD/Tykqr6TZblIclMDRglubLS04d5VQLKk8cxEKRxhi9pC7QjBigSMoaCT1Db9dnynDkWI5Hx9lrLgK9frgWm2Oezn5EEICyprupeQTr6eJxg2EkwHhvwPRrWT58arr2Km06nW6yHcCSQZhNll6c0gXqdOS28+vZT4TiEjmY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=m6QTuUxg; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="m6QTuUxg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA3781F000E9; Wed, 1 Jul 2026 08:59:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1782896383; bh=0lRsz+bsd59r/YXRL4xu3uteL9lA+FSwzHtZ025wxN4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=m6QTuUxgqiakjeh4Srm3Evvf+x8GPJPlS/3Lskx8UQXFHBicETcE5qifKdaVarGO2 RPvCyOkZJ9PVEKt3cydgiN3nEpUYCSwX+UTu5SVKcIeDunip/TfvEh8XllbD5Imi26 nKSGoJIL4UA6IOSO+vRvjfRYAwNW4GGgLb3fx0COd0rV+bdQYmMRRG9LgyivRygHbd NH2vo8wRMNzbomkC5/PBjRpDtLgLiDnp1U+AeZ9Z9HhEUAvWaZfpYv2BsSSF4Xk8t0 /f+srLd0t6QmSU/4RiTfp34vrlFjWGE2QQ7oQbtgh7pb0W64HiMELyYrKC/Yx8h+mI NZWhqmKpP6Piw== From: Philipp Stanner To: Matthew Brost , Danilo Krummrich , Philipp Stanner , =?UTF-8?q?Christian=20K=C3=B6nig?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Sumit Semwal , Marco Pagani , Tvrtko Ursulin , Boris Brezillon Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linaro-mm-sig@lists.linaro.org Subject: [PATCH 2/5] drm/sched: Lock spsc_queue in drm_sched_entity_pop_job() Date: Wed, 1 Jul 2026 10:59:18 +0200 Message-ID: <20260701085920.3253248-4-phasta@kernel.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260701085920.3253248-2-phasta@kernel.org> References: <20260701085920.3253248-2-phasta@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Cleanup work in the preceding commit added locking to drm_sched_entity_pop_job(). This cleanup causes a slightly sub-optimal lock cycle with drm_sched_rq_pop_entity(). sched_entity also utilizes the lockless spsc_queue (partially already used simultaneously with locks), which was marked for removal in commit 6e7eb171ac96 ("Documentation: drm: Add entry for removing spsc_queue to TODO list") To remove the lock-cycle mentioned above, the unlock must be moved downwards, also locking the lockless queue. Guard spsc_queue_pop() in drm_sched_entity_pop_job() with the lock and document why that is being done. Signed-off-by: Philipp Stanner --- drivers/gpu/drm/scheduler/sched_entity.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/scheduler/sched_entity.c b/drivers/gpu/drm/scheduler/sched_entity.c index 91aec20611ad..5cf0af91faf2 100644 --- a/drivers/gpu/drm/scheduler/sched_entity.c +++ b/drivers/gpu/drm/scheduler/sched_entity.c @@ -529,9 +529,17 @@ struct drm_sched_job *drm_sched_entity_pop_job(struct drm_sched_entity *entity) spin_lock(&entity->lock); prev_last_scheduled = entity->last_scheduled; entity->last_scheduled = dma_fence_get(&sched_job->s_fence->finished); - spin_unlock(&entity->lock); + /* Preceding cleanup work made it necessary to add the spinlock + * to this function. spsc_queue, a lockless queue, is now + * counterintuitively guarded by the lock as well. spsc_queue is queued + * for removal (see DRM TODO list), so this somewhat serves as a + * preparational step. + * + * TODO: Replace spsc_queue completely with a locked (h)list. + */ spsc_queue_pop(&entity->job_queue); + spin_unlock(&entity->lock); dma_fence_put(prev_last_scheduled); drm_sched_rq_pop_entity(entity); -- 2.54.0