Commit cec77925 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Jia, Yingbao
Browse files

cpuidle, intel_idle: Fix CPUIDLE_FLAG_IRQ_ENABLE *again* 

mainline inclusion
from mainline-v6.3
commit 6d9c7f51
category: feature
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/IB1H2A
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=6d9c7f51b1d9179bf7c3542267c656a934e8af23



-------------------------------------------------

Intel-SIG: Intel-SIG: commit 6d9c7f51 cpuidle, intel_idle: Fix CPUIDLE_FLAG_IRQ_ENABLE *again*.
Backport for GNR intel_idle support and fix on 5.10

So objtool found this bug:

  vmlinux.o: warning: objtool: intel_idle_irq+0x10c: call to trace_hardirqs_off() leaves .noinstr.text section

As per commit 32d4fd57 ("cpuidle,intel_idle: Fix CPUIDLE_FLAG_IRQ_ENABLE"):

  "must not have tracing in idle functions"

Clearly people can't read and tinker along until splat dissapears.
This straight up reverts commit d295ad34 ("intel_idle: Fix false
positive RCU splats due to incorrect hardirqs state").

It doesn't re-introduce the problem because preceding patches fixed it
properly.

Fixes: d295ad34 ("intel_idle: Fix false positive RCU splats due to incorrect hardirqs state")
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Tested-by: default avatarTony Lindgren <tony@atomide.com>
Tested-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Acked-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarFrederic Weisbecker <frederic@kernel.org>
Link: https://lore.kernel.org/r/20230112195540.434302128@infradead.org


[ yingbao jia: amend commit log ]
Signed-off-by: default avataryingbao jia <yingbao.jia@intel.com>
parent 96b72588

drivers/idle/intel_idle.c

+1 −6
Original line number Diff line number Diff line
@@ -174,12 +174,7 @@ static __cpuidle int intel_idle_irq(struct cpuidle_device *dev, 
	raw_local_irq_enable();

	ret = __intel_idle(dev, drv, index);



	/*

	 * The lockdep hardirqs state may be changed to 'on' with timer

	 * tick interrupt followed by __do_softirq(). Use local_irq_disable()

	 * to keep the hardirqs state correct.

	 */

	local_irq_disable();

	raw_local_irq_disable();



	return ret;

}