Merge tag 'locking-urgent-2020-08-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (b69bea8a) · Commits · 戴 / test

Pull locking fixes from Thomas Gleixner: "A set of fixes for lockdep, tracing and RCU: - Prevent recursion by using raw_cpu_* operations - Fixup the interrupt state in the cpu idle code to be consistent - Push rcu_idle_enter/exit() invocations deeper into the idle path so that the lock operations are inside the RCU watching sections - Move trace_cpu_idle() into generic code so it's called before RCU goes idle. - Handle raw_local_irq* vs. local_irq* operations correctly - Move the tracepoints out from under the lockdep recursion handling which turned out to be fragile and inconsistent" * tag 'locking-urgent-2020-08-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: lockdep,trace: Expose tracepoints lockdep: Only trace IRQ edges mips: Implement arch_irqs_disabled() arm64: Implement arch_irqs_disabled() nds32: Implement arch_irqs_disabled() locking/lockdep: Cleanup x86/entry: Remove unused THUNKs cpuidle: Move trace_cpu_idle() into generic code cpuidle: Make CPUIDLE_FLAG_TLB_FLUSHED generic sched,idle,rcu: Push rcu_idle deeper into the idle path cpuidle: Fixup IRQ state lockdep: Use raw_cpu_*() for per-cpu variables

arch/arm/mach-omap2/pm34xx.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -298,11 +298,7 @@ static void omap3_pm_idle(void)
		if (omap_irq_pending())
		return;

		trace_cpu_idle_rcuidle(1, smp_processor_id());

		omap_sram_idle();

		trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id());
		}

		#ifdef CONFIG_SUSPEND

arch/arm64/include/asm/irqflags.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,11 @@ static inline int arch_irqs_disabled_flags(unsigned long flags)
		return res;
		}

		static inline int arch_irqs_disabled(void)
		{
		return arch_irqs_disabled_flags(arch_local_save_flags());
		}

		static inline unsigned long arch_local_irq_save(void)
		{
		unsigned long flags;

arch/arm64/kernel/process.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -123,10 +123,8 @@ void arch_cpu_idle(void)
		* This should do all the clock switching and wait for interrupt
		* tricks
		*/
		trace_cpu_idle_rcuidle(1, smp_processor_id());
		cpu_do_idle();
		local_irq_enable();
		trace_cpu_idle_rcuidle(PWR_EVENT_EXIT, smp_processor_id());
		}

		#ifdef CONFIG_HOTPLUG_CPU

arch/mips/include/asm/irqflags.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -137,6 +137,11 @@ static inline int arch_irqs_disabled_flags(unsigned long flags)
		return !(flags & 1);
		}

		static inline int arch_irqs_disabled(void)
		{
		return arch_irqs_disabled_flags(arch_local_save_flags());
		}

		#endif /* #ifndef __ASSEMBLY__ */

		/*

arch/nds32/include/asm/irqflags.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -34,3 +34,8 @@ static inline int arch_irqs_disabled_flags(unsigned long flags)
		{
		return !flags;
		}

		static inline int arch_irqs_disabled(void)
		{
		return arch_irqs_disabled_flags(arch_local_save_flags());
		}

Admin message