From patchwork Thu Apr 15 05:59:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richael Zhuang X-Patchwork-Id: 91537 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 994BBA0A0C; Thu, 15 Apr 2021 07:59:50 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B17B1162010; Thu, 15 Apr 2021 07:59:48 +0200 (CEST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mails.dpdk.org (Postfix) with ESMTP id 7A1A6162009; Thu, 15 Apr 2021 07:59:47 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EC40811B3; Wed, 14 Apr 2021 22:59:46 -0700 (PDT) Received: from wls-arm-cavium06.shanghai.arm.com (wls-arm-cavium06.shanghai.arm.com [10.169.206.120]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D72223F792; Wed, 14 Apr 2021 22:59:44 -0700 (PDT) From: Richael Zhuang To: dev@dpdk.org Cc: nd@arm.com, alan.carew@intel.com, stable@dpdk.org, David Hunt , Pablo de Lara Date: Thu, 15 Apr 2021 13:59:29 +0800 Message-Id: <20210415055930.3899-2-richael.zhuang@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210415055930.3899-1-richael.zhuang@arm.com> References: <20210407074636.26891-2-richael.zhuang@arm.com> <20210415055930.3899-1-richael.zhuang@arm.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v5 1/2] test/power: add delay before checking cpuinfo cur freq X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" For some platforms the newly-set frequency may not be effective immediately. If we didn't get the right value from cpuinfo_cur_freq immediately, add 10ms delay each time before rechecking until timeout. From our test, for some arm platforms, it requires up to 700ms when going from a minimum to a maximum frequency. And it's not the driver/software issue. Fixes: ed7c51a6a680 ("app/test: vm power management") Cc: alan.carew@intel.com Cc: stable@dpdk.org Signed-off-by: Richael Zhuang Reviewed-by: David Hunt --- app/test/test_power_cpufreq.c | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c index 731c6b4dc..d47b3e0a1 100644 --- a/app/test/test_power_cpufreq.c +++ b/app/test/test_power_cpufreq.c @@ -8,6 +8,7 @@ #include #include #include +#include #include "test.h" @@ -44,11 +45,13 @@ static int check_cur_freq(unsigned lcore_id, uint32_t idx) { #define TEST_POWER_CONVERT_TO_DECIMAL 10 +#define MAX_LOOP 100 FILE *f; char fullpath[PATH_MAX]; char buf[BUFSIZ]; uint32_t cur_freq; int ret = -1; + int i; if (snprintf(fullpath, sizeof(fullpath), TEST_POWER_SYSFILE_CUR_FREQ, lcore_id) < 0) { @@ -58,13 +61,27 @@ check_cur_freq(unsigned lcore_id, uint32_t idx) if (f == NULL) { return 0; } - if (fgets(buf, sizeof(buf), f) == NULL) { - goto fail_get_cur_freq; + for (i = 0; i < MAX_LOOP; i++) { + fflush(f); + if (fgets(buf, sizeof(buf), f) == NULL) + goto fail_all; + + cur_freq = strtoul(buf, NULL, TEST_POWER_CONVERT_TO_DECIMAL); + ret = (freqs[idx] == cur_freq ? 0 : -1); + + if (ret == 0) + break; + + if (fseek(f, 0, SEEK_SET) < 0) { + printf("Fail to set file position indicator to 0\n"); + goto fail_all; + } + + /* wait for the value to be updated */ + rte_delay_ms(10); } - cur_freq = strtoul(buf, NULL, TEST_POWER_CONVERT_TO_DECIMAL); - ret = (freqs[idx] == cur_freq ? 0 : -1); -fail_get_cur_freq: +fail_all: fclose(f); return ret; From patchwork Thu Apr 15 05:59:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richael Zhuang X-Patchwork-Id: 91538 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B66D7A0A0C; Thu, 15 Apr 2021 07:59:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4CF7116201F; Thu, 15 Apr 2021 07:59:52 +0200 (CEST) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mails.dpdk.org (Postfix) with ESMTP id 79BAC16201B; Thu, 15 Apr 2021 07:59:51 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id EBA2811B3; Wed, 14 Apr 2021 22:59:50 -0700 (PDT) Received: from wls-arm-cavium06.shanghai.arm.com (wls-arm-cavium06.shanghai.arm.com [10.169.206.120]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D8F8A3F792; Wed, 14 Apr 2021 22:59:48 -0700 (PDT) From: Richael Zhuang To: dev@dpdk.org Cc: nd@arm.com, alan.carew@intel.com, stable@dpdk.org, David Hunt , Pablo de Lara Date: Thu, 15 Apr 2021 13:59:30 +0800 Message-Id: <20210415055930.3899-3-richael.zhuang@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210415055930.3899-1-richael.zhuang@arm.com> References: <20210407074636.26891-2-richael.zhuang@arm.com> <20210415055930.3899-1-richael.zhuang@arm.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v5 2/2] test/power: round cpuinfo cur freq value in cpufreq autotest X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The value in "/sys/.../cpuinfo_cur_freq" may not be exactly the same as what was set. For example, if "2400000" is written to "/sys/.../cpufreq/scaling_setspeed" to set the frequency, then the value in "/sys/.../cpuinfo_cur_freq" may be "2401222". So need to round the value. Fixes: ed7c51a6a680 ("app/test: vm power management") Cc: alan.carew@intel.com Cc: stable@dpdk.org Signed-off-by: Richael Zhuang Reviewed-by: David Hunt --- app/test/test_power_cpufreq.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c index d47b3e0a1..f753d24ac 100644 --- a/app/test/test_power_cpufreq.c +++ b/app/test/test_power_cpufreq.c @@ -35,6 +35,10 @@ test_power_caps(void) #define TEST_POWER_LCORE_INVALID ((unsigned)RTE_MAX_LCORE) #define TEST_POWER_FREQS_NUM_MAX ((unsigned)RTE_MAX_LCORE_FREQS) +/* macros used for rounding frequency to nearest 100000 */ +#define TEST_FREQ_ROUNDING_DELTA 50000 +#define TEST_ROUND_FREQ_TO_N_100000 100000 + #define TEST_POWER_SYSFILE_CUR_FREQ \ "/sys/devices/system/cpu/cpu%u/cpufreq/cpuinfo_cur_freq" @@ -67,7 +71,17 @@ check_cur_freq(unsigned lcore_id, uint32_t idx) goto fail_all; cur_freq = strtoul(buf, NULL, TEST_POWER_CONVERT_TO_DECIMAL); - ret = (freqs[idx] == cur_freq ? 0 : -1); + + /* 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; + + ret = (freqs[idx] == freq_conv ? 0 : -1); if (ret == 0) break;