commit e351e54b48da5c23000b72470908595d5ec23079
author Amaury Denoyelle <adenoyelle@haproxy.com> Fri Oct 15 15:22:31 2021 +0200
committer Christopher Faulet <cfaulet@haproxy.com> Tue Oct 19 15:39:18 2021 +0200
tree 1a300f7ff8063016bb1b015f17087af0f7f55f8a
parent 08da273a5c67404da8b7fe405a7e22d0b5f5a58b

BUG/MEDIUM: cpuset: fix cpuset size for FreeBSD

Fix the macro used to retrieve the max number of cpus on FreeBSD. The
MAXCPU is not properly defined in userspace and always set to 1 despite
the machine architecture. Replace it with CPU_SETSIZE.

See https://freebsd-hackers.freebsd.narkive.com/gw4BeLum/smp-in-machine-params-h#post6

Without this, the following config file is rejected on FreeBSD even if
the machine is SMP :
  global
    cpu-map 1-2 0-1

This must be backported up to 2.4.

(cherry picked from commit 697cfde34072ca145262ad9ed5608322946166dd)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

src/cpuset.c

diff --git a/src/cpuset.c b/src/cpuset.c
index 46e572d..c1632c5 100644
--- a/src/cpuset.c
+++ b/src/cpuset.c
@@ -110,12 +110,9 @@
 
 int ha_cpuset_size()
 {
-#if defined(CPUSET_USE_CPUSET)
+#if defined(CPUSET_USE_CPUSET) || defined(CPUSET_USE_FREEBSD_CPUSET)
 	return CPU_SETSIZE;
 
-#elif defined(CPUSET_USE_FREEBSD_CPUSET)
-	return MAXCPU;
-
 #elif defined(CPUSET_USE_ULONG)
 	return LONGBITS;