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 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 18 Dec 2020 16:02:32 -0000 From: "tip-bot2 for Peter Zijlstra" <tip-bot2@...utronix.de> To: linux-tip-commits@...r.kernel.org Cc: Heiko Carstens <hca@...ux.ibm.com>, "Peter Zijlstra (Intel)" <peterz@...radead.org>, x86@...nel.org, linux-kernel@...r.kernel.org Subject: [tip: locking/urgent] softirq: Avoid bad tracing / lockdep interaction The following commit has been merged into the locking/urgent branch of tip: Commit-ID: 91ea62d58bd661827c328a2c6c02a87fa4aae88b Gitweb: https://git.kernel.org/tip/91ea62d58bd661827c328a2c6c02a87fa4aae88b Author: Peter Zijlstra <peterz@...radead.org> AuthorDate: Fri, 18 Dec 2020 16:39:14 +01:00 Committer: Peter Zijlstra <peterz@...radead.org> CommitterDate: Fri, 18 Dec 2020 16:53:13 +01:00 softirq: Avoid bad tracing / lockdep interaction Similar to commit: 1a63dcd8765b ("softirq: Reorder trace_softirqs_on to prevent lockdep splat") __local_bh_enable_ip() can also call into tracing with inconsistent state. Unlike that commit we don't need to bother about the tracepoint because 'cnt-1' never matches preempt_count() (by construction). Reported-by: Heiko Carstens <hca@...ux.ibm.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org> Tested-by: Heiko Carstens <hca@...ux.ibm.com> Link: https://lkml.kernel.org/r/20201218154519.GW3092@hirez.programming.kicks-ass.net --- kernel/softirq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/softirq.c b/kernel/softirq.c index 09229ad..0f1d3a3 100644 --- a/kernel/softirq.c +++ b/kernel/softirq.c @@ -185,7 +185,7 @@ void __local_bh_enable_ip(unsigned long ip, unsigned int cnt) * Keep preemption disabled until we are done with * softirq processing: */ - preempt_count_sub(cnt - 1); + __preempt_count_sub(cnt - 1); if (unlikely(!in_interrupt() && local_softirq_pending())) { /*
Powered by blists - more mailing lists