From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82142C433DB for ; Sat, 6 Mar 2021 11:43:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5FD706501E for ; Sat, 6 Mar 2021 11:43:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231376AbhCFLnA (ORCPT ); Sat, 6 Mar 2021 06:43:00 -0500 Received: from Galois.linutronix.de ([193.142.43.55]:34356 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230417AbhCFLm0 (ORCPT ); Sat, 6 Mar 2021 06:42:26 -0500 Date: Sat, 06 Mar 2021 11:42:25 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1615030945; 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=GNGkF5/g0u95uwFeT+UWAgCcTyvpSHpXOZsb2p590tQ=; b=ocezjz1OxosQ/4BsIOSUHGztZD/5s8HS/csi42G41eeoFKiKCIvI8ZOPpWK8bmuiFh5O0p C9fxZbDraSJfy6WMs9STFKcizaomUF/cqsQHo6tCguBzJ21GCoFhYpl7AdSfddV4o8tU+w nVb4WOuPqdF2qCiwhW5lXz6/Ggi53bAI8YprtFkWnHlOLBejWghjnCr40tiQRBWQUHzWdm WwHEUQfup4nYrrHu3zSteMN4xkhY0q4bxMOrifOb/Bd0cJUK2cBvmRp4KnttAWvDHW/G8u XSGXSl1gDB+adDqDKOn31qLMA9vlKlsZ5wVJiMoZv4ApcmuFY/utt3zzqdScKA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1615030945; 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=GNGkF5/g0u95uwFeT+UWAgCcTyvpSHpXOZsb2p590tQ=; b=a9mTYSbYsX/JXgOMYi92qhPRM/PDbBfcJIq70QpX2DTkjpnx9J5bIOyeHWx4FLSmIEx8dA QjfWOcGnVymbPkDA== 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] sched: Optimize migration_cpu_stop() Cc: stable@kernel.org, "Peter Zijlstra (Intel)" , Ingo Molnar , Valentin Schneider , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210224131355.569238629@infradead.org> References: <20210224131355.569238629@infradead.org> MIME-Version: 1.0 Message-ID: <161503094530.398.14268009773661232972.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: 7bit 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: 3f1bc119cd7fc987c8ed25ffb717f99403bb308c Gitweb: https://git.kernel.org/tip/3f1bc119cd7fc987c8ed25ffb717f99403bb308c Author: Peter Zijlstra AuthorDate: Wed, 24 Feb 2021 11:21:35 +01:00 Committer: Ingo Molnar CommitterDate: Sat, 06 Mar 2021 12:40:21 +01:00 sched: Optimize migration_cpu_stop() When the purpose of migration_cpu_stop() is to migrate the task to 'any' valid CPU, don't migrate the task when it's already running on a valid CPU. Fixes: 6d337eab041d ("sched: Fix migrate_disable() vs set_cpus_allowed_ptr()") Cc: stable@kernel.org Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Ingo Molnar Reviewed-by: Valentin Schneider Link: https://lkml.kernel.org/r/20210224131355.569238629@infradead.org --- kernel/sched/core.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 84b657f..ac05afb 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1936,14 +1936,25 @@ static int migration_cpu_stop(void *data) complete = true; } - if (dest_cpu < 0) + if (dest_cpu < 0) { + if (cpumask_test_cpu(task_cpu(p), &p->cpus_mask)) + goto out; + dest_cpu = cpumask_any_distribute(&p->cpus_mask); + } if (task_on_rq_queued(p)) rq = __migrate_task(rq, &rf, p, dest_cpu); else p->wake_cpu = dest_cpu; + /* + * XXX __migrate_task() can fail, at which point we might end + * up running on a dodgy CPU, AFAICT this can only happen + * during CPU hotplug, at which point we'll get pushed out + * anyway, so it's probably not a big deal. + */ + } else if (pending) { /* * This happens when we get migrated between migrate_enable()'s