From nobody Thu Oct 2 10:39:57 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 6136C34BA28 for ; Wed, 17 Sep 2025 16:20:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126015; cv=none; b=THTVgMOdj1D2H2aNqyd1Mg3/eCbqba7/EZdRRuHHdG4dXFWVzBkppShPT57CqZo1xllhQe2gHbTZc/5SN9gA7kpI2MdelUhl1Su2aZseXCb9JqXgX9TgR9HCSqjajlcq12crhWqCIy+pDLW5AA6EeeXKSSdgVP00U0U9ayFHspg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126015; c=relaxed/simple; bh=W5HeOLn53bkMXvyginmPkrpggXzunizSPk+ErNBEFcE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BCk4HE7QM13wjXJNurCf5M6Iy+t3EO9jbDOnufZQGtYnmJyYkoUByWkPWbxhI3opkBTgEUwDZNKFZuRn406WuZPQqCHyB+a3BfevPU+taoq1+oEZ1dUK71EbvoqL9ZwzuZNRqLGb+BDkm2me/Pzssa7WYrznuq3o7iXEjxJwWSs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=IBtu2n49; arc=none smtp.client-ip=170.10.133.124 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.b="IBtu2n49" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758126013; 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=IqHoqHbNdw3xd89Dbu+aPXkrTjTEf+IBAZgrCZ/KQ7A=; b=IBtu2n49ue7CxLymFzZbpZwjuZ8wq6JpL+6Aeb15r6el2GS+G/MyGSrqEu/5sm5MoQUrU2 /3Yw7sfSo9Bc/zjNU695DgZrXUybk5xIh9hdEozEXp/QTliCuY6GvyjRn2iHVI0eA5zLrs p2s51o78GsWvLVnSk5eALAcXyemWeGw= Received: from mx-prod-mc-03.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-650-PbY6nd8ANyO0UQubl0KB9Q-1; Wed, 17 Sep 2025 12:20:11 -0400 X-MC-Unique: PbY6nd8ANyO0UQubl0KB9Q-1 X-Mimecast-MFC-AGG-ID: PbY6nd8ANyO0UQubl0KB9Q_1758126011 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E212E1956061; Wed, 17 Sep 2025 16:20:10 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.44.34.168]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 3E2731800446; Wed, 17 Sep 2025 16:20:07 +0000 (UTC) From: Gabriele Monaco To: linux-kernel@vger.kernel.org, Anna-Maria Behnsen , Frederic Weisbecker , Thomas Gleixner , Waiman Long Cc: Gabriele Monaco Subject: [PATCH v13 1/9] timers/migration: Postpone online/offline callbacks registration to late initcall Date: Wed, 17 Sep 2025 18:19:50 +0200 Message-ID: <20250917161958.178925-2-gmonaco@redhat.com> In-Reply-To: <20250917161958.178925-1-gmonaco@redhat.com> References: <20250917161958.178925-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Type: text/plain; charset="utf-8" From: Frederic Weisbecker During the early boot process, the default clocksource used for timekeeping is the jiffies. Better clocksources can only be selected once clocksource_done_booting() is called as an fs initcall. NOHZ can only be enabled after that stage, making global timer migration irrelevant up to that point. The tree remains inactive before NOHZ is enabled anyway. Therefore it makes sense to enable each CPUs to the tree only once that is setup. Make the CPUs available to the tree on late initcall, after the right clocksource had a chance to be selected. This will also simplify the handling of domain isolated CPUs on further patches. Signed-off-by: Frederic Weisbecker Signed-off-by: Gabriele Monaco --- kernel/time/timer_migration.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c index c0c54dc5314c..891891794b92 100644 --- a/kernel/time/timer_migration.c +++ b/kernel/time/timer_migration.c @@ -1481,6 +1481,16 @@ static int tmigr_cpu_online(unsigned int cpu) return 0; } =20 +/* + * NOHZ can only be enabled after clocksource_done_booting(). Don't + * bother trashing the cache in the tree before. + */ +static int __init tmigr_late_init(void) +{ + return cpuhp_setup_state(CPUHP_AP_TMIGR_ONLINE, "tmigr:online", + tmigr_cpu_online, tmigr_cpu_offline); +} + static void tmigr_init_group(struct tmigr_group *group, unsigned int lvl, int node) { @@ -1843,18 +1853,10 @@ static int __init tmigr_init(void) =20 ret =3D cpuhp_setup_state(CPUHP_TMIGR_PREPARE, "tmigr:prepare", tmigr_cpu_prepare, NULL); - if (ret) - goto err; - - ret =3D cpuhp_setup_state(CPUHP_AP_TMIGR_ONLINE, "tmigr:online", - tmigr_cpu_online, tmigr_cpu_offline); - if (ret) - goto err; - - return 0; - err: - pr_err("Timer migration setup failed\n"); + if (ret) + pr_err("Timer migration setup failed\n"); return ret; } early_initcall(tmigr_init); +late_initcall(tmigr_late_init); --=20 2.51.0 From nobody Thu Oct 2 10:39:57 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 64F402F7AAF for ; Wed, 17 Sep 2025 16:20:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126022; cv=none; b=P9il3t9kPkx8G8tDNuL4CNib2A2w3S8nLcRkpcvkI4ZtaX6lQ/8EyJ/MqUjlKLA6mzKJzHL+8fK2wgwT0cqLS0nPiIftPxhR6bC4AkPOkho4eOrZOADy5ix6Xoic2KpZFaGpxDYwU6beFO+BOphXVs0cMOzCR6LY98ULn4ik9E4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126022; c=relaxed/simple; bh=K0ElDsTm2ArSyphsFcxUA253o3pMHPe9E9UYvTFwGY0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JWJqlyZqL8NlukOhsDlXopgKKh1pr473hIrOn3O/5TRQZJxUkhVqLVt+zohsbUlFUBnbhAg6rAxyM3qWRwpCqSampxdp4UCuQb/MaGTURVsUNF2JzYE05n8vSSs5vrc0IjDtEd4D9OF7gWJFxOqoDq+eCtP0MxsbjAUR5h9+zO0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=hdQ/062/; arc=none smtp.client-ip=170.10.133.124 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.b="hdQ/062/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758126019; 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=iFkTi56GeHkgOO3HQJUs680Pme7PW2l5lL1fNlMRCTY=; b=hdQ/062/yj51hC0Jc3EXFx6E2HkSPEov5ame6BvySsihK3U/jGY4H4PrQRmqtKiHyZEga9 cW0Caa2Jx4fZuHoCY4CXR+7gpVKs9ma6ifMIR6j0W2Ej6lILFJ+SxnFg5w7QZdj3PXgdlP XJZpOMrKz0wA7M9ppiiMo47OfK3aW/M= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-198-vWcQ21i7Oz6tIOGOujDRcA-1; Wed, 17 Sep 2025 12:20:15 -0400 X-MC-Unique: vWcQ21i7Oz6tIOGOujDRcA-1 X-Mimecast-MFC-AGG-ID: vWcQ21i7Oz6tIOGOujDRcA_1758126014 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 64CB11800451; Wed, 17 Sep 2025 16:20:14 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.44.34.168]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 822BB1800446; Wed, 17 Sep 2025 16:20:11 +0000 (UTC) From: Gabriele Monaco To: linux-kernel@vger.kernel.org, Anna-Maria Behnsen , Frederic Weisbecker , Thomas Gleixner , Waiman Long Cc: Gabriele Monaco Subject: [PATCH v13 2/9] timers: Rename tmigr 'online' bit to 'available' Date: Wed, 17 Sep 2025 18:19:51 +0200 Message-ID: <20250917161958.178925-3-gmonaco@redhat.com> In-Reply-To: <20250917161958.178925-1-gmonaco@redhat.com> References: <20250917161958.178925-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Type: text/plain; charset="utf-8" The timer migration hierarchy excludes offline CPUs via the tmigr_is_not_available function, which is essentially checking the online bit for the CPU. Rename the online bit to available and all references in function names and tracepoint to generalise the concept of available CPUs. Reviewed-by: Frederic Weisbecker Signed-off-by: Gabriele Monaco --- include/trace/events/timer_migration.h | 4 ++-- kernel/time/timer_migration.c | 22 +++++++++++----------- kernel/time/timer_migration.h | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/trace/events/timer_migration.h b/include/trace/events/= timer_migration.h index 47db5eaf2f9a..61171b13c687 100644 --- a/include/trace/events/timer_migration.h +++ b/include/trace/events/timer_migration.h @@ -173,14 +173,14 @@ DEFINE_EVENT(tmigr_cpugroup, tmigr_cpu_active, TP_ARGS(tmc) ); =20 -DEFINE_EVENT(tmigr_cpugroup, tmigr_cpu_online, +DEFINE_EVENT(tmigr_cpugroup, tmigr_cpu_available, =20 TP_PROTO(struct tmigr_cpu *tmc), =20 TP_ARGS(tmc) ); =20 -DEFINE_EVENT(tmigr_cpugroup, tmigr_cpu_offline, +DEFINE_EVENT(tmigr_cpugroup, tmigr_cpu_unavailable, =20 TP_PROTO(struct tmigr_cpu *tmc), =20 diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c index 891891794b92..55b186fd146c 100644 --- a/kernel/time/timer_migration.c +++ b/kernel/time/timer_migration.c @@ -427,7 +427,7 @@ static DEFINE_PER_CPU(struct tmigr_cpu, tmigr_cpu); =20 static inline bool tmigr_is_not_available(struct tmigr_cpu *tmc) { - return !(tmc->tmgroup && tmc->online); + return !(tmc->tmgroup && tmc->available); } =20 /* @@ -926,7 +926,7 @@ static void tmigr_handle_remote_cpu(unsigned int cpu, u= 64 now, * updated the event takes care when hierarchy is completely * idle. Otherwise the migrator does it as the event is enqueued. */ - if (!tmc->online || tmc->remote || tmc->cpuevt.ignore || + if (!tmc->available || tmc->remote || tmc->cpuevt.ignore || now < tmc->cpuevt.nextevt.expires) { raw_spin_unlock_irq(&tmc->lock); return; @@ -973,7 +973,7 @@ static void tmigr_handle_remote_cpu(unsigned int cpu, u= 64 now, * (See also section "Required event and timerqueue update after a * remote expiry" in the documentation at the top) */ - if (!tmc->online || !tmc->idle) { + if (!tmc->available || !tmc->idle) { timer_unlock_remote_bases(cpu); goto unlock; } @@ -1432,19 +1432,19 @@ static long tmigr_trigger_active(void *unused) { struct tmigr_cpu *tmc =3D this_cpu_ptr(&tmigr_cpu); =20 - WARN_ON_ONCE(!tmc->online || tmc->idle); + WARN_ON_ONCE(!tmc->available || tmc->idle); =20 return 0; } =20 -static int tmigr_cpu_offline(unsigned int cpu) +static int tmigr_clear_cpu_available(unsigned int cpu) { struct tmigr_cpu *tmc =3D this_cpu_ptr(&tmigr_cpu); int migrator; u64 firstexp; =20 raw_spin_lock_irq(&tmc->lock); - tmc->online =3D false; + tmc->available =3D false; WRITE_ONCE(tmc->wakeup, KTIME_MAX); =20 /* @@ -1452,7 +1452,7 @@ static int tmigr_cpu_offline(unsigned int cpu) * offline; Therefore nextevt value is set to KTIME_MAX */ firstexp =3D __tmigr_cpu_deactivate(tmc, KTIME_MAX); - trace_tmigr_cpu_offline(tmc); + trace_tmigr_cpu_unavailable(tmc); raw_spin_unlock_irq(&tmc->lock); =20 if (firstexp !=3D KTIME_MAX) { @@ -1463,7 +1463,7 @@ static int tmigr_cpu_offline(unsigned int cpu) return 0; } =20 -static int tmigr_cpu_online(unsigned int cpu) +static int tmigr_set_cpu_available(unsigned int cpu) { struct tmigr_cpu *tmc =3D this_cpu_ptr(&tmigr_cpu); =20 @@ -1472,11 +1472,11 @@ static int tmigr_cpu_online(unsigned int cpu) return -EINVAL; =20 raw_spin_lock_irq(&tmc->lock); - trace_tmigr_cpu_online(tmc); + trace_tmigr_cpu_available(tmc); tmc->idle =3D timer_base_is_idle(); if (!tmc->idle) __tmigr_cpu_activate(tmc); - tmc->online =3D true; + tmc->available =3D true; raw_spin_unlock_irq(&tmc->lock); return 0; } @@ -1488,7 +1488,7 @@ static int tmigr_cpu_online(unsigned int cpu) static int __init tmigr_late_init(void) { return cpuhp_setup_state(CPUHP_AP_TMIGR_ONLINE, "tmigr:online", - tmigr_cpu_online, tmigr_cpu_offline); + tmigr_set_cpu_available, tmigr_clear_cpu_available); } =20 static void tmigr_init_group(struct tmigr_group *group, unsigned int lvl, diff --git a/kernel/time/timer_migration.h b/kernel/time/timer_migration.h index ae19f70f8170..70879cde6fdd 100644 --- a/kernel/time/timer_migration.h +++ b/kernel/time/timer_migration.h @@ -97,7 +97,7 @@ struct tmigr_group { */ struct tmigr_cpu { raw_spinlock_t lock; - bool online; + bool available; bool idle; bool remote; struct tmigr_group *tmgroup; --=20 2.51.0 From nobody Thu Oct 2 10:39:57 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 674592F7ADB for ; Wed, 17 Sep 2025 16:20:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126023; cv=none; b=gn0TynZ2FGC1DZfaFYZWIfWEgzkAW4Jm03KvAWWFAsSD40Vk5yNSTqe9+fqplO7XcTq/cYRwPYOPrJjfX7kM6k0x2aAmKyfXlEb2RKGld9fES1AP8CLz8H1slvQXNwIU4gUqGYBueFICF8C9xshMwYm0xBjpIpOn4zLzZy5jmSY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126023; c=relaxed/simple; bh=s6DRgB4ZQLXuz3fHRKmP5K1mXf4BGuPX0q56iGqgbA0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RJ1PsP9JdA3C0g5JPbXjacCbdzP1KfSw7nTMtE9YPl8bCKtViaqhdqj5xrsaRVJZZj5hI/m+3JLW8ouoOnH48NbsYtqshwVX3hCq7Bw9YyrVC4AkafG620mTpoc59tBmNap7PTU2/sMny8xnfCfIDYUyLy652p/iX8321f/zLT4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=XvGU9tMu; arc=none smtp.client-ip=170.10.133.124 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.b="XvGU9tMu" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758126020; 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=dEaNsn6JuCXOUjQ0A/OCwJlHT770BY8Sx/uuyjZom0E=; b=XvGU9tMuA1FDmmIAUTSq/LTMfFd4ooiJ4mOXSZN9Yx+y1/ajtR+SYmVMyUZ8KYKumWSpqf UrovBG230jc8T9kZVL/X9q1fDdxWTgGUMWCCsfAS6MM18A/p2yheMYKN3JcArZX1CYwmkq SomZTwoFn4jLwyp/0mWnPg9Y1YmaHO4= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-26-jF6fUt1iN8y7UuCL4dfKbg-1; Wed, 17 Sep 2025 12:20:19 -0400 X-MC-Unique: jF6fUt1iN8y7UuCL4dfKbg-1 X-Mimecast-MFC-AGG-ID: jF6fUt1iN8y7UuCL4dfKbg_1758126018 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id F13CE18002C1; Wed, 17 Sep 2025 16:20:17 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.44.34.168]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1E4CD1800447; Wed, 17 Sep 2025 16:20:14 +0000 (UTC) From: Gabriele Monaco To: linux-kernel@vger.kernel.org, Anna-Maria Behnsen , Frederic Weisbecker , Thomas Gleixner , Waiman Long Cc: Gabriele Monaco Subject: [PATCH v13 3/9] timers: Add the available mask in timer migration Date: Wed, 17 Sep 2025 18:19:52 +0200 Message-ID: <20250917161958.178925-4-gmonaco@redhat.com> In-Reply-To: <20250917161958.178925-1-gmonaco@redhat.com> References: <20250917161958.178925-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Type: text/plain; charset="utf-8" Keep track of the CPUs available for timer migration in a cpumask. This prepares the ground to generalise the concept of unavailable CPUs. Reviewed-by: Frederic Weisbecker Signed-off-by: Gabriele Monaco --- kernel/time/timer_migration.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c index 55b186fd146c..865071ab5062 100644 --- a/kernel/time/timer_migration.c +++ b/kernel/time/timer_migration.c @@ -422,6 +422,12 @@ static unsigned int tmigr_crossnode_level __read_mostl= y; =20 static DEFINE_PER_CPU(struct tmigr_cpu, tmigr_cpu); =20 +/* + * CPUs available for timer migration. + * Protected by cpuset_mutex (with cpus_read_lock held) or cpus_write_lock. + */ +static cpumask_var_t tmigr_available_cpumask; + #define TMIGR_NONE 0xFF #define BIT_CNT 8 =20 @@ -1443,6 +1449,7 @@ static int tmigr_clear_cpu_available(unsigned int cpu) int migrator; u64 firstexp; =20 + cpumask_clear_cpu(cpu, tmigr_available_cpumask); raw_spin_lock_irq(&tmc->lock); tmc->available =3D false; WRITE_ONCE(tmc->wakeup, KTIME_MAX); @@ -1456,7 +1463,7 @@ static int tmigr_clear_cpu_available(unsigned int cpu) raw_spin_unlock_irq(&tmc->lock); =20 if (firstexp !=3D KTIME_MAX) { - migrator =3D cpumask_any_but(cpu_online_mask, cpu); + migrator =3D cpumask_any(tmigr_available_cpumask); work_on_cpu(migrator, tmigr_trigger_active, NULL); } =20 @@ -1471,6 +1478,7 @@ static int tmigr_set_cpu_available(unsigned int cpu) if (WARN_ON_ONCE(!tmc->tmgroup)) return -EINVAL; =20 + cpumask_set_cpu(cpu, tmigr_available_cpumask); raw_spin_lock_irq(&tmc->lock); trace_tmigr_cpu_available(tmc); tmc->idle =3D timer_base_is_idle(); @@ -1808,6 +1816,11 @@ static int __init tmigr_init(void) if (ncpus =3D=3D 1) return 0; =20 + if (!zalloc_cpumask_var(&tmigr_available_cpumask, GFP_KERNEL)) { + ret =3D -ENOMEM; + goto err; + } + /* * Calculate the required hierarchy levels. Unfortunately there is no * reliable information available, unless all possible CPUs have been --=20 2.51.0 From nobody Thu Oct 2 10:39:57 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 4D7C42F8BD5 for ; Wed, 17 Sep 2025 16:20:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126028; cv=none; b=TttGIfF+qDYhEZL4EcOPvMoi1LvB1TWL33yFxUnKxDjn+Zu1o7UWgLHt9/CpHor/lUprS+dhvvUAx2FriseH9rHhY6FMalfsJz+IvauYmkkKToCxDZfvXP+MyIdmT01l8k7ECFxUq9RXLdZbRPB2KrIIU6YmZ0of+qL3SNh81SY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126028; c=relaxed/simple; bh=UMsHu+w8EEtkyNcFKkFqgEeOYSGG/E/cfqNjj48Uvek=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HQSp4xCVrE59comZY3jclsTYsB8ozHXKpXZyZGcGARykCIBkziba2w/2h6qoOZ4CbKbtxI/HbVvbSUtXejJoM+iolniMudKIYS+348TmzGEdyWRo3E2cAFeyo9cOgveMIi08Yj9xdlV92B+R1hIpqybEImqwz5f0bosOQ5eM7og= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=BsB7WWaG; arc=none smtp.client-ip=170.10.133.124 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.b="BsB7WWaG" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758126026; 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=nneiESOQSRs1JNr8iGSFvq05p9vDY3T+UnNzRYLtsEk=; b=BsB7WWaGkc1kkjjwZ1XyE892BiLxG6Ca3EwCMbhyaFySYbEHvS59vhyb5qENCe18LBNP9g 3ydC3ripujmHVgPLih1ro0ApGcG2btqK73teIz1Vxf2LyVeA5/DfwmwpL6nlvASGVFC01z Yz4pPWYnuefPK/MRt9sfaZBVOp5LO6c= Received: from mx-prod-mc-03.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-158-2_IcMWv8PmuBCsgvQEWQyQ-1; Wed, 17 Sep 2025 12:20:22 -0400 X-MC-Unique: 2_IcMWv8PmuBCsgvQEWQyQ-1 X-Mimecast-MFC-AGG-ID: 2_IcMWv8PmuBCsgvQEWQyQ_1758126021 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 7712119560AA; Wed, 17 Sep 2025 16:20:21 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.44.34.168]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A80361800446; Wed, 17 Sep 2025 16:20:18 +0000 (UTC) From: Gabriele Monaco To: linux-kernel@vger.kernel.org, Anna-Maria Behnsen , Frederic Weisbecker , Thomas Gleixner , Waiman Long Cc: Gabriele Monaco Subject: [PATCH v13 4/9] timers: Use scoped_guard when setting/clearing the tmigr available flag Date: Wed, 17 Sep 2025 18:19:53 +0200 Message-ID: <20250917161958.178925-5-gmonaco@redhat.com> In-Reply-To: <20250917161958.178925-1-gmonaco@redhat.com> References: <20250917161958.178925-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Type: text/plain; charset="utf-8" Cleanup tmigr_clear_cpu_available() and tmigr_set_cpu_available() to prepare for easier checks on the available flag. Reviewed-by: Frederic Weisbecker Signed-off-by: Gabriele Monaco --- kernel/time/timer_migration.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c index 865071ab5062..0a3a26e766d0 100644 --- a/kernel/time/timer_migration.c +++ b/kernel/time/timer_migration.c @@ -1450,17 +1450,17 @@ static int tmigr_clear_cpu_available(unsigned int c= pu) u64 firstexp; =20 cpumask_clear_cpu(cpu, tmigr_available_cpumask); - raw_spin_lock_irq(&tmc->lock); - tmc->available =3D false; - WRITE_ONCE(tmc->wakeup, KTIME_MAX); + scoped_guard(raw_spinlock_irq, &tmc->lock) { + tmc->available =3D false; + WRITE_ONCE(tmc->wakeup, KTIME_MAX); =20 - /* - * CPU has to handle the local events on his own, when on the way to - * offline; Therefore nextevt value is set to KTIME_MAX - */ - firstexp =3D __tmigr_cpu_deactivate(tmc, KTIME_MAX); - trace_tmigr_cpu_unavailable(tmc); - raw_spin_unlock_irq(&tmc->lock); + /* + * CPU has to handle the local events on his own, when on the way to + * offline; Therefore nextevt value is set to KTIME_MAX + */ + firstexp =3D __tmigr_cpu_deactivate(tmc, KTIME_MAX); + trace_tmigr_cpu_unavailable(tmc); + } =20 if (firstexp !=3D KTIME_MAX) { migrator =3D cpumask_any(tmigr_available_cpumask); @@ -1479,13 +1479,13 @@ static int tmigr_set_cpu_available(unsigned int cpu) return -EINVAL; =20 cpumask_set_cpu(cpu, tmigr_available_cpumask); - raw_spin_lock_irq(&tmc->lock); - trace_tmigr_cpu_available(tmc); - tmc->idle =3D timer_base_is_idle(); - if (!tmc->idle) - __tmigr_cpu_activate(tmc); - tmc->available =3D true; - raw_spin_unlock_irq(&tmc->lock); + scoped_guard(raw_spinlock_irq, &tmc->lock) { + trace_tmigr_cpu_available(tmc); + tmc->idle =3D timer_base_is_idle(); + if (!tmc->idle) + __tmigr_cpu_activate(tmc); + tmc->available =3D true; + } return 0; } =20 --=20 2.51.0 From nobody Thu Oct 2 10:39:57 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 AAF8434BA44 for ; Wed, 17 Sep 2025 16:20:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126030; cv=none; b=paAamX7rvD5Shu4qKo22hKG/oKvFripCObzA67umVsACYOfess8HdkVMmBbQGNLQIS/1n7uLrKRcHV68UxCA2JKlVEfd6vh4IspzpVp0zTV9tJGOCXdpmfgz3R2UMOEA4s6obzXA8EfFjNTuMzk2a73BN09YwB0wflBrMyd9yaQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126030; c=relaxed/simple; bh=CVcxBN3yBi2+KF9nsuc5ygifXUn/J8ZoLLY8fUb/2IQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dqQJHeK8NGWX8Tbn5qFGD7cO6EyXtmKa6iHTbQFr0brfw3RVZ2exUR3S56ndUYDy3H9+w4pF4YHodB2RUFpr/68bwMXn3ypM/b4mywNUVzreBn6Y4KFv5OCaVZj7t18NuPqWF9w/YPQwsVuZIRP3nRVMKhf/AlVHuysv9LoCXNw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ChMgOCbw; arc=none smtp.client-ip=170.10.133.124 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.b="ChMgOCbw" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758126027; 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=8d/8dosrELDy6fCndqrJ6GJCaJmUKepAV3zv1L8i3og=; b=ChMgOCbw5iggRc8hc3Jfaqq3fayLc0DUCJZ/ftjgT4eXyYcYkoMO/LmvAGIuDwSP7ZjzYF 2MnOKYCcJNX817c/R1aAEagaBqJlHdwE9tHIv9vsoHv9k7PAOBrmB63NYhGA9GNTHmQy5U jTO476bHxCuiBAqswGWAQPipSNYwdyg= Received: from mx-prod-mc-04.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-412-UHmY_qF8Mwmr2EfOKG2kvw-1; Wed, 17 Sep 2025 12:20:26 -0400 X-MC-Unique: UHmY_qF8Mwmr2EfOKG2kvw-1 X-Mimecast-MFC-AGG-ID: UHmY_qF8Mwmr2EfOKG2kvw_1758126025 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0EF7719560B8; Wed, 17 Sep 2025 16:20:25 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.44.34.168]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 2A13B1800447; Wed, 17 Sep 2025 16:20:21 +0000 (UTC) From: Gabriele Monaco To: linux-kernel@vger.kernel.org, Anna-Maria Behnsen , Frederic Weisbecker , Thomas Gleixner , Waiman Long Cc: Gabriele Monaco Subject: [PATCH v13 5/9] cgroup/cpuset: Rename update_unbound_workqueue_cpumask() to update_exclusion_cpumasks() Date: Wed, 17 Sep 2025 18:19:54 +0200 Message-ID: <20250917161958.178925-6-gmonaco@redhat.com> In-Reply-To: <20250917161958.178925-1-gmonaco@redhat.com> References: <20250917161958.178925-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Type: text/plain; charset="utf-8" update_unbound_workqueue_cpumask() updates unbound workqueues settings when there's a change in isolated CPUs, but it can be used for other subsystems requiring updated when isolated CPUs change. Generalise the name to update_exclusion_cpumasks() to prepare for other functions unrelated to workqueues to be called in that spot. Acked-by: Frederic Weisbecker Acked-by: Waiman Long Signed-off-by: Gabriele Monaco --- kernel/cgroup/cpuset.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 27adb04df675..81a9239053a7 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -1339,7 +1339,7 @@ static bool partition_xcpus_del(int old_prs, struct c= puset *parent, return isolcpus_updated; } =20 -static void update_unbound_workqueue_cpumask(bool isolcpus_updated) +static void update_exclusion_cpumasks(bool isolcpus_updated) { int ret; =20 @@ -1470,7 +1470,7 @@ static int remote_partition_enable(struct cpuset *cs,= int new_prs, list_add(&cs->remote_sibling, &remote_children); cpumask_copy(cs->effective_xcpus, tmp->new_cpus); spin_unlock_irq(&callback_lock); - update_unbound_workqueue_cpumask(isolcpus_updated); + update_exclusion_cpumasks(isolcpus_updated); cpuset_force_rebuild(); cs->prs_err =3D 0; =20 @@ -1511,7 +1511,7 @@ static void remote_partition_disable(struct cpuset *c= s, struct tmpmasks *tmp) compute_effective_exclusive_cpumask(cs, NULL, NULL); reset_partition_data(cs); spin_unlock_irq(&callback_lock); - update_unbound_workqueue_cpumask(isolcpus_updated); + update_exclusion_cpumasks(isolcpus_updated); cpuset_force_rebuild(); =20 /* @@ -1580,7 +1580,7 @@ static void remote_cpus_update(struct cpuset *cs, str= uct cpumask *xcpus, if (xcpus) cpumask_copy(cs->exclusive_cpus, xcpus); spin_unlock_irq(&callback_lock); - update_unbound_workqueue_cpumask(isolcpus_updated); + update_exclusion_cpumasks(isolcpus_updated); if (adding || deleting) cpuset_force_rebuild(); =20 @@ -1943,7 +1943,7 @@ static int update_parent_effective_cpumask(struct cpu= set *cs, int cmd, WARN_ON_ONCE(parent->nr_subparts < 0); } spin_unlock_irq(&callback_lock); - update_unbound_workqueue_cpumask(isolcpus_updated); + update_exclusion_cpumasks(isolcpus_updated); =20 if ((old_prs !=3D new_prs) && (cmd =3D=3D partcmd_update)) update_partition_exclusive_flag(cs, new_prs); @@ -2968,7 +2968,7 @@ static int update_prstate(struct cpuset *cs, int new_= prs) else if (isolcpus_updated) isolated_cpus_update(old_prs, new_prs, cs->effective_xcpus); spin_unlock_irq(&callback_lock); - update_unbound_workqueue_cpumask(isolcpus_updated); + update_exclusion_cpumasks(isolcpus_updated); =20 /* Force update if switching back to member & update effective_xcpus */ update_cpumasks_hier(cs, &tmpmask, !new_prs); --=20 2.51.0 From nobody Thu Oct 2 10:39:57 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 AA62C34BA44 for ; Wed, 17 Sep 2025 16:20:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126035; cv=none; b=LGBOkYZAw5WS+BkfsDgg7OFvuuZRe0Xj3ydz7qPmlRNFCCHUhr7nK8K51saFiN+9ub2uARckj4eb4ZL47dXGn+rv6ZDkdtiauAKraZPt8IQRO7uhmn8dd9pQydQEeQy8ZtnE2uNhDR1vsqn5dk/ClRQjOYop/0KqUt9QWkvulPE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126035; c=relaxed/simple; bh=orl97ADICI4ifLLSRLAlatiFb35y7EONMQ1cCnXv80k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=d7EHyywKtdYfTR5eY3WDlW2JlExGwX2ZERl6PARFvseEiXWHDH0laS5RiAdlzDTaGw/reqJ8TeEJgKD0WR4JRhehSsAuk3ksyHZShmncfkAjJWLw6HPCfr27OmyP+WAlZEDpWt4Hhi2WCGN81fJsV2UM/0AzOxuW0w9yhynXghM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=b3SIiAcf; arc=none smtp.client-ip=170.10.133.124 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.b="b3SIiAcf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758126032; 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=gYezNvw2JXA2eYKqYkaBQbpJb87hLMjOLjuBiAHIOFM=; b=b3SIiAcfQ6KH5SB6+NEUNThMuxgIOes9/tqrSI5gpqHF6GacudCJOGS7O7y8+kWilUE1os i3byjqfiW1XT12/9CLskEg7kiy5bb2Ad9o8+8WMSPUusmZpYTjU+uRMSBDJ37bsgImuOuk GuczUIaMr8l70uMmNHdQpBe7QJztL/M= Received: from mx-prod-mc-05.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-58-gzkUgrX_PCe2YqokXdMzmw-1; Wed, 17 Sep 2025 12:20:29 -0400 X-MC-Unique: gzkUgrX_PCe2YqokXdMzmw-1 X-Mimecast-MFC-AGG-ID: gzkUgrX_PCe2YqokXdMzmw_1758126028 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6BBDC19560B0; Wed, 17 Sep 2025 16:20:28 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.44.34.168]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B7DC51800446; Wed, 17 Sep 2025 16:20:25 +0000 (UTC) From: Gabriele Monaco To: linux-kernel@vger.kernel.org, Anna-Maria Behnsen , Frederic Weisbecker , Thomas Gleixner , Waiman Long Cc: Gabriele Monaco Subject: [PATCH v13 6/9] sched/isolation: Force housekeeping if isolcpus and nohz_full don't leave any Date: Wed, 17 Sep 2025 18:19:55 +0200 Message-ID: <20250917161958.178925-7-gmonaco@redhat.com> In-Reply-To: <20250917161958.178925-1-gmonaco@redhat.com> References: <20250917161958.178925-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Type: text/plain; charset="utf-8" Currently the user can set up isolcpus and nohz_full in such a way that leaves no housekeeping CPU (i.e. no CPU that is neither domain isolated nor nohz full). This can be a problem for other subsystems (e.g. the timer wheel imgration). Prevent this configuration by invalidating the last setting in case the union of isolcpus (domain) and nohz_full covers all CPUs. Reviewed-by: Waiman Long Reviewed-by: Frederic Weisbecker Signed-off-by: Gabriele Monaco --- kernel/sched/isolation.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c index a4cf17b1fab0..3ad0d6df6a0a 100644 --- a/kernel/sched/isolation.c +++ b/kernel/sched/isolation.c @@ -167,6 +167,29 @@ static int __init housekeeping_setup(char *str, unsign= ed long flags) } } =20 + /* + * Check the combination of nohz_full and isolcpus=3Ddomain, + * necessary to avoid problems with the timer migration + * hierarchy. managed_irq is ignored by this check since it + * isn't considered in the timer migration logic. + */ + iter_flags =3D housekeeping.flags & (HK_FLAG_KERNEL_NOISE | HK_FLAG_DOMA= IN); + type =3D find_first_bit(&iter_flags, HK_TYPE_MAX); + /* + * Pass the check if none of these flags were previously set or + * are not in the current selection. + */ + iter_flags =3D flags & (HK_FLAG_KERNEL_NOISE | HK_FLAG_DOMAIN); + first_cpu =3D (type =3D=3D HK_TYPE_MAX || !iter_flags) ? 0 : + cpumask_first_and_and(cpu_present_mask, + housekeeping_staging, housekeeping.cpumasks[type]); + if (first_cpu >=3D min(nr_cpu_ids, setup_max_cpus)) { + pr_warn("Housekeeping: must include one present CPU " + "neither in nohz_full=3D nor in isolcpus=3Ddomain, " + "ignoring setting %s\n", str); + goto free_housekeeping_staging; + } + iter_flags =3D flags & ~housekeeping.flags; =20 for_each_set_bit(type, &iter_flags, HK_TYPE_MAX) --=20 2.51.0 From nobody Thu Oct 2 10:39:57 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 EAFB42FB096 for ; Wed, 17 Sep 2025 16:20:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126039; cv=none; b=hcfb4AbolyaI6A2L8lQMf6VAtqsvLq+PsWKCsqTIN4KwKYXY/NNLU9qEEdW5SUKwxPzz32QmogGC9YDypqlpSRKbRDe7+EtRxCOAn4x8Bzb0D+Ia/J9DAi2m/4fjKtlYNkb5PsssNHerUzcJIVMxSojcxme7Q81OVnZTtnIgRlQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126039; c=relaxed/simple; bh=9lyRNBb5AdM0v2n86ToWxQX9tESUiSem7PIqqT1+Duk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TL7QoOCP0u8WPdvfWKSW6s5TrRn3e5Wd+TKxkf2/szyXqlTn6knR7axfWE5vknPc5oUwe4n1u4MnQPnn7HEaNrYFqbEdvlhFeLHlAiJnCZ/Wopy4icys9ncGTEancwHZe18peupRYtySanz9/hI2bwXfGbEq//4CMJVr35GBKPM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=jSIQKyZ8; arc=none smtp.client-ip=170.10.129.124 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.b="jSIQKyZ8" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758126037; 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=wjwMIaeur4AL5zrZIvWSYztP2k+H4ileSnfH3+UIqQA=; b=jSIQKyZ8q4vSHbAYZ/mVi6ckLSwCXxTCSqS31btrDpSSpoMuP9JqoaSguZYMJ5Y2TiAgzr wsU0J0TfTdIBU9MArd36S5AGtBC8RsO05IpuZHCZodiOkz1MMLX/VbLskU3h/EwfppGYXE uRTeW/RLcfLeSBR6DneVQKGt6FDp0bQ= 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-655-u3a7NBKQNem0MruKRJLpvg-1; Wed, 17 Sep 2025 12:20:32 -0400 X-MC-Unique: u3a7NBKQNem0MruKRJLpvg-1 X-Mimecast-MFC-AGG-ID: u3a7NBKQNem0MruKRJLpvg_1758126031 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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 78CE1195608C; Wed, 17 Sep 2025 16:20:31 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.44.34.168]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 139F01800446; Wed, 17 Sep 2025 16:20:28 +0000 (UTC) From: Gabriele Monaco To: linux-kernel@vger.kernel.org, Anna-Maria Behnsen , Frederic Weisbecker , Thomas Gleixner , Waiman Long Cc: Gabriele Monaco Subject: [PATCH v13 7/9] cgroup/cpuset: Fail if isolated and nohz_full don't leave any housekeeping Date: Wed, 17 Sep 2025 18:19:56 +0200 Message-ID: <20250917161958.178925-8-gmonaco@redhat.com> In-Reply-To: <20250917161958.178925-1-gmonaco@redhat.com> References: <20250917161958.178925-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Type: text/plain; charset="utf-8" Currently the user can set up isolated cpus via cpuset and nohz_full in such a way that leaves no housekeeping CPU (i.e. no CPU that is neither domain isolated nor nohz full). This can be a problem for other subsystems (e.g. the timer wheel imgration). Prevent this configuration by blocking any assignation that would cause the union of domain isolated cpus and nohz_full to covers all CPUs. Acked-by: Frederic Weisbecker Reviewed-by: Waiman Long Signed-off-by: Gabriele Monaco --- kernel/cgroup/cpuset.c | 63 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 81a9239053a7..3cedc3580373 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -1275,6 +1275,19 @@ static void isolated_cpus_update(int old_prs, int ne= w_prs, struct cpumask *xcpus cpumask_andnot(isolated_cpus, isolated_cpus, xcpus); } =20 +/* + * isolated_cpus_should_update - Returns if the isolated_cpus mask needs u= pdate + * @prs: new or old partition_root_state + * @parent: parent cpuset + * Return: true if isolated_cpus needs modification, false otherwise + */ +static bool isolated_cpus_should_update(int prs, struct cpuset *parent) +{ + if (!parent) + parent =3D &top_cpuset; + return prs !=3D parent->partition_root_state; +} + /* * partition_xcpus_add - Add new exclusive CPUs to partition * @new_prs: new partition_root_state @@ -1339,6 +1352,42 @@ static bool partition_xcpus_del(int old_prs, struct = cpuset *parent, return isolcpus_updated; } =20 +/* + * isolated_cpus_can_update - check for isolated & nohz_full conflicts + * @add_cpus: cpu mask for cpus that are going to be isolated + * @del_cpus: cpu mask for cpus that are no longer isolated, can be NULL + * Return: false if there is conflict, true otherwise + * + * If nohz_full is enabled and we have isolated CPUs, their combination mu= st + * still leave housekeeping CPUs. + */ +static bool isolated_cpus_can_update(struct cpumask *add_cpus, + struct cpumask *del_cpus) +{ + cpumask_var_t full_hk_cpus; + int res =3D true; + + if (!housekeeping_enabled(HK_TYPE_KERNEL_NOISE)) + return true; + + if (del_cpus && cpumask_weight_and(del_cpus, + housekeeping_cpumask(HK_TYPE_KERNEL_NOISE))) + return true; + + if (!alloc_cpumask_var(&full_hk_cpus, GFP_KERNEL)) + return false; + + cpumask_and(full_hk_cpus, housekeeping_cpumask(HK_TYPE_KERNEL_NOISE), + housekeeping_cpumask(HK_TYPE_DOMAIN)); + cpumask_andnot(full_hk_cpus, full_hk_cpus, isolated_cpus); + cpumask_and(full_hk_cpus, full_hk_cpus, cpu_active_mask); + if (!cpumask_weight_andnot(full_hk_cpus, add_cpus)) + res =3D false; + + free_cpumask_var(full_hk_cpus); + return res; +} + static void update_exclusion_cpumasks(bool isolcpus_updated) { int ret; @@ -1464,6 +1513,9 @@ static int remote_partition_enable(struct cpuset *cs,= int new_prs, if (!cpumask_intersects(tmp->new_cpus, cpu_active_mask) || cpumask_subset(top_cpuset.effective_cpus, tmp->new_cpus)) return PERR_INVCPUS; + if (isolated_cpus_should_update(new_prs, NULL) && + !isolated_cpus_can_update(tmp->new_cpus, NULL)) + return PERR_HKEEPING; =20 spin_lock_irq(&callback_lock); isolcpus_updated =3D partition_xcpus_add(new_prs, NULL, tmp->new_cpus); @@ -1563,6 +1615,9 @@ static void remote_cpus_update(struct cpuset *cs, str= uct cpumask *xcpus, else if (cpumask_intersects(tmp->addmask, subpartitions_cpus) || cpumask_subset(top_cpuset.effective_cpus, tmp->addmask)) cs->prs_err =3D PERR_NOCPUS; + else if (isolated_cpus_should_update(prs, NULL) && + !isolated_cpus_can_update(tmp->addmask, tmp->delmask)) + cs->prs_err =3D PERR_HKEEPING; if (cs->prs_err) goto invalidate; } @@ -1914,6 +1969,12 @@ static int update_parent_effective_cpumask(struct cp= uset *cs, int cmd, return err; } =20 + if (deleting && isolated_cpus_should_update(new_prs, parent) && + !isolated_cpus_can_update(tmp->delmask, tmp->addmask)) { + cs->prs_err =3D PERR_HKEEPING; + return PERR_HKEEPING; + } + /* * Change the parent's effective_cpus & effective_xcpus (top cpuset * only). @@ -2934,6 +2995,8 @@ static int update_prstate(struct cpuset *cs, int new_= prs) * Need to update isolated_cpus. */ isolcpus_updated =3D true; + if (!isolated_cpus_can_update(cs->effective_xcpus, NULL)) + err =3D PERR_HKEEPING; } else { /* * Switching back to member is always allowed even if it --=20 2.51.0 From nobody Thu Oct 2 10:39:57 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 B92A134BA49 for ; Wed, 17 Sep 2025 16:20:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126046; cv=none; b=cUaDx5sWmdGLuiq+L5UDF8Iodo1YaIQ0ho0ZwgPsEFfEVFd9FD7PBZxv4plQSP5JuOcKVlHkXTcWUu045AV4ijn3lZMOmK94G2hvn1A+5bP+7fvzbndXAXyJmMebROcO5rD6gUEf6tmqylYXmo1GlcgeRQRx2x+4qsBBHij0Nrs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126046; c=relaxed/simple; bh=n6LMEIcuoolJpth7pN4hIkhLamDQXi/2VrINutz5cUk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mFL/l10jqS44OFLUO6E02PdEgx4FDLlHmI3iINWVwAO/lsuXzxGKH+idOlLVOzd5gUMICyomROx9at4Pbz+gVA2jsRcX6W0uy7oCgshQ+ErTOmrhb7e4DZ9IpWSCKeil2RqNiNPUj5EIJgPiJgoUAC27SgHrDCKYlz0TawmBca8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=B+gKH5MA; arc=none smtp.client-ip=170.10.133.124 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.b="B+gKH5MA" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758126043; 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=1QZCuuO1uxqVkvMcW4eNgitUnGt7YSRGNgF2/LsKi88=; b=B+gKH5MAplsB+1IZIWoOv8oENIb4PTVuiN9UUa96WjrHAllCs4pf+eLyEeeIVVE3nWhB7i 7ojUNAiB9gvF3hJ1HswdProLRw/sL4UM7UbQo+ji5MtBvQh0Vy20B2wftKfo01g2elc0zz XlZFSGqJeaP5FGyHIL7r23ebTGf+WNQ= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-526-zbGcU_XqNk6hAKDblkbKZg-1; Wed, 17 Sep 2025 12:20:36 -0400 X-MC-Unique: zbGcU_XqNk6hAKDblkbKZg-1 X-Mimecast-MFC-AGG-ID: zbGcU_XqNk6hAKDblkbKZg_1758126035 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4871718002C1; Wed, 17 Sep 2025 16:20:35 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.44.34.168]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1982E1800446; Wed, 17 Sep 2025 16:20:31 +0000 (UTC) From: Gabriele Monaco To: linux-kernel@vger.kernel.org, Anna-Maria Behnsen , Frederic Weisbecker , Thomas Gleixner , Waiman Long Cc: Yury Norov , Gabriele Monaco Subject: [PATCH v13 8/9] cpumask: Add initialiser to use cleanup helpers Date: Wed, 17 Sep 2025 18:19:57 +0200 Message-ID: <20250917161958.178925-9-gmonaco@redhat.com> In-Reply-To: <20250917161958.178925-1-gmonaco@redhat.com> References: <20250917161958.178925-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Type: text/plain; charset="utf-8" From: Yury Norov Now we can simplify a code that allocates cpumasks for local needs. Automatic variables have to be initialized at declaration, or at least before any possibility for the logic to return, so that compiler wouldn't try to call an associate destructor function on a random stack number. Because cpumask_var_t, depending on the CPUMASK_OFFSTACK config, is either a pointer or an array, we have to have a macro for initialization. So define a CPUMASK_VAR_NULL macro, which allows to init struct cpumask pointer with NULL when CPUMASK_OFFSTACK is enabled, and effectively a no-op when CPUMASK_OFFSTACK is disabled. Signed-off-by: Yury Norov Signed-off-by: Gabriele Monaco --- include/linux/cpumask.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/linux/cpumask.h b/include/linux/cpumask.h index ff8f41ab7ce6..68be522449ec 100644 --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h @@ -1005,6 +1005,7 @@ static __always_inline unsigned int cpumask_size(void) =20 #define this_cpu_cpumask_var_ptr(x) this_cpu_read(x) #define __cpumask_var_read_mostly __read_mostly +#define CPUMASK_VAR_NULL NULL =20 bool alloc_cpumask_var_node(cpumask_var_t *mask, gfp_t flags, int node); =20 @@ -1051,6 +1052,7 @@ static __always_inline bool cpumask_available(cpumask= _var_t mask) =20 #define this_cpu_cpumask_var_ptr(x) this_cpu_ptr(x) #define __cpumask_var_read_mostly +#define CPUMASK_VAR_NULL {} =20 static __always_inline bool alloc_cpumask_var(cpumask_var_t *mask, gfp_t f= lags) { --=20 2.51.0 From nobody Thu Oct 2 10:39:57 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 41E6534BA4B for ; Wed, 17 Sep 2025 16:20:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126047; cv=none; b=D+y0qQPsAJaPBKFy+3fYApz18HwXBPDkbru+pFC2Ali5UqA7puGT3JdCRDqvwHkn9U7ZBvDmyZhVTzeflvs6e3xfhp87QKeqbloXGc7LLA0tgy/rZJQXlHE6UWU0xov2tg0JzmVyU2YJfTBE0cguxgRsrbKG62kKFawuwltd2XQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758126047; c=relaxed/simple; bh=HKAoeMQ+vq1SiXL7Y5DOVVWZDDv4YEDxjkXGUTinsPY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nkihzXaZaTkD0XJBIzKWTawOubPE0hwH0ba+FwFQqKpl6iLN1V7YV6orGD218aQNT2UIY7mPnKluc3C9PI5qAE+hNXjLDGt7HI6Y/Am7IRGpl/qT2dBbK0LkiiPwkulq3156zvZTX4rBAnq6iVyPf6WpvhNOQgpSMPa/scm7abI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Olnzuky7; arc=none smtp.client-ip=170.10.129.124 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.b="Olnzuky7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758126044; 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=cBfoWrKWrvTyn4dKF7Fvdl1EVkUXMyVH3Gg0IlqPNDo=; b=Olnzuky7ruaLY+4l2GuR07jv/gkVqqthPreFTEfnq5XES566Z4R9GPGunOjBy+6geHco+u pgu0iMCKqqlom9ty04Hw+tj5C6s/F0YIQRspfEtzDLojOd/DtBRRyh/TfDyhghfeMpXunI g7tqsmml1K9gSZbLSsiiVXqb6jZjrik= Received: from mx-prod-mc-04.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-649-crn8aZ_MOpyR13JdTFBrEA-1; Wed, 17 Sep 2025 12:20:40 -0400 X-MC-Unique: crn8aZ_MOpyR13JdTFBrEA-1 X-Mimecast-MFC-AGG-ID: crn8aZ_MOpyR13JdTFBrEA_1758126039 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (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-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id B29C219560AF; Wed, 17 Sep 2025 16:20:39 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.44.34.168]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 17DC31800446; Wed, 17 Sep 2025 16:20:35 +0000 (UTC) From: Gabriele Monaco To: linux-kernel@vger.kernel.org, Anna-Maria Behnsen , Frederic Weisbecker , Thomas Gleixner , Waiman Long Cc: Gabriele Monaco , "John B. Wyatt IV" , "John B. Wyatt IV" Subject: [PATCH v13 9/9] timers: Exclude isolated cpus from timer migration Date: Wed, 17 Sep 2025 18:19:58 +0200 Message-ID: <20250917161958.178925-10-gmonaco@redhat.com> In-Reply-To: <20250917161958.178925-1-gmonaco@redhat.com> References: <20250917161958.178925-1-gmonaco@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Type: text/plain; charset="utf-8" The timer migration mechanism allows active CPUs to pull timers from idle ones to improve the overall idle time. This is however undesired when CPU intensive workloads run on isolated cores, as the algorithm would move the timers from housekeeping to isolated cores, negatively affecting the isolation. Exclude isolated cores from the timer migration algorithm, extend the concept of unavailable cores, currently used for offline ones, to isolated ones: * A core is unavailable if isolated or offline; * A core is available if non isolated and online; A core is considered unavailable as isolated if it belongs to: * the isolcpus (domain) list * an isolated cpuset Except if it is: * in the nohz_full list (already idle for the hierarchy) * the nohz timekeeper core (must be available to handle global timers) CPUs are added to the hierarchy during late boot, excluding isolated ones, the hierarchy is also adapted when the cpuset isolation changes. Due to how the timer migration algorithm works, any CPU part of the hierarchy can have their global timers pulled by remote CPUs and have to pull remote timers, only skipping pulling remote timers would break the logic. For this reason, prevent isolated CPUs from pulling remote global timers, but also the other way around: any global timer started on an isolated CPU will run there. This does not break the concept of isolation (global timers don't come from outside the CPU) and, if considered inappropriate, can usually be mitigated with other isolation techniques (e.g. IRQ pinning). This effect was noticed on a 128 cores machine running oslat on the isolated cores (1-31,33-63,65-95,97-127). The tool monopolises CPUs, and the CPU with lowest count in a timer migration hierarchy (here 1 and 65) appears as always active and continuously pulls global timers, from the housekeeping CPUs. This ends up moving driver work (e.g. delayed work) to isolated CPUs and causes latency spikes: before the change: # oslat -c 1-31,33-63,65-95,97-127 -D 62s ... Maximum: 1203 10 3 4 ... 5 (us) after the change: # oslat -c 1-31,33-63,65-95,97-127 -D 62s ... Maximum: 10 4 3 4 3 ... 5 (us) The same behaviour was observed on a machine with as few as 20 cores / 40 threads with isocpus set to: 1-9,11-39 with rtla-osnoise-top. Tested-by: John B. Wyatt IV Tested-by: John B. Wyatt IV Signed-off-by: Gabriele Monaco --- include/linux/timer.h | 9 +++ kernel/cgroup/cpuset.c | 3 + kernel/time/timer_migration.c | 128 ++++++++++++++++++++++++++++++++-- 3 files changed, 135 insertions(+), 5 deletions(-) diff --git a/include/linux/timer.h b/include/linux/timer.h index 0414d9e6b4fc..62e1cea71125 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h @@ -188,4 +188,13 @@ int timers_dead_cpu(unsigned int cpu); #define timers_dead_cpu NULL #endif =20 +#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON) +extern int tmigr_isolated_exclude_cpumask(struct cpumask *exclude_cpumask); +#else +static inline int tmigr_isolated_exclude_cpumask(struct cpumask *exclude_c= pumask) +{ + return 0; +} +#endif + #endif diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 3cedc3580373..6e9d86fab27e 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -1399,6 +1399,9 @@ static void update_exclusion_cpumasks(bool isolcpus_u= pdated) =20 ret =3D workqueue_unbound_exclude_cpumask(isolated_cpus); WARN_ON_ONCE(ret < 0); + + ret =3D tmigr_isolated_exclude_cpumask(isolated_cpus); + WARN_ON_ONCE(ret < 0); } =20 /** diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c index 0a3a26e766d0..9aa01f1e0ea4 100644 --- a/kernel/time/timer_migration.c +++ b/kernel/time/timer_migration.c @@ -10,6 +10,7 @@ #include #include #include +#include =20 #include "timer_migration.h" #include "tick-internal.h" @@ -436,6 +437,29 @@ static inline bool tmigr_is_not_available(struct tmigr= _cpu *tmc) return !(tmc->tmgroup && tmc->available); } =20 +/* + * Returns true if @cpu should be excluded from the hierarchy as isolated. + * Domain isolated CPUs don't participate in timer migration, nohz_full CP= Us + * are still part of the hierarchy but become idle (from a tick and timer + * migration perspective) when they stop their tick. This lets the timekee= ping + * CPU handle their global timers. Marking also isolated CPUs as idle woul= d be + * too costly, hence they are completely excluded from the hierarchy. + * This check is necessary, for instance, to prevent offline isolated CPUs= from + * being incorrectly marked as available once getting back online. + * + * Additionally, the tick CPU can be isolated at boot, however + * we cannot mark it as unavailable to avoid having no global migrator + * for the nohz_full CPUs. This check is only necessary at boot time. + */ +static inline bool tmigr_is_isolated(int cpu) +{ + if (!tick_nohz_cpu_hotpluggable(cpu)) + return false; + return (!housekeeping_cpu(cpu, HK_TYPE_DOMAIN) || + cpuset_cpu_is_isolated(cpu)) && + housekeeping_cpu(cpu, HK_TYPE_KERNEL_NOISE); +} + /* * Returns true, when @childmask corresponds to the group migrator or when= the * group is not active - so no migrator is set. @@ -1449,8 +1473,9 @@ static int tmigr_clear_cpu_available(unsigned int cpu) int migrator; u64 firstexp; =20 - cpumask_clear_cpu(cpu, tmigr_available_cpumask); scoped_guard(raw_spinlock_irq, &tmc->lock) { + if (!tmc->available) + return 0; tmc->available =3D false; WRITE_ONCE(tmc->wakeup, KTIME_MAX); =20 @@ -1463,11 +1488,11 @@ static int tmigr_clear_cpu_available(unsigned int c= pu) } =20 if (firstexp !=3D KTIME_MAX) { - migrator =3D cpumask_any(tmigr_available_cpumask); + migrator =3D cpumask_any_but(tmigr_available_cpumask, cpu); work_on_cpu(migrator, tmigr_trigger_active, NULL); } =20 - return 0; + return 1; } =20 static int tmigr_set_cpu_available(unsigned int cpu) @@ -1478,14 +1503,107 @@ static int tmigr_set_cpu_available(unsigned int cp= u) if (WARN_ON_ONCE(!tmc->tmgroup)) return -EINVAL; =20 - cpumask_set_cpu(cpu, tmigr_available_cpumask); + if (tmigr_is_isolated(cpu)) + return 0; + scoped_guard(raw_spinlock_irq, &tmc->lock) { + if (tmc->available) + return 0; trace_tmigr_cpu_available(tmc); tmc->idle =3D timer_base_is_idle(); if (!tmc->idle) __tmigr_cpu_activate(tmc); tmc->available =3D true; } + return 1; +} + +static int tmigr_online_cpu(unsigned int cpu) +{ + if (tmigr_set_cpu_available(cpu) > 0) + cpumask_set_cpu(cpu, tmigr_available_cpumask); + return 0; +} + +static int tmigr_offline_cpu(unsigned int cpu) +{ + if (tmigr_clear_cpu_available(cpu) > 0) + cpumask_clear_cpu(cpu, tmigr_available_cpumask); + return 0; +} + +static void tmigr_cpu_isolate(struct work_struct *ignored) +{ + tmigr_clear_cpu_available(smp_processor_id()); +} + +static void tmigr_cpu_unisolate(struct work_struct *ignored) +{ + tmigr_set_cpu_available(smp_processor_id()); +} + +/** + * tmigr_isolated_exclude_cpumask - Exclude given CPUs from hierarchy + * @exclude_cpumask: the cpumask to be excluded from timer migration hiera= rchy + * + * This function can be called from cpuset code to provide the new set of + * isolated CPUs that should be excluded from the hierarchy. + * Online CPUs not present in exclude_cpumask but already excluded are bro= ught + * back to the hierarchy. + * Functions to isolate/unisolate need to be called locally and can sleep. + */ +int tmigr_isolated_exclude_cpumask(struct cpumask *exclude_cpumask) +{ + struct work_struct __percpu *works __free(free_percpu) =3D + alloc_percpu(struct work_struct); + cpumask_var_t cpumask_unisol __free(free_cpumask_var) =3D CPUMASK_VAR_NUL= L; + cpumask_var_t cpumask_isol __free(free_cpumask_var) =3D CPUMASK_VAR_NULL; + int cpu; + + lockdep_assert_cpus_held(); + + if (!alloc_cpumask_var(&cpumask_isol, GFP_KERNEL)) + return -ENOMEM; + if (!alloc_cpumask_var(&cpumask_unisol, GFP_KERNEL)) + return -ENOMEM; + if (!works) + return -ENOMEM; + + cpumask_andnot(cpumask_unisol, cpu_online_mask, exclude_cpumask); + cpumask_andnot(cpumask_unisol, cpumask_unisol, tmigr_available_cpumask); + /* Set up the mask earlier to avoid races with the migrator CPU */ + cpumask_or(tmigr_available_cpumask, tmigr_available_cpumask, cpumask_unis= ol); + for_each_cpu(cpu, cpumask_unisol) { + struct work_struct *work =3D per_cpu_ptr(works, cpu); + + INIT_WORK(work, tmigr_cpu_unisolate); + schedule_work_on(cpu, work); + } + + cpumask_and(cpumask_isol, exclude_cpumask, tmigr_available_cpumask); + cpumask_and(cpumask_isol, cpumask_isol, housekeeping_cpumask(HK_TYPE_KERN= EL_NOISE)); + /* + * Handle this here and not in the cpuset code because exclude_cpumask + * might include also the tick CPU if included in isolcpus. + */ + for_each_cpu(cpu, cpumask_isol) { + if (!tick_nohz_cpu_hotpluggable(cpu)) { + cpumask_clear_cpu(cpu, cpumask_isol); + break; + } + } + /* Set up the mask earlier to avoid races with the migrator CPU */ + cpumask_andnot(tmigr_available_cpumask, tmigr_available_cpumask, cpumask_= isol); + for_each_cpu(cpu, cpumask_isol) { + struct work_struct *work =3D per_cpu_ptr(works, cpu); + + INIT_WORK(work, tmigr_cpu_isolate); + schedule_work_on(cpu, work); + } + + for_each_cpu_or(cpu, cpumask_isol, cpumask_unisol) + flush_work(per_cpu_ptr(works, cpu)); + return 0; } =20 @@ -1496,7 +1614,7 @@ static int tmigr_set_cpu_available(unsigned int cpu) static int __init tmigr_late_init(void) { return cpuhp_setup_state(CPUHP_AP_TMIGR_ONLINE, "tmigr:online", - tmigr_set_cpu_available, tmigr_clear_cpu_available); + tmigr_online_cpu, tmigr_offline_cpu); } =20 static void tmigr_init_group(struct tmigr_group *group, unsigned int lvl, --=20 2.51.0