diff --git a/arch/arm64/kernel/entry-common.c b/arch/arm64/kernel/entry-common.c
index 387c755b79f6601c6772b135bf9013903f062790..b8a527ac67814b9c705836852073466d921d8050 100644
--- a/arch/arm64/kernel/entry-common.c
+++ b/arch/arm64/kernel/entry-common.c
@@ -17,6 +17,7 @@
 #include <asm/mmu.h>
 #include <asm/sysreg.h>
 
+static DEFINE_PER_CPU(int, dbg_count);
 /*
  * This is intended to match the logic in irqentry_enter(), handling the kernel
  * mode transitions only.
@@ -150,10 +151,16 @@ static void noinstr el1_inv(struct pt_regs *regs, unsigned long esr)
 	exit_to_kernel_mode(regs);
 }
 
+int in_dbg(void)
+{
+	return this_cpu_read(dbg_count) > 0;
+}
+
 static void noinstr arm64_enter_el1_dbg(struct pt_regs *regs)
 {
 	regs->lockdep_hardirqs = lockdep_hardirqs_enabled();
 
+	this_cpu_inc(dbg_count);
 	lockdep_hardirqs_off(CALLER_ADDR0);
 	rcu_nmi_enter();
 
@@ -172,6 +179,7 @@ static void noinstr arm64_exit_el1_dbg(struct pt_regs *regs)
 	rcu_nmi_exit();
 	if (restore)
 		lockdep_hardirqs_on(CALLER_ADDR0);
+	this_cpu_dec(dbg_count);
 }
 
 static void noinstr el1_dbg(struct pt_regs *regs, unsigned long esr)
diff --git a/include/linux/preempt.h b/include/linux/preempt.h
index 7d9c1c0e149c0d429d5ecbf9e015848fa1fdb8a4..89d5281e060a662572d5388460a12d3eef178eb2 100644
--- a/include/linux/preempt.h
+++ b/include/linux/preempt.h
@@ -352,4 +352,6 @@ static __always_inline void migrate_enable(void)
 	preempt_enable();
 }
 
+int in_dbg(void);
+
 #endif /* __LINUX_PREEMPT_H */
diff --git a/kernel/panic.c b/kernel/panic.c
index d991c3b1b5591dd2aaa933a727cc91e9bee4644b..9dadd3c5df57f6af385639dbda8a4c0709163baa 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -761,3 +761,8 @@ static int __init panic_on_taint_setup(char *s)
 	return 0;
 }
 early_param("panic_on_taint", panic_on_taint_setup);
+
+int __weak in_dbg(void)
+{
+	return 0;
+}
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index 0142855482f8b674fe52ae2db65e5d07906e47fe..18b9c74474ec1fecf851a9409b42723b2080326b 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -957,7 +957,7 @@ void __rcu_irq_enter_check_tick(void)
 	struct rcu_data *rdp = this_cpu_ptr(&rcu_data);
 
 	// If we're here from NMI there's nothing to do.
-	if (in_nmi())
+	if (in_nmi() || in_dbg())
 		return;
 
 	RCU_LOCKDEP_WARN(rcu_dynticks_curr_cpu_in_eqs(),