d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

examples/vm_power: allow greater than 64 cores

Browse Source 
To facilitate more info per core, change the global_cpu_mask
from a uint64_t to an array. This also removes the limit on
64 cores, allocing the aray at run-time based on the number of
cores found in the system.

Signed-off-by: David Hunt <david.hunt@intel.com>
Acked-by: Radu Nicolau <radu.nicolau@intel.com>
This commit is contained in:
David Hunt 2018-07-13 15:22:57 +01:00 committed by Thomas Monjalon
parent 4b1a631b8a
commit 6453b9284b
1 changed files with 59 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
examples/vm_power_manager/power_manager.c
View File

@ -19,14 +19,14 @@
#include <rte_power.h> #include <rte_power.h>
#include <rte_spinlock.h> #include <rte_spinlock.h>
#include "channel_manager.h"
#include "power_manager.h" #include "power_manager.h"
#include "oob_monitor.h"
#define RTE_LOGTYPE_POWER_MANAGER RTE_LOGTYPE_USER1
#define POWER_SCALE_CORE(DIRECTION, core_num , ret) do { \ #define POWER_SCALE_CORE(DIRECTION, core_num , ret) do { \
if (core_num >= POWER_MGR_MAX_CPUS) \ if (core_num >= ci.core_count) \
return -1; \ return -1; \
if (!(global_enabled_cpus & (1ULL << core_num))) \ if (!(ci.cd[core_num].global_enabled_cpus)) \
return -1; \ return -1; \
rte_spinlock_lock(&global_core_freq_info[core_num].power_sl); \ rte_spinlock_lock(&global_core_freq_info[core_num].power_sl); \
ret = rte_power_freq_##DIRECTION(core_num); \ ret = rte_power_freq_##DIRECTION(core_num); \
@ -37,7 +37,7 @@
int i; \ int i; \
for (i = 0; core_mask; core_mask &= ~(1 << i++)) { \ for (i = 0; core_mask; core_mask &= ~(1 << i++)) { \
if ((core_mask >> i) & 1) { \ if ((core_mask >> i) & 1) { \
if (!(global_enabled_cpus & (1ULL << i))) \ if (!(ci.cd[i].global_enabled_cpus)) \
continue; \ continue; \
rte_spinlock_lock(&global_core_freq_info[i].power_sl); \ rte_spinlock_lock(&global_core_freq_info[i].power_sl); \
if (rte_power_freq_##DIRECTION(i) != 1) \ if (rte_power_freq_##DIRECTION(i) != 1) \
@ -56,28 +56,9 @@ struct freq_info {
static struct freq_info global_core_freq_info[POWER_MGR_MAX_CPUS]; static struct freq_info global_core_freq_info[POWER_MGR_MAX_CPUS];
struct core_info ci; struct core_info ci;
static uint64_t global_enabled_cpus;
#define SYSFS_CPU_PATH "/sys/devices/system/cpu/cpu%u/topology/core_id" #define SYSFS_CPU_PATH "/sys/devices/system/cpu/cpu%u/topology/core_id"
static unsigned
set_host_cpus_mask(void)
{
char path[PATH_MAX];
unsigned i;
unsigned num_cpus = 0;
for (i = 0; i < POWER_MGR_MAX_CPUS; i++) {
snprintf(path, sizeof(path), SYSFS_CPU_PATH, i);
if (access(path, F_OK) == 0) {
global_enabled_cpus |= 1ULL << i;
num_cpus++;
} else
return num_cpus;
}
return num_cpus;
}
struct core_info * struct core_info *
get_core_info(void) get_core_info(void)
{ {
@ -110,38 +91,45 @@ core_info_init(void)
int int
power_manager_init(void) power_manager_init(void)
{ {
unsigned int i, num_cpus, num_freqs; unsigned int i, num_cpus = 0, num_freqs = 0;
uint64_t cpu_mask;
int ret = 0; int ret = 0;
struct core_info *ci;
num_cpus = set_host_cpus_mask(); rte_power_set_env(PM_ENV_ACPI_CPUFREQ);
if (num_cpus == 0) {
RTE_LOG(ERR, POWER_MANAGER, "Unable to detected host CPUs, please " ci = get_core_info();
"ensure that sufficient privileges exist to inspect sysfs\n"); if (!ci) {
RTE_LOG(ERR, POWER_MANAGER,
"Failed to get core info!\n");
return -1; return -1;
} }
rte_power_set_env(PM_ENV_ACPI_CPUFREQ);
cpu_mask = global_enabled_cpus; for (i = 0; i < ci->core_count; i++) {
for (i = 0; cpu_mask; cpu_mask &= ~(1 << i++)) { if (ci->cd[i].global_enabled_cpus) {
if (rte_power_init(i) < 0) if (rte_power_init(i) < 0)
RTE_LOG(ERR, POWER_MANAGER, RTE_LOG(ERR, POWER_MANAGER,
"Unable to initialize power manager " "Unable to initialize power manager "
"for core %u\n", i); "for core %u\n", i);
num_freqs = rte_power_freqs(i, global_core_freq_info[i].freqs, num_cpus++;
num_freqs = rte_power_freqs(i,
global_core_freq_info[i].freqs,
RTE_MAX_LCORE_FREQS); RTE_MAX_LCORE_FREQS);
if (num_freqs == 0) { if (num_freqs == 0) {
RTE_LOG(ERR, POWER_MANAGER, RTE_LOG(ERR, POWER_MANAGER,
"Unable to get frequency list for core %u\n", "Unable to get frequency list for core %u\n",
i); i);
global_enabled_cpus &= ~(1 << i); ci->cd[i].oob_enabled = 0;
num_cpus--; ret = -1;
ret = -1; }
global_core_freq_info[i].num_freqs = num_freqs;
rte_spinlock_init(&global_core_freq_info[i].power_sl);
} }
global_core_freq_info[i].num_freqs = num_freqs; if (ci->cd[i].oob_enabled)
rte_spinlock_init(&global_core_freq_info[i].power_sl); add_core_to_monitor(i);
} }
RTE_LOG(INFO, POWER_MANAGER, "Detected %u host CPUs , enabled core mask:" RTE_LOG(INFO, POWER_MANAGER, "Managing %u cores out of %u available host cores\n",
" 0x%"PRIx64"\n", num_cpus, global_enabled_cpus); num_cpus, ci->core_count);
return ret; return ret;
} }
@ -156,7 +144,7 @@ power_manager_get_current_frequency(unsigned core_num)
core_num, POWER_MGR_MAX_CPUS-1); core_num, POWER_MGR_MAX_CPUS-1);
return -1; return -1;
} }
if (!(global_enabled_cpus & (1ULL << core_num))) if (!(ci.cd[core_num].global_enabled_cpus))
return 0; return 0;
rte_spinlock_lock(&global_core_freq_info[core_num].power_sl); rte_spinlock_lock(&global_core_freq_info[core_num].power_sl);
@ -175,15 +163,26 @@ power_manager_exit(void)
{ {
unsigned int i; unsigned int i;
int ret = 0; int ret = 0;
struct core_info *ci;
for (i = 0; global_enabled_cpus; global_enabled_cpus &= ~(1 << i++)) { ci = get_core_info();
if (rte_power_exit(i) < 0) { if (!ci) {
RTE_LOG(ERR, POWER_MANAGER, "Unable to shutdown power manager " RTE_LOG(ERR, POWER_MANAGER,
"for core %u\n", i); "Failed to get core info!\n");
ret = -1; return -1;
} }
for (i = 0; i < ci->core_count; i++) {
if (ci->cd[i].global_enabled_cpus) {
if (rte_power_exit(i) < 0) {
RTE_LOG(ERR, POWER_MANAGER, "Unable to shutdown power manager "
"for core %u\n", i);
ret = -1;
}
ci->cd[i].global_enabled_cpus = 0;
}
remove_core_from_monitor(i);
} }
global_enabled_cpus = 0;
return ret; return ret;
} }
@ -299,10 +298,12 @@ int
power_manager_scale_core_med(unsigned int core_num) power_manager_scale_core_med(unsigned int core_num)
{ {
int ret = 0; int ret = 0;
struct core_info *ci;
ci = get_core_info();
if (core_num >= POWER_MGR_MAX_CPUS) if (core_num >= POWER_MGR_MAX_CPUS)
return -1; return -1;
if (!(global_enabled_cpus & (1ULL << core_num))) if (!(ci->cd[core_num].global_enabled_cpus))
return -1; return -1;
rte_spinlock_lock(&global_core_freq_info[core_num].power_sl); rte_spinlock_lock(&global_core_freq_info[core_num].power_sl);
ret = rte_power_set_freq(core_num, ret = rte_power_set_freq(core_num,