Re: patch 'power: fix mapped lcore ID' has been queued to stable release 21.11.9

[David Marchand <david.marchand@redhat.com>]

On Wed, Nov 27, 2024 at 6:22 PM Kevin Traynor <ktraynor@redhat.com> wrote:
>   Diff of the applied patch vs upstream commit (please double-check if non-empty:
> ---
> --- -   2024-11-27 17:17:40.435934249 +0000
> +++ 0069-power-fix-mapped-lcore-ID.patch        2024-11-27 17:17:38.262269565 +0000
> @@ -1 +1 @@
> -From 5c9b07eeba55d527025f1f4945e2dbb366f21215 Mon Sep 17 00:00:00 2001
> +From 939535ca3bed8f1c9013baba9691ca356cca6d3b Mon Sep 17 00:00:00 2001
> @@ -5,0 +6,2 @@
> +[ upstream commit 5c9b07eeba55d527025f1f4945e2dbb366f21215 ]
> +
> @@ -25 +26,0 @@
> -Cc: stable@dpdk.org
> @@ -31,8 +32,8 @@
> - app/test/test_power_cpufreq.c        | 21 ++++++++++++++++++---
> - lib/power/power_acpi_cpufreq.c       |  6 +++++-
> - lib/power/power_amd_pstate_cpufreq.c |  6 +++++-
> - lib/power/power_common.c             | 23 +++++++++++++++++++++++
> - lib/power/power_common.h             |  1 +
> - lib/power/power_cppc_cpufreq.c       |  6 +++++-
> - lib/power/power_pstate_cpufreq.c     |  6 +++++-
> - 7 files changed, 62 insertions(+), 7 deletions(-)
> + app/test/test_power_cpufreq.c    | 21 ++++++++++++++++++---
> + lib/power/power_acpi_cpufreq.c   |  6 +++++-
> + lib/power/power_common.c         | 23 +++++++++++++++++++++++
> + lib/power/power_common.h         |  1 +
> + lib/power/power_cppc_cpufreq.c   |  6 +++++-
> + lib/power/power_pstate_cpufreq.c |  6 +++++-
> + lib/power/rte_power_pmd_mgmt.c   |  4 ++--
> + 7 files changed, 59 insertions(+), 8 deletions(-)
> @@ -41 +42 @@
> -index 619b2811c6..edbd34424e 100644
> +index 4d013cd7bb..051b9036dc 100644
> @@ -74 +75 @@
> -@@ -498,4 +500,17 @@ test_power_cpufreq(void)
> +@@ -487,4 +489,17 @@ test_power_cpufreq(void)
> @@ -93 +94 @@
> -index abad53bef1..ae809fbb60 100644
> +index 402ed8c99b..1bb74bdca6 100644
> @@ -101,16 +102 @@
> -+              POWER_LOG(ERR, "Cannot get CPU ID mapped for lcore %u", lcore_id);
> -+              return -1;
> -+      }
> -+
> -       /* Check and set the governor */
> -       if (power_set_governor_userspace(pi) < 0) {
> -diff --git a/lib/power/power_amd_pstate_cpufreq.c b/lib/power/power_amd_pstate_cpufreq.c
> -index 4809d45a22..2b728eca18 100644
> ---- a/lib/power/power_amd_pstate_cpufreq.c
> -+++ b/lib/power/power_amd_pstate_cpufreq.c
> -@@ -383,5 +383,9 @@ power_amd_pstate_cpufreq_init(unsigned int lcore_id)
> -       }
> -
> --      pi->lcore_id = lcore_id;
> -+      if (power_get_lcore_mapped_cpu_id(lcore_id, &pi->lcore_id) < 0) {
> -+              POWER_LOG(ERR, "Cannot get CPU ID mapped for lcore %u", lcore_id);
> ++              RTE_LOG(ERR, POWER, "Cannot get CPU ID mapped for lcore %u", lcore_id);

A final \n is missing in the format string.

> @@ -123 +109 @@
> -index 590986d5ef..b47c63a5f1 100644
> +index 1e09facb86..e2a8c33604 100644
> @@ -132 +118 @@
> -@@ -205,2 +206,24 @@ out:
> +@@ -203,2 +204,24 @@ out:
> @@ -143 +129 @@
> -+              POWER_LOG(ERR,
> ++              RTE_LOG(ERR, POWER,

Probably the same here, and other occurences in this patch.


-- 
David Marchand