* [RFC PATCH 1/2] power: fix power library with --lcores
@ 2024-07-24 13:03 Sivaprasad Tummala
2024-07-24 13:03 ` [RFC PATCH 2/2] test/power: " Sivaprasad Tummala
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Sivaprasad Tummala @ 2024-07-24 13:03 UTC (permalink / raw)
To: david.hunt, anatoly.burakov, thomas, ferruh.yigit, david.marchand; +Cc: dev
This commit fixes an issue in the power library
related to using lcores mapped to different
physical cores (--lcores option in EAL).
Previously, the power library incorrectly accessed
CPU sysfs attributes for power management, treating
lcore IDs as CPU IDs.
e.g. with --lcores '1@128', lcore_id '1' was interpreted
as CPU_id instead of '128'.
This patch corrects the cpu_id based on lcore and CPU
mappings. It also constraints power management support
for lcores mapped to multiple physical cores/threads.
When multiple lcores are mapped to the same physical core,
invoking frequency scaling APIs on any lcore will apply the
changes effectively.
Signed-off-by: Sivaprasad Tummala <sivaprasad.tummala@amd.com>
---
lib/power/power_acpi_cpufreq.c | 16 ++++++++++++++--
lib/power/power_amd_pstate_cpufreq.c | 16 ++++++++++++++--
lib/power/power_cppc_cpufreq.c | 16 ++++++++++++++--
lib/power/power_pstate_cpufreq.c | 16 ++++++++++++++--
4 files changed, 56 insertions(+), 8 deletions(-)
diff --git a/lib/power/power_acpi_cpufreq.c b/lib/power/power_acpi_cpufreq.c
index 81996e1c13..97a27e09a0 100644
--- a/lib/power/power_acpi_cpufreq.c
+++ b/lib/power/power_acpi_cpufreq.c
@@ -9,6 +9,7 @@
#include <rte_memcpy.h>
#include <rte_stdatomic.h>
#include <rte_string_fns.h>
+#include <rte_lcore.h>
#include "power_acpi_cpufreq.h"
#include "power_common.h"
@@ -234,7 +235,8 @@ int
power_acpi_cpufreq_init(unsigned int lcore_id)
{
struct acpi_power_info *pi;
- uint32_t exp_state;
+ uint32_t exp_state, cpu;
+ rte_cpuset_t lcore_cpus;
if (lcore_id >= RTE_MAX_LCORE) {
POWER_LOG(ERR, "Lcore id %u can not exceeds %u",
@@ -258,7 +260,17 @@ power_acpi_cpufreq_init(unsigned int lcore_id)
return -1;
}
- pi->lcore_id = lcore_id;
+ lcore_cpus = rte_lcore_cpuset(lcore_id);
+ if (CPU_COUNT(&lcore_cpus) != 1) {
+ POWER_LOG(ERR, "Power library doesn't support lcore %u mapping "
+ "to %u cpus", lcore_id, CPU_COUNT(&lcore_cpus));
+ return -1;
+ }
+ for (cpu = 0; cpu < CPU_SETSIZE; cpu++) {
+ if (CPU_ISSET(cpu, &lcore_cpus))
+ break;
+ }
+ pi->lcore_id = cpu;
/* Check and set the governor */
if (power_set_governor_userspace(pi) < 0) {
POWER_LOG(ERR, "Cannot set governor of lcore %u to "
diff --git a/lib/power/power_amd_pstate_cpufreq.c b/lib/power/power_amd_pstate_cpufreq.c
index 090a0d96cb..8a3930eac7 100644
--- a/lib/power/power_amd_pstate_cpufreq.c
+++ b/lib/power/power_amd_pstate_cpufreq.c
@@ -8,6 +8,7 @@
#include <rte_memcpy.h>
#include <rte_stdatomic.h>
+#include <rte_lcore.h>
#include "power_amd_pstate_cpufreq.h"
#include "power_common.h"
@@ -352,7 +353,8 @@ int
power_amd_pstate_cpufreq_init(unsigned int lcore_id)
{
struct amd_pstate_power_info *pi;
- uint32_t exp_state;
+ uint32_t exp_state, cpu;
+ rte_cpuset_t lcore_cpus;
if (lcore_id >= RTE_MAX_LCORE) {
POWER_LOG(ERR, "Lcore id %u can not exceeds %u",
@@ -376,7 +378,17 @@ power_amd_pstate_cpufreq_init(unsigned int lcore_id)
return -1;
}
- pi->lcore_id = lcore_id;
+ lcore_cpus = rte_lcore_cpuset(lcore_id);
+ if (CPU_COUNT(&lcore_cpus) != 1) {
+ POWER_LOG(ERR, "Power library doesn't support lcore %u mapping "
+ "to %u cpus", lcore_id, CPU_COUNT(&lcore_cpus));
+ return -1;
+ }
+ for (cpu = 0; cpu < CPU_SETSIZE; cpu++) {
+ if (CPU_ISSET(cpu, &lcore_cpus))
+ break;
+ }
+ pi->lcore_id = cpu;
/* Check and set the governor */
if (power_set_governor_userspace(pi) < 0) {
POWER_LOG(ERR, "Cannot set governor of lcore %u to "
diff --git a/lib/power/power_cppc_cpufreq.c b/lib/power/power_cppc_cpufreq.c
index 32aaacb948..d51118820b 100644
--- a/lib/power/power_cppc_cpufreq.c
+++ b/lib/power/power_cppc_cpufreq.c
@@ -7,6 +7,7 @@
#include <rte_memcpy.h>
#include <rte_stdatomic.h>
+#include <rte_lcore.h>
#include "power_cppc_cpufreq.h"
#include "power_common.h"
@@ -338,7 +339,8 @@ int
power_cppc_cpufreq_init(unsigned int lcore_id)
{
struct cppc_power_info *pi;
- uint32_t exp_state;
+ uint32_t exp_state, cpu;
+ rte_cpuset_t lcore_cpus;
if (lcore_id >= RTE_MAX_LCORE) {
POWER_LOG(ERR, "Lcore id %u can not exceeds %u",
@@ -362,7 +364,17 @@ power_cppc_cpufreq_init(unsigned int lcore_id)
return -1;
}
- pi->lcore_id = lcore_id;
+ lcore_cpus = rte_lcore_cpuset(lcore_id);
+ if (CPU_COUNT(&lcore_cpus) != 1) {
+ POWER_LOG(ERR, "Power library doesn't support lcore %u mapping "
+ "to %u cpus", lcore_id, CPU_COUNT(&lcore_cpus));
+ return -1;
+ }
+ for (cpu = 0; cpu < CPU_SETSIZE; cpu++) {
+ if (CPU_ISSET(cpu, &lcore_cpus))
+ break;
+ }
+ pi->lcore_id = cpu;
/* Check and set the governor */
if (power_set_governor_userspace(pi) < 0) {
POWER_LOG(ERR, "Cannot set governor of lcore %u to "
diff --git a/lib/power/power_pstate_cpufreq.c b/lib/power/power_pstate_cpufreq.c
index 2343121621..cd7dfb5468 100644
--- a/lib/power/power_pstate_cpufreq.c
+++ b/lib/power/power_pstate_cpufreq.c
@@ -13,6 +13,7 @@
#include <rte_memcpy.h>
#include <rte_stdatomic.h>
+#include <rte_lcore.h>
#include "rte_power_pmd_mgmt.h"
#include "power_pstate_cpufreq.h"
@@ -540,7 +541,8 @@ int
power_pstate_cpufreq_init(unsigned int lcore_id)
{
struct pstate_power_info *pi;
- uint32_t exp_state;
+ uint32_t exp_state, cpu;
+ rte_cpuset_t lcore_cpus;
if (lcore_id >= RTE_MAX_LCORE) {
POWER_LOG(ERR, "Lcore id %u can not exceed %u",
@@ -564,7 +566,17 @@ power_pstate_cpufreq_init(unsigned int lcore_id)
return -1;
}
- pi->lcore_id = lcore_id;
+ lcore_cpus = rte_lcore_cpuset(lcore_id);
+ if (CPU_COUNT(&lcore_cpus) != 1) {
+ POWER_LOG(ERR, "Power library doesn't support lcore %u mapping "
+ "to %u cpus", lcore_id, CPU_COUNT(&lcore_cpus));
+ return -1;
+ }
+ for (cpu = 0; cpu < CPU_SETSIZE; cpu++) {
+ if (CPU_ISSET(cpu, &lcore_cpus))
+ break;
+ }
+ pi->lcore_id = cpu;
/* Check and set the governor */
if (power_set_governor_performance(pi) < 0) {
POWER_LOG(ERR, "Cannot set governor of lcore %u to "
--
2.34.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [RFC PATCH 2/2] test/power: fix power library with --lcores
2024-07-24 13:03 [RFC PATCH 1/2] power: fix power library with --lcores Sivaprasad Tummala
@ 2024-07-24 13:03 ` Sivaprasad Tummala
2024-07-24 14:38 ` [RFC PATCH 1/2] power: " Stephen Hemminger
2024-07-24 14:39 ` Stephen Hemminger
2 siblings, 0 replies; 5+ messages in thread
From: Sivaprasad Tummala @ 2024-07-24 13:03 UTC (permalink / raw)
To: david.hunt, anatoly.burakov, thomas, ferruh.yigit, david.marchand; +Cc: dev
When user request to use lcores mapped to different physical
cores using --lcores eal option, power application accesses
incorrect cpu sysfs attribute for checking current frequency
The patch fixes the cpu_id based on the lcore and cpu mappings.
Signed-off-by: Sivaprasad Tummala <sivaprasad.tummala@amd.com>
---
app/test/test_power_cpufreq.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
index 619b2811c6..63d13614df 100644
--- a/app/test/test_power_cpufreq.c
+++ b/app/test/test_power_cpufreq.c
@@ -9,6 +9,7 @@
#include <string.h>
#include <inttypes.h>
#include <rte_cycles.h>
+#include <rte_lcore.h>
#include "test.h"
@@ -46,9 +47,10 @@ test_power_caps(void)
static uint32_t total_freq_num;
static uint32_t freqs[TEST_POWER_FREQS_NUM_MAX];
+static uint32_t cpu_id;
static int
-check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo)
+check_cur_freq(__rte_unused unsigned int lcore_id, uint32_t idx, bool turbo)
{
#define TEST_POWER_CONVERT_TO_DECIMAL 10
#define MAX_LOOP 100
@@ -62,13 +64,13 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo)
int i;
if (snprintf(fullpath, sizeof(fullpath),
- TEST_POWER_SYSFILE_CPUINFO_FREQ, lcore_id) < 0) {
+ TEST_POWER_SYSFILE_CPUINFO_FREQ, cpu_id) < 0) {
return 0;
}
f = fopen(fullpath, "r");
if (f == NULL) {
if (snprintf(fullpath, sizeof(fullpath),
- TEST_POWER_SYSFILE_SCALING_FREQ, lcore_id) < 0) {
+ TEST_POWER_SYSFILE_SCALING_FREQ, cpu_id) < 0) {
return 0;
}
f = fopen(fullpath, "r");
@@ -497,6 +499,20 @@ test_power_cpufreq(void)
{
int ret = -1;
enum power_management_env env;
+ rte_cpuset_t lcore_cpus;
+
+ lcore_cpus = rte_lcore_cpuset(TEST_POWER_LCORE_ID);
+ if (CPU_COUNT(&lcore_cpus) != 1) {
+ printf("Power management doesn't support "
+ "lcore %u mapping to %u cpus\n",
+ TEST_POWER_LCORE_ID,
+ CPU_COUNT(&lcore_cpus));
+ return TEST_SKIPPED;
+ }
+ for (cpu_id = 0; cpu_id < CPU_SETSIZE; cpu_id++) {
+ if (CPU_ISSET(cpu_id, &lcore_cpus))
+ break;
+ }
/* Test initialisation of a valid lcore */
ret = rte_power_init(TEST_POWER_LCORE_ID);
--
2.34.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [RFC PATCH 1/2] power: fix power library with --lcores
2024-07-24 13:03 [RFC PATCH 1/2] power: fix power library with --lcores Sivaprasad Tummala
2024-07-24 13:03 ` [RFC PATCH 2/2] test/power: " Sivaprasad Tummala
@ 2024-07-24 14:38 ` Stephen Hemminger
2024-07-24 14:39 ` Stephen Hemminger
2 siblings, 0 replies; 5+ messages in thread
From: Stephen Hemminger @ 2024-07-24 14:38 UTC (permalink / raw)
To: Sivaprasad Tummala
Cc: david.hunt, anatoly.burakov, thomas, ferruh.yigit, david.marchand, dev
On Wed, 24 Jul 2024 13:03:35 +0000
Sivaprasad Tummala <sivaprasad.tummala@amd.com> wrote:
> + POWER_LOG(ERR, "Power library doesn't support lcore %u mapping "
> + "to %u cpus", lcore_id, CPU_COUNT(&lcore_cpus));
Please don't break single format error string across lines. It makes it harder
for users to find the error in the source. Instead wrap after Er,,
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [RFC PATCH 1/2] power: fix power library with --lcores
2024-07-24 13:03 [RFC PATCH 1/2] power: fix power library with --lcores Sivaprasad Tummala
2024-07-24 13:03 ` [RFC PATCH 2/2] test/power: " Sivaprasad Tummala
2024-07-24 14:38 ` [RFC PATCH 1/2] power: " Stephen Hemminger
@ 2024-07-24 14:39 ` Stephen Hemminger
2024-08-26 13:43 ` Tummala, Sivaprasad
2 siblings, 1 reply; 5+ messages in thread
From: Stephen Hemminger @ 2024-07-24 14:39 UTC (permalink / raw)
To: Sivaprasad Tummala
Cc: david.hunt, anatoly.burakov, thomas, ferruh.yigit, david.marchand, dev
On Wed, 24 Jul 2024 13:03:35 +0000
Sivaprasad Tummala <sivaprasad.tummala@amd.com> wrote:
> + lcore_cpus = rte_lcore_cpuset(lcore_id);
> + if (CPU_COUNT(&lcore_cpus) != 1) {
> + POWER_LOG(ERR, "Power library doesn't support lcore %u mapping "
> + "to %u cpus", lcore_id, CPU_COUNT(&lcore_cpus));
> + return -1;
> + }
> + for (cpu = 0; cpu < CPU_SETSIZE; cpu++) {
> + if (CPU_ISSET(cpu, &lcore_cpus))
> + break;
> + }
You are copy and pasting the same code into multiple places which
indicates it should be an API function.
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [RFC PATCH 1/2] power: fix power library with --lcores
2024-07-24 14:39 ` Stephen Hemminger
@ 2024-08-26 13:43 ` Tummala, Sivaprasad
0 siblings, 0 replies; 5+ messages in thread
From: Tummala, Sivaprasad @ 2024-08-26 13:43 UTC (permalink / raw)
To: Stephen Hemminger
Cc: david.hunt, anatoly.burakov, thomas, Yigit, Ferruh, david.marchand, dev
[-- Attachment #1: Type: text/plain, Size: 1456 bytes --]
[AMD Official Use Only - AMD Internal Distribution Only]
Hi Stephen,
> -----Original Message-----
> From: Stephen Hemminger <stephen@networkplumber.org>
> Sent: Wednesday, July 24, 2024 8:10 PM
> To: Tummala, Sivaprasad <Sivaprasad.Tummala@amd.com>
> Cc: david.hunt@intel.com; anatoly.burakov@intel.com;
> thomas@monjalon.net; Yigit, Ferruh <Ferruh.Yigit@amd.com>;
> david.marchand@redhat.com; dev@dpdk.org
> Subject: Re: [RFC PATCH 1/2] power: fix power library with --lcores
>
> Caution: This message originated from an External Source. Use proper caution
> when opening attachments, clicking links, or responding.
>
>
> On Wed, 24 Jul 2024 13:03:35 +0000
> Sivaprasad Tummala <sivaprasad.tummala@amd.com<mailto:sivaprasad.tummala@amd.com>> wrote:
>
> > + lcore_cpus = rte_lcore_cpuset(lcore_id);
> > + if (CPU_COUNT(&lcore_cpus) != 1) {
> > + POWER_LOG(ERR, "Power library doesn't support lcore %u mapping
> "
> > + "to %u cpus", lcore_id, CPU_COUNT(&lcore_cpus));
> > + return -1;
> > + }
> > + for (cpu = 0; cpu < CPU_SETSIZE; cpu++) {
> > + if (CPU_ISSET(cpu, &lcore_cpus))
> > + break;
> > + }
>
> You are copy and pasting the same code into multiple places which indicates it
> should be an API function.
ACK! Will fix this in next version.
[-- Attachment #2: Type: text/html, Size: 5010 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-08-26 13:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-24 13:03 [RFC PATCH 1/2] power: fix power library with --lcores Sivaprasad Tummala
2024-07-24 13:03 ` [RFC PATCH 2/2] test/power: " Sivaprasad Tummala
2024-07-24 14:38 ` [RFC PATCH 1/2] power: " Stephen Hemminger
2024-07-24 14:39 ` Stephen Hemminger
2024-08-26 13:43 ` Tummala, Sivaprasad
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).