From nobody Sun Apr 5 20:04:54 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1645AC54EBD for ; Fri, 13 Jan 2023 12:35:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241683AbjAMMfl (ORCPT ); Fri, 13 Jan 2023 07:35:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232777AbjAMMcR (ORCPT ); Fri, 13 Jan 2023 07:32:17 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48567559CC; Fri, 13 Jan 2023 04:31:14 -0800 (PST) Date: Fri, 13 Jan 2023 12:31:12 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1673613073; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hFd/MBVlDyzyGtoyEebydqVmqBkHK7/ntdkqzrN0+sk=; b=CUdeCnIzwRSjx5iiApPJqen/oXxXYifljwQ4ldd7TqusscViX6Rm3CKhkgljJPSDQWRKfx DL1W64Nl7lq0BMTlU3GmHk99hMhU2NRRJAlPxrX6EnjKqFzsAlSR70RtVZb172TioGdJvD hPs+bvNT0RlF84qHP34KRKfpUYqHfa9JRf0Kdt0ntgcJMDXDTLtjJWnkhpUwPdVCICZhFI WehSmUFdQ5uGFjEjhlZSuCy+83Cnqrtti07JblNGdlSpetICFnRFXFRi9SxnJwiv8jfNr+ /Xw/w94UAsc3DL/s5aNv+c3R2W7mAK1rwlhfUyCkl0M/saB4cNyB+it8yHaxCg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1673613073; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hFd/MBVlDyzyGtoyEebydqVmqBkHK7/ntdkqzrN0+sk=; b=/uh9p9DWh8C6MnaC9XKVtZB5Dm4caevXM1Nm7H5W1TtvrsslzFK9XMcBCq4uUXLyqx/XYq i/Y7O1v/ATzjm9AQ== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] cpuidle, intel_idle: Fix CPUIDLE_FLAG_IRQ_ENABLE *again* Cc: "Peter Zijlstra (Intel)" , Ingo Molnar , Tony Lindgren , Ulf Hansson , "Rafael J. Wysocki" , Frederic Weisbecker , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230112195540.434302128@infradead.org> References: <20230112195540.434302128@infradead.org> MIME-Version: 1.0 Message-ID: <167361307255.4906.962152647120118730.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the sched/core branch of tip: Commit-ID: 6d9c7f51b1d9179bf7c3542267c656a934e8af23 Gitweb: https://git.kernel.org/tip/6d9c7f51b1d9179bf7c3542267c656a93= 4e8af23 Author: Peter Zijlstra AuthorDate: Thu, 12 Jan 2023 20:43:32 +01:00 Committer: Ingo Molnar CommitterDate: Fri, 13 Jan 2023 11:48:15 +01:00 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 32d4fd5751ea ("cpuidle,intel_idle: Fix CPUIDLE_FLAG_IRQ_ENABL= E"): "must not have tracing in idle functions" Clearly people can't read and tinker along until splat dissapears. This straight up reverts commit d295ad34f236 ("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: d295ad34f236 ("intel_idle: Fix false positive RCU splats due to inco= rrect hardirqs state") Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Tested-by: Tony Lindgren Tested-by: Ulf Hansson Acked-by: Rafael J. Wysocki Acked-by: Frederic Weisbecker Link: https://lore.kernel.org/r/20230112195540.434302128@infradead.org --- drivers/idle/intel_idle.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index cfeb24d..f060ac7 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -168,13 +168,7 @@ static __cpuidle int intel_idle_irq(struct cpuidle_dev= ice *dev, =20 raw_local_irq_enable(); ret =3D __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(); =20 return ret; }