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 0C84AA0A02 for ; Mon, 17 May 2021 18:13:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 01B7640041; Mon, 17 May 2021 18:13:42 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 4B13740041 for ; Mon, 17 May 2021 18:13:41 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifsD-0007yH-1r; Mon, 17 May 2021 16:13:41 +0000 From: Christian Ehrhardt To: Anatoly Burakov Cc: Reshma Pattan , dpdk stable Date: Mon, 17 May 2021 18:08:27 +0200 Message-Id: <20210517161039.3132619-78-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'power: do not skip saving original P-state governor' has been queued to stable release 19.11.9 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 19.11.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/19/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/500cef51e15ace6e16f628e4c98f37043f9907d3 Thanks. Christian Ehrhardt --- >From 500cef51e15ace6e16f628e4c98f37043f9907d3 Mon Sep 17 00:00:00 2001 From: Anatoly Burakov Date: Fri, 2 Apr 2021 09:26:45 +0000 Subject: [PATCH] power: do not skip saving original P-state governor [ upstream commit 190f38773acffc5cc822f4347b38ce04257cd044 ] Currently, when we set the pstate governor to "performance", we check if it is already set to this value, and if it is, we skip setting it. However, we never save this value anywhere, so that next time we come back and request the governor to be set to its original value, the original value is empty. Fix it by saving the original pstate governor first. While we're at it, replace `strlcpy` with `rte_strscpy`. Fixes: e6c6dc0f96c8 ("power: add p-state driver compatibility") Signed-off-by: Anatoly Burakov Acked-by: Reshma Pattan --- lib/librte_power/power_pstate_cpufreq.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/librte_power/power_pstate_cpufreq.c b/lib/librte_power/power_pstate_cpufreq.c index fa16b44146..103c5375e9 100644 --- a/lib/librte_power/power_pstate_cpufreq.c +++ b/lib/librte_power/power_pstate_cpufreq.c @@ -350,6 +350,9 @@ power_set_governor_performance(struct pstate_power_info *pi) /* Strip off terminating '\n' */ strtok(buf, "\n"); + /* Save the original governor */ + rte_strscpy(pi->governor_ori, buf, sizeof(pi->governor_ori)); + /* Check if current governor is performance */ if (strncmp(buf, POWER_GOVERNOR_PERF, sizeof(POWER_GOVERNOR_PERF)) == 0) { @@ -358,8 +361,6 @@ power_set_governor_performance(struct pstate_power_info *pi) "already performance\n", pi->lcore_id); goto out; } - /* Save the original governor */ - strlcpy(pi->governor_ori, buf, sizeof(pi->governor_ori)); /* Write 'performance' to the governor */ val = fseek(f, 0, SEEK_SET); -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:32.557947750 +0200 +++ 0078-power-do-not-skip-saving-original-P-state-governor.patch 2021-05-17 17:40:29.243810043 +0200 @@ -1 +1 @@ -From 190f38773acffc5cc822f4347b38ce04257cd044 Mon Sep 17 00:00:00 2001 +From 500cef51e15ace6e16f628e4c98f37043f9907d3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 190f38773acffc5cc822f4347b38ce04257cd044 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index c4639e4b8a..1cb0e4d917 100644 +index fa16b44146..103c5375e9 100644 @@ -29 +30 @@ -@@ -382,6 +382,9 @@ power_set_governor_performance(struct pstate_power_info *pi) +@@ -350,6 +350,9 @@ power_set_governor_performance(struct pstate_power_info *pi) @@ -39 +40 @@ -@@ -390,8 +393,6 @@ power_set_governor_performance(struct pstate_power_info *pi) +@@ -358,8 +361,6 @@ power_set_governor_performance(struct pstate_power_info *pi)