From nobody Thu Dec 18 07:51:54 2025 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 5CC73C77B6E for ; Fri, 14 Apr 2023 16:30:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229864AbjDNQav (ORCPT ); Fri, 14 Apr 2023 12:30:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229553AbjDNQar (ORCPT ); Fri, 14 Apr 2023 12:30:47 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EAF7C7EF8 for ; Fri, 14 Apr 2023 09:30:45 -0700 (PDT) Message-ID: <20230414162841.166896739@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1681489844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=hib+QUcWetFyH8FmqwSyijII2kFnQ679zRchSrjewOI=; b=mkOEfmQAy1l9beE/ApwVf5kMTXFdW+W6thNeHlt2hVoKuNaU3U6KpAjMWVyPxYDX/6rhIg mleUKHql8/2KvH6oVIyEysB+Oa+7LeSFf/AvUrWvSQ3ySZ1fb0i4ziBcHdXZVZkxEmai48 x1Ltb1oysAgGS6WWQ5/pZZ1610l/t+J8doGI4HnSJaEnHdbNlaqOXp/mO9ny9sp/ZChUS1 YTR5xlhCZIFRbJSQrtz3LyfFRaKuX0ZuePZXI95hpI9sPWub1dyaBfgSgoEGMfbBdXwztj CPk1+4pOj2TewxCxxZ1Cc7TBxp3VnRo1UxE2YLW11BkCq9r37USZZ35xhpjKAw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1681489844; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=hib+QUcWetFyH8FmqwSyijII2kFnQ679zRchSrjewOI=; b=ttZCey6pYGuViXp7ns8wLTTaL1J6mGg7f7cWVBDE3G7lfMbe3mDZ57A/73HoCad5AaN4Jy Wc3B8waWZg+pbPAQ== From: Thomas Gleixner To: LKML Cc: Peter Zijlstra , Valentin Schneider , Dennis Zhou , Tejun Heo , Christoph Lameter , Dave Chinner , Yury Norov , Andy Shevchenko , Rasmus Villemoes , Ye Bin , linux-mm@kvack.org Subject: [patch 1/3] lib/percpu_counter: Fix CPU hotplug handling References: <20230414162755.281993820@linutronix.de> MIME-Version: 1.0 Date: Fri, 14 Apr 2023 18:30:43 +0200 (CEST) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Commit 8b57b11cca88 ("pcpcntrs: fix dying cpu summation race") tried to address a race condition between percpu_counter_sum() and a concurrent CPU hotplug operation. The race window is between the point where an un-plugged CPU removed itself from the online_cpu_mask and the hotplug state callback which folds the per CPU counters of the now dead CPU into the global count. percpu_counter_sum() used for_each_online_cpu() to accumulate the per CPU local counts, so during the race window it missed to account for the not yet folded back local count of the offlined CPU. The attempt to address this used the admittedly undocumented and pointlessly public cpu_dying_mask by changing the loop iterator to take both the cpu_online_mask and the cpu_dying_mask into account. That works to some extent, but it is incorrect. The cpu_dying_mask bits are sticky even after cpu_up()/cpu_down() completes. That means that all offlined CPUs are always taken into account. In the case of disabling SMT at boottime or runtime this results in evaluating _all_ offlined SMT siblings counters forever. Depending on system size, that's a massive amount of cache-lines to be touched forever. It might be argued, that the cpu_dying_mask bit could be cleared when cpu_down() completes, but that's not possible under all circumstances. Especially with partial hotplug the bit must be sticky in order to keep the initial user, i.e. the scheduler correct. Partial hotplug which allows explicit state transitions also can create a situation where the race window gets recreated: cpu_down(target =3D CPUHP_PERCPU_CNT_DEAD + 1) brings a CPU down to one state before the per CPU counter folding callback. As this did not reach CPUHP_OFFLINE state the bit would stay set. Now the next partial operation: cpu_up(target =3D CPUHP_PERCPU_CNT_DEAD + 2) has to clear the bit and the race window is open again. There are two ways to solve this: 1) Maintain a local CPU mask in the per CPU counter code which gets the bit set when a CPU comes online and removed in the the CPUHP_PERCPU_CNT_DEAD state after folding. This adds more code and complexity. 2) Move the folding hotplug state into the DYING callback section, which runs on the outgoing CPU immediatedly after it cleared its online bit. There is no concurrency vs. percpu_counter_sum() on another CPU because all still online CPUs are waiting in stop_machine() for the outgoing CPU to complete its shutdown. The raw spinlock held around the CPU mask iteration prevents that an online CPU reaches the stop machine thread while iterating, which implicitely prevents the outgoing CPU from clearing its online bit. This is way simpler than #1 and makes the hotplug calls symmetric for the price of a slightly longer wait time in stop_machine(), which is not the end of the world as CPU un-plug is already slow. The overall time for a cpu_down() operation stays exactly the same. Implement #2 and plug the race completely. percpu_counter_sum() is still inherently racy against a concurrent percpu_counter_add_batch() fastpath unless externally serialized. That's completely independent of CPU hotplug though. Fixes: 8b57b11cca88 ("pcpcntrs: fix dying cpu summation race") Signed-off-by: Thomas Gleixner Cc: Dennis Zhou Cc: Tejun Heo Cc: Christoph Lameter Cc: Dave Chinner Cc: Yury Norov Cc: Andy Shevchenko Cc: Rasmus Villemoes Cc: Ye Bin Cc: linux-mm@kvack.org Acked-by: Dennis Zhou Reviewed-by: Valentin Schneider --- include/linux/cpuhotplug.h | 2 - lib/percpu_counter.c | 57 +++++++++++++++++++---------------------= ----- 2 files changed, 26 insertions(+), 33 deletions(-) --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -91,7 +91,6 @@ enum cpuhp_state { CPUHP_PRINTK_DEAD, CPUHP_MM_MEMCQ_DEAD, CPUHP_XFS_DEAD, - CPUHP_PERCPU_CNT_DEAD, CPUHP_RADIX_DEAD, CPUHP_PAGE_ALLOC, CPUHP_NET_DEV_DEAD, @@ -196,6 +195,7 @@ enum cpuhp_state { CPUHP_AP_SMPCFD_DYING, CPUHP_AP_X86_TBOOT_DYING, CPUHP_AP_ARM_CACHE_B15_RAC_DYING, + CPUHP_AP_PERCPU_COUNTER_STARTING, CPUHP_AP_ONLINE, CPUHP_TEARDOWN_CPU, =20 --- a/lib/percpu_counter.c +++ b/lib/percpu_counter.c @@ -12,7 +12,7 @@ =20 #ifdef CONFIG_HOTPLUG_CPU static LIST_HEAD(percpu_counters); -static DEFINE_SPINLOCK(percpu_counters_lock); +static DEFINE_RAW_SPINLOCK(percpu_counters_lock); #endif =20 #ifdef CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER @@ -126,13 +126,8 @@ EXPORT_SYMBOL(percpu_counter_sync); * Add up all the per-cpu counts, return the result. This is a more accur= ate * but much slower version of percpu_counter_read_positive(). * - * We use the cpu mask of (cpu_online_mask | cpu_dying_mask) to capture su= ms - * from CPUs that are in the process of being taken offline. Dying cpus ha= ve - * been removed from the online mask, but may not have had the hotplug dead - * notifier called to fold the percpu count back into the global counter s= um. - * By including dying CPUs in the iteration mask, we avoid this race condi= tion - * so __percpu_counter_sum() just does the right thing when CPUs are being= taken - * offline. + * Note: This function is inherently racy against the lockless fastpath of + * percpu_counter_add_batch() unless externaly serialized. */ s64 __percpu_counter_sum(struct percpu_counter *fbc) { @@ -142,10 +137,8 @@ s64 __percpu_counter_sum(struct percpu_c =20 raw_spin_lock_irqsave(&fbc->lock, flags); ret =3D fbc->count; - for_each_cpu_or(cpu, cpu_online_mask, cpu_dying_mask) { - s32 *pcount =3D per_cpu_ptr(fbc->counters, cpu); - ret +=3D *pcount; - } + for_each_online_cpu(cpu) + ret +=3D *per_cpu_ptr(fbc->counters, cpu); raw_spin_unlock_irqrestore(&fbc->lock, flags); return ret; } @@ -167,9 +160,9 @@ int __percpu_counter_init(struct percpu_ =20 #ifdef CONFIG_HOTPLUG_CPU INIT_LIST_HEAD(&fbc->list); - spin_lock_irqsave(&percpu_counters_lock, flags); + raw_spin_lock_irqsave(&percpu_counters_lock, flags); list_add(&fbc->list, &percpu_counters); - spin_unlock_irqrestore(&percpu_counters_lock, flags); + raw_spin_unlock_irqrestore(&percpu_counters_lock, flags); #endif return 0; } @@ -185,9 +178,9 @@ void percpu_counter_destroy(struct percp debug_percpu_counter_deactivate(fbc); =20 #ifdef CONFIG_HOTPLUG_CPU - spin_lock_irqsave(&percpu_counters_lock, flags); + raw_spin_lock_irqsave(&percpu_counters_lock, flags); list_del(&fbc->list); - spin_unlock_irqrestore(&percpu_counters_lock, flags); + raw_spin_unlock_irqrestore(&percpu_counters_lock, flags); #endif free_percpu(fbc->counters); fbc->counters =3D NULL; @@ -197,22 +190,29 @@ EXPORT_SYMBOL(percpu_counter_destroy); int percpu_counter_batch __read_mostly =3D 32; EXPORT_SYMBOL(percpu_counter_batch); =20 -static int compute_batch_value(unsigned int cpu) +static void compute_batch_value(int offs) { - int nr =3D num_online_cpus(); + int nr =3D num_online_cpus() + offs; + + percpu_counter_batch =3D max(32, nr * 2); +} =20 - percpu_counter_batch =3D max(32, nr*2); +static int percpu_counter_cpu_starting(unsigned int cpu) +{ + /* If invoked during hotplug @cpu is not yet marked online. */ + compute_batch_value(cpu_online(cpu) ? 0 : 1); return 0; } =20 -static int percpu_counter_cpu_dead(unsigned int cpu) +static int percpu_counter_cpu_dying(unsigned int cpu) { #ifdef CONFIG_HOTPLUG_CPU struct percpu_counter *fbc; + unsigned long flags; =20 - compute_batch_value(cpu); + compute_batch_value(0); =20 - spin_lock_irq(&percpu_counters_lock); + raw_spin_lock_irqsave(&percpu_counters_lock, flags); list_for_each_entry(fbc, &percpu_counters, list) { s32 *pcount; =20 @@ -222,7 +222,7 @@ static int percpu_counter_cpu_dead(unsig *pcount =3D 0; raw_spin_unlock(&fbc->lock); } - spin_unlock_irq(&percpu_counters_lock); + raw_spin_unlock_irqrestore(&percpu_counters_lock, flags); #endif return 0; } @@ -256,15 +256,8 @@ EXPORT_SYMBOL(__percpu_counter_compare); =20 static int __init percpu_counter_startup(void) { - int ret; - - ret =3D cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "lib/percpu_cnt:online", - compute_batch_value, NULL); - WARN_ON(ret < 0); - ret =3D cpuhp_setup_state_nocalls(CPUHP_PERCPU_CNT_DEAD, - "lib/percpu_cnt:dead", NULL, - percpu_counter_cpu_dead); - WARN_ON(ret < 0); + WARN_ON(cpuhp_setup_state(CPUHP_AP_PERCPU_COUNTER_STARTING, "lib/percpu_c= ounter:starting", + percpu_counter_cpu_starting, percpu_counter_cpu_dying)); return 0; } module_init(percpu_counter_startup); From nobody Thu Dec 18 07:51:54 2025 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 512BDC77B71 for ; Fri, 14 Apr 2023 16:30:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229937AbjDNQax (ORCPT ); Fri, 14 Apr 2023 12:30:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37232 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229721AbjDNQas (ORCPT ); Fri, 14 Apr 2023 12:30:48 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4DF015581 for ; Fri, 14 Apr 2023 09:30:47 -0700 (PDT) Message-ID: <20230414162841.229672670@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1681489845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=flXL5BT+igZd2jFVy2rrUP9R+ZUvsjSeOSfyM1mplgA=; b=n8Zzj9XT5skwt0s+kneK6aorlhEumvTdJA1WSfhEMGjZt9ak1fX1XTGgEIFh2ef47XvXrZ D7+2OXWHyDTxCYDZ5p6VALUqKfJoXpoRW0HHH0YHBw+oOcRZ1S/FmIpvqk1Vagj3ObQj9O XhAb7QEifrAGwZwUy43O7slG3cs7rJDZhH31szz/3jo6JJyL7cvadj/dF6fc3itd5LkmIR 6Nv7/x9NwJssBpIPCAMK5RFKWXbW08V6A76xgvJN0CpNNlV21rYnVIrD1AXXxkCxtMQj2B IQSxB3B+ygO3UeXgyaFYiA3QDhYOPpSMYPwzXOsClYFIdMUFJzjFSzGEFotmQQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1681489845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=flXL5BT+igZd2jFVy2rrUP9R+ZUvsjSeOSfyM1mplgA=; b=rFhSZGVrmAMgJZ7xdunNtmMjUVUhPhUjj/zvrYcV4jB2ZZzAS80Zu3IpGYW+1VuyWt8wim 2XkCVzBaPz/mNoAQ== From: Thomas Gleixner To: LKML Cc: Peter Zijlstra , Valentin Schneider , Dennis Zhou , Tejun Heo , Christoph Lameter , Dave Chinner , Yury Norov , Andy Shevchenko , Rasmus Villemoes , Ye Bin , linux-mm@kvack.org Subject: [patch 2/3] cpu/hotplug: Remove export of cpu_active_mask and cpu_dying_mask References: <20230414162755.281993820@linutronix.de> MIME-Version: 1.0 Date: Fri, 14 Apr 2023 18:30:45 +0200 (CEST) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" No module users and no module should ever care. Signed-off-by: Thomas Gleixner Reviewed-by: Valentin Schneider --- kernel/cpu.c | 2 -- 1 file changed, 2 deletions(-) --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -2643,10 +2643,8 @@ struct cpumask __cpu_present_mask __read EXPORT_SYMBOL(__cpu_present_mask); =20 struct cpumask __cpu_active_mask __read_mostly; -EXPORT_SYMBOL(__cpu_active_mask); =20 struct cpumask __cpu_dying_mask __read_mostly; -EXPORT_SYMBOL(__cpu_dying_mask); =20 atomic_t __num_online_cpus __read_mostly; EXPORT_SYMBOL(__num_online_cpus); From nobody Thu Dec 18 07:51:54 2025 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 A0AB1C77B71 for ; Fri, 14 Apr 2023 16:30:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229822AbjDNQa4 (ORCPT ); Fri, 14 Apr 2023 12:30:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229841AbjDNQau (ORCPT ); Fri, 14 Apr 2023 12:30:50 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C07C85581 for ; Fri, 14 Apr 2023 09:30:48 -0700 (PDT) Message-ID: <20230414162841.292513270@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1681489847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=Liy0JL0O99yuZfbRpqXKPbI/GHoH9SgVRO31sSZwo7E=; b=ijF0ruw1cRMf22DDY8lmd1RpMdgKqhhAKkwlN0FRiBkbd5rpJLGGXc6GIVBW2BbRxz+vrs bZINbc9E23N9wlLYUwjvi3tmXJ1x+IPt4Ms2sgxXE5oSFZGuZ9xJXM6yqt56hOoy5h+e8r IXQV2yLLh0BEcBOUq7fAsL3h3mRk5+BoQvLVLP9DC9TWBqDDBUtrbtyJOHtpVA8WVv2maC I/49Pc6G6I0AGxUSCTvpI+8aUkJHJtFsa0vzxnk8LF60uJJ14iOfxeeQi9R4xPF0/f3xQh qKas2Szjgx59CicyyVV4R+ZlbG1G+0ip+HLYkw+WSJZgNrbys3cRgU0nx79kYQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1681489847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=Liy0JL0O99yuZfbRpqXKPbI/GHoH9SgVRO31sSZwo7E=; b=88gs/L+WXECo4w3u1kbaszJZORO8dhFU42usZ2pHN0I3SSSJ1k5U4lRitxe8qPvcWmWzCC 0yekjG5CpzkPrmCw== From: Thomas Gleixner To: LKML Cc: Peter Zijlstra , Valentin Schneider , Dennis Zhou , Tejun Heo , Christoph Lameter , Dave Chinner , Yury Norov , Andy Shevchenko , Rasmus Villemoes , Ye Bin , linux-mm@kvack.org Subject: [patch 3/3] cpu/hotplug: Get rid of cpu_dying_mask References: <20230414162755.281993820@linutronix.de> MIME-Version: 1.0 Date: Fri, 14 Apr 2023 18:30:46 +0200 (CEST) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The cpu_dying_mask is not only undocumented but also to some extent a misnomer. It's purpose is to capture the last direction of a cpu_up() or cpu_down() operation taking eventual rollback operations into account. The name and the lack of documentation lured already someone to use it in the wrong way. The initial user is the scheduler code which needs to keep the decision correct whether to schedule tasks on a CPU, which is between the CPUHP_ONLINE and the CPUHP_ACTIVE state and has the balance_push() hook installed. cpu_dying mask is not really useful for general consumption. The cpu_dying_mask bits are sticky even after cpu_up() or cpu_down() completes.=20 It might be argued, that the cpu_dying_mask bit could be cleared when cpu_down() completes, but that's not possible under all circumstances. Especially not with partial hotplug operations. In that case the bit must be sticky in order to keep the initial user, i.e. the scheduler correct. Replace the cpumask completely by: - recording the direction internally in the CPU hotplug core state - exposing that state via a documented function to the scheduler After that cpu_dying_mask is not longer in use and removed before the next user trips over it. Signed-off-by: Thomas Gleixner Reviewed-by: Valentin Schneider --- include/linux/cpumask.h | 21 --------------------- kernel/cpu.c | 43 +++++++++++++++++++++++++++++++++++++------ kernel/sched/core.c | 4 ++-- kernel/smpboot.h | 2 ++ 4 files changed, 41 insertions(+), 29 deletions(-) --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h @@ -126,12 +126,10 @@ extern struct cpumask __cpu_possible_mas extern struct cpumask __cpu_online_mask; extern struct cpumask __cpu_present_mask; extern struct cpumask __cpu_active_mask; -extern struct cpumask __cpu_dying_mask; #define cpu_possible_mask ((const struct cpumask *)&__cpu_possible_mask) #define cpu_online_mask ((const struct cpumask *)&__cpu_online_mask) #define cpu_present_mask ((const struct cpumask *)&__cpu_present_mask) #define cpu_active_mask ((const struct cpumask *)&__cpu_active_mask) -#define cpu_dying_mask ((const struct cpumask *)&__cpu_dying_mask) =20 extern atomic_t __num_online_cpus; =20 @@ -1015,15 +1013,6 @@ set_cpu_active(unsigned int cpu, bool ac cpumask_clear_cpu(cpu, &__cpu_active_mask); } =20 -static inline void -set_cpu_dying(unsigned int cpu, bool dying) -{ - if (dying) - cpumask_set_cpu(cpu, &__cpu_dying_mask); - else - cpumask_clear_cpu(cpu, &__cpu_dying_mask); -} - /** * to_cpumask - convert an NR_CPUS bitmap to a struct cpumask * * @bitmap: the bitmap @@ -1097,11 +1086,6 @@ static inline bool cpu_active(unsigned i return cpumask_test_cpu(cpu, cpu_active_mask); } =20 -static inline bool cpu_dying(unsigned int cpu) -{ - return cpumask_test_cpu(cpu, cpu_dying_mask); -} - #else =20 #define num_online_cpus() 1U @@ -1129,11 +1113,6 @@ static inline bool cpu_active(unsigned i return cpu =3D=3D 0; } =20 -static inline bool cpu_dying(unsigned int cpu) -{ - return false; -} - #endif /* NR_CPUS > 1 */ =20 #define cpu_is_offline(cpu) unlikely(!cpu_online(cpu)) --- a/kernel/cpu.c +++ b/kernel/cpu.c @@ -53,6 +53,9 @@ * @rollback: Perform a rollback * @single: Single callback invocation * @bringup: Single callback bringup or teardown selector + * @goes_down: Indicator for direction of cpu_up()/cpu_down() operations + * including eventual rollbacks. Not affected by state or + * instance add/remove operations. See cpuhp_cpu_goes_down(). * @cpu: CPU number * @node: Remote CPU node; for multi-instance, do a * single entry callback for install/remove @@ -72,6 +75,7 @@ struct cpuhp_cpu_state { bool rollback; bool single; bool bringup; + bool goes_down; struct hlist_node *node; struct hlist_node *last; enum cpuhp_state cb_state; @@ -295,6 +299,37 @@ void cpu_maps_update_done(void) mutex_unlock(&cpu_add_remove_lock); } =20 +/** + * cpuhp_cpu_goes_down - Query the current/last CPU hotplug direction of a= CPU + * @cpu: The CPU to query + * + * The direction indicator is modified by the hotplug core on + * cpu_up()/cpu_down() operations including eventual rollback operations. + * The indicator is not affected by state or instance install/remove + * operations. + * + * The indicator is sticky after the hotplug operation completes, whether + * the operation was a full up/down or just a partial bringup/teardown. + * + * goes_down + * cpu_up(target) enter -> False + * rollback on fail -> True + * cpu_up(target) exit Last state + * + * cpu_down(target) enter -> True + * rollback on fail -> False + * cpu_down(target) exit Last state + * + * The return value is a racy snapshot and not protected against concurrent + * CPU hotplug operations which modify the indicator. + * + * Returns: True if cached direction is down, false otherwise + */ +bool cpuhp_cpu_goes_down(unsigned int cpu) +{ + return data_race(per_cpu(cpuhp_state.goes_down, cpu)); +} + /* * If set, cpu_up and cpu_down will return -EBUSY and do nothing. * Should always be manipulated under cpu_add_remove_lock @@ -486,8 +521,7 @@ cpuhp_set_state(int cpu, struct cpuhp_cp st->target =3D target; st->single =3D false; st->bringup =3D bringup; - if (cpu_dying(cpu) !=3D !bringup) - set_cpu_dying(cpu, !bringup); + st->goes_down =3D !bringup; =20 return prev_state; } @@ -521,8 +555,7 @@ cpuhp_reset_state(int cpu, struct cpuhp_ } =20 st->bringup =3D bringup; - if (cpu_dying(cpu) !=3D !bringup) - set_cpu_dying(cpu, !bringup); + st->goes_down =3D !bringup; } =20 /* Regular hotplug invocation of the AP hotplug thread */ @@ -2644,8 +2677,6 @@ EXPORT_SYMBOL(__cpu_present_mask); =20 struct cpumask __cpu_active_mask __read_mostly; =20 -struct cpumask __cpu_dying_mask __read_mostly; - atomic_t __num_online_cpus __read_mostly; EXPORT_SYMBOL(__num_online_cpus); =20 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -2297,7 +2297,7 @@ static inline bool is_cpu_allowed(struct return cpu_online(cpu); =20 /* Regular kernel threads don't get to stay during offline. */ - if (cpu_dying(cpu)) + if (cpuhp_cpu_goes_down(cpu)) return false; =20 /* But are allowed during online. */ @@ -9344,7 +9344,7 @@ static void balance_push(struct rq *rq) * Only active while going offline and when invoked on the outgoing * CPU. */ - if (!cpu_dying(rq->cpu) || rq !=3D this_rq()) + if (!cpuhp_cpu_goes_down(rq->cpu) || rq !=3D this_rq()) return; =20 /* --- a/kernel/smpboot.h +++ b/kernel/smpboot.h @@ -20,4 +20,6 @@ int smpboot_unpark_threads(unsigned int =20 void __init cpuhp_threads_init(void); =20 +bool cpuhp_cpu_goes_down(unsigned int cpu); + #endif