[dpdk-stable] patch 'test/power: fix CPU frequency check for intel_pstate' has been queued to stable release 19.11.10

[Christian Ehrhardt]

On Tue, Aug 10, 2021 at 5:44 PM <christian.ehrhardt at canonical.com> wrote:
>
> Hi,
>
> FYI, your patch has been queued to stable release 19.11.10

Hi,
while applying cleanly your patch caused build time failures like:

../app/test/test_power_cpufreq.c: In function ‘check_cur_freq’:
../app/test/test_power_cpufreq.c:88:14: error: ‘PM_ENV_CPPC_CPUFREQ’
undeclared (first use in this function); did you mean
‘PM_ENV_ACPI_CPUFREQ’?
   88 |   if (env == PM_ENV_CPPC_CPUFREQ || env == PM_ENV_PSTATE_CPUFREQ) {
      |              ^~~~~~~~~~~~~~~~~~~
      |              PM_ENV_ACPI_CPUFREQ

Therefore the patch will be de-qeueud from the stable branch that shall become
19.11.10.
Please consider having a look and providing a backport.

A backport should contain a reference to the DPDK main branch commit
in it's commit message in the following fashion:
    [ upstream commit <commit's dpdk main branch SHA-1 checksum> ]

For example:
    https://git.dpdk.org/dpdk-stable/commit/?h=18.11&id=d90e6ae6f936ecdc2fd3811ff9f26aec7f3c06eb

When sending the backported patch, please indicate the target branch in the
subject line, as we have multiple branches, for example:
    [PATCH 19.11] foo/bar: fix baz

With git format-patch, this can be achieved by appending the parameter:
    --subject-prefix='PATCH 19.11'

Send the backported patch to "stable at dpdk.org" but not "dev at dpdk.org".

FYI, branch 19.11 is located at tree:
   https://git.dpdk.org/dpdk-stable

Thanks in advance,
Chrtistian

> Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
> It will be pushed if I get no objections before 08/12/21. So please
> shout if anyone has objections.
>
> Also note that after the patch there's a diff of the upstream commit vs the
> patch applied to the branch. This will indicate if there was any rebasing
> needed to apply to the stable branch. If there were code changes for rebasing
> (ie: not only metadata diffs), please double check that the rebase was
> correctly done.
>
> Queued patches are on a temporary branch at:
> https://github.com/cpaelzer/dpdk-stable-queue
>
> This queued commit can be viewed at:
> https://github.com/cpaelzer/dpdk-stable-queue/commit/ed9be54294b454945f73d70ba5989bd5cd1e7bcb
>
> Thanks.
>
> Christian Ehrhardt <christian.ehrhardt at canonical.com>
>
> ---
> From ed9be54294b454945f73d70ba5989bd5cd1e7bcb Mon Sep 17 00:00:00 2001
> From: Richael Zhuang <richael.zhuang at arm.com>
> Date: Wed, 14 Jul 2021 18:44:05 +0800
> Subject: [PATCH] test/power: fix CPU frequency check for intel_pstate
>
> [ upstream commit cf1e803508009917f41dd5bb347e4140043afe03 ]
>
> For acpi_cpufreq and cppc_cpufreq, both cpuinfo_cur_freq and
> scaling_cur_freq exist. For pstate, only scaling_cur_freq exists.
> And value in scaling_cur_freq and cpuinfo_cur_freq may not be the
> same. For acpi_cpufreq and cppc_cpufreq, we should check
> cpuinfo_cur_freq but not scaling_cur_freq. So here change the
> check sequence to make sure it works for all cpufreq drivers.
> Besides, add rounding for pstate driver.
>
> Fixes: ff6dfb8e492f ("test/power: fix CPU frequency check")
>
> Signed-off-by: Richael Zhuang <richael.zhuang at arm.com>
> Acked-by: David Hunt <david.hunt at intel.com>
> ---
>  app/test/test_power_cpufreq.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
> index e5bf3b3367..c0e0431c5f 100644
> --- a/app/test/test_power_cpufreq.c
> +++ b/app/test/test_power_cpufreq.c
> @@ -62,13 +62,13 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo)
>         int i;
>
>         if (snprintf(fullpath, sizeof(fullpath),
> -               TEST_POWER_SYSFILE_SCALING_FREQ, lcore_id) < 0) {
> +               TEST_POWER_SYSFILE_CPUINFO_FREQ, lcore_id) < 0) {
>                 return 0;
>         }
>         f = fopen(fullpath, "r");
>         if (f == NULL) {
>                 if (snprintf(fullpath, sizeof(fullpath),
> -                       TEST_POWER_SYSFILE_CPUINFO_FREQ, lcore_id) < 0) {
> +                       TEST_POWER_SYSFILE_SCALING_FREQ, lcore_id) < 0) {
>                         return 0;
>                 }
>                 f = fopen(fullpath, "r");
> @@ -85,7 +85,7 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo)
>                 freq_conv = cur_freq;
>
>                 env = rte_power_get_env();
> -               if (env == PM_ENV_CPPC_CPUFREQ) {
> +               if (env == PM_ENV_CPPC_CPUFREQ || env == PM_ENV_PSTATE_CPUFREQ) {
>                         /* convert the frequency to nearest 100000 value
>                          * Ex: if cur_freq=1396789 then freq_conv=1400000
>                          * Ex: if cur_freq=800030 then freq_conv=800000
> --
> 2.32.0
>
> ---
>   Diff of the applied patch vs upstream commit (please double-check if non-empty:
> ---
> --- -   2021-08-10 15:11:15.838864480 +0200
> +++ 0073-test-power-fix-CPU-frequency-check-for-intel_pstate.patch      2021-08-10 15:11:13.078638532 +0200
> @@ -1 +1 @@
> -From cf1e803508009917f41dd5bb347e4140043afe03 Mon Sep 17 00:00:00 2001
> +From ed9be54294b454945f73d70ba5989bd5cd1e7bcb Mon Sep 17 00:00:00 2001
> @@ -5,0 +6,2 @@
> +[ upstream commit cf1e803508009917f41dd5bb347e4140043afe03 ]
> +
> @@ -15 +16,0 @@
> -Cc: stable at dpdk.org
> @@ -24 +25 @@
> -index b8fc53925c..1a9549527e 100644
> +index e5bf3b3367..c0e0431c5f 100644



-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd