From: Olivier Houchard <ohouchard@haproxy.com>
Date: Fri, 26 Dec 2025 22:50:20 +0000 (+0100)
Subject: BUG/MEDIUM: cpu-topo: Don't forget to reset visited_ccx.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54f59e466927b8c1678247d282c8e2956a7bd693;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: cpu-topo: Don't forget to reset visited_ccx.

We want to reset visited_ccx, as introduced by commit
8aef5bec1ef57eac449298823843d6cc08545745, each time we run the loop,
otherwise the chances of its content being correct are very low, and
will likely end up being bound to the wrong threads.
This was reported in github issue #3224.
---

diff --git a/src/cpu_topo.c b/src/cpu_topo.c
index 2a2966cd4..9d3a7e8ca 100644
--- a/src/cpu_topo.c
+++ b/src/cpu_topo.c
@@ -1507,6 +1507,7 @@ static int cpu_policy_group_by_ccx(int policy, int tmin, int tmax, int gmin, int
 	while (global.nbtgroups < MAX_TGROUPS && global.nbthread < MAX_THREADS) {
 		ha_cpuset_zero(&node_cpu_set);
 		ha_cpuset_zero(&visited_tsid);
+		ha_cpuset_zero(&visited_ccx);
 		l3id = -1; cpu_count = 0;
 
 		for (cpu = cpu_start; cpu <= cpu_topo_lastcpu; cpu++) {