@@ -19,6 +19,7 @@ extern "C" {
#endif
#include <odp/init.h>
+#include <odp/cpumask.h>
#include <odp/thread.h>
#include <stdio.h>
@@ -40,6 +41,8 @@ struct odp_global_data_s {
odp_log_func_t log_fn;
odp_abort_func_t abort_fn;
odp_system_info_t system_info;
+ odp_cpumask_t control_cpus;
+ odp_cpumask_t worker_cpus;
};
enum init_stage {
@@ -60,6 +63,9 @@ enum init_stage {
extern struct odp_global_data_s odp_global_data;
+/* Number of logical CPUs detected at boot time */
+extern int num_cpus_installed;
+
int _odp_term_global(enum init_stage stage);
int _odp_term_local(enum init_stage stage);
@@ -12,55 +12,52 @@
#include <odp/cpumask.h>
#include <odp_debug_internal.h>
+/*
+ * The following functions assume that odp_init_global() or some external
+ * logic has previously initialized the globally accessible cpumasks
+ * for ODP control and worker CPU selections.
+ */
int odp_cpumask_default_worker(odp_cpumask_t *mask, int num)
{
- int ret, cpu, i;
- cpu_set_t cpuset;
-
- ret = pthread_getaffinity_np(pthread_self(),
- sizeof(cpu_set_t), &cpuset);
- if (ret != 0)
- ODP_ABORT("failed to read CPU affinity value\n");
-
- odp_cpumask_zero(mask);
+ odp_cpumask_t overlap;
+ int cpu, i;
/*
* If no user supplied number or it's too large, then attempt
* to use all CPUs
*/
- if (0 == num || CPU_SETSIZE < num)
- num = CPU_COUNT(&cpuset);
+ cpu = odp_cpumask_count(&odp_global_data.worker_cpus);
+ if (0 == num || cpu < num)
+ num = cpu;
/* build the mask, allocating down from highest numbered CPU */
+ odp_cpumask_zero(mask);
for (cpu = 0, i = CPU_SETSIZE - 1; i >= 0 && cpu < num; --i) {
- if (CPU_ISSET(i, &cpuset)) {
+ if (odp_cpumask_isset(&odp_global_data.worker_cpus, i)) {
odp_cpumask_set(mask, i);
cpu++;
}
}
- if (odp_cpumask_isset(mask, 0))
- ODP_DBG("\n\tCPU0 will be used for both control and worker threads,\n"
- "\tthis will likely have a performance impact on the worker thread.\n");
+ odp_cpumask_and(&overlap, mask, &odp_global_data.control_cpus);
+ if (odp_cpumask_count(&overlap))
+ ODP_DBG("\n\tWorker and Control CPU selections overlap...\n"
+ "\tthis will likely have a performance impact on the worker threads.\n");
return cpu;
}
int odp_cpumask_default_control(odp_cpumask_t *mask, int num ODP_UNUSED)
{
- odp_cpumask_zero(mask);
- /* By default all control threads on CPU 0 */
- odp_cpumask_set(mask, 0);
- return 1;
+ odp_cpumask_copy(mask, &odp_global_data.control_cpus);
+
+ return odp_cpumask_count(mask);
}
int odp_cpumask_all_available(odp_cpumask_t *mask)
{
- odp_cpumask_t mask_work, mask_ctrl;
-
- odp_cpumask_default_worker(&mask_work, 0);
- odp_cpumask_default_control(&mask_ctrl, 0);
- odp_cpumask_or(mask, &mask_work, &mask_ctrl);
+ odp_cpumask_or(mask, &odp_global_data.worker_cpus,
+ &odp_global_data.control_cpus);
return odp_cpumask_count(mask);
}
@@ -4,13 +4,94 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#include <odp/init.h>
-#include <odp_internal.h>
+#include <odp_posix_extensions.h>
+
+#include <dirent.h>
+#include <errno.h>
+#include <sched.h>
+#include <string.h>
+#include <sys/types.h>
+
+#include <odp/cpumask.h>
#include <odp/debug.h>
#include <odp_debug_internal.h>
+#include <odp/init.h>
+#include <odp_internal.h>
struct odp_global_data_s odp_global_data;
+/*
+ * This function obtains system information specifying which cpus are
+ * available at boot time. These data are then used to produce cpumasks of
+ * configured CPUs without concern over isolation support.
+ */
+static int get_installed_cpus(void)
+{
+ char *numptr;
+ char *endptr;
+ long int cpu_idnum;
+ DIR *d;
+ struct dirent *dir;
+
+ /* Clear the global cpumasks for control and worker CPUs */
+ odp_cpumask_zero(&odp_global_data.control_cpus);
+ odp_cpumask_zero(&odp_global_data.worker_cpus);
+
+ /*
+ * Scan the /sysfs pseudo-filesystem for CPU info directories.
+ * There should be one subdirectory for each installed logical CPU
+ */
+ d = opendir("/sys/devices/system/cpu");
+ if (d) {
+ while ((dir = readdir(d)) != NULL) {
+ cpu_idnum = CPU_SETSIZE;
+
+ /*
+ * If the current directory entry doesn't represent
+ * a CPU info subdirectory then skip to the next entry.
+ */
+ if (dir->d_type == DT_DIR) {
+ if (!strncmp(dir->d_name, "cpu", 3)) {
+ /*
+ * Directory name starts with "cpu"...
+ * Try to extract a CPU ID number
+ * from the remainder of the dirname.
+ */
+ errno = 0;
+ numptr = dir->d_name;
+ numptr += 3;
+ cpu_idnum = strtol(numptr, &endptr,
+ 10);
+ if (errno || (endptr == numptr))
+ continue;
+ } else {
+ continue;
+ }
+ } else {
+ continue;
+ }
+ /*
+ * If we get here the current directory entry specifies
+ * a CPU info subdir for the CPU indexed by cpu_idnum.
+ */
+
+ /* Track number of logical CPUs discovered */
+ if (num_cpus_installed < (int)(cpu_idnum + 1))
+ num_cpus_installed = (int)(cpu_idnum + 1);
+
+ /* Add the CPU to our default cpumasks */
+ odp_cpumask_set(&odp_global_data.control_cpus,
+ (int)cpu_idnum);
+ odp_cpumask_set(&odp_global_data.worker_cpus,
+ (int)cpu_idnum);
+ }
+ closedir(d);
+ return 0;
+ } else {
+ return -1;
+ }
+}
+
int odp_init_global(const odp_init_t *params,
const odp_platform_init_t *platform_params ODP_UNUSED)
{
@@ -25,6 +106,11 @@ int odp_init_global(const odp_init_t *params,
odp_global_data.abort_fn = params->abort_fn;
}
+ if (get_installed_cpus()) {
+ ODP_ERR("ODP cpumask init failed.\n");
+ goto init_failed;
+ }
+
if (odp_time_init_global()) {
ODP_ERR("ODP time init failed.\n");
goto init_failed;
@@ -30,21 +30,15 @@
#define HUGE_PAGE_DIR "/sys/kernel/mm/hugepages"
+/* Number of logical CPUs detected at boot time */
+int num_cpus_installed;
/*
- * Report the number of CPUs in the affinity mask of the main thread
+ * Report the number of logical CPUs detected at boot time
*/
static int sysconf_cpu_count(void)
{
- cpu_set_t cpuset;
- int ret;
-
- ret = pthread_getaffinity_np(pthread_self(),
- sizeof(cpuset), &cpuset);
- if (ret != 0)
- return 0;
-
- return CPU_COUNT(&cpuset);
+ return num_cpus_installed;
}
#if defined __x86_64__ || defined __i386__ || defined __OCTEON__ || \
sched_getaffinity() and pthread_getaffinity_np() do not return an accurate mask of all CPUs in the machine when the kernel is compiled with NO_HZ_FULL support. See Linaro BUG 2027 for details. https://bugs.linaro.org/show_bug.cgi?id=2027 This code replaces the 'getaffinity' based CPU discovery logic -and- removes any exclusivity between default control and worker cpumasks, based on an assumption that external cpumask specifications will segregate CPUs if needed. The results of these changes which address BUG 2027 are: (1) all CPUs known to the kernel at boot time are considered for use by ODP regardless of the default CPU affinity masks set by the kernel scheduler, (2) the default control and worker cpumasks both contain all CPUs Also - this code: (a) adds control worker cpumasks to the linux-generic global data (b) adds logic to odp_init_global() to initialize these masks, -and- (c) reduces odp_cpumask_default_control() and odp_cpumask_default_worker() to use the content of these new cpumasks without modification. These changes provide prerequisite infrastructure for pending changes which will allow ODP to accept cpumasks passed in from external entities such as a provisioning service. Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org> --- platform/linux-generic/include/odp_internal.h | 6 ++ platform/linux-generic/odp_cpumask_task.c | 45 +++++++------- platform/linux-generic/odp_init.c | 90 ++++++++++++++++++++++++++- platform/linux-generic/odp_system_info.c | 14 ++--- 4 files changed, 119 insertions(+), 36 deletions(-)