changes from feedback, removing "further plans" parts.

using _SC_NPROCESSORS_ONLN code path only as backup now,
checking actual max cpu affinity first.

Author: devnexen

configure.ac

@@ -405,10 +405,8 @@ pty.h \
 pwd.h \
 resolv.h \
 strings.h \
-sched.h \
 syslog.h \
 sysexits.h \
-sys/cpuset.h \
 sys/ioctl.h \
 sys/file.h \
 sys/mman.h \
@@ -576,7 +574,6 @@ AC_CHECK_FUNCS(
 alphasort \
 asctime_r \
 chroot \
-cpuset_setaffinity \
 ctime_r \
 explicit_memset \
 fdatasync \
@@ -614,7 +611,6 @@ poll \
 pthread_jit_write_protect_np \
 putenv \
 scandir \
-sched_setaffinity \
 setitimer \
 setenv \
 shutdown \

sapi/fpm/config.m4

@@ -7,7 +7,8 @@ PHP_ARG_ENABLE([fpm],,
 dnl Configure checks.
 AC_DEFUN([AC_FPM_STDLIBS],
 [
-  AC_CHECK_FUNCS(clearenv setproctitle setproctitle_fast)
+  AC_CHECK_FUNCS(clearenv setproctitle setproctitle_fast cpuset_setaffinity sched_setaffinity)
+  AC_CHECK_HEADERS([sys/cpuset.h sched.h])
 
   AC_SEARCH_LIBS(socket, socket)
   AC_SEARCH_LIBS(inet_addr, nsl)

sapi/fpm/fpm/fpm_conf.c

@@ -100,7 +100,7 @@ static struct ini_value_parser_s ini_fpm_global_options[] = {
 	{ "process.max",                 &fpm_conf_set_integer,         GO(process_max) },
 	{ "process.priority",            &fpm_conf_set_integer,         GO(process_priority) },
 #if HAVE_FPM_CPUAFFINITY
-	{ "process.cpumask",             &fpm_conf_set_string,          GO(process_cpumask) },
+	{ "process.cpu_list",            &fpm_conf_set_string,          GO(process_cpu_list) },
 #endif
 	{ "daemonize",                   &fpm_conf_set_boolean,         GO(daemonize) },
 	{ "rlimit_files",                &fpm_conf_set_integer,         GO(rlimit_files) },
@@ -135,7 +135,7 @@ static struct ini_value_parser_s ini_fpm_pool_options[] = {
 	{ "process.priority",          &fpm_conf_set_integer,     WPO(process_priority) },
 	{ "process.dumpable",          &fpm_conf_set_boolean,     WPO(process_dumpable) },
 #if HAVE_FPM_CPUAFFINITY
-	{ "process.cpumask",           &fpm_conf_set_string,      WPO(process_cpumask) },
+	{ "process.cpu_list",          &fpm_conf_set_string,      WPO(process_cpu_list) },
 #endif
 	{ "pm",                        &fpm_conf_set_pm,          WPO(pm) },
 	{ "pm.max_children",           &fpm_conf_set_integer,     WPO(pm_max_children) },
@@ -629,7 +629,7 @@ static void *fpm_worker_pool_config_alloc(void)
 	wp->config->process_priority = 64; /* 64 means unset */
 	wp->config->process_dumpable = 0;
 #if HAVE_FPM_CPUAFFINITY
-	wp->config->process_cpumask = NULL;
+	wp->config->process_cpu_list = NULL;
 #endif
 	wp->config->clear_env = 1;
 	wp->config->decorate_workers_output = 1;
@@ -1742,6 +1742,9 @@ static void fpm_conf_dump(void)
 	} else {
 		zlog(ZLOG_NOTICE, "\tprocess.priority = %d", fpm_global_config.process_priority);
 	}
+#if HAVE_FPM_CPUAFFINITY
+	zlog(ZLOG_NOTICE, "\tprocess.cpu_list = %s",            STR2STR(fpm_global_config.process_cpu_list));
+#endif
 	zlog(ZLOG_NOTICE, "\tdaemonize = %s",                   BOOL2STR(fpm_global_config.daemonize));
 	zlog(ZLOG_NOTICE, "\trlimit_files = %d",                fpm_global_config.rlimit_files);
 	zlog(ZLOG_NOTICE, "\trlimit_core = %d",                 fpm_global_config.rlimit_core);
@@ -1781,6 +1784,9 @@ static void fpm_conf_dump(void)
 			zlog(ZLOG_NOTICE, "\tprocess.priority = %d", wp->config->process_priority);
 		}
 		zlog(ZLOG_NOTICE, "\tprocess.dumpable = %s",           BOOL2STR(wp->config->process_dumpable));
+#if HAVE_FPM_CPUAFFINITY
+		zlog(ZLOG_NOTICE, "\tprocess.cpu_list = %s",           STR2STR(wp->config->process_cpu_list));
+#endif
 		zlog(ZLOG_NOTICE, "\tpm = %s",                         PM2STR(wp->config->pm));
 		zlog(ZLOG_NOTICE, "\tpm.max_children = %d",            wp->config->pm_max_children);
 		zlog(ZLOG_NOTICE, "\tpm.start_servers = %d",           wp->config->pm_start_servers);

sapi/fpm/fpm/fpm_conf.h

@@ -45,7 +45,7 @@ struct fpm_global_config_s {
 	int systemd_interval;
 #endif
 #if HAVE_FPM_CPUAFFINITY
-	char *process_cpumask;
+	char *process_cpu_list;
 #endif
 };
 
@@ -111,7 +111,7 @@ struct fpm_worker_pool_config_s {
 	int listen_setfib;
 #endif
 #if HAVE_FPM_CPUAFFINITY
-	char *process_cpumask;
+	char *process_cpu_list;
 #endif
 };
 

sapi/fpm/fpm/fpm_unix.c

@@ -8,6 +8,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/types.h>
+#include <errno.h>
 #include <pwd.h>
 #include <grp.h>
 
@@ -414,22 +415,31 @@ static long fpm_cpumax(void)
 {
 	static long cpuid = LONG_MIN;
 	if (cpuid == LONG_MIN) {
-		cpuid = sysconf(_SC_NPROCESSORS_ONLN);
+		cpu_set_t cset;
+#if defined(HAVE_SCHED_SETAFFINITY)
+		if (sched_getaffinity(0, sizeof(cset), &cset) == 0) {
+#elif defined(HAVE_CPUSET_SETAFFINITY)
+		if (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(cset), &cset) == 0) {
+#endif
+			cpuid = CPU_COUNT(&cset);
+		} else {
+			cpuid = -1;
+		}
 	}
 
 	return cpuid;
 }
 
 static void fpm_cpuaffinity_init(struct fpm_cpuaffinity_conf *c)
 {
-#if defined(HAVE_SCHED_SETAFFINITY) || defined(HAVE_CPUSET_SETAFFINITY)
+#if defined(HAVE_FPM_CPUAFFINITY)
 	CPU_ZERO(&c->cset);
 #endif
 }
 
 static void fpm_cpuaffinity_add(struct fpm_cpuaffinity_conf *c)
 {
-#if defined(HAVE_SCHED_SETAFFINITY) || defined(HAVE_CPUSET_SETAFFINITY)
+#if defined(HAVE_FPM_CPUAFFINITY)
 	int i;
 
 	for (i = c->min; i <= c->max; i ++) {
@@ -449,12 +459,7 @@ static int fpm_cpuaffinity_set(struct fpm_cpuaffinity_conf *c)
 #endif
 }
 
-static void fpm_cpuaffinity_destroy(struct fpm_cpuaffinity_conf *c)
-{
-	// some platform/apis require to allocates data on the heap
-}
-
-static int fpm_setcpuaffinity(char *cpumask)
+static int fpm_setcpuaffinity(char *cpu_list)
 {
 	char *token, *buf;
 	struct fpm_cpuaffinity_conf fconf;
@@ -464,20 +469,20 @@ static int fpm_setcpuaffinity(char *cpumask)
 	cpumax = fpm_cpumax();
 
 	fpm_cpuaffinity_init(&fconf);
-	token = php_strtok_r(cpumask, ";", &buf);
+	token = php_strtok_r(cpu_list, ",", &buf);
 
 	while (token) {
-		char *cpumasksep;
+		char *cpu_listsep;
 
-		fconf.min = strtol(token, &cpumasksep, 0);
+		fconf.min = strtol(token, &cpu_listsep, 0);
 		if (errno || fconf.min < 0 || fconf.min > cpumax) {
 			return -1;
 		}
 		fconf.max = fconf.min;
-		if (*cpumasksep == '-') {
-			if (strlen(cpumasksep) > 1) {
+		if (*cpu_listsep == '-') {
+			if (strlen(cpu_listsep) > 1) {
 				char *err;
-				fconf.max = strtol(cpumasksep + 1, &err, 0);
+				fconf.max = strtol(cpu_listsep + 1, &err, 0);
 				if (errno || *err != '\0' || fconf.max < fconf.min || fconf.max > cpumax) {
 					return -1;
 				}
@@ -492,7 +497,6 @@ static int fpm_setcpuaffinity(char *cpumask)
 	}
 
 	r = fpm_cpuaffinity_set(&fconf);
-	fpm_cpuaffinity_destroy(&fconf);
 	return r;
 }
 #endif
@@ -522,10 +526,10 @@ int fpm_unix_init_child(struct fpm_worker_pool_s *wp) /* {{{ */
 		}
 	}
 #if HAVE_FPM_CPUAFFINITY
-	if (wp->config->process_cpumask) {
+	if (wp->config->process_cpu_list) {
 
-		if (0 > fpm_setcpuaffinity(wp->config->process_cpumask)) {
-			zlog(ZLOG_SYSERROR, "[pool %s] failed to fpm_setcpuaffinity(%s)", wp->config->name, wp->config->process_cpumask);
+		if (0 > fpm_setcpuaffinity(wp->config->process_cpu_list)) {
+			zlog(ZLOG_SYSERROR, "[pool %s] failed to fpm_setcpuaffinity(%s)", wp->config->name, wp->config->process_cpu_list);
 			return -1;
 		}
 	}
@@ -777,9 +781,9 @@ int fpm_unix_init_main(void)
 	}
 
 #if HAVE_FPM_CPUAFFINITY
-	if (fpm_global_config.process_cpumask) {
-		if (0 > fpm_setcpuaffinity(fpm_global_config.process_cpumask)) {
-			zlog(ZLOG_SYSERROR, "failed to fpm_setcpuaffinity(%s)", fpm_global_config.process_cpumask);
+	if (fpm_global_config.process_cpu_list) {
+		if (0 > fpm_setcpuaffinity(fpm_global_config.process_cpu_list)) {
+			zlog(ZLOG_SYSERROR, "failed to fpm_setcpuaffinity(%s)", fpm_global_config.process_cpu_list);
 			return -1;
 		}
 	}

sapi/fpm/php-fpm.conf.in

@@ -129,9 +129,12 @@
 ; The value can be one cpu id, a range or a list thereof.
 ;
 ; Default Value: not set
-; process.cpumask = "4"
-; process.cpumask = "0-3"
-; process.cpumask = "1-4;8-16;32-48"
+; the master process could be bound to a single core
+; process.cpu_list = "4"
+; a range from the minimum cpuid to the max required
+; process.cpu_list = "0-3"
+; or multiple ranges separated by a comma
+; process.cpu_list = "1-4,8-16,32-48"
 
 ;;;;;;;;;;;;;;;;;;;;
 ; Pool Definitions ;

sapi/fpm/tests/cpuaffinity-fail.phpt

@@ -14,7 +14,7 @@ require_once "tester.inc";
 
 $cfg = <<<EOT
 [global]
-process.cpumask = 1000024
+process.cpu_list = 1000024
 error_log = {{FILE:LOG}}
 pid = {{FILE:PID}}
 [unconfined]

sapi/fpm/tests/cpuaffinity.phpt

@@ -27,7 +27,7 @@ pm.max_children = 1
 pm.start_servers = 1
 pm.min_spare_servers = 1
 pm.max_spare_servers = 1
-process.cpumask = 1
+process.cpu_list = 1
 EOT;
 
 $tester = new FPM\Tester($cfg);

sapi/fpm/www.conf.in

@@ -84,9 +84,12 @@ listen = 127.0.0.1:9000
 ; The value can be one cpu id, a range or a list thereof.
 ;
 ; Default Value: inherits master's cpu affinity
-; process.cpumask = "8"
-; process.cpumask = "0-3"
-; process.cpumask = "4-7;10-12"
+; the pool process could be bound to a single core
+; process.cpu_list = "8"
+; a range from the minimum cpuid to the max required
+; process.cpu_list = "0-3"
+; or multiple ranges separated by a comma
+; process.cpu_list = "4-7,10-12"
 
 ; Set the process dumpable flag (PR_SET_DUMPABLE prctl for Linux or
 ; PROC_TRACE_CTL procctl for FreeBSD) even if the process user