RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-22 05:36:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: fix a 100% cpu usage with cpu-map and nbthread/nbproc

Browse Source 
Krishna Kumar reported a 100% cpu usage with a configuration using
cpu-map and a high number of threads,

Indeed, this minimal configuration to reproduce the issue :
  global
    nbthread 40
    cpu-map auto:1/1-40 0-39

  frontend test
    bind :8000

This is due to a wrong type in a shift operator (int vs unsigned long int),
causing an endless loop while applying the cpu affinity on threads. The same
issue may also occur with nbproc under FreeBSD. This commit addresses both
cases.

This patch must be backported to 1.8.
This commit is contained in:
Cyril Bont 2018-03-12 21:47:39 +01:00 committed by Willy Tarreau
parent b53e20826e
commit d400ab3a36
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/haproxy.c
View File

@ -2837,7 +2837,7 @@ int main(int argc, char **argv)
CPU_ZERO(&cpuset);
while ((i = ffsl(cpu_map)) > 0) {
CPU_SET(i - 1, &cpuset);
cpu_map &= ~(1 << (i - 1));
cpu_map &= ~(1UL << (i - 1));
}
ret = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(cpuset), &cpuset);
}
@ -3037,7 +3037,7 @@ int main(int argc, char **argv)
while ((j = ffsl(cpu_map)) > 0) {
CPU_SET(j - 1, &cpuset);
cpu_map &= ~(1 << (j - 1));
cpu_map &= ~(1UL << (j - 1));
}
pthread_setaffinity_np(threads[i],
sizeof(cpuset), &cpuset);