From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id C56C5A05D3 for ; Thu, 25 Apr 2019 17:41:38 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BC0011B5EA; Thu, 25 Apr 2019 17:41:38 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E0FFE1B5C4 for ; Thu, 25 Apr 2019 17:41:36 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 50BB1308A110; Thu, 25 Apr 2019 15:41:36 +0000 (UTC) Received: from rh.redhat.com (unknown [10.36.116.255]) by smtp.corp.redhat.com (Postfix) with ESMTP id 437DD5D9C6; Thu, 25 Apr 2019 15:41:35 +0000 (UTC) From: Kevin Traynor To: David Hunt Cc: Anatoly Burakov , dpdk stable Date: Thu, 25 Apr 2019 16:40:07 +0100 Message-Id: <20190425154037.28778-32-ktraynor@redhat.com> In-Reply-To: <20190425154037.28778-1-ktraynor@redhat.com> References: <20190425154037.28778-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Thu, 25 Apr 2019 15:41:36 +0000 (UTC) Subject: [dpdk-stable] patch 'power: fix governor storage to trim newlines' has been queued to LTS release 18.11.2 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 LTS release 18.11.2 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/01/19. 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 can be viewed on the 18.11 branch at: https://github.com/kevintraynor/dpdk-stable-queue.git Thanks. Kevin Traynor --- >From 0ab100f39c63fc7a88920f7df9a54659ebcb61f9 Mon Sep 17 00:00:00 2001 From: David Hunt Date: Fri, 29 Mar 2019 16:39:20 +0000 Subject: [PATCH] power: fix governor storage to trim newlines [ upstream commit 08a710642d1d8bed831ecf2085e041213381fc68 ] Currently the Power Libray stores the governor name with an embedded newline read from the scaling_governor sysfs file. This patch strips it out. Fixes: 445c6528b55f ("power: common interface for guest and host") Signed-off-by: David Hunt Acked-by: Anatoly Burakov --- lib/librte_power/power_acpi_cpufreq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/librte_power/power_acpi_cpufreq.c b/lib/librte_power/power_acpi_cpufreq.c index cd5978d5b..7addde274 100644 --- a/lib/librte_power/power_acpi_cpufreq.c +++ b/lib/librte_power/power_acpi_cpufreq.c @@ -148,4 +148,6 @@ power_set_governor_userspace(struct rte_power_info *pi) s = fgets(buf, sizeof(buf), f); FOPS_OR_NULL_GOTO(s, out); + /* Strip off terminating '\n' */ + strtok(buf, "\n"); /* Check if current governor is userspace */ -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-04-25 16:37:48.144056671 +0100 +++ 0032-power-fix-governor-storage-to-trim-newlines.patch 2019-04-25 16:37:46.741295041 +0100 @@ -1 +1 @@ -From 08a710642d1d8bed831ecf2085e041213381fc68 Mon Sep 17 00:00:00 2001 +From 0ab100f39c63fc7a88920f7df9a54659ebcb61f9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 08a710642d1d8bed831ecf2085e041213381fc68 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16,3 +17,2 @@ - lib/librte_power/power_acpi_cpufreq.c | 2 ++ - lib/librte_power/power_pstate_cpufreq.c | 2 ++ - 2 files changed, 4 insertions(+) + lib/librte_power/power_acpi_cpufreq.c | 2 ++ + 1 file changed, 2 insertions(+) @@ -21 +21 @@ -index 534efe817..49325d0e0 100644 +index cd5978d5b..7addde274 100644 @@ -31,11 +30,0 @@ -diff --git a/lib/librte_power/power_pstate_cpufreq.c b/lib/librte_power/power_pstate_cpufreq.c -index 9c1a1625f..3e04e8040 100644 ---- a/lib/librte_power/power_pstate_cpufreq.c -+++ b/lib/librte_power/power_pstate_cpufreq.c -@@ -293,4 +293,6 @@ power_set_governor_performance(struct pstate_power_info *pi) - s = fgets(buf, sizeof(buf), f); - FOPS_OR_NULL_GOTO(s, out); -+ /* Strip off terminating '\n' */ -+ strtok(buf, "\n"); - - /* Check if current governor is performance */