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 D378EA0C41 for ; Tue, 30 Nov 2021 17:36:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 18DBA4118F; Tue, 30 Nov 2021 17:36:22 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 5FF8F410F7 for ; Tue, 30 Nov 2021 17:36:20 +0100 (CET) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.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-internal-0.canonical.com (Postfix) with ESMTPS id 40B5F3F1B1 for ; Tue, 30 Nov 2021 16:36:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290179; bh=buEvUr7h8lfl90ng9lpcg6KaVv/aCT1Z5Cub88z2rJg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=URuAA4J035+c6rBcJjtmk9jzq2rTl5ffc8fSUNU/2IBg/9NxNOsxnc9Vb+4fC/7IR WqIP7HtnCJ8WH8y/w1a+usxZ27PWR6Plckclr+OD5n1e2A7eKbMHaPkB1Wka97RMfa Zmd07Fxw1mdAaxWbRX3I6h4mH/IbUrop0NPQpLT+TYIS288C3gQIEcRgg+zH7fR9yR xQTmz19qJb12lAOOG7pnh2ZSfO2H8LtD/vjaAqOLM346AogtzC88RSZzAZ3EWOdYr1 wRYHhCUozHf47ZRK/GWGoaJHzCeoVr1dpTBEbM1NNThu1A2AVxAuHw63okbJU7cxkQ 7Ve+bzTk7oeaQ== Received: by mail-ed1-f70.google.com with SMTP id w18-20020a056402071200b003e61cbafdb4so17475327edx.4 for ; Tue, 30 Nov 2021 08:36:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=buEvUr7h8lfl90ng9lpcg6KaVv/aCT1Z5Cub88z2rJg=; b=wMxL8rXu50VEB1keC68SE8g0wIRn4iFDSMsBAhCEq0eb5CWdkgKSdRYOVXauwK5QfY ZJqKqOf4IfITGU1qqarEQR+tx/YHr8tMO2LWD1y/VkRVGe3nTskPP/GtrbKub9lWitUt zipedqMyDmFQ2f02W8ihBQbQ8k8poC5qQz+2i8xtNoT3GK0NCRsrWbWsi1zOBgfIHLOP cDWxXSkcmnx9Bg8262kVXZYOnnHTGj/ZnLasNf6/y+ETbh/wybuHNO2ptosjeiF969/0 kk5P4rPhZuvHBCEVL0n+3dlJUHtnAQ08PAPhRYFGnVnBOZKYse3wt18rfp2qg9AZScv/ nnEw== X-Gm-Message-State: AOAM530GNuYegPiBZkKInWOUELxXIRQEL5nFjkQ7lY4o1DNCt4QFdzxj OTAlk5nNU8JKjAGDR97mLlsATYPgx9sWQmilxaPUqzJdngzZQFL3+vzER3VwWhHayVsSNMo3LJE 1BdYd6+nPe6mqKykjA5y6uGRm X-Received: by 2002:a05:6402:7d8:: with SMTP id u24mr7217edy.215.1638290178974; Tue, 30 Nov 2021 08:36:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJzRI27jNTqdmPt/qNxeKkSfeqd5c4IYcElZOH0dks6OeE3KA36hxS98ax4yxcMaCvFpYwj7zQ== X-Received: by 2002:a05:6402:7d8:: with SMTP id u24mr7185edy.215.1638290178750; Tue, 30 Nov 2021 08:36:18 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id e1sm8859798ejy.82.2021.11.30.08.36.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:36:18 -0800 (PST) From: christian.ehrhardt@canonical.com To: David Hunt Cc: Christian Ehrhardt , dpdk stable Subject: patch 'test/power: fix CPU frequency when turbo enabled' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:26 +0100 Message-Id: <20211130163605.2460997-2-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/910f2fa408a8f794db74ab215cc3c588e11692ea Thanks. Christian Ehrhardt --- >From 910f2fa408a8f794db74ab215cc3c588e11692ea Mon Sep 17 00:00:00 2001 From: David Hunt Date: Fri, 3 Sep 2021 09:37:36 +0100 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. Backport-Note: This is a version of the patch for 19.11.9 that fixes this issue without the dependency of having the CPPC support applied first. Fixes: 606a234c6d360 ("test/power: round CPU frequency to check") Cc: stable@dpdk.org Signed-off-by: David Hunt Signed-off-by: Christian Ehrhardt --- app/test/test_power_cpufreq.c | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c index d0c7e60ca5..51105f35be 100644 --- a/app/test/test_power_cpufreq.c +++ b/app/test/test_power_cpufreq.c @@ -55,18 +55,20 @@ 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; 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"); @@ -80,15 +82,20 @@ 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_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 + */ + 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; + } if (turbo) ret = (freqs[idx] <= freq_conv ? 0 : -1); -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:06.340336560 +0100 +++ 0002-test-power-fix-CPU-frequency-when-turbo-enabled.patch 2021-11-30 16:50:05.482871270 +0100 @@ -1,3 +1,3 @@ -From 29343b9030e38e8c3519ba01cb66724d45b13dc8 Mon Sep 17 00:00:00 2001 -From: Richael Zhuang -Date: Fri, 9 Jul 2021 18:55:48 +0800 +From 910f2fa408a8f794db74ab215cc3c588e11692ea Mon Sep 17 00:00:00 2001 +From: David Hunt +Date: Fri, 3 Sep 2021 09:37:36 +0100 @@ -5,0 +6,2 @@ +[ upstream commit 29343b9030e38e8c3519ba01cb66724d45b13dc8 ] + @@ -12,0 +15,4 @@ +Backport-Note: +This is a version of the patch for 19.11.9 that fixes this issue +without the dependency of having the CPPC support applied first. + @@ -16,2 +22,2 @@ -Signed-off-by: Richael Zhuang -Acked-by: David Hunt +Signed-off-by: David Hunt +Signed-off-by: Christian Ehrhardt @@ -19,2 +25,2 @@ - app/test/test_power_cpufreq.c | 23 ++++++++++++++--------- - 1 file changed, 14 insertions(+), 9 deletions(-) + app/test/test_power_cpufreq.c | 29 ++++++++++++++++++----------- + 1 file changed, 18 insertions(+), 11 deletions(-) @@ -23 +29 @@ -index 8516df4ca6..b8fc53925c 100644 +index d0c7e60ca5..51105f35be 100644 @@ -26 +32 @@ -@@ -55,7 +55,9 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo) +@@ -55,18 +55,20 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo) @@ -36 +42,14 @@ -@@ -80,15 +82,18 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo) + 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"); +@@ -80,15 +82,20 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo) @@ -52 +71,2 @@ -+ if (env == PM_ENV_CPPC_CPUFREQ) { ++ ++ if (env == PM_ENV_PSTATE_CPUFREQ) { @@ -56,0 +77 @@ ++ unsigned int freq_conv = 0;