From nobody Sat Feb 7 18:16:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 C300E335BAF; Thu, 30 Oct 2025 10:42:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761820969; cv=none; b=Xnch0qMVAiCFoFaP5PwB4Qx2JsUk1DXJxNhlRO7SKy/ZBWAo8qg1W5eWOphF6x+iN864KAuJWFX/uLI86Y0oZRgmFNzY+BFK5xJ5BOt0G3Ir/Fu/oywBIlUTB5sc4jDtKf9fcc6BJIqUqerquBZHoab/9aZpI/hcXj/wGXPLKv4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761820969; c=relaxed/simple; bh=21Imxsayj+IViqhAG6JgOVkWhAy1BH84E8W2Bso8PDw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ViNMhKtHn8f0vohJmBM3K30XonH63JMwHoYKIp7scBBFhjAm4V2K7yf+RvqDrTx0pTVS1ITCgWv2EYMgLlI1An57VbkQoIcBhc4B7Vakl3wLngpqTqr2Dij4fwDVSb1bOcai79KNqxmtaQyo9yxXYYa5E1AmXSrrcDpKGvzbYGI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FOLo2YOH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FOLo2YOH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DDFFDC4CEF1; Thu, 30 Oct 2025 10:42:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1761820969; bh=21Imxsayj+IViqhAG6JgOVkWhAy1BH84E8W2Bso8PDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FOLo2YOH4OkOEoCN2DKzPliod5u8DzwhLaUYSh74iVtICZoUDt59pB8EOqnc+yKi7 fOyvR4BAB6BsL6YKrPtxL5d+SYvMj49JujD8R++V2+geHBZxgpea9o38Br3rYXxctg 8n1+lUyYXHRoL1PivR5S+WVqAkbven2QAvK4x8grgpNh07qH7UsV/rFfYoZTGVu0b7 IVTNZuawGp+6BYSVTBSiVb1yjODMg8n/IUygF0t0s2bhqjftt69aKPEcclC2kaeii8 M1pt38bVOMD78mMJpA1Df7osigAlWmJfaHyPfORpT0tJEVWVgIsVThGRg1Y4iX4aBc EJWfDQn0geYNA== 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 , Boris Brezillon , Melissa Wen , Steven Price Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 1/2] drm/sched: Use proper locks in drm_sched_job_arm() Date: Thu, 30 Oct 2025 11:42:19 +0100 Message-ID: <20251030104219.181704-3-phasta@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20251030104219.181704-2-phasta@kernel.org> References: <20251030104219.181704-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: quoted-printable Content-Type: text/plain; charset="utf-8" drm_sched_job_arm() is just racing when dereferencing entity and runqueue. Add the proper spinlocks. Cc: stable@vger.kernel.org # v5.16+ Fixes: dbe48d030b28 ("drm/sched: Split drm_sched_job_init") Signed-off-by: Philipp Stanner --- drivers/gpu/drm/scheduler/sched_main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/sched= uler/sched_main.c index c39f0245e3a9..7f938f491b6f 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -859,10 +859,16 @@ void drm_sched_job_arm(struct drm_sched_job *job) =20 BUG_ON(!entity); drm_sched_entity_select_rq(entity); + + spin_lock(&entity->lock); + spin_lock(&entity->rq->lock); sched =3D entity->rq->sched; + spin_unlock(&entity->rq->lock); + + job->s_priority =3D entity->priority; + spin_unlock(&entity->lock); =20 job->sched =3D sched; - job->s_priority =3D entity->priority; =20 drm_sched_fence_init(job->s_fence, job->entity); } --=20 2.49.0 From nobody Sat Feb 7 18:16:06 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 5BA0B350D52; Thu, 30 Oct 2025 10:42:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761820973; cv=none; b=omEw59jVLeXqtYYeDcSfr8noLJgKXQkSwhoa5lF12SXi+d15N6xS/TqA2o+Ndq9cY9mdFKAe2SIVCUdsxfextntwBGCMDS6kXXLL0JV9AubDd2qriOu6sWD9VtxOTne2EEjhthGJKvc/oaU16h0hEM+voeDjwNMcpmOCRt1rawM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761820973; c=relaxed/simple; bh=F/f+RWP9fwyYDOn+3d4o1ZB3ZqbyAoBpoxM/PzubWPA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uP9+kHgDa33yx79QIdok4zF6V5103yQhtOYrwUSiTc7PFZlkau4VE+zOe2PdKSTm3KOaBUcSUlBEa/L1v0ldffCBSgiUrOtQlMJRpCKQuW+2Z5dTfkTqaZqla4N53u4zWYSSFuka0vpuWGpfLL4Et/LGkHMdkPF0b19RYBtJqE0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VXQu60U0; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VXQu60U0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C382FC4CEFD; Thu, 30 Oct 2025 10:42:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1761820973; bh=F/f+RWP9fwyYDOn+3d4o1ZB3ZqbyAoBpoxM/PzubWPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VXQu60U0nG3c8cO44lOHxE7TcPKEwP6oEC+fULdsoDahypPowOlaKDtGgI9Ya2t2g XjYYSKt+TotIhfLPlj8AfBxg0SYhum+YkS8+xNvKy5hwiaVdB41W50Iz5vbVyE3FwZ s0lEtvuy41Dj8ypR6B4c68K0dOLT/+4Ngv/GEpwDd75npu64yogxo7sf7pBQu5eqH/ CTD2ekWuV6xpX8oN3SkRnMoskVMtUm3f0UqdUBnHWCUhWnFpS+5cACEjtUK3kEZjCm SRa1SoZvii+B6pHGXjnTxwYWl5VcuOTkpNVnB4uFInqv2blm4/+QBU+yEDkM10i7gb jHgrqBYAmFdpw== 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 , Boris Brezillon , Melissa Wen , Steven Price Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH 2/2] drm/sched: Use proper locks for drm_sched_job_init() Date: Thu, 30 Oct 2025 11:42:20 +0100 Message-ID: <20251030104219.181704-4-phasta@kernel.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20251030104219.181704-2-phasta@kernel.org> References: <20251030104219.181704-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: quoted-printable Content-Type: text/plain; charset="utf-8" drm_sched_job_init() is just racing when checking an entity's runqueue, wit= hout taking the proper spinlock. Add the lock. Cc: stable@vger.kernel.org # 6.7+ Fixes: 56e449603f0a ("drm/sched: Convert the GPU scheduler to variable numb= er of run-queues") Signed-off-by: Philipp Stanner --- drivers/gpu/drm/scheduler/sched_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/scheduler/sched_main.c b/drivers/gpu/drm/sched= uler/sched_main.c index 7f938f491b6f..30028054385f 100644 --- a/drivers/gpu/drm/scheduler/sched_main.c +++ b/drivers/gpu/drm/scheduler/sched_main.c @@ -799,7 +799,12 @@ int drm_sched_job_init(struct drm_sched_job *job, u32 credits, void *owner, uint64_t drm_client_id) { - if (!entity->rq) { + struct drm_sched_rq *rq; + + spin_lock(&entity->lock); + rq =3D entity->rq; + spin_unlock(&entity->lock); + if (!rq) { /* This will most likely be followed by missing frames * or worse--a blank screen--leave a trail in the * logs, so this can be debugged easier. --=20 2.49.0