From: w15303746062@163.com
To: stable@vger.kernel.org, gregkh@linuxfoundation.org
Cc: tzimmermann@suse.de, maarten.lankhorst@linux.intel.com,
mripard@kernel.org, louis.chauvet@bootlin.com,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
Mingyu Wang <25181214217@stu.xidian.edu.cn>
Subject: [PATCH 6.18.y 0/5] drm/vkms: Backport generic vblank timer to fix ABBA deadlock
Date: Mon, 25 May 2026 21:16:05 +0800 [thread overview]
Message-ID: <20260525131610.608273-1-w15303746062@163.com> (raw)
In-Reply-To: <9c4a68c4-43a3-4a9b-a131-9570174c8df3@linux.intel.com>
From: Mingyu Wang <25181214217@stu.xidian.edu.cn>
Hi Greg and all,
This patch series backports the generic DRM vblank timer infrastructure
and converts the vkms driver to use it, specifically targeting the
6.18.y stable branch.
During local fuzzing with Syzkaller, an RCU preempt stall (ABBA deadlock)
was consistently observed in the 6.18.y vkms driver. This deadlock occurs
between the legacy drm_vblank_disable_and_save() function and the
vkms_vblank_simulate() hrtimer callback.
A previous localized patch was submitted to address this in 6.18.y using
hrtimer_try_to_cancel. However, as discussed with Greg KH and Maarten
Lankhorst on the mailing list, the correct and most maintainable approach
is to backport the mainline commits that inherently resolve this by
removing the custom vkms hrtimer entirely.
Following Maarten's roadmap, this series cherry-picks the exact
dependency chain from mainline to introduce the drm_vblank_helper
infrastructure and migrate vkms to it.
The series applies smoothly to 6.18.y and completely resolves the soft
lockup in the fuzzing environment.
Thanks,
Mingyu Wang
Thomas Zimmermann (5):
drm/vblank: Add vblank timer
drm/vblank: Add CRTC helpers for simple use cases
drm/vkms: Convert to DRM's vblank timer
drm/atomic: Increase timeout in drm_atomic_helper_wait_for_vblanks()
drm/vblank: Fix kernel docs for vblank timer
Documentation/gpu/drm-kms-helpers.rst | 12 ++
drivers/gpu/drm/Makefile | 3 +-
drivers/gpu/drm/drm_atomic_helper.c | 2 +-
drivers/gpu/drm/drm_vblank.c | 172 +++++++++++++++++++++-
drivers/gpu/drm/drm_vblank_helper.c | 176 +++++++++++++++++++++++
drivers/gpu/drm/vkms/vkms_crtc.c | 83 +----------
drivers/gpu/drm/vkms/vkms_drv.h | 2 -
include/drm/drm_modeset_helper_vtables.h | 12 ++
include/drm/drm_vblank.h | 32 +++++
include/drm/drm_vblank_helper.h | 56 ++++++++
10 files changed, 468 insertions(+), 82 deletions(-)
create mode 100644 drivers/gpu/drm/drm_vblank_helper.c
create mode 100644 include/drm/drm_vblank_helper.h
--
2.34.1
next prev parent reply other threads:[~2026-05-25 13:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-15 13:18 [PATCH 6.18.y] drm/vkms: Fix ABBA deadlock in vblank disable and timer callback w15303746062
2026-05-15 15:09 ` Greg KH
2026-05-16 2:43 ` w15303746062
2026-05-16 9:51 ` Greg KH
2026-05-18 2:22 ` w15303746062
2026-05-25 8:55 ` Maarten Lankhorst
2026-05-25 13:16 ` w15303746062 [this message]
2026-05-25 13:16 ` [PATCH 6.18.y 1/5] drm/vblank: Add vblank timer w15303746062
2026-05-25 13:16 ` [PATCH 6.18.y 2/5] drm/vblank: Add CRTC helpers for simple use cases w15303746062
2026-05-25 13:16 ` [PATCH 6.18.y 3/5] drm/vkms: Convert to DRM's vblank timer w15303746062
2026-05-25 13:16 ` [PATCH 6.18.y 4/5] drm/atomic: Increase timeout in drm_atomic_helper_wait_for_vblanks() w15303746062
2026-05-25 13:16 ` [PATCH 6.18.y 5/5] drm/vblank: Fix kernel docs for vblank timer w15303746062
2026-05-25 21:07 ` Claude review: drm/vkms: Backport generic vblank timer to fix ABBA deadlock Claude Code Review Bot
2026-05-25 21:07 ` Claude review: Re:Re: Re: [PATCH 6.18.y] drm/vkms: Fix ABBA deadlock in vblank disable and timer callback Claude Code Review Bot
2026-05-25 21:07 ` Claude review: " Claude Code Review Bot
2026-05-25 21:07 ` Claude review: " Claude Code Review Bot
2026-05-25 21:07 ` Claude review: " Claude Code Review Bot
2026-05-15 23:05 ` Claude review: " Claude Code Review Bot
2026-05-15 23:05 ` Claude Code Review Bot
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=20260525131610.608273-1-w15303746062@163.com \
--to=w15303746062@163.com \
--cc=25181214217@stu.xidian.edu.cn \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=louis.chauvet@bootlin.com \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=stable@vger.kernel.org \
--cc=tzimmermann@suse.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox