From patchwork Fri Jan 13 12:31:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 43252 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp243976wrt; Fri, 13 Jan 2023 04:37:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXsfv1MTgs95d1iyeKoPtLhcjgdCfR9/y6wnZI9tYMMEQTrVQpS2h+vvXQf7wMlPMk+8gIhG X-Received: by 2002:a17:907:9814:b0:857:1e36:3b7b with SMTP id ji20-20020a170907981400b008571e363b7bmr15704968ejc.11.1673613427672; Fri, 13 Jan 2023 04:37:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673613427; cv=none; d=google.com; s=arc-20160816; b=gcw7vmkN6COdOjQkyYZcblcZ6xMchGc+HDnOGYXdNtRc4EVdMSn/cba4cKLURwpcrw 7AwTkPndc1wpy1p312DN/8JUuW2YOEm/R76/XHr2CmHMtQful1BXGJ+pYoqay+hTTWGL xDUGV7+xmTN0i0DRaN8iexZbl4zBjjutaSgTmEKBpek67TdBr/j7Dssnw8Ewtimvz+Fb Pmqk84bOIakAM1d9rSk0SwM3vBPdYA/nKsfHN6kqbNS35P5dsdjiNGgG3V5n99xQOD17 +TRHEzoUd4IChOYbThapn1HjNlx11osBoY4YgYGzPGECjZbvYwQj7dgAV7/JPt/M7KyP 0vzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=hFd/MBVlDyzyGtoyEebydqVmqBkHK7/ntdkqzrN0+sk=; b=JmeXns0Pwi25kk+2tuRS+kuVVYUoNaHo0rKQSE88cOgihKAyRt5JbTBaMWOxosaCs+ hmCuKdLRAo90BZ52wuSOioko8GhaRihTtFjqt9y+GMYwBsSQ2nsBsYTmAqKKWmSQjVd4 6VsX+AcwamP2mpIdWWy/Zdj417+flKli7CuYr2HqJntOQBY+Xivte0pX5k6duCqbJoZF Gz6mkPWFuLhGYk+U4Xk1M58k4Pw5BR+snqrXTZEZe0er884cY+SsekhliLYN6IC70LtQ /yxkLCDqXooZ2vuRRopoNIre+XqeA97emQDgmmXE1LBIqaxNfXBFxwjlVmJfsS4JrTAx ++kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=CUdeCnIz; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jg13-20020a170907970d00b0078dfe6dc4d2si22237407ejc.33.2023.01.13.04.36.42; Fri, 13 Jan 2023 04:37:07 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=CUdeCnIz; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241584AbjAMMfl (ORCPT + 99 others); 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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754848466574431295?= X-GMAIL-MSGID: =?utf-8?q?1754910873297702161?= The following commit has been merged into the sched/core branch of tip: Commit-ID: 6d9c7f51b1d9179bf7c3542267c656a934e8af23 Gitweb: https://git.kernel.org/tip/6d9c7f51b1d9179bf7c3542267c656a934e8af23 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_ENABLE"): "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 incorrect 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_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; }