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]
Date:	Tue, 08 Feb 2011 15:18:00 +0100
From:	Peter Zijlstra <>
To:	Yong Zhang <>
Cc:	Borislav Petkov <>,
	Linus Torvalds <>,
	Linux Kernel Mailing List <>,, tglx <>,
	Ingo Molnar <>,
	Andrew Morton <>
Subject: Re: lockdep: possible reason: unannotated irqs-off. (was: Re:
 Linux 2.6.38-rc4)

On Tue, 2011-02-08 at 14:48 +0100, Peter Zijlstra wrote:
> Well that and modifying softirq bits for a lockdep annotation really
> feels wrong. 

How about we revert it for this release and try again later?

Subject: lockdep, timer: Revert the del_timer_sync() annotation

Both attempts at trying to allow softirq usage failed, revert for this
release and try again later.

Signed-off-by: Peter Zijlstra <>
 kernel/timer.c |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/kernel/timer.c b/kernel/timer.c
index 343ff27..c848cd8 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -959,7 +959,7 @@ EXPORT_SYMBOL(try_to_del_timer_sync);
  * Synchronization rules: Callers must prevent restarting of the timer,
  * otherwise this function is meaningless. It must not be called from
- * hardirq contexts. The caller must not hold locks which would prevent
+ * interrupt contexts. The caller must not hold locks which would prevent
  * completion of the timer's handler. The timer's handler must not call
  * add_timer_on(). Upon exit the timer is not queued and the handler is
  * not running on any CPU.
@@ -971,12 +971,10 @@ int del_timer_sync(struct timer_list *timer)
 	unsigned long flags;
-	raw_local_irq_save(flags);
-	local_bh_disable();
+	local_irq_save(flags);
-	_local_bh_enable();
-	raw_local_irq_restore(flags);
+	local_irq_restore(flags);
 	 * don't use it in hardirq context, because it

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to
More majordomo info at
Please read the FAQ at

Powered by blists - more mailing lists