From patchwork Mon Mar 4 16:51:15 2024 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: 209644 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:fa17:b0:10a:f01:a869 with SMTP id ju23csp1545554dyc; Mon, 4 Mar 2024 08:52:31 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXgvxUBzyD4TuiIwHKJziqrDwxLJCl9giSa4qsxNDbUjA7KeFsu3mvFQskHgEOIGuW4Ur9wjEeu75QptPG9R/WKwW08Mw== X-Google-Smtp-Source: AGHT+IGe4FlB6/myL7n9xvqactd3g2ti5kVYjwcuJSsKVcSrS+SZt5OLA+9MLzHZuRZydQ9tHyce X-Received: by 2002:a17:906:ad9a:b0:a45:2601:56b with SMTP id la26-20020a170906ad9a00b00a452601056bmr2611487ejb.51.1709571151032; Mon, 04 Mar 2024 08:52:31 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709571151; cv=pass; d=google.com; s=arc-20160816; b=VcxQCrNgv7Clv/n1XrK8eD0LOe7K6gMpMaij/Bvkboa3I76APQxLwC2KP0PO2AxegP tjIVlAy05tAQIzbVsv+HgRdGHNnd4Q6tf9Nk2YAaqXiZj6CMiMrihShjcHGMhVdU0qKn TZzXIZ81Hq6+AZKH9DN7B0WIs2pXMI9CA7YdNH1Sfufj7d9Tiyep+f1m4zg9iZStq5Jz ZoOxxLdHhlId86fu8hFqEI81ZI07ecUt3JZIjp6VRodnn5jVr4pOBwvmdV9ps1R9Migf MB8rukCBJ/m4JVlCuscFNiCr9iLUTTbBKDjjzEPlx0LqsVAWVuk5LgGN/2IGqeLtj0Zj igmw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=GC5ZbR6JL0+F9LFYFrxKkVTnjHv8MW3IG4YBYZHG/FU=; fh=LWlv3U+xZ3+vQt4tlJRIlKl5VzN7iFjjE/bzRmlxKDA=; b=Jx4YTc40h5DBGtzBS9dYq1bl5q2M6Eu1xRity9GQmqn9ct8OfrVEPOOCmFcRYVd9Dt MzdihyqICtMu1rfXUtqYRqwuYytHWQiiAunuatzO9HsHcxfl2MVbcCAEDSZ5IOwnfKa1 2xhjWAhdfvStOnc2spJEOMzDSl3REF5Rri7vRd/tYD8sMaoDPwDaqCwNcI+1djB3bRQC nXgwJAvK08PR6V98mRj3Vsk+3/9+46DSo3K3sdXT2R6HWKeXS3MUoPnMZ1BeS2FzzXFe vrbgUoBC6AS1RLxkBtg2laMq7IZy9XkYGRfAJXCimp3b/LnHBhiyRLld5t17iiKNObzO dRAA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=LAdEtoEE; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-90959-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90959-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id hv12-20020a17090760cc00b00a44ebb63058si1989998ejc.346.2024.03.04.08.52.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Mar 2024 08:52:31 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-90959-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=LAdEtoEE; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-90959-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-90959-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 85D8B1F2269D for ; Mon, 4 Mar 2024 16:52:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BE561605CD; Mon, 4 Mar 2024 16:51:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="LAdEtoEE"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="U/mnxoCn" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA0D15FDDD; Mon, 4 Mar 2024 16:51:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709571086; cv=none; b=FGUydnPZ+i2TsCnou0XcxHXyQflv90kCkeV5QZV6sQrZEsn6ScUkp87eDZ16kD3HryT69PMX7NRV4rJ2VCQTmPoA7Trej5ujyMnsQUJOQ9P1h/fpm9vVjOZq8QDDpEQtjpJJauFITWZ5k3t2mlJathuT7MTp1WF0CIIJnBSvIxE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709571086; c=relaxed/simple; bh=dQbmAu2rwruOqP/ABkEiJsKHiX/3Vyq2dMg6yOxWuPo=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=RIiznai8d/SPGzo4JF+cnw2uGD/kTtuShexycHgqq4Tn2lmwz5XeJ73Cutm/ThpwZsxFVHIaM1dBi+lSY4eyPasqo+DsQ/FprKp07XTsu9yISTLn1zwvkcyjlj+acyVSQVxpeWHyCYGFqhP6Zidu691aP4lTa5a1kEAxw+eR2s8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=LAdEtoEE; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=U/mnxoCn; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Date: Mon, 04 Mar 2024 16:51:15 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1709571076; 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=GC5ZbR6JL0+F9LFYFrxKkVTnjHv8MW3IG4YBYZHG/FU=; b=LAdEtoEE0xOCTE1QP7wccUNGcpCC/so0EFhuXUXsAdXRdgOcHsmoNc9bVVrZ1mtmCKjmO6 u59fewJX35mNjXpFpVeT8BXkPXJu3o/9l5Jtac7rNit9F1NBGOIyGYKA35hgF2/CeI/t/N h8on4QL78HrbGDVW2E8u2njW9QVg4aF1X0pyX3V7Ee1WW2fe1RjJaf2jTcFFtSezDNFr4h LWRn9UmfwDyP87TQRQ2Tvu7C1lR8j6fb9Lu8w2bpoOj6TAkQMCtOshSFW6YhCKyq70B+sV jJ7J+eDQ1dwfDG9pMVY86/N+Ukr5XcnsIQyJTCRP3XRGMXTQNKDLKvx7P/w0DQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1709571076; 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=GC5ZbR6JL0+F9LFYFrxKkVTnjHv8MW3IG4YBYZHG/FU=; b=U/mnxoCnXhmwz73W2DzUW/MDpnKV+BKSxVK2zk2UQr0vQ2F/fe6Eo09JBfqXnMFJVaymxf RQYRZhxOZiqNPvCw== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] x86/idle: Clean up idle selection Cc: Thomas Gleixner , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20240229142248.392017685@linutronix.de> References: <20240229142248.392017685@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170957107541.398.17375423777710078618.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792243903191256035 X-GMAIL-MSGID: 1792615279291731988 The following commit has been merged into the x86/core branch of tip: Commit-ID: 0ab562875c01c91ec8167f8f6593ea61e510fd0a Gitweb: https://git.kernel.org/tip/0ab562875c01c91ec8167f8f6593ea61e510fd0a Author: Thomas Gleixner AuthorDate: Thu, 29 Feb 2024 15:23:38 +01:00 Committer: Borislav Petkov (AMD) CommitterDate: Mon, 04 Mar 2024 17:39:24 +01:00 x86/idle: Clean up idle selection Clean up the code to make it readable. No functional change. Signed-off-by: Thomas Gleixner Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20240229142248.392017685@linutronix.de --- arch/x86/kernel/process.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index b86ff0f..792394b 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -910,11 +910,13 @@ static __cpuidle void mwait_idle(void) void select_idle_routine(const struct cpuinfo_x86 *c) { -#ifdef CONFIG_SMP - if (boot_option_idle_override == IDLE_POLL && smp_num_siblings > 1) - pr_warn_once("WARNING: polling idle and HT enabled, performance may degrade\n"); -#endif - if (x86_idle_set() || boot_option_idle_override == IDLE_POLL) + if (boot_option_idle_override == IDLE_POLL) { + if (IS_ENABLED(CONFIG_SMP) && smp_num_siblings > 1) + pr_warn_once("WARNING: polling idle and HT enabled, performance may degrade\n"); + return; + } + + if (x86_idle_set()) return; if (prefer_mwait_c1_over_halt(c)) {