From nobody Tue Oct 7 05:19:42 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 276342E36E5 for ; Mon, 14 Jul 2025 13:31:31 +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=1752499893; cv=none; b=K/AcHHOKNdcLNZHVIwcC02RXAyQbWCVFq6SOmKvBVbtoXALBBxwLSnPpFgHEyZGDGEPm2PwKcFQF2srGw6J2MYjiJePIv+vifdRuV/P7UmzDaA77fhVJ/bohpHIEmS94k3EoklxFhzZAl8bF3x1KIt1iQ96hRe7gMB+Y8Nht/EA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752499893; c=relaxed/simple; bh=LsnF4cZ53G5TUqjv6nSeU/xxyAC9DA+6RL9jTuDLTbo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I+FZeIkxBzpWueB91vy0dZ5QaNf+sE6TlAmoSoCpRrIEOP45FLUS0ocTdVIL6LS9fmeq5/YoVUWQTlbYD0mhAFv1O4tkhWs5nvt6Qdj2GDUqijPEKJVEMXzLImRrMO7BxQr/deJFIu05XLF1PzPI+x5+sMYmXPbjvnmKFbNYKRY= 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=KkZp6QyU; 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="KkZp6QyU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752499891; 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=ZwOGdCSES+LHiD9NDMIxNj+Skc1hjhUiFVTl8zFnXjM=; b=KkZp6QyUPVMz1VW0Q+m68ZXY7OGNW9zNBR2RrMIsYSxKa119Oox0glC7Rapx9dcMy4XQsH 8SBqBubL0pQwuC7RDGvo5shnGTVXudPb/XgcHy1Q+g2ggfjOF3O9KxbpqNFCXpA59vTfOg CoS4h8XVcbIqCyS/EkdRW/oBZSKDj5E= 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-117-wDIcQSG2PjSrJeuBofDhHA-1; Mon, 14 Jul 2025 09:31:27 -0400 X-MC-Unique: wDIcQSG2PjSrJeuBofDhHA-1 X-Mimecast-MFC-AGG-ID: wDIcQSG2PjSrJeuBofDhHA_1752499886 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 56B0D1801210; Mon, 14 Jul 2025 13:31:26 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.45.225.215]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 582E419560A3; Mon, 14 Jul 2025 13:31:22 +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 v8 1/7] timers: Rename tmigr 'online' bit to 'available' Date: Mon, 14 Jul 2025 15:30:52 +0200 Message-ID: <20250714133050.193108-10-gmonaco@redhat.com> In-Reply-To: <20250714133050.193108-9-gmonaco@redhat.com> References: <20250714133050.193108-9-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.0 on 10.30.177.12 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 47db5eaf2f9ab..61171b13c687c 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 2f6330831f084..2c2c8810b8137 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; } @@ -1435,19 +1435,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 /* @@ -1455,7 +1455,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) { @@ -1466,7 +1466,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 @@ -1475,11 +1475,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; } @@ -1850,7 +1850,7 @@ static int __init tmigr_init(void) goto err; =20 ret =3D cpuhp_setup_state(CPUHP_AP_TMIGR_ONLINE, "tmigr:online", - tmigr_cpu_online, tmigr_cpu_offline); + tmigr_set_cpu_available, tmigr_clear_cpu_available); if (ret) goto err; =20 diff --git a/kernel/time/timer_migration.h b/kernel/time/timer_migration.h index ae19f70f8170f..70879cde6fdd0 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.50.1 From nobody Tue Oct 7 05:19:42 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 12C8F253355 for ; Mon, 14 Jul 2025 13:31:37 +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=1752499901; cv=none; b=WJGhBC+kkgjhhnOqB08QOFW2xDL/U0MYmfukKufyd9HFnkzvzFYmUB4JeOUxoz7ibApVXTOGoccHmYxxZy5yCH9fFHartiAhOOur7xDITW/sLeX29fAM4hKkJc1WPhjPAQ/FTp7HO3YG4zu+gf7io7HqzML4+qxozH+fHhdzbVo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752499901; c=relaxed/simple; bh=XeR3NZnzEJKohf+OVTLlSRfcDeUpF8sJXusd/tzTygo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DL4fPBqk89FITlNjgujsFPHPDArh+s/q8eV1Z9EV3U9MDjh7IF19rUBc8dTq0L+11E1o1H0UJyJNeavweKVrKhGfYmL9RXSYvFT/JaAYve4uy7s6tdhggRNEESN48wYucj2+zCmb+V9KI+N6on96Q4cNsoJFjHSHlNqvnANtPTM= 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=McAiQOEE; 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="McAiQOEE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752499897; 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=yZTPF3l0qa4HyWG5G3v3ZEYXFoCmq4Dm+Ob1JvupEs0=; b=McAiQOEEFrSHtT2G4nsJ7Q0MQ81t7juEy7qG0aF5GR7xlR3OTARebDVsXFNpEN9S7yot1H ve/VwIYpwYMcjykIHSkqU33aILCDrazaP0XY707yT65ReBdIy2nnnr4iqpJzqOkUc5Yrw1 leh+o2V9gpbvU4bx0QPYrPygBcLfezE= 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-160-_AmWqVsEM3CXezJ0hhZM2g-1; Mon, 14 Jul 2025 09:31:32 -0400 X-MC-Unique: _AmWqVsEM3CXezJ0hhZM2g-1 X-Mimecast-MFC-AGG-ID: _AmWqVsEM3CXezJ0hhZM2g_1752499890 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 0872D180121B; Mon, 14 Jul 2025 13:31:30 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.45.225.215]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 245A219560A3; Mon, 14 Jul 2025 13:31:26 +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 v8 2/7] timers: Add the available mask in timer migration Date: Mon, 14 Jul 2025 15:30:53 +0200 Message-ID: <20250714133050.193108-11-gmonaco@redhat.com> In-Reply-To: <20250714133050.193108-9-gmonaco@redhat.com> References: <20250714133050.193108-9-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.0 on 10.30.177.12 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. Signed-off-by: Gabriele Monaco Reviewed-by: Frederic Weisbecker --- 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 2c2c8810b8137..b4623ac3c2830 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 @@ -1446,6 +1452,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); @@ -1459,7 +1466,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 @@ -1474,6 +1481,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(); @@ -1801,6 +1809,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.50.1 From nobody Tue Oct 7 05:19:42 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 24AE0253B56 for ; Mon, 14 Jul 2025 13:31:42 +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=1752499905; cv=none; b=RH6ZeHYwRDumZpQma68oklIDnxpQpLI88A+4+vGaIOLZF0KH91+QoKcjlq3LLGmwcZdg26HGCLY493Up+dGtS05lnFzHVuo1niT4JpUudrPQZhA6vM6orZFsQ6N8R2kYd38YVne6VLBWyLL9Wa3wv478uVuG0m7MmAnwORB5TbI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752499905; c=relaxed/simple; bh=Zf5kLOFABWaAarMPsRQMYuz/UxWUofMgxn6jtrP1Cng=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CwcwZyQi6crDi5UIPDv9QCLFobW5B1atrChmb86Oea5k9TdQ9tWlIFckobylVv7HJntPY+1NUhXJUvasYNTO2E8F2UXqP1G7MWInHQwFeUqs+8GmmKI4oF7EmhZevvrq4KtL7dgaUlkxIx3rB7LwOwJEQEuS/1S3umn8lSHoC10= 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=PdHtyFkn; 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="PdHtyFkn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752499902; 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=7dvd7QpvG6m9lwfAaNeBQBkEpkromh4Cgymj0Twpx3A=; b=PdHtyFknnJawGN0WNHxcFUaIh1pNbwGjBMgbEYmjlZ22W+RQ3vXUm4QyGHPZNjjXzCmaF/ 1npFBL3693p9CPHG2HLecrp/80n1huEDYA+dQ5lADu4dnQWjc6smJ51REe/UzhglAkI4TY 5uX5rXvaSlyRq3uBPRjTlZl84lIMT38= 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-364-BQnR1rYENoqmFNVu2XgijQ-1; Mon, 14 Jul 2025 09:31:37 -0400 X-MC-Unique: BQnR1rYENoqmFNVu2XgijQ-1 X-Mimecast-MFC-AGG-ID: BQnR1rYENoqmFNVu2XgijQ_1752499894 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 3B69B18011FE; Mon, 14 Jul 2025 13:31:34 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.45.225.215]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B32D719560A3; Mon, 14 Jul 2025 13:31:30 +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 v8 3/7] timers: Use scoped_guard when setting/clearing the tmigr available flag Date: Mon, 14 Jul 2025 15:30:54 +0200 Message-ID: <20250714133050.193108-12-gmonaco@redhat.com> In-Reply-To: <20250714133050.193108-9-gmonaco@redhat.com> References: <20250714133050.193108-9-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.0 on 10.30.177.12 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. Signed-off-by: Gabriele Monaco Reviewed-by: Frederic Weisbecker --- 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 b4623ac3c2830..878fd3af40ecb 100644 --- a/kernel/time/timer_migration.c +++ b/kernel/time/timer_migration.c @@ -1453,17 +1453,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); @@ -1482,13 +1482,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.50.1 From nobody Tue Oct 7 05:19:42 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 EF9222528FC for ; Mon, 14 Jul 2025 13:31:41 +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=1752499903; cv=none; b=d6i/glEMNdQyttVXAhkMLjwFpmX0Dr+bsecSjm+fXD56LwpDOXYh785Q4A6wa9E+nn0hGqxyt6dAcppf+0ck9AiCvL3QRCf/lj+qlreUnDfKPnX64cpkRDmIxdE9TH0yabgA/fuRoHj1ID4aVsyeoCMYfzShTdi1/DaL5E8RaoE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752499903; c=relaxed/simple; bh=+XoXyN431w1iDlRksUQNFJSkOVhZlPO/GVI9Y9bVXvg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bV5ef3DyNnNytZjZAy8om0rnZSlrwy2il2QqeCpwLoWsUmuM9Wf69wB0oa2T0bU0mlo3+nQb8fznIKw5bh9SjZ2awnO5nSrEgXnZbgev7jP4iHMy6E4mSNElPTY/n5PvI3/r2rwTM/c0D0o4Ea/n22ZESTpGX9INiK+kLM2lQpM= 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=OLYdYIfm; 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="OLYdYIfm" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752499900; 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=pkXXH15hItnLuidS38orcfL8CoLC8nsYJQhDY6OUtwY=; b=OLYdYIfmiPQVRQivavQu2c5FW68ZihfjFzKOhkzPWRRCbjRMHgEE4VZ3nozvhYOs/zzQWs gH/Jk6R2Vgt8YLrz0p/ctMSOT6pZumvySDG1/SoZtx/EydzKbRtPdbHurhcMt0Q+CQsb21 Dr0PaWWVHrsC+WvUtAbyqfpXM45sJf8= 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-518-Xa262AYFOMCdK7D938Gt2w-1; Mon, 14 Jul 2025 09:31:39 -0400 X-MC-Unique: Xa262AYFOMCdK7D938Gt2w-1 X-Mimecast-MFC-AGG-ID: Xa262AYFOMCdK7D938Gt2w_1752499898 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 54D4919560B5; Mon, 14 Jul 2025 13:31:38 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.45.225.215]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E590E19560A7; Mon, 14 Jul 2025 13:31:34 +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 v8 4/7] cgroup/cpuset: Rename update_unbound_workqueue_cpumask() to update_exclusion_cpumasks() Date: Mon, 14 Jul 2025 15:30:55 +0200 Message-ID: <20250714133050.193108-13-gmonaco@redhat.com> In-Reply-To: <20250714133050.193108-9-gmonaco@redhat.com> References: <20250714133050.193108-9-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.0 on 10.30.177.12 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. Signed-off-by: Gabriele Monaco Acked-by: Frederic Weisbecker --- 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 3bc4301466f33..6e3f44ffaa219 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.50.1 From nobody Tue Oct 7 05:19:42 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 C9318246BC7 for ; Mon, 14 Jul 2025 13:31: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=1752499907; cv=none; b=EzNJxTBYZWPn2qyxST+5Ej1/xetgvJseQJXhQ7V4flmT11IWBx6GiHRmSXQr7LAmH1DQ4iK+WLUMNdf1Kl6AjRXqynSuWsSbjkTmzh5ab4f0qvyFtWzrAHmMLZWdYWeJx2tOKq83GcVMgaQbRi+G1atrnRXTAz7/2AonmT3CiEI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752499907; c=relaxed/simple; bh=/ngu1X8UAcAMW7nQ2qwEe/BTxf9ufDDdWdwrHIOq2LI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E0Sx1WhVDlwm1YJIwHNK5IPfZgwQiCAzHF2iVeb9g391qEqaLHeuvf4TAnwhEQ42PPI1RxsRg+3rJXmuVCWqKBKrhGmjM9YWsdYdoz9JEbYf9mH3H7JngYqVafvRHAN7pVDx5vFFcQiVOiFhwMKkCLDI4YKuFOWfXpqfRQjD0es= 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=KXVu7P1+; 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="KXVu7P1+" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752499904; 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=zLism8EftLMfGY2XtmjU5c/SH0PZGP9bCy9WaqH4dis=; b=KXVu7P1+twDnWbbUjUv/Te1dmBmu2MD2x9QFu43eEbX0ExbpXjasFeuUCRTiOeSx5m+DP0 fDu5LWUpurfd2qZeUwMlztFXhBka+HtvxM6zoU3Uxq8usfxc+yl/8U4LwXsLaqA7j2t7gs z3GoR2dldmugmmVm0fjqwDaeRn8JQlU= 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-319-vd7WD3rdMsWLCrswPOQ82g-1; Mon, 14 Jul 2025 09:31:43 -0400 X-MC-Unique: vd7WD3rdMsWLCrswPOQ82g-1 X-Mimecast-MFC-AGG-ID: vd7WD3rdMsWLCrswPOQ82g_1752499902 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 1E0AF180A8FA; Mon, 14 Jul 2025 13:31:42 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.45.225.215]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 1FBDA19560A3; Mon, 14 Jul 2025 13:31:38 +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 v8 5/7] sched/isolation: Force housekeeping if isolcpus and nohz_full don't leave any Date: Mon, 14 Jul 2025 15:30:56 +0200 Message-ID: <20250714133050.193108-14-gmonaco@redhat.com> In-Reply-To: <20250714133050.193108-9-gmonaco@redhat.com> References: <20250714133050.193108-9-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.0 on 10.30.177.12 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 and nohz_full covers all CPUs. Reviewed-by: Frederic Weisbecker Signed-off-by: Gabriele Monaco --- kernel/sched/isolation.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c index 93b038d48900a..0019d941de683 100644 --- a/kernel/sched/isolation.c +++ b/kernel/sched/isolation.c @@ -165,6 +165,18 @@ static int __init housekeeping_setup(char *str, unsign= ed long flags) } } =20 + /* Check in combination with the previously set cpumask */ + type =3D find_first_bit(&housekeeping.flags, HK_TYPE_MAX); + first_cpu =3D cpumask_first_and_and(cpu_present_mask, + housekeeping_staging, + housekeeping.cpumasks[type]); + if (first_cpu >=3D nr_cpu_ids || first_cpu >=3D setup_max_cpus) { + pr_warn("Housekeeping: must include one present CPU neither " + "in nohz_full=3D nor in isolcpus=3D, 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.50.1 From nobody Tue Oct 7 05:19:42 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 190FF246BC7 for ; Mon, 14 Jul 2025 13:31:50 +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=1752499912; cv=none; b=PIqdCc9NEOeK+xiyaSO/GqU0kyPv+vsweJXhnfPKPIpnsJ1NYa8ruRVyAQBJBW8JiqAhWn451X7FbEt0bH8FMeaCYfP9dYs0w+XQclxE5WfosyMgOcuvZXXOa7EHQ9kv1HHpSH0cg2RVdksSbWYvUvvGOK6GrdS85pH4pjwTf28= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752499912; c=relaxed/simple; bh=xY9zYiio8FnFU/tqVnrKiCDAoXjjN0bfRkXzmV1quKI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G6+JxZS7ixRG6esW0bgHmO7gMH2Gn9uCeAyb/wRrzaBjlTm62zYyt+LVaD/PZZlPUwKy8EPcS0jdeGuGzrXuzQcNPX6BAKlnzt6hsszi/8ZehX7z0/PmwX+45MYPy2Y/w+FlaFQF1IWy3JjYps3mp2UnVdbXrhWuu4hITB1LBBI= 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=JrmzzRR7; 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="JrmzzRR7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752499910; 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=BHohOItaVR2x0CD6AtpMY2FeGlMi41JFeKHw/xNJ71A=; b=JrmzzRR7BVmi9mHrBdV2kEN5PkIJavowciNrjiZE55SfnBzgnSPaHZwdedzAVm3eYGF5ti P6H23I37OkgDqnjnGRKSfjqNVFISgsS9qQpELRD3/oAsIgkMF+jTga5ZFPhESR9MkOWGeW vJ7e6TR8OIYXmfHw3tgdvmNTx5Vgo0c= 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-622-y2doVDgZPjmJ6FuzN7LINA-1; Mon, 14 Jul 2025 09:31:46 -0400 X-MC-Unique: y2doVDgZPjmJ6FuzN7LINA-1 X-Mimecast-MFC-AGG-ID: y2doVDgZPjmJ6FuzN7LINA_1752499905 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 94D30180029F; Mon, 14 Jul 2025 13:31:45 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.45.225.215]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BBA4A19560A3; Mon, 14 Jul 2025 13:31:42 +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 v8 6/7] cgroup/cpuset: Fail if isolated and nohz_full don't leave any housekeeping Date: Mon, 14 Jul 2025 15:30:57 +0200 Message-ID: <20250714133050.193108-15-gmonaco@redhat.com> In-Reply-To: <20250714133050.193108-9-gmonaco@redhat.com> References: <20250714133050.193108-9-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.0 on 10.30.177.12 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. Signed-off-by: Gabriele Monaco Acked-by: Frederic Weisbecker --- kernel/cgroup/cpuset.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 6e3f44ffaa219..a946d85ce954a 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,35 @@ static bool partition_xcpus_del(int old_prs, struct = cpuset *parent, return isolcpus_updated; } =20 +/* + * isolcpus_nohz_conflict - check for isolated & nohz_full conflicts + * @new_cpus: cpu mask for cpus that are going to be isolated + * Return: true if there is conflict, false otherwise + * + * If nohz_full is enabled and we have isolated CPUs, their combination mu= st + * still leave housekeeping CPUs. + */ +static bool isolcpus_nohz_conflict(struct cpumask *new_cpus) +{ + cpumask_var_t full_hk_cpus; + int res =3D false; + + if (!housekeeping_enabled(HK_TYPE_KERNEL_NOISE)) + return false; + + if (!alloc_cpumask_var(&full_hk_cpus, GFP_KERNEL)) + return true; + + cpumask_and(full_hk_cpus, housekeeping_cpumask(HK_TYPE_KERNEL_NOISE), + housekeeping_cpumask(HK_TYPE_DOMAIN)); + cpumask_and(full_hk_cpus, full_hk_cpus, cpu_online_mask); + if (!cpumask_weight_andnot(full_hk_cpus, new_cpus)) + res =3D true; + + free_cpumask_var(full_hk_cpus); + return res; +} + static void update_exclusion_cpumasks(bool isolcpus_updated) { int ret; @@ -1464,6 +1506,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) && + isolcpus_nohz_conflict(tmp->new_cpus)) + return PERR_HKEEPING; =20 spin_lock_irq(&callback_lock); isolcpus_updated =3D partition_xcpus_add(new_prs, NULL, tmp->new_cpus); @@ -1563,6 +1608,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) && + isolcpus_nohz_conflict(tmp->addmask)) + cs->prs_err =3D PERR_HKEEPING; if (cs->prs_err) goto invalidate; } @@ -1914,6 +1962,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) && + isolcpus_nohz_conflict(tmp->delmask)) { + cs->prs_err =3D PERR_HKEEPING; + return PERR_HKEEPING; + } + /* * Change the parent's effective_cpus & effective_xcpus (top cpuset * only). @@ -2934,6 +2988,8 @@ static int update_prstate(struct cpuset *cs, int new_= prs) * Need to update isolated_cpus. */ isolcpus_updated =3D true; + if (isolcpus_nohz_conflict(cs->effective_xcpus)) + err =3D PERR_HKEEPING; } else { /* * Switching back to member is always allowed even if it --=20 2.50.1 From nobody Tue Oct 7 05:19:42 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 AD185255F5E for ; Mon, 14 Jul 2025 13:31:55 +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=1752499917; cv=none; b=Lg8V2JV+XDK9hVb61skLxq5N90c/3EdQEPKDzthP//Hxy3RvayQtSyTqmw6XnyBZj4itJ34Jw2pJLNMp2gjghPU5w7J46t9xZEMOcMNNp+wEVIHr07M0Jd3o2KFzr7cbrHi2TTR3kgq1a7J7UH8HK774yZvaukiEmc0fn9B4PU4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752499917; c=relaxed/simple; bh=K7qAczb3YQ6z1nXWwVbmqNORemjdg36f/1bzhva0amk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qEsGVlAOzi+eLRAh2qNrjrPPlboFuhUBXB7sx8pZpjAtbORy2PU9uXPnm8vD2H2KmC0x+Y7lIkQZH7uajnL0MnrI/oPrS+yFzaTHiTLQEHAulJBCgRMoMst2y9Uxl/mq0LLSYXs9V4oxH2M2y5iHp1w+a3qtPUvzZ30FKg30/3s= 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=QdttMt7t; 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="QdttMt7t" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752499914; 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=WYbbgpzUKB8X3b3r4oh4zjfNRIGhYdLB9UmhVtf7hUw=; b=QdttMt7tj8JB/o7cjp3dJa13o661OeOVlmGtMh9V+KDmhvJWDh0tBxKJeZYGzDzZ+nFHV4 XpzhC1j0ZwB9NfI5HA9GtMLOwSKN00s0pRtuSUD7t1p/om9maPMoOSiciFh/Zm7tT3kXFQ P8PMowCZDe3RU2eNH1ihlVBkI9SvGmM= 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-190-OBkFUcPZPOCTtncnJZZBcw-1; Mon, 14 Jul 2025 09:31:50 -0400 X-MC-Unique: OBkFUcPZPOCTtncnJZZBcw-1 X-Mimecast-MFC-AGG-ID: OBkFUcPZPOCTtncnJZZBcw_1752499909 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 C3BA119560B7; Mon, 14 Jul 2025 13:31:49 +0000 (UTC) Received: from gmonaco-thinkpadt14gen3.rmtit.com (unknown [10.45.225.215]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 61EED19560A3; Mon, 14 Jul 2025 13:31:46 +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 v8 7/7] timers: Exclude isolated cpus from timer migration Date: Mon, 14 Jul 2025 15:30:58 +0200 Message-ID: <20250714133050.193108-16-gmonaco@redhat.com> In-Reply-To: <20250714133050.193108-9-gmonaco@redhat.com> References: <20250714133050.193108-9-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.0 on 10.30.177.12 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) All online CPUs are added to the hierarchy during early boot, isolated CPUs are removed during late boot if configured or whenever 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) Signed-off-by: Gabriele Monaco --- include/linux/timer.h | 9 ++++ kernel/cgroup/cpuset.c | 3 ++ kernel/time/timer_migration.c | 90 +++++++++++++++++++++++++++++++++++ 3 files changed, 102 insertions(+) diff --git a/include/linux/timer.h b/include/linux/timer.h index 0414d9e6b4fcd..62e1cea711257 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 a946d85ce954a..ff5b66abd0474 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c @@ -1392,6 +1392,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 878fd3af40ecb..c07cc9a2b209d 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" @@ -428,6 +429,9 @@ static DEFINE_PER_CPU(struct tmigr_cpu, tmigr_cpu); */ static cpumask_var_t tmigr_available_cpumask; =20 +/* Enabled during late initcall */ +static bool tmigr_exclude_isolated __read_mostly; + #define TMIGR_NONE 0xFF #define BIT_CNT 8 =20 @@ -436,6 +440,24 @@ 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 + * CPUs are still part of the hierarchy but are always considered idle. + * This behaviour depends on the value of tmigr_exclude_isolated, which is + * normally disabled during early boot. + * This check is necessary, for instance, to prevent offline isolated CPU = from + * being incorrectly marked as available once getting back online. + */ +static inline bool tmigr_is_isolated(int cpu) +{ + if (!tmigr_exclude_isolated) + 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. @@ -1454,6 +1476,8 @@ static int tmigr_clear_cpu_available(unsigned int cpu) =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 @@ -1481,8 +1505,12 @@ static int tmigr_set_cpu_available(unsigned int cpu) if (WARN_ON_ONCE(!tmc->tmgroup)) return -EINVAL; =20 + if (tmigr_is_isolated(cpu)) + return 0; cpumask_set_cpu(cpu, tmigr_available_cpumask); 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) @@ -1492,6 +1520,67 @@ static int tmigr_set_cpu_available(unsigned int cpu) return 0; } =20 +static bool tmigr_should_isolate_cpu(int cpu, void *ignored) +{ + /* + * The tick CPU can be marked as isolated by the cpuset code, however + * we cannot mark it as unavailable to avoid having no global migrator + * for the nohz_full CPUs. + */ + return tick_nohz_cpu_hotpluggable(cpu); +} + +static void tmigr_cpu_isolate(void *ignored) +{ + tmigr_clear_cpu_available(smp_processor_id()); +} + +static void tmigr_cpu_unisolate(void *ignored) +{ + tmigr_set_cpu_available(smp_processor_id()); +} + +int tmigr_isolated_exclude_cpumask(struct cpumask *exclude_cpumask) +{ + cpumask_var_t cpumask; + + lockdep_assert_cpus_held(); + + if (!alloc_cpumask_var(&cpumask, GFP_KERNEL)) + return -ENOMEM; + + cpumask_and(cpumask, exclude_cpumask, tmigr_available_cpumask); + cpumask_and(cpumask, cpumask, housekeeping_cpumask(HK_TYPE_KERNEL_NOISE)); + on_each_cpu_cond_mask(tmigr_should_isolate_cpu, tmigr_cpu_isolate, NULL, + 1, cpumask); + + cpumask_andnot(cpumask, cpu_online_mask, exclude_cpumask); + cpumask_andnot(cpumask, cpumask, tmigr_available_cpumask); + on_each_cpu_mask(cpumask, tmigr_cpu_unisolate, NULL, 1); + + free_cpumask_var(cpumask); + return 0; +} + +static int __init tmigr_init_isolation(void) +{ + cpumask_var_t cpumask; + + tmigr_exclude_isolated =3D true; + if (!housekeeping_enabled(HK_TYPE_DOMAIN)) + return 0; + if (!alloc_cpumask_var(&cpumask, GFP_KERNEL)) + return -ENOMEM; + cpumask_andnot(cpumask, tmigr_available_cpumask, + housekeeping_cpumask(HK_TYPE_DOMAIN)); + cpumask_and(cpumask, cpumask, housekeeping_cpumask(HK_TYPE_KERNEL_NOISE)); + on_each_cpu_cond_mask(tmigr_should_isolate_cpu, tmigr_cpu_isolate, NULL, + 1, cpumask); + + free_cpumask_var(cpumask); + return 0; +} + static void tmigr_init_group(struct tmigr_group *group, unsigned int lvl, int node) { @@ -1874,3 +1963,4 @@ static int __init tmigr_init(void) return ret; } early_initcall(tmigr_init); +late_initcall(tmigr_init_isolation); --=20 2.50.1