From patchwork Mon Oct 24 11:32:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8819 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp431171wru; Mon, 24 Oct 2022 05:43:08 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7KYliljTeHum4n71encxorBF2XNRuIfO0C0hbzGMBaELN5nGTMvZ84Ht8He+bmDv/v/WY8 X-Received: by 2002:a17:902:c612:b0:186:8376:208d with SMTP id r18-20020a170902c61200b001868376208dmr15132449plr.89.1666615388530; Mon, 24 Oct 2022 05:43:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615388; cv=none; d=google.com; s=arc-20160816; b=DbsdwkArHJtza5ve1n5SdnmwpU+fG63JJFa2fWkkU9pGXyFbkK60/oPb+SC6tm5niF ZeVZI1d437Qt9WsFHxnsYjkDjKshP8PuLobfzbunOrh/jdQ5jTYdLZUT4wEEm4ZBLuHB vei4CdWEHiDNWHmSbJar8M/vMqycjL3o8+lvZpf60uIYJ1yZxivt3Wqo7+wo7OJ2sHFt QY1cdVStpTGVrNzLS2+erjnA1bI6gVWZiEPj/oQkYPghGjd4ptafaIPPy5x0u97zJHk6 kU0xKU+hKwIVJqGjAztRlzD8cI6ou40D0ZiVGjDVUOzLe9b0/QSfDaIR+tlSdzE+pZms 3mUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=NGQPDhb7x7+wydTtcZFehZh80yJnk0tehq4AXLIshBE=; b=pCaGuvhQ296CV6VakwuOy/5hC3ikdheyPpp1LivDvQWUFZFhrDj/BO4f+9mpA7HZfE NglXbVKLQtJKIAOTdoc7NBSvL9DhTplK7ieuWEO2j2gVi2Z2jEOmNGArJZPMZbw7EG8V f6jQvRG4aU0U+OurMPmIKnmq71P/plbMLvXshdshVd5WtQBDmoT8a8nw83w1l8y4d/DN +smJgcerLPQXnLQhiWShzCgDeL+Gl7/G5TxOcQcEbuhoS7ASqyM+RNW786bbfPJY9ECF LCmqz8+3qy2jyIxeUA6RLbnM60TDpfbhNAFiTAD4UT02T4sE0hSOWP6wkXvMSfHzFwdL WATA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IuO43QW+; 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=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f7-20020a056a0022c700b00537e88da121si37150490pfj.35.2022.10.24.05.42.51; Mon, 24 Oct 2022 05:43:08 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b=IuO43QW+; 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=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231955AbiJXMcn (ORCPT + 99 others); Mon, 24 Oct 2022 08:32:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233983AbiJXM3I (ORCPT ); Mon, 24 Oct 2022 08:29:08 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77CF387FB0; Mon, 24 Oct 2022 05:03:06 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6E680612DA; Mon, 24 Oct 2022 11:54:28 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 83682C433D6; Mon, 24 Oct 2022 11:54:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612467; bh=jUlYH+CCO+C1GozJgPk99oAfl+QuIg9M6++iiseMq9I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IuO43QW+vapaFCju19mj4ZC+60gSwnyTJz7u9Ep5bG0FGwcecTTUwt+Sbm3KurU8c FRdC6Kz/AYc/IBLplKIdWwiqkUH1EWG57NnWedCOywFWeR3RIdT7rBN7F6iBqpmDiB YD+XDzQK0wR0NJj7WYJHoaNj8Vv0+zC41wDd1C9U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Rafael J. Wysocki" , Chen Yu Subject: [PATCH 4.14 210/210] thermal: intel_powerclamp: Use first online CPU as control_cpu Date: Mon, 24 Oct 2022 13:32:07 +0200 Message-Id: <20221024113003.827869862@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1747572897373556741?= X-GMAIL-MSGID: =?utf-8?q?1747572897373556741?= From: Rafael J. Wysocki commit 4bb7f6c2781e46fc5bd00475a66df2ea30ef330d upstream. Commit 68b99e94a4a2 ("thermal: intel_powerclamp: Use get_cpu() instead of smp_processor_id() to avoid crash") fixed an issue related to using smp_processor_id() in preemptible context by replacing it with a pair of get_cpu()/put_cpu(), but what is needed there really is any online CPU and not necessarily the one currently running the code. Arguably, getting the one that's running the code in there is confusing. For this reason, simply give the control CPU role to the first online one which automatically will be CPU0 if it is online, so one check can be dropped from the code for an added benefit. Link: https://lore.kernel.org/linux-pm/20221011113646.GA12080@duo.ucw.cz/ Fixes: 68b99e94a4a2 ("thermal: intel_powerclamp: Use get_cpu() instead of smp_processor_id() to avoid crash") Signed-off-by: Rafael J. Wysocki Reviewed-by: Chen Yu Signed-off-by: Greg Kroah-Hartman --- drivers/thermal/intel_powerclamp.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) --- a/drivers/thermal/intel_powerclamp.c +++ b/drivers/thermal/intel_powerclamp.c @@ -549,11 +549,7 @@ static int start_power_clamp(void) get_online_cpus(); /* prefer BSP */ - control_cpu = 0; - if (!cpu_online(control_cpu)) { - control_cpu = get_cpu(); - put_cpu(); - } + control_cpu = cpumask_first(cpu_online_mask); clamping = true; schedule_delayed_work(&poll_pkg_cstate_work, 0);