linux-kernel - Re: [BUG v6.0-rc2] lockdep splat on ct_kernel

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20220822220134.5d91f3db@rorschach.local.home>
Date:   Mon, 22 Aug 2022 22:01:34 -0400
From:   Steven Rostedt <rostedt@...dmis.org>
To:     LKML <linux-kernel@...r.kernel.org>
Cc:     Linus Torvalds <torvalds@...ux-foundation.org>,
        Frederic Weisbecker <fweisbec@...il.com>,
        "Paul E. McKenney" <paulmck@...nel.org>,
        Peter Zijlstra <peterz@...radead.org>,
        Jiri Olsa <olsajiri@...il.com>,
        Thomas Gleixner <tglx@...utronix.de>
Subject: Re: [BUG v6.0-rc2] lockdep splat on ct_kernel_enter()

On Mon, 22 Aug 2022 21:40:24 -0400
Steven Rostedt <rostedt@...dmis.org> wrote:

> And this patch (which is wrong, but will at least let my tests finish
> testing my code) makes the warning go away.

Well that patch was against the broken commit, but this patch against
6.0-rc2 works for me, albeit, it's still wrong ;-)

-- Steve

diff --git a/kernel/context_tracking.c b/kernel/context_tracking.c
index 77978e372377..17201159f3df 100644
--- a/kernel/context_tracking.c
+++ b/kernel/context_tracking.c
@@ -330,13 +330,13 @@ EXPORT_SYMBOL_GPL(ct_idle_enter);
  * If you add or remove a call to ct_idle_exit(), be sure to test with
  * CONFIG_RCU_EQS_DEBUG=y.
  */
-void noinstr ct_idle_exit(void)
+void ct_idle_exit(void)
 {
 	unsigned long flags;
 
-	raw_local_irq_save(flags);
+	local_irq_save(flags);
 	ct_kernel_enter(false, RCU_DYNTICKS_IDX - CONTEXT_IDLE);
-	raw_local_irq_restore(flags);
+	local_irq_restore(flags);
 }
 EXPORT_SYMBOL_GPL(ct_idle_exit);