Skip to content

Commit 48d843d

Browse files
committed
cpuidle, intel_idle: Fix CPUIDLE_FLAG_IRQ_ENABLE *again*
Bugzilla: https://bugzilla.redhat.com/2185872 commit 6d9c7f5 Author: Peter Zijlstra <peterz@infradead.org> Date: Thu Jan 12 20:43:32 2023 +0100 cpuidle, intel_idle: Fix CPUIDLE_FLAG_IRQ_ENABLE *again* 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 32d4fd5 ("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 d295ad3 ("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: d295ad3 ("intel_idle: Fix false positive RCU splats due to incorrect hardirqs state") Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Tested-by: Tony Lindgren <tony@atomide.com> Tested-by: Ulf Hansson <ulf.hansson@linaro.org> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Acked-by: Frederic Weisbecker <frederic@kernel.org> Link: https://lore.kernel.org/r/20230112195540.434302128@infradead.org Signed-off-by: David Arcari <darcari@redhat.com>
1 parent 47f0707 commit 48d843d

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

drivers/idle/intel_idle.c

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,7 @@ static __cpuidle int intel_idle_irq(struct cpuidle_device *dev,
168168

169169
raw_local_irq_enable();
170170
ret = __intel_idle(dev, drv, index);
171-
172-
/*
173-
* The lockdep hardirqs state may be changed to 'on' with timer
174-
* tick interrupt followed by __do_softirq(). Use local_irq_disable()
175-
* to keep the hardirqs state correct.
176-
*/
177-
local_irq_disable();
171+
raw_local_irq_disable();
178172

179173
return ret;
180174
}

0 commit comments

Comments
 (0)