From: Joel Fernandes <joelaf@google.com>
To: linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org
Cc: Joel Fernandes <joelaf@google.com>,
Steven Rostedt <rostedt@goodmis.org>,
Peter Zilstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
Tom Zanussi <tom.zanussi@linux.intel.com>,
Namhyung Kim <namhyung@kernel.org>,
Thomas Glexiner <tglx@linutronix.de>,
Boqun Feng <boqun.feng@gmail.com>,
Paul McKenney <paulmck@linux.vnet.ibm.com>,
Frederic Weisbecker <fweisbec@gmail.com>,
Randy Dunlap <rdunlap@infradead.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
Fenguang Wu <fengguang.wu@intel.com>,
Baohong Liu <baohong.liu@intel.com>,
Vedang Patel <vedang.patel@intel.com>
Subject: [RFC v4 2/4] softirq: reorder trace_softirqs_on to prevent lockdep splat
Date: Mon, 16 Apr 2018 21:07:46 -0700 [thread overview]
Message-ID: <20180417040748.212236-3-joelaf@google.com> (raw)
In-Reply-To: <20180417040748.212236-1-joelaf@google.com>
Currently there's an issue which is not always reproducible, where the
softirqs annotation in lockdep goes out of sync with the reality of the
world and causes a lockdep splat. This is because the preemptoff tracer
calls into lockdep which can cause a softirqs invalid annotation splat.
The same issue was fixed in local_bh_disable_ip.
/*
* The preempt tracer hooks into preempt_count_add and will break
* lockdep because it calls back into lockdep after SOFTIRQ_OFFSET
* is set and before current->softirq_enabled is cleared.
* We must manually increment preempt_count here and manually
* call the trace_preempt_off later.
*/
I am not fully sure why the issue is reproducible with my patches easily,
but it seems like the same ordering issue can exist so we ought to fix
it.
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zilstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Tom Zanussi <tom.zanussi@linux.intel.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Thomas Glexiner <tglx@linutronix.de>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Paul McKenney <paulmck@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Fenguang Wu <fengguang.wu@intel.com>
Cc: Baohong Liu <baohong.liu@intel.com>
Cc: Vedang Patel <vedang.patel@intel.com>
Signed-off-by: Joel Fernandes <joelaf@google.com>
---
kernel/softirq.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/kernel/softirq.c b/kernel/softirq.c
index 177de3640c78..8a040bcaa033 100644
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -139,9 +139,13 @@ static void __local_bh_enable(unsigned int cnt)
{
lockdep_assert_irqs_disabled();
+ if (preempt_count() == cnt)
+ trace_preempt_on(CALLER_ADDR0, get_lock_parent_ip());
+
if (softirq_count() == (cnt & SOFTIRQ_MASK))
trace_softirqs_on(_RET_IP_);
- preempt_count_sub(cnt);
+
+ __preempt_count_sub(cnt);
}
/*
--
2.17.0.484.g0c8726318c-goog
next prev parent reply other threads:[~2018-04-17 4:08 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-17 4:07 [RFC v4 0/4] Centralize and unify usage of preempt/irq tracepoints Joel Fernandes
2018-04-17 4:07 ` [RFC v4 1/4] tracepoint: Add API to not do lockdep checks during RCU ops Joel Fernandes
2018-04-17 4:07 ` Joel Fernandes [this message]
2018-04-17 4:07 ` [RFC v4 3/4] irqflags: Avoid unnecessary calls to trace_ if you can Joel Fernandes
2018-04-18 9:02 ` Masami Hiramatsu
2018-04-19 5:43 ` Namhyung Kim
2018-04-20 7:07 ` Joel Fernandes
2018-04-23 1:14 ` Joel Fernandes
2018-04-23 3:19 ` Paul E. McKenney
2018-04-23 14:31 ` Mathieu Desnoyers
2018-04-23 14:53 ` Steven Rostedt
2018-04-23 14:59 ` Mathieu Desnoyers
2018-04-23 15:12 ` Paul E. McKenney
2018-04-23 16:18 ` Steven Rostedt
2018-04-23 17:12 ` Mathieu Desnoyers
2018-04-23 17:24 ` Joel Fernandes
2018-04-23 21:22 ` Steven Rostedt
2018-04-24 15:56 ` Paul E. McKenney
2018-04-24 16:01 ` Joel Fernandes
2018-04-24 17:26 ` Paul E. McKenney
2018-04-24 18:23 ` Paul E. McKenney
2018-04-24 18:26 ` Paul E. McKenney
2018-04-24 18:59 ` Joel Fernandes
2018-04-24 19:01 ` Joel Fernandes
2018-04-24 19:09 ` Paul E. McKenney
2018-04-24 19:16 ` Joel Fernandes
2018-04-24 23:21 ` Mathieu Desnoyers
2018-04-24 23:46 ` Joel Fernandes
2018-04-25 0:10 ` Paul E. McKenney
2018-04-25 4:20 ` Paul E. McKenney
2018-04-25 21:27 ` Joel Fernandes
2018-04-25 21:35 ` Paul E. McKenney
2018-04-25 21:40 ` Mathieu Desnoyers
2018-04-25 22:51 ` Steven Rostedt
2018-04-26 15:03 ` Mathieu Desnoyers
2018-04-26 16:08 ` Mathieu Desnoyers
2018-04-25 23:13 ` Joel Fernandes
2018-04-26 15:13 ` Mathieu Desnoyers
2018-04-26 15:20 ` Joel Fernandes
2018-04-26 15:49 ` Paul E. McKenney
2018-04-23 15:49 ` Joel Fernandes
2018-04-26 2:18 ` Joel Fernandes
2018-05-01 1:18 ` Joel Fernandes
2018-04-17 4:07 ` [RFC v4 4/4] tracing: Centralize preemptirq tracepoints and unify their usage Joel Fernandes
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=20180417040748.212236-3-joelaf@google.com \
--to=joelaf@google.com \
--cc=baohong.liu@intel.com \
--cc=boqun.feng@gmail.com \
--cc=fengguang.wu@intel.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=paulmck@linux.vnet.ibm.com \
--cc=peterz@infradead.org \
--cc=rdunlap@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=tom.zanussi@linux.intel.com \
--cc=vedang.patel@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;
as well as URLs for NNTP newsgroup(s).