From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795230857; b=SnPtnV+PnXk9sKZJCHfC2W4FQJfEzMFAUYiSZ6pLmbIyV1sMLqaZvGwhijuImmmLnBjv +5/UpVYrQFQDS6NrcP1AR+48I6enqbX0lzYwV1+FcFIH6K1p1hGDuIYfWckeHsyxBNA5U mPbgShR1zazrXcI8Nkzp1zEU6HD1bHq3zvbzRUBszzRL7N07hNJLCMBCpnYcwYYw39pFR rykHb3g2p7qSPE/i2lwu4eALp+YOUWb9PdHN7uXLG6U6KSYlSLeRMbh70mSBER8KVNxBU YN3huDGBSspd1f7ni/XorLgz4rr3AGgwu22XFSDfcyAfARkLGVcHyfCr8tTyTLl7MrQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795230857; h=DMARC-Filter:DKIM-Signature:Received:X-MC-Unique: X-Mimecast-MFC-AGG-ID:Received:Received:From:To:Cc:Subject:Date: Message-ID:In-Reply-To:References:MIME-Version: Content-Transfer-Encoding:X-Scanned-By; bh=mRRUy+sJAurb8e7tBGiIHZ6mni03s6qtHfmTBQfhVKU=; b=P6hwR6nloArI3skOAc4UODWzIiQwxOEoi34K4LY/pY5UkvbmAZ9T+v/y+wQBiTCzSqxw Q3x0mFj2laLCEb0Smtc3mIMwnT5V/lXDYhggh+YczV1309A/1x2Ng7ZmIPcnmkNcwB7et FbD7/S0CcEpFJ9hWXq5eNfHU6Tc7J+0tP9x0PyLdalaWeimQ3eRtgtN45tcgLIqquu/aw 0drAVLHuf8id+hY8lFeXCmMGdJGU0pCmD9nOuE49iZPVohPTXi7Pcm4nAUrYwej4j9vOZ jlrbq6jYa1Ig/OavmdPvI3AY5k8r65xwcKQPKH/kPvMcJSzHJWnwGN++X+nvHYlwCsA== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=TfJYJDxa; arc=none smtp.remote-ip=170.10.129.124 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD177606A6A8 for ; Sat, 21 Nov 2026 03:14:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org CD177606A6A8 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=TfJYJDxa DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1795230854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mRRUy+sJAurb8e7tBGiIHZ6mni03s6qtHfmTBQfhVKU=; b=TfJYJDxabVUkHVL0w2Z32tx+UZgRbUq7hR3BdztIfPaQYb2eE5Utg1nPkAOCQqW6DLG4aa 3TdqHkmLFAsijk5MPnEBns3JFHZYKQu85DrHqLLa54g0XA8BAz9nvrydPXeU/w0p75IjVe 1l/Vj3swkFlDw+s+HbijgEwHALOWOvQ= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-587-eAv4RbTSMGWfj6uhat66mA-1; Sat, 21 Nov 2026 03:14:10 +0000 X-MC-Unique: eAv4RbTSMGWfj6uhat66mA-1 X-Mimecast-MFC-AGG-ID: eAv4RbTSMGWfj6uhat66mA_1795230847 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 784A71956094; Sat, 21 Nov 2026 03:14:06 +0000 (UTC) Received: from llong-thinkpadp16vgen1.redhat.corp (headnet04.pony-001.prod.iad2.dc.redhat.com [10.2.32.116]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A4AE0195B3C0; Sat, 21 Nov 2026 03:14:01 +0000 (UTC) From: Waiman Long To: Tejun Heo , Johannes Weiner , =?UTF-8?q?Michal=20Koutn=C3=BD?= , Jonathan Corbet , Shuah Khan , Randy Dunlap , Ridong Chen , Ingo Molnar , Peter Zijlstra , Juri Lelli , Vincent Guittot , Dietmar Eggemann , Steven Rostedt , Ben Segall , Mel Gorman , Valentin Schneider , K Prateek Nayak , Anna-Maria Behnsen , Frederic Weisbecker , Thomas Gleixner Cc: cgroups@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Guopeng Zhang , Mathieu Desnoyers , Waiman Long Subject: [PATCH-next 1/3] tick/sched: Make tick_nohz_full_mask and HK_TYPE_KERNEL_NOISE cpumask consistent Date: Fri, 20 Nov 2026 22:13:27 -0500 Message-ID: <20261121031329.240177-2-longman@redhat.com> In-Reply-To: <20261121031329.240177-1-longman@redhat.com> References: <20261121031329.240177-1-longman@redhat.com> X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 When the nohz_full boot parameter is first set, the cpu list parameter is passed directly to tick_nohz_full_setup() to set up tick_nohz_full_mask cpumask. Then the HK_TYPE_KERNEL_NOISE cpumask will be set up as the inverse of given cpu list parameter. Some of the timer code and RCU uses tick_nohz_full_mask directly while other timer code, scheduler and other subsystems use the HK_TYPE_KERNEL_NOISE cpumask. There are two problems that can cause inconsistency between tick_nohz_full_mask and HK_TYPE_KERNEL_NOISE cpumask. First of all, if there are more than one nohz_full boot parameters in the boot command line, only the first one is passed to tick_nohz_full_setup() while the setting of HK_TYPE_KERNEL_NOISE cpumask is controlled by the last nohz_full parameter. Secondly, with CONFIG_PM_SLEEP_SMP && !CONFIG_PM_SLEEP_SMP_NONZERO_CPU config options, the boot CPU will be cleared from tick_nohz_full_mask if set while the corresponding HK_TYPE_KERNEL_NOISE cpumask isn't touched. The nohz_full entry in kernel-parameters.txt does state that the boot CPU will be forced outside the range to maintain the timekeeping. So it makes sense that the HK_TYPE_KERNEL_NOISE should be modified accordingly. PM_SLEEP_SMP_NONZERO_CPU depends on ARCH_SUSPEND_NONZERO_CPU which can only be set for the PowerPC architecture. Moreover CONFIG_PM_SLEEP_SMP is on by default, it means most kernels will not allow CPU 0 to be set in the tick_nohz_full_mask and hence should be set in HK_TYPE_KERNEL_NOISE cpumask. The first inconsistency problem is fixed by calling tick_nohz_full_setup() every time a nohz_full parameter is hit with tick_nohz_full_setup() modified to allow multiple calls. The second problem is fixed by adding a new cpumask_set_cpu() init function to be called by tick_nohz_init() when the boot CPU is cleared from tick_nohz_full_mask. Fixes: 6010d245ddc9 ("sched/isolation: Consolidate housekeeping cpumasks that are always identical") Fixes: 6f1982fedd59 ("sched/isolation: Handle the nohz_full= parameter") Signed-off-by: Waiman Long --- include/linux/sched/isolation.h | 2 ++ kernel/sched/isolation.c | 14 +++++++++++++- kernel/time/tick-sched.c | 8 ++++++-- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/include/linux/sched/isolation.h b/include/linux/sched/isolation.h index cf0fd03dd7a2..ae5109450ac9 100644 --- a/include/linux/sched/isolation.h +++ b/include/linux/sched/isolation.h @@ -44,6 +44,7 @@ extern bool housekeeping_enabled(enum hk_type type); extern void housekeeping_affine(struct task_struct *t, enum hk_type type); extern bool housekeeping_test_cpu(int cpu, enum hk_type type); extern int housekeeping_update(struct cpumask *isol_mask); +extern void __init housekeeping_set_cpu(int cpu, enum hk_type type); extern void __init housekeeping_init(void); #else @@ -72,6 +73,7 @@ static inline bool housekeeping_test_cpu(int cpu, enum hk_type type) } static inline int housekeeping_update(struct cpumask *isol_mask) { return 0; } +static inline void housekeeping_set_cpu(int cpu, enum hk_type type) { } static inline void housekeeping_init(void) { } #endif /* CONFIG_CPU_ISOLATION */ diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c index 156025ef81b7..18b50c0d807a 100644 --- a/kernel/sched/isolation.c +++ b/kernel/sched/isolation.c @@ -120,6 +120,18 @@ bool housekeeping_test_cpu(int cpu, enum hk_type type) } EXPORT_SYMBOL_GPL(housekeeping_test_cpu); +void __init housekeeping_set_cpu(int cpu, enum hk_type type) +{ + /* Only CPU setting of HK_TYPE_KERNEL_NOISE is currently supported */ + if (type != HK_TYPE_KERNEL_NOISE) + return; + + if (static_branch_unlikely(&housekeeping_overridden) && + READ_ONCE(housekeeping.flags) & BIT(type)) + cpumask_set_cpu(cpu, housekeeping.cpumasks[type]); +} +EXPORT_SYMBOL_GPL(housekeeping_set_cpu); + int housekeeping_update(struct cpumask *isol_mask) { struct cpumask *trial, *old = NULL; @@ -301,7 +313,7 @@ static int __init housekeeping_setup(char *str, unsigned long flags) housekeeping_setup_type(type, housekeeping_staging); } - if ((flags & HK_FLAG_KERNEL_NOISE) && !(housekeeping.flags & HK_FLAG_KERNEL_NOISE)) + if (flags & HK_FLAG_KERNEL_NOISE) tick_nohz_full_setup(non_housekeeping_mask); housekeeping.flags |= flags; diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 255488366d7c..a4dbb154242f 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -634,9 +635,11 @@ void __tick_nohz_task_switch(void) /* Get the boot-time nohz CPU list from the kernel parameters. */ void __init tick_nohz_full_setup(cpumask_var_t cpumask) { - alloc_bootmem_cpumask_var(&tick_nohz_full_mask); + if (!tick_nohz_full_running) { + alloc_bootmem_cpumask_var(&tick_nohz_full_mask); + tick_nohz_full_running = true; + } cpumask_copy(tick_nohz_full_mask, cpumask); - tick_nohz_full_running = true; } bool tick_nohz_cpu_hotpluggable(unsigned int cpu) @@ -683,6 +686,7 @@ void __init tick_nohz_init(void) pr_warn("NO_HZ: Clearing %d from nohz_full range " "for timekeeping\n", cpu); cpumask_clear_cpu(cpu, tick_nohz_full_mask); + housekeeping_set_cpu(cpu, HK_TYPE_KERNEL_NOISE); } } -- 2.56.1