From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 D81DC3E5A0B for ; Tue, 19 May 2026 22:09:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779228580; cv=none; b=CEyAivji3A4E5521Fx0meNucdINy7Rwrkag8AMGQIMZJJvx0caWzBoBHYR5cczmue1FtAtaQecinpQphIQenxy5xUY+bB35ckW5h3lOmU6iOUEx1m8jnRTkyW1ydggmn7WRPrWoIbXcovyMOh2qNCo7dLcuWys3pDeVG+qzdSto= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779228580; c=relaxed/simple; bh=8KCjHbBnCQFRkaSw/5N5RDvzpkvkiz5rKcM4kbS9QwE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qNOHn6LAVPt06L1DnDTdXM6w3suhNT1W8WJgq65Ukj05mvHJqvCGXBuld/igpwOtQpNc3KMXF9GDsmAJDvRhUQO2fWSLxGNvuxyonltiP07K9PUBied+j0DRuoV8tOyr40sduYDGgxktbRIkw0w3eyJf0JS5/SwnYiFrOglxRQY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MmapLioj; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MmapLioj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 821031F00894; Tue, 19 May 2026 22:09:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1779228578; bh=sjLYmOHQS9FTMoifKXEBFT0f2bvFB/fjrrSuaUXK1Io=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MmapLiojCvUhMNVG4Tu2kLTPGYeJi+8fOkSHBVcg1i8RVXgFerrpK7f38xcrITP3P jTs04R3efxlaA0kdK4q+4qA1UZ+8oPsBq5JMGCMX99GDkN+b4uBh7ECnxmqgv5IHoS m1SDDOyPvRIgc1FebxSzC788n0Xvgiq1ipq9MoVKzMBuQ1hV/1KQfJd8nHbMKIC4i5 VjOr1DhDVqMRYTTqt90bN2EnE9pEGrWNizKwBmwcusLwm7JuvN+hO6bO1Sxi2ddott q6OGHv2sr+gaOlyIclRpePk2pkYPaSmQQnWdII16zC3ytWF8itfPg2g3s6OEfGn4Ac fpUa0CbkecVxw== From: Frederic Weisbecker To: Thomas Gleixner Cc: LKML , Frederic Weisbecker , Anna-Maria Behnsen Subject: [PATCH 1/2] timers/migration: Fix hotplug migrator selection target on asymetric capacity machines Date: Wed, 20 May 2026 00:09:25 +0200 Message-ID: <20260519220926.63437-2-frederic@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260519220926.63437-1-frederic@kernel.org> References: <20260519220926.63437-1-frederic@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit When a top-level migrator is deactivated, either at CPU down hotplug time or when a CPU is domain isolated, a new migrator is elected among the available CPUs and woken up to take over the migration duty. However that election must happen at the scope of a given hierarchy and not globally, which the introduction of per-capacity hierarchies failed to handle. As a result a given hierarchy may end up without migrator to handle global timers. Fix it with making sure that the new migrator belongs to the same hierarchy as the outgoing CPU. Fixes: 098cbaad8e57 ("timers/migration: Split per-capacity hierarchies") Signed-off-by: Frederic Weisbecker --- kernel/time/timer_migration.c | 42 ++++++++++++++++++++++++++--------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/kernel/time/timer_migration.c b/kernel/time/timer_migration.c index 25e3c563eb74..8032b0044f44 100644 --- a/kernel/time/timer_migration.c +++ b/kernel/time/timer_migration.c @@ -1464,6 +1464,18 @@ static long tmigr_trigger_active(void *unused) return 0; } +static struct tmigr_hierarchy *__tmigr_get_hierarchy(unsigned int capacity) +{ + struct tmigr_hierarchy *iter; + + list_for_each_entry(iter, &tmigr_hierarchy_list, node) { + if (iter->capacity == capacity) + return iter; + } + + return NULL; +} + static int tmigr_clear_cpu_available(unsigned int cpu) { struct tmigr_cpu *tmc = this_cpu_ptr(&tmigr_cpu); @@ -1488,8 +1500,21 @@ static int tmigr_clear_cpu_available(unsigned int cpu) } if (firstexp != KTIME_MAX) { - migrator = cpumask_any(tmigr_available_cpumask); - work_on_cpu(migrator, tmigr_trigger_active, NULL); + struct tmigr_hierarchy *hier = __tmigr_get_hierarchy(arch_scale_cpu_capacity(cpu)); + + if (WARN_ON_ONCE(!hier)) + return -EINVAL; + + migrator = cpumask_any_and(tmigr_available_cpumask, hier->cpumask); + if (migrator < nr_cpu_ids) { + work_on_cpu(migrator, tmigr_trigger_active, NULL); + } else { + /* + * If deactivation returned an expiration, it belongs to an available + * nohz CPU in the hierarchy. + */ + WARN_ONCE(1, "Expected available CPU in the hierarchy\n"); + } } return 0; @@ -1915,12 +1940,9 @@ static int tmigr_setup_groups(struct tmigr_hierarchy *hier, unsigned int cpu, static struct tmigr_hierarchy *tmigr_get_hierarchy(unsigned int capacity) { - struct tmigr_hierarchy *hier = NULL, *iter; + struct tmigr_hierarchy *hier; - list_for_each_entry(iter, &tmigr_hierarchy_list, node) { - if (iter->capacity == capacity) - hier = iter; - } + hier = __tmigr_get_hierarchy(capacity); if (hier) return hier; @@ -1978,9 +2000,9 @@ static long connect_old_root_work(void *arg) struct tmigr_hierarchy *hier; int cpu = smp_processor_id(); - hier = tmigr_get_hierarchy(arch_scale_cpu_capacity(cpu)); - if (IS_ERR(hier)) - return PTR_ERR(hier); + hier = __tmigr_get_hierarchy(arch_scale_cpu_capacity(cpu)); + if (WARN_ON_ONCE(!hier)) + return -EINVAL; return tmigr_connect_old_root(hier, cpu, old_root, true); } -- 2.53.0