From: Beomseok Kim <dilddream31@gmail.com>
To: nouveau@lists.freedesktop.org
Cc: dakr@kernel.org, maarten.lankhorst@linux.intel.com,
mripard@kernel.org, simona@ffwll.ch,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Beomseok Kim <dilddream31@gmail.com>,
stable@vger.kernel.org
Subject: [PATCH] drm/nouveau: Clear fence channel in no-signaling path
Date: Mon, 28 Sep 2026 17:14:50 +0900 [thread overview]
Message-ID: <20260928081450.19340-1-dilddream31@gmail.com> (raw)
nouveau_fence_signal() clears fence->channel before dropping its
reference. nouveau_fence_no_signaling(), however, removes an already
signaled fence from fctx->pending without clearing the pointer.
The fence can remain attached to a BO reservation object and be used
later in nouveau_fence_sync() after channel teardown has freed the
channel. This leaves a stale channel pointer that the sync path can
dereference.
A diagnostic build with concurrent short-lived Wayland GL clients
observed nouveau_fence_no_signaling() with a fence pointing to channel
C, nouveau_channel_del(C) returning, and then nouveau_fence_sync()
attempting to read C->cli. A no-fault read failed after teardown.
Clear the pointer in nouveau_fence_no_signaling() to match
nouveau_fence_signal(), so the sync path uses the fence wait fallback.
Fixes: 29ba89b2371d ("drm/nouveau: rework to new fence interface")
Cc: stable@vger.kernel.org
Assisted-by: LLM
Signed-off-by: Beomseok Kim <dilddream31@gmail.com>
---
drivers/gpu/drm/nouveau/nouveau_fence.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index edbe9e08b..5b09cf134 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -488,6 +488,7 @@ static bool nouveau_fence_no_signaling(struct dma_fence *f)
*/
if (nouveau_fence_is_signaled(f)) {
list_del(&fence->head);
+ rcu_assign_pointer(fence->channel, NULL);
dma_fence_put(&fence->base);
return false;
--
2.55.0
WARNING: multiple messages have this Message-ID (diff)
From: Beomseok Kim <dilddream31@gmail.com>
To: nouveau@lists.freedesktop.org
Cc: lyude@redhat.com, dakr@kernel.org,
maarten.lankhorst@linux.intel.com, mripard@kernel.org,
tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Beomseok Kim <dilddream31@gmail.com>,
stable@vger.kernel.org
Subject: [PATCH] drm/nouveau: Clear fence channel in no-signaling path
Date: Mon, 28 Sep 2026 17:14:50 +0900 [thread overview]
Message-ID: <20260928081450.19340-1-dilddream31@gmail.com> (raw)
nouveau_fence_signal() clears fence->channel before dropping its
reference. nouveau_fence_no_signaling(), however, removes an already
signaled fence from fctx->pending without clearing the pointer.
The fence can remain attached to a BO reservation object and be used
later in nouveau_fence_sync() after channel teardown has freed the
channel. This leaves a stale channel pointer that the sync path can
dereference.
A diagnostic build with concurrent short-lived Wayland GL clients
observed nouveau_fence_no_signaling() with a fence pointing to channel
C, nouveau_channel_del(C) returning, and then nouveau_fence_sync()
attempting to read C->cli. A no-fault read failed after teardown.
Clear the pointer in nouveau_fence_no_signaling() to match
nouveau_fence_signal(), so the sync path uses the fence wait fallback.
Fixes: 29ba89b2371d ("drm/nouveau: rework to new fence interface")
Cc: stable@vger.kernel.org
Assisted-by: LLM
Signed-off-by: Beomseok Kim <dilddream31@gmail.com>
---
drivers/gpu/drm/nouveau/nouveau_fence.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/gpu/drm/nouveau/nouveau_fence.c b/drivers/gpu/drm/nouveau/nouveau_fence.c
index edbe9e08b..5b09cf134 100644
--- a/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
@@ -488,6 +488,7 @@ static bool nouveau_fence_no_signaling(struct dma_fence *f)
*/
if (nouveau_fence_is_signaled(f)) {
list_del(&fence->head);
+ rcu_assign_pointer(fence->channel, NULL);
dma_fence_put(&fence->base);
return false;
--
2.55.0
next reply other threads:[~2026-10-02 3:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-28 8:14 Beomseok Kim [this message]
2026-09-28 8:14 ` [PATCH] drm/nouveau: Clear fence channel in no-signaling path Beomseok Kim
2026-10-15 9:10 ` 김범석
2026-10-15 9:10 ` 김범석
2026-10-15 10:40 ` 김범석
2026-10-15 10:40 ` 김범석
2026-10-23 17:19 ` lyude
2026-10-23 17:19 ` lyude
2026-11-12 21:40 ` Marek Czernohous
2026-11-12 21:40 ` Marek Czernohous
2026-11-13 13:00 ` Fab Stz
2026-11-13 13:00 ` Fab Stz
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=20260928081450.19340-1-dilddream31@gmail.com \
--to=dilddream31@gmail.com \
--cc=dakr@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=nouveau@lists.freedesktop.org \
--cc=simona@ffwll.ch \
--cc=stable@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.