[GIT pull] core/urgent for 5.10-rc3

[Thomas Gleixner]

Linus,

please pull the latest core/urgent branch from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-2020-11-08

up to:  9d820f68b2bd: entry: Fix the incorrect ordering of lockdep and RCU check

A single fix for the generic entry code to correct the wrong assumption
that the lockdep interrupt state needs not to be established before calling
the RCU check.

Thanks,

	tglx

------------------>
Thomas Gleixner (1):
      entry: Fix the incorrect ordering of lockdep and RCU check


 kernel/entry/common.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/entry/common.c b/kernel/entry/common.c
index 2b8366693d5c..e9e2df3f3f9e 100644
--- a/kernel/entry/common.c
+++ b/kernel/entry/common.c
@@ -337,10 +337,10 @@ noinstr irqentry_state_t irqentry_enter(struct pt_regs *regs)
 	 * already contains a warning when RCU is not watching, so no point
 	 * in having another one here.
 	 */
+	lockdep_hardirqs_off(CALLER_ADDR0);
 	instrumentation_begin();
 	rcu_irq_enter_check_tick();
-	/* Use the combo lockdep/tracing function */
-	trace_hardirqs_off();
+	trace_hardirqs_off_finish();
 	instrumentation_end();
 
 	return ret;