Merge tag 'locking-urgent-2020-11-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (855cf1ee) · Commits · 戴 / test

Pull locking fix from Thomas Gleixner: "A single fix for lockdep which makes the recursion protection cover graph lock/unlock" * tag 'locking-urgent-2020-11-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: lockdep: Put graph lock/unlock under lock_recursion protection

kernel/locking/lockdep.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -108,19 +108,21 @@ static inline void lockdep_lock(void)
		{
		DEBUG_LOCKS_WARN_ON(!irqs_disabled());

		__this_cpu_inc(lockdep_recursion);
		arch_spin_lock(&__lock);
		__owner = current;
		__this_cpu_inc(lockdep_recursion);
		}

		static inline void lockdep_unlock(void)
		{
		DEBUG_LOCKS_WARN_ON(!irqs_disabled());

		if (debug_locks && DEBUG_LOCKS_WARN_ON(__owner != current))
		return;

		__this_cpu_dec(lockdep_recursion);
		__owner = NULL;
		arch_spin_unlock(&__lock);
		__this_cpu_dec(lockdep_recursion);
		}

		static inline bool lockdep_assert_locked(void)

Admin message