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 46A50A0C47 for ; Mon, 26 Jul 2021 15:54:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3CE9F40F35; Mon, 26 Jul 2021 15:54:25 +0200 (CEST) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mails.dpdk.org (Postfix) with ESMTP id CEE3840DDA for ; Mon, 26 Jul 2021 15:54:23 +0200 (CEST) Received: by mail-wm1-f46.google.com with SMTP id m19so1536184wms.0 for ; Mon, 26 Jul 2021 06:54:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s/uCQatknxkHFqBtQejFpZhenNUWqAPN7lqoAnsMspE=; b=W8Z8KgwIwGwzQ3s2/MFK9pYEjWSCvXqMv8AyZzdqb/dvtCt3N5+qDL/TVLCoZz49Vh umNRhJx2YkTzu+KH7Px5IJddMo2os368plgq3s/06lZu+3I0svMI7XcapC3Os/fInm+o 9a+VKwoFE8MLXT7JqZQR/CuRgadNiIJhD6ox5W0PwAjlXdBoqApTOTbVPxiwhUsK79HW M4MtQk+ZXQ7stzbrGXZm0Ec3BBvpUPL6oi8gEMU+iCrU7r3Rwa02HbgHJDsopgZ2bzp9 AyePKfVQv8nvlf6e6q51G+RQOyTMyoF+2PoCLy5AVgKhYJFBu8yyYvQ5MexFSmBpkUHN Hh7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=s/uCQatknxkHFqBtQejFpZhenNUWqAPN7lqoAnsMspE=; b=W+panJbtEhj0jidH9ImYnbpHr4Af5XQgb4LGf1ZYlpg/yVoDMAyRxwV3M69BI/6LvX TI6Li2CUBPoSAt03yuYAx9bew6egKV14zXwcZFK8RxdJ9L+LUUW1+Orh3smXdcVr2cp5 GFuiZbccLjnz82/9zgETslWG8t1yn50DJ5P/YzV/TG8oKL0UxiEK9qZMylcqC3YoLPe0 r8E/Ol/EhAjO10WL6NLS0t354FIQL9LsQOQhZQQba5nGeAD5ev7k0sZu3R6gyryon4nC K2zqhTITRK1y1eBJGQXEl7lSMbGR0j6179/UcCt1RBotfXPZ/89A4aa5bRi4G0LuAPre zuQA== X-Gm-Message-State: AOAM5303T0frT5zWw8HG+bFDiWMkEURwRwozFJiP60dYn2PDKU2Y49/q dGJv+McAchAu+YiVsi8HuiI= X-Google-Smtp-Source: ABdhPJzrBE9vwAGbYzBnPEsWRJxbdkW2Tze97bD0NUHtosZAnp5LgstwNP4t/k2KRQNjPDzRyipldQ== X-Received: by 2002:a1c:2314:: with SMTP id j20mr10804445wmj.30.1627307663573; Mon, 26 Jul 2021 06:54:23 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id f15sm5213075wrp.12.2021.07.26.06.54.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jul 2021 06:54:23 -0700 (PDT) From: luca.boccassi@gmail.com To: Richael Zhuang Cc: David Hunt , dpdk stable Date: Mon, 26 Jul 2021 14:52:41 +0100 Message-Id: <20210726135322.149850-18-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> <20210726135322.149850-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'test/power: fix CPU frequency check for intel_pstate' has been queued to stable release 20.11.3 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" Hi, FYI, your patch has been queued to stable release 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/28/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/7bbe27495819e91b7ae8d5aeddafc5d91414337a Thanks. Luca Boccassi --- >From 7bbe27495819e91b7ae8d5aeddafc5d91414337a 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/test/test_power_cpufreq.c b/app/test/test_power_cpufreq.c index 0c3adc5f33..1c9d5cb48e 100644 --- a/app/test/test_power_cpufreq.c +++ b/app/test/test_power_cpufreq.c @@ -60,13 +60,13 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool 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 = 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"); -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-26 13:53:16.826089054 +0100 +++ 0018-test-power-fix-CPU-frequency-check-for-intel_pstate.patch 2021-07-26 13:53:15.833292286 +0100 @@ -1 +1 @@ -From cf1e803508009917f41dd5bb347e4140043afe03 Mon Sep 17 00:00:00 2001 +From 7bbe27495819e91b7ae8d5aeddafc5d91414337a Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit cf1e803508009917f41dd5bb347e4140043afe03 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -20,2 +21,2 @@ - app/test/test_power_cpufreq.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) + app/test/test_power_cpufreq.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) @@ -24 +25 @@ -index b8fc53925c..1a9549527e 100644 +index 0c3adc5f33..1c9d5cb48e 100644 @@ -27 +28 @@ -@@ -62,13 +62,13 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo) +@@ -60,13 +60,13 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo) @@ -43,9 +43,0 @@ -@@ -85,7 +85,7 @@ check_cur_freq(unsigned int lcore_id, uint32_t idx, bool turbo) - freq_conv = cur_freq; - - env = rte_power_get_env(); -- if (env == PM_ENV_CPPC_CPUFREQ) { -+ if (env == PM_ENV_CPPC_CPUFREQ || 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