[dpdk-stable] patch 'test/power: fix CPU frequency when turbo enabled' has been queued to stable release 19.11.10

[Christian Ehrhardt]

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

Hi,
I've rejected your other patch based on this already a few minutes ago
earlier, but this one is the actual one adding PM_ENV_CPPC_CPUFREQ in
a place it isn't available yet.

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) {
      |              ^~~~~~~~~~~~~~~~~~~
      |              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/4da3e8a9f04a9c2f820b8270b25b09cca79ed739
>
> Thanks.
>
> Christian Ehrhardt <christian.ehrhardt at canonical.com>
>
> ---
> From 4da3e8a9f04a9c2f820b8270b25b09cca79ed739 Mon Sep 17 00:00:00 2001
> From: Richael Zhuang <richael.zhuang at arm.com>
> Date: Fri, 9 Jul 2021 18:55:48 +0800
> Subject: [PATCH] test/power: fix CPU frequency when turbo enabled
>
> [ upstream commit 29343b9030e38e8c3519ba01cb66724d45b13dc8 ]
>
> On arm platform, the value in "/sys/.../cpuinfo_cur_freq" may not
> be exactly the same as what was set when using CPPC cpufreq driver.
> For other cpufreq driver, no need to round it currently, or else
> this check will fail with turbo enabled. For example, with acpi_cpufreq,
> cpuinfo_cur_freq can be 2401000 which is equal to freqs[0].It should
> not be rounded to 2400000.
>
> Fixes: 606a234c6d360 ("test/power: round CPU frequency to 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 | 23 ++++++++++++++---------
>  1 file changed, 14 insertions(+), 9 deletions(-)
>
> diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c
> index d0c7e60ca5..e5bf3b3367 100644
> --- a/app/test/test_power_cpufreq.c
> +++ b/app/test/test_power_cpufreq.c
> @@ -55,7 +55,9 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo)
>         FILE *f;
>         char fullpath[PATH_MAX];
>         char buf[BUFSIZ];
> +       enum power_management_env env;
>         uint32_t cur_freq;
> +       uint32_t freq_conv;
>         int ret = -1;
>         int i;
>
> @@ -80,15 +82,18 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo)
>                         goto fail_all;
>
>                 cur_freq = strtoul(buf, NULL, TEST_POWER_CONVERT_TO_DECIMAL);
> -
> -               /* 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
> -                */
> -               unsigned int freq_conv = 0;
> -               freq_conv = (cur_freq + TEST_FREQ_ROUNDING_DELTA)
> -                                       / TEST_ROUND_FREQ_TO_N_100000;
> -               freq_conv = freq_conv * TEST_ROUND_FREQ_TO_N_100000;
> +               freq_conv = cur_freq;
> +
> +               env = rte_power_get_env();
> +               if (env == PM_ENV_CPPC_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
> +                        */
> +                       freq_conv = (cur_freq + TEST_FREQ_ROUNDING_DELTA)
> +                                               / TEST_ROUND_FREQ_TO_N_100000;
> +                       freq_conv = freq_conv * TEST_ROUND_FREQ_TO_N_100000;
> +               }
>
>                 if (turbo)
>                         ret = (freqs[idx] <= freq_conv ? 0 : -1);
> --
> 2.32.0
>
> ---
>   Diff of the applied patch vs upstream commit (please double-check if non-empty:
> ---
> --- -   2021-08-10 15:11:15.364486251 +0200
> +++ 0060-test-power-fix-CPU-frequency-when-turbo-enabled.patch  2021-08-10 15:11:13.054638359 +0200
> @@ -1 +1 @@
> -From 29343b9030e38e8c3519ba01cb66724d45b13dc8 Mon Sep 17 00:00:00 2001
> +From 4da3e8a9f04a9c2f820b8270b25b09cca79ed739 Mon Sep 17 00:00:00 2001
> @@ -5,0 +6,2 @@
> +[ upstream commit 29343b9030e38e8c3519ba01cb66724d45b13dc8 ]
> +
> @@ -14 +15,0 @@
> -Cc: stable at dpdk.org
> @@ -23 +24 @@
> -index 8516df4ca6..b8fc53925c 100644
> +index d0c7e60ca5..e5bf3b3367 100644



-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd