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 112F4A034F for ; Wed, 11 Aug 2021 11:51:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D475040040; Wed, 11 Aug 2021 11:51:28 +0200 (CEST) Received: from smtp-relay-canonical-0.canonical.com (smtp-relay-canonical-0.canonical.com [185.125.188.120]) by mails.dpdk.org (Postfix) with ESMTP id 8CE7D40040 for ; Wed, 11 Aug 2021 11:51:27 +0200 (CEST) Received: from mail-qt1-f198.google.com (mail-qt1-f198.google.com [209.85.160.198]) (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-0.canonical.com (Postfix) with ESMTPS id E60803F0A9 for ; Wed, 11 Aug 2021 09:51:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1628675486; bh=Ducwvg4UThczWjCUtfKuimjzJDxYZ76traqXdIq40ig=; h=MIME-Version:References:In-Reply-To:From:Date:Message-ID:Subject: To:Cc:Content-Type; b=agVtF4OpoVLkr0wSeZESl7VLbkPymfQLaJtHhCGnbNQyGfTyDSgeK8bKGrI33/xs/ 4xO7gVwWvaVy+NfVO2RQpoqjFIKQX9w10zYfzh84N2/rxv6KQ6OlpbMtdsd8rMYrXV 976Y4OfMuoA+PGA/PdaK924i6e1l5ZZYWqZoKbJf+bkbxIRRrirk/1VPM7SLJe8Azh DGLxKvaFUYzlo/pF9qTSxj85TYKlvxnf2pHLRZKl49ofwHs8H6z6+WpN2J7pbktql4 m1UdyE9rfYLQOKfTa2OXD1ZzLerr/ctUcoj6aYVxE7X4l3euTvEaIyLNbCkzoDOSCA zFt68O4/9yKrQ== Received: by mail-qt1-f198.google.com with SMTP id x15-20020ac87a8f0000b0290294d1eeaa1dso1013873qtr.13 for ; Wed, 11 Aug 2021 02:51:26 -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=Ducwvg4UThczWjCUtfKuimjzJDxYZ76traqXdIq40ig=; b=nnEw61c8VGXYmN2dqu+K1iDMbSmrDYmNDAukA8dBayWFK9XqY8ql7RExrkyYqWb40Q NxTDByigjPcp7kYbFojWp31rh5y9tC4Picp1jJ7w6G7cAabllqRDQW9iHC89FmdKxcP3 T8l8yFzaSQb6KpdA9GZb0WQ3cyysLqqTJ7AL6naROLxqhuRfJM2csXpL4lDLIE/7ciPN x7KSpb4OagUC5XSm9upfqDwknFdN0P1C6l9evQcQ6HCSQosLRYG2wtxouhRw3zp1jERf ImhS/3O0L/seZjMjE9DkfzykP2fOz/cR2ajaGUabk21xRM7D0wWFAvJzz812b8Yzz7FE rIQQ== X-Gm-Message-State: AOAM531O8iTHT3gsskLeldRqmRemFjTVSCg+7IkypOjmhzNKyQq1BXzn LK7z4FOdqvuEw3zXtFJ0NmKcpa5bw+slDkFAx+U9OJGuAyNnpvk1ALcU806XmhGp8jwjAfG0BoW JooNTU764I+LykBV590RhCa56hTiU3HoZCg8kjSqi X-Received: by 2002:a0c:aac2:: with SMTP id g2mr22933721qvb.44.1628675485946; Wed, 11 Aug 2021 02:51:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyp8pBUM+faC4/j2eyzNi7IkTUsAI08GiDcGsblrTSoQDYM35mrmyeGeNKlGZwlXqCsWQaUmoRDoLPiXLn8wjk= X-Received: by 2002:a0c:aac2:: with SMTP id g2mr22933707qvb.44.1628675485730; Wed, 11 Aug 2021 02:51:25 -0700 (PDT) MIME-Version: 1.0 References: <20210810154022.749358-1-christian.ehrhardt@canonical.com> <20210810154022.749358-73-christian.ehrhardt@canonical.com> In-Reply-To: <20210810154022.749358-73-christian.ehrhardt@canonical.com> From: Christian Ehrhardt Date: Wed, 11 Aug 2021 11:51:00 +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 check for intel_pstate' 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:44 PM 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 =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 || env =3D=3D PM_ENV_PSTATE_CP= UFREQ) { | ^~~~~~~~~~~~~~~~~~~ | 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/ed9be54294b454945f73= d70ba5989bd5cd1e7bcb > > Thanks. > > Christian Ehrhardt > > --- > From ed9be54294b454945f73d70ba5989bd5cd1e7bcb Mon Sep 17 00:00:00 2001 > From: Richael Zhuang > 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 > Acked-by: David Hunt > --- > 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, b= ool 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 =3D fopen(fullpath, "r"); > if (f =3D=3D 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 =3D fopen(fullpath, "r"); > @@ -85,7 +85,7 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, boo= l turbo) > freq_conv =3D cur_freq; > > env =3D rte_power_get_env(); > - if (env =3D=3D PM_ENV_CPPC_CPUFREQ) { > + if (env =3D=3D PM_ENV_CPPC_CPUFREQ || env =3D=3D PM_ENV_P= STATE_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 > -- > 2.32.0 > > --- > Diff of the applied patch vs upstream commit (please double-check if no= n-empty: > --- > --- - 2021-08-10 15:11:15.838864480 +0200 > +++ 0073-test-power-fix-CPU-frequency-check-for-intel_pstate.patch 2= 021-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@dpdk.org > @@ -24 +25 @@ > -index b8fc53925c..1a9549527e 100644 > +index e5bf3b3367..c0e0431c5f 100644 --=20 Christian Ehrhardt Staff Engineer, Ubuntu Server Canonical Ltd