From: Andrzej Hajda <andrzej.hajda@intel.com>
To: "Jani Nikula" <jani.nikula@linux.intel.com>,
"Ville Syrjälä" <ville.syrjala@linux.intel.com>,
"Arun R Murthy" <arun.r.murthy@intel.com>
Cc: Andrzej Hajda <andrzej.hajda@intel.com>,
intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org,
Rodrigo Vivi <rodrigo.vivi@intel.com>
Subject: [Intel-gfx] [PATCH v6 2/4] drm/i915/fbdev: suspend HPD before fbdev unregistration
Date: Fri, 22 Jul 2022 14:51:41 +0200 [thread overview]
Message-ID: <20220722125143.1604709-3-andrzej.hajda@intel.com> (raw)
In-Reply-To: <20220722125143.1604709-1-andrzej.hajda@intel.com>
HPD event after fbdev unregistration can cause registration of deferred
fbdev which will not be unregistered later, causing use-after-free.
To avoid it HPD handling should be suspended before fbdev unregistration.
It should fix following GPF:
[272.634530] general protection fault, probably for non-canonical address 0x6b6b6b6b6b6b6b6b: 0000 [#1] PREEMPT SMP NOPTI
[272.634536] CPU: 0 PID: 6030 Comm: i915_selftest Tainted: G U 5.18.0-rc5-CI_DRM_11603-g12dccf4f5eef+ #1
[272.634541] Hardware name: Intel Corporation Raptor Lake Client Platform/RPL-S ADP-S DDR5 UDIMM CRB, BIOS RPLSFWI1.R00.2397.A01.2109300731 09/30/2021
[272.634545] RIP: 0010:fb_do_apertures_overlap.part.14+0x26/0x60
...
[272.634582] Call Trace:
[272.634583] <TASK>
[272.634585] do_remove_conflicting_framebuffers+0x59/0xa0
[272.634589] remove_conflicting_framebuffers+0x2d/0xc0
[272.634592] remove_conflicting_pci_framebuffers+0xc8/0x110
[272.634595] drm_aperture_remove_conflicting_pci_framebuffers+0x52/0x70
[272.634604] i915_driver_probe+0x63a/0xdd0 [i915]
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/5329
Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/5510
Signed-off-by: Andrzej Hajda <andrzej.hajda@intel.com>
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
---
drivers/gpu/drm/i915/display/intel_fbdev.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
index 221336178991f0..94ddc0f34fde64 100644
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -573,7 +573,8 @@ void intel_fbdev_unregister(struct drm_i915_private *dev_priv)
if (!ifbdev)
return;
- cancel_work_sync(&dev_priv->fbdev_suspend_work);
+ intel_fbdev_set_suspend(&dev_priv->drm, FBINFO_STATE_SUSPENDED, true);
+
if (!current_is_async())
intel_fbdev_sync(ifbdev);
@@ -618,7 +619,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous
struct fb_info *info;
if (!ifbdev || !ifbdev->vma)
- return;
+ goto unlock;
info = ifbdev->helper.fbdev;
@@ -661,6 +662,7 @@ void intel_fbdev_set_suspend(struct drm_device *dev, int state, bool synchronous
drm_fb_helper_set_suspend(&ifbdev->helper, state);
console_unlock();
+unlock:
intel_fbdev_hpd_set_suspend(dev_priv, state);
}
--
2.25.1
next prev parent reply other threads:[~2022-07-22 12:52 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-22 12:51 [Intel-gfx] [PATCH v6 0/4] drm/i915/display: stop HPD workers before display driver unregister Andrzej Hajda
2022-07-22 12:51 ` [Intel-gfx] [PATCH v6 1/4] drm/i915/hpd: postpone HPD cancel work after last user suspension Andrzej Hajda
2022-08-22 17:08 ` Imre Deak
2022-08-23 7:41 ` Jani Nikula
2022-08-23 9:10 ` Imre Deak
2022-07-22 12:51 ` Andrzej Hajda [this message]
2022-08-22 17:10 ` [Intel-gfx] [PATCH v6 2/4] drm/i915/fbdev: suspend HPD before fbdev unregistration Imre Deak
2022-07-22 12:51 ` [Intel-gfx] [PATCH v6 3/4] drm/i915/display: add hotplug.suspended flag Andrzej Hajda
2022-08-22 17:27 ` Imre Deak
2022-08-23 21:48 ` Andrzej Hajda
2022-08-24 11:22 ` Imre Deak
2022-08-25 11:24 ` Andrzej Hajda
2022-08-25 14:57 ` Imre Deak
2022-07-22 12:51 ` [Intel-gfx] [PATCH v6 4/4] drm/i915/fbdev: do not create fbdev if HPD is suspended Andrzej Hajda
2022-07-26 6:50 ` Murthy, Arun R
2022-08-22 17:28 ` Imre Deak
2022-07-22 13:08 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915/display: stop HPD workers before display driver unregister (rev12) Patchwork
2022-07-22 13:32 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-07-22 15:23 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2022-07-22 16:56 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915/display: stop HPD workers before display driver unregister (rev13) Patchwork
2022-07-22 17:19 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-07-22 20:55 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-07-24 14:46 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915/display: stop HPD workers before display driver unregister (rev14) Patchwork
2022-07-24 15:09 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-07-24 16:55 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2022-08-02 12:24 ` [Intel-gfx] [PATCH v6 0/4] drm/i915/display: stop HPD workers before display driver unregister Gwan-gyeong Mun
2022-08-11 8:33 ` Andrzej Hajda
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=20220722125143.1604709-3-andrzej.hajda@intel.com \
--to=andrzej.hajda@intel.com \
--cc=arun.r.murthy@intel.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@linux.intel.com \
--cc=rodrigo.vivi@intel.com \
--cc=ville.syrjala@linux.intel.com \
/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