From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Aravind Iddamsetty <aravind.iddamsetty@linux.intel.com>
Cc: intel-xe@lists.freedesktop.org
Subject: Re: [Intel-xe] [PATCH] drm/xe: Fix lockdep warning in xe_force_wake calls
Date: Fri, 24 Nov 2023 09:19:15 +0200 [thread overview]
Message-ID: <ZWBOc5WgvgDLUBqG@intel.com> (raw)
In-Reply-To: <20231124064408.1800646-1-aravind.iddamsetty@linux.intel.com>
On Fri, Nov 24, 2023 at 12:14:08PM +0530, Aravind Iddamsetty wrote:
> Introduce atomic version for xe_force_wake calls which uses spin_lock
> while the non atomic version uses spin_lock_irq
>
> Fix for below:
> [13994.811263] ========================================================
> [13994.811295] WARNING: possible irq lock inversion dependency detected
> [13994.811326] 6.6.0-rc3-xe #2 Tainted: G U
> [13994.811358] --------------------------------------------------------
> [13994.811388] swapper/0/0 just changed the state of lock:
> [13994.811416] ffff895c7e044db8 (&cpuctx_lock){-...}-{2:2}, at:
> __perf_event_read+0xb7/0x3a0
> [13994.811494] but this lock took another, HARDIRQ-unsafe lock in the
> past:
> [13994.811528] (&fw->lock){+.+.}-{2:2}
> [13994.811544]
>
> and interrupts could create inverse lock ordering between
> them.
>
> [13994.811606]
> other info that might help us debug this:
> [13994.811636] Possible interrupt unsafe locking scenario:
>
> [13994.811667] CPU0 CPU1
> [13994.811691] ---- ----
> [13994.811715] lock(&fw->lock);
> [13994.811744] local_irq_disable();
> [13994.811773] lock(&cpuctx_lock);
> [13994.811810] lock(&fw->lock);
> [13994.811846] <Interrupt>
> [13994.811865] lock(&cpuctx_lock);
> [13994.811895]
> *** DEADLOCK ***
>
> v2: Use spin_lock in atomic context and spin_lock_irq in a non atomic
> context (Matthew Brost)
No idea what this "atomic context" means, but looks like
you just want to use spin_lock_irqsave() & co.
>
> Cc: Matthew Brost <matthew.brost@intel.com>
> Cc: Anshuman Gupta <anshuman.gupta@intel.com>
> Cc: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>
> Signed-off-by: Aravind Iddamsetty <aravind.iddamsetty@linux.intel.com>
> ---
> drivers/gpu/drm/xe/xe_force_wake.c | 62 +++++++++++++++++++++++++++++-
> drivers/gpu/drm/xe/xe_force_wake.h | 4 ++
> drivers/gpu/drm/xe/xe_pmu.c | 4 +-
> 3 files changed, 66 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/xe/xe_force_wake.c b/drivers/gpu/drm/xe/xe_force_wake.c
> index 32d6c4dd2807..1693097f72d3 100644
> --- a/drivers/gpu/drm/xe/xe_force_wake.c
> +++ b/drivers/gpu/drm/xe/xe_force_wake.c
> @@ -147,7 +147,7 @@ int xe_force_wake_get(struct xe_force_wake *fw,
> enum xe_force_wake_domains tmp, woken = 0;
> int ret, ret2 = 0;
>
> - spin_lock(&fw->lock);
> + spin_lock_irq(&fw->lock);
> for_each_fw_domain_masked(domain, domains, fw, tmp) {
> if (!domain->ref++) {
> woken |= BIT(domain->id);
> @@ -162,7 +162,7 @@ int xe_force_wake_get(struct xe_force_wake *fw,
> domain->id, ret);
> }
> fw->awake_domains |= woken;
> - spin_unlock(&fw->lock);
> + spin_unlock_irq(&fw->lock);
>
> return ret2;
> }
> @@ -176,6 +176,64 @@ int xe_force_wake_put(struct xe_force_wake *fw,
> enum xe_force_wake_domains tmp, sleep = 0;
> int ret, ret2 = 0;
>
> + spin_lock_irq(&fw->lock);
> + for_each_fw_domain_masked(domain, domains, fw, tmp) {
> + if (!--domain->ref) {
> + sleep |= BIT(domain->id);
> + domain_sleep(gt, domain);
> + }
> + }
> + for_each_fw_domain_masked(domain, sleep, fw, tmp) {
> + ret = domain_sleep_wait(gt, domain);
Why on earth are we waiting here?
Why is this all this stuff called "sleep something"?
--
Ville Syrjälä
Intel
next prev parent reply other threads:[~2023-11-24 7:19 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-24 6:44 [Intel-xe] [PATCH] drm/xe: Fix lockdep warning in xe_force_wake calls Aravind Iddamsetty
2023-11-24 7:09 ` [Intel-xe] FW: " Gupta, Anshuman
2023-11-24 7:54 ` Aravind Iddamsetty
2023-11-24 7:17 ` [Intel-xe] ✓ CI.Patch_applied: success for drm/xe: Fix lockdep warning in xe_force_wake calls (rev2) Patchwork
2023-11-24 7:18 ` [Intel-xe] ✓ CI.checkpatch: " Patchwork
2023-11-24 7:19 ` [Intel-xe] ✓ CI.KUnit: " Patchwork
2023-11-24 7:19 ` Ville Syrjälä [this message]
2023-11-24 8:31 ` [Intel-xe] [PATCH] drm/xe: Fix lockdep warning in xe_force_wake calls Aravind Iddamsetty
2023-11-24 8:37 ` Ville Syrjälä
2023-11-28 8:30 ` Aravind Iddamsetty
2023-12-01 3:37 ` Aravind Iddamsetty
2023-11-24 7:26 ` [Intel-xe] ✓ CI.Build: success for drm/xe: Fix lockdep warning in xe_force_wake calls (rev2) Patchwork
2023-11-24 7:26 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-11-24 7:28 ` [Intel-xe] ✓ CI.checksparse: " Patchwork
2023-11-24 8:02 ` [Intel-xe] ✓ CI.BAT: " Patchwork
2023-11-24 8:04 ` [Intel-xe] ✗ CI.Patch_applied: failure for drm/xe: Fix lockdep warning in xe_force_wake calls (rev3) Patchwork
-- strict thread matches above, loose matches on Subject: below --
2023-12-06 9:53 [Intel-xe] [PATCH] drm/xe: Fix lockdep warning in xe_force_wake calls Aravind Iddamsetty
2023-12-08 5:17 ` Rodrigo Vivi
2023-12-08 5:49 ` Aravind Iddamsetty
2023-11-10 6:29 Aravind Iddamsetty
2023-11-10 13:17 ` Matthew Brost
2023-11-17 8:48 ` Aravind Iddamsetty
2023-11-20 12:32 ` Matthew Brost
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=ZWBOc5WgvgDLUBqG@intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=aravind.iddamsetty@linux.intel.com \
--cc=intel-xe@lists.freedesktop.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox