From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4A57CA034F for ; Wed, 11 Aug 2021 11:59:41 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1B54340040; Wed, 11 Aug 2021 11:59:41 +0200 (CEST) Received: from smtp-relay-canonical-1.canonical.com (smtp-relay-canonical-1.canonical.com [185.125.188.121]) by mails.dpdk.org (Postfix) with ESMTP id 32D0440040 for ; Wed, 11 Aug 2021 11:59:40 +0200 (CEST) Received: from mail-qv1-f70.google.com (mail-qv1-f70.google.com [209.85.219.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 1E2F540653 for ; Wed, 11 Aug 2021 09:59:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628675975; bh=JeEf+tf6lg49YqbrRXNtLFRigTab7gQcw1Uj0RM9rtA=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=fvJaDwXVBofSI5eXyCyQ5dpw0YBBoc8vGxUHu6gxYkwVtC9+4SlV2dWcdzC7Y/Eww mrRgHW9EVhp3KWI4XuQIVCrFG4CEJ7F/UJgD3lWIgVa/DZQ6oP3vqrjGgoC9DxfhKz jaZwX2JUm6PRNPGJDT/tykMby4KaapY1OhlMe+pgYtIKWy0yXrv+ZxL5vfBuV/48AU YhBCPZaeYevr7IS/zCh8kxdPmq2JA7rLr9DTRQwEK/A6/nlt2FOiW4CPYr5BYCj2+t 9aSnpw9c64wDY69q4rjmuNXIUsewgafrBJaHu7LJnRYdbjiBzDBcsWSC/djcEUDb54 F3CRhlgNmGMeA== Received: by mail-qv1-f70.google.com with SMTP id w10-20020a0cfc4a0000b0290335dd22451dso968721qvp.5 for ; Wed, 11 Aug 2021 02:59:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=JeEf+tf6lg49YqbrRXNtLFRigTab7gQcw1Uj0RM9rtA=; b=S95l41h3+Jkl7Bn3lbqXKIU2mdhQKPsqG0HcWrqJq16RCYHa3WzBPh+Z+Bo+Eu5ejH VVgg7EVJgXhaXIsPypPB7UyTefMJuCS94cySHa4T0jUHSXDEhDYgyEd+SpveAAiK3ZdM CcPuzIvylNUrKSwly+O+7koDxGAPsdzGmF/UHcqHn3cQWsqcuPSNSWoSvpfa4kwdVU6W /KXd9hArPfQm0CPOVDi/CUq4IkK56e/OZ9sdiCCSxebEl6sBcLbejYoOyof1A25oX8Ea BqQIdKS3ct9doMDDx1cF6knqZ4VhPe4w1wJPdq/auqHwnvQB7qKQiXji8wsuX8FYJx4e pBng== X-Gm-Message-State: AOAM53075EGlTSFUO4f6r3pnOkhn36wze9Cq7biJvy2jrVM/E7VWkBCF 5kuZB6r1AscYaMnp1DnAivG6RUkFtUJnx1Om/eBsnSTbcgJxre+f6M9RCeSBHcIULjXfsAJ9pHF O4+cGFp4mAwitqzKBw49QAvU28dq4gYXJ5jHc8OSb X-Received: by 2002:ac8:5546:: with SMTP id o6mr20971404qtr.321.1628675974131; Wed, 11 Aug 2021 02:59:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwbHHbQkYrY45s6QAz+mG5VR6x1wxt2lXC2AjAdGsiHkaZd5ir+J99gavLWZVK9PMAmTIKo7Ilq3uZxTxOyzJw= X-Received: by 2002:ac8:5546:: with SMTP id o6mr20971399qtr.321.1628675973923; Wed, 11 Aug 2021 02:59:33 -0700 (PDT) MIME-Version: 1.0 References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> <20210810154022.749358-60-christian.ehrhardt@canonical.com> In-Reply-To: <20210810154022.749358-60-christian.ehrhardt@canonical.com> From: Christian Ehrhardt Date: Wed, 11 Aug 2021 11:59:08 +0200 Message-ID: To: Richael Zhuang Cc: David Hunt , dpdk stable Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Subject: Re: [dpdk-stable] patch 'test/power: fix CPU frequency when turbo enabled' has been queued to stable release 19.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On Tue, Aug 10, 2021 at 5:43 PM 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 =E2=80=98check_cur_freq=E2=80= =99: ../app/test/test_power_cpufreq.c:88:14: error: =E2=80=98PM_ENV_CPPC_CPUFREQ= =E2=80=99 undeclared (first use in this function); did you mean =E2=80=98PM_ENV_ACPI_CPUFREQ=E2=80=99? 88 | if (env =3D=3D PM_ENV_CPPC_CPUFREQ) { | ^~~~~~~~~~~~~~~~~~~ | PM_ENV_ACPI_CPUFREQ Therefore the patch will be de-qeueud from the stable branch that shall bec= ome 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 ] For example: https://git.dpdk.org/dpdk-stable/commit/?h=3D18.11&id=3Dd90e6ae6f936ecd= c2fd3811ff9f26aec7f3c06eb 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=3D'PATCH 19.11' Send the backported patch to "stable@dpdk.org" but not "dev@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 t= he > 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 reba= sing > (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/4da3e8a9f04a9c2f820b= 8270b25b09cca79ed739 > > Thanks. > > Christian Ehrhardt > > --- > From 4da3e8a9f04a9c2f820b8270b25b09cca79ed739 Mon Sep 17 00:00:00 2001 > From: Richael Zhuang > 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 > Acked-by: David Hunt > --- > 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, boo= l 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 =3D -1; > int i; > > @@ -80,15 +82,18 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, b= ool turbo) > goto fail_all; > > cur_freq =3D strtoul(buf, NULL, TEST_POWER_CONVERT_TO_DEC= IMAL); > - > - /* convert the frequency to nearest 100000 value > - * Ex: if cur_freq=3D1396789 then freq_conv=3D1400000 > - * Ex: if cur_freq=3D800030 then freq_conv=3D800000 > - */ > - unsigned int freq_conv =3D 0; > - freq_conv =3D (cur_freq + TEST_FREQ_ROUNDING_DELTA) > - / TEST_ROUND_FREQ_TO_N_100000; > - freq_conv =3D freq_conv * TEST_ROUND_FREQ_TO_N_100000; > + freq_conv =3D cur_freq; > + > + env =3D rte_power_get_env(); > + if (env =3D=3D PM_ENV_CPPC_CPUFREQ) { > + /* convert the frequency to nearest 100000 value > + * Ex: if cur_freq=3D1396789 then freq_conv=3D140= 0000 > + * Ex: if cur_freq=3D800030 then freq_conv=3D8000= 00 > + */ > + freq_conv =3D (cur_freq + TEST_FREQ_ROUNDING_DELT= A) > + / TEST_ROUND_FREQ_TO_N_10= 0000; > + freq_conv =3D freq_conv * TEST_ROUND_FREQ_TO_N_10= 0000; > + } > > if (turbo) > ret =3D (freqs[idx] <=3D freq_conv ? 0 : -1); > -- > 2.32.0 > > --- > Diff of the applied patch vs upstream commit (please double-check if no= n-empty: > --- > --- - 2021-08-10 15:11:15.364486251 +0200 > +++ 0060-test-power-fix-CPU-frequency-when-turbo-enabled.patch 2021-08-1= 0 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@dpdk.org > @@ -23 +24 @@ > -index 8516df4ca6..b8fc53925c 100644 > +index d0c7e60ca5..e5bf3b3367 100644 --=20 Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd