Skip to content

Fix CPU detection in cgroup v2 constrained environments #303

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rucoder wants to merge 1 commit into from
Closed

Fix CPU detection in cgroup v2 constrained environments #303

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 31 additions & 29 deletions lib/os_cpuinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,62 +253,68 @@ os_cpuinfo_topology(void)
{
struct pqos_cpuinfo *cpu = NULL;
struct dirent **namelist = NULL;
int max_core_count;
int num_cpus;
int i;
int retval = PQOS_RETVAL_OK;

max_core_count = sysconf(_SC_NPROCESSORS_CONF);
if (max_core_count < 0) {
LOG_ERROR("Failed to get number of processors!\n");
return NULL;
} else if (max_core_count == 0) {
LOG_ERROR("Zero processors in the system!\n");
num_cpus = scandir(SYSTEM_CPU, &namelist, filter_cpu, cpu_sort);

if (num_cpus <= 0) {
LOG_ERROR("os_cpuinfo_topology: Failed to read %s!\n", SYSTEM_CPU);
if (namelist != NULL)
free(namelist);
return NULL;
}

if (pqos_set_no_files_limit(max_core_count)) {
if (pqos_set_no_files_limit(num_cpus)) {
LOG_ERROR("Open files limit not sufficient!\n");
for (i = 0; i < num_cpus; i++)
free(namelist[i]);
free(namelist);
return NULL;
}

const size_t mem_sz =
sizeof(*cpu) + (max_core_count * sizeof(struct pqos_coreinfo));
sizeof(*cpu) + (num_cpus * sizeof(struct pqos_coreinfo));

cpu = (struct pqos_cpuinfo *)malloc(mem_sz);
if (cpu == NULL) {
LOG_ERROR("Couldn't allocate CPU topology structure!\n");
for (i = 0; i < num_cpus; i++)
free(namelist[i]);
free(namelist);
return NULL;
}
cpu->mem_size = (unsigned)mem_sz;
memset(cpu, 0, mem_sz);

num_cpus = scandir(SYSTEM_CPU, &namelist, filter_cpu, cpu_sort);
if (num_cpus <= 0 || max_core_count < num_cpus) {
LOG_ERROR("Failed to read proc cpus!\n");
free(cpu);
return NULL;
}

for (i = 0; i < num_cpus; i++) {
unsigned lcore = atoi(namelist[i]->d_name + 3);
struct pqos_coreinfo *info = &cpu->cores[cpu->num_cores];

if (!os_cpuinfo_cpu_online(lcore))
if (!os_cpuinfo_cpu_online(lcore)) {
LOG_DEBUG("Logical core %u is offline, skipping\n", lcore);
continue;
}

retval = os_cpuinfo_cpu_socket(lcore, &info->socket);
if (retval != PQOS_RETVAL_OK)
if (retval != PQOS_RETVAL_OK) {
LOG_ERROR("Failed to get socket for lcore %u\n", lcore);
break;
}

retval = os_cpuinfo_cpu_node(lcore, &info->numa);
if (retval != PQOS_RETVAL_OK)
if (retval != PQOS_RETVAL_OK) {
LOG_ERROR("Failed to get NUMA node for lcore %u\n", lcore);
break;
}

retval =
os_cpuinfo_cpu_cache(lcore, &info->l3_id, &info->l2_id);
if (retval != PQOS_RETVAL_OK)
if (retval != PQOS_RETVAL_OK) {
LOG_ERROR("Failed to get cache IDs for lcore %u\n", lcore);
break;
}

info->lcore = lcore;

Expand Down Expand Up @@ -362,25 +368,21 @@ int
os_cpuinfo_get_socket_num(void)
{
struct dirent **namelist = NULL;
int max_core_count;
int num_cpus;
unsigned num_sockets = 0;
unsigned *sockets;
int i;
int retval = PQOS_RETVAL_OK;

max_core_count = sysconf(_SC_NPROCESSORS_CONF);
if (max_core_count < 0) {
LOG_ERROR("Failed to get number of processors!\n");
return -1;
} else if (max_core_count == 0) {
num_cpus = scandir(SYSTEM_CPU, &namelist, filter_cpu, cpu_sort);

if (num_cpus == 0) {
LOG_ERROR("Zero processors in the system!\n");
return -1;
}

num_cpus = scandir(SYSTEM_CPU, &namelist, filter_cpu, cpu_sort);
if (num_cpus <= 0 || max_core_count < num_cpus) {
LOG_ERROR("Failed to read proc cpus!\n");
if (num_cpus <= 0) {
LOG_ERROR("os_cpuinfo_get_socket_num: Failed to read %s cpus!\n", SYSTEM_CPU);
return -1;
}

Expand Down
Loading