DPDK patches and discussions
 help / color / mirror / Atom feed
From: Hajkowski <marcinx.hajkowski@intel.com>
To: david.hunt@intel.com
Cc: dev@dpdk.org, Marcin Hajkowski <marcinx.hajkowski@intel.com>,
	stable@dpdk.org, Anatoly Burakov <anatoly.burakov@intel.com>
Subject: [dpdk-dev] [PATCH] power: fix non thread-safe power env modification
Date: Fri,  5 Apr 2019 16:35:35 +0200	[thread overview]
Message-ID: <20190405143535.2028-1-marcinx.hajkowski@intel.com> (raw)
In-Reply-To: <20190318115647.14784-1-marcinx.hajkowski@intel.com>

From: Marcin Hajkowski <marcinx.hajkowski@intel.com>

Due to lack of thread safety in exisiting solution
use spinlock mechanism for atomic
modification of power environment related data.

Fixes: 445c6528b5 ("power: common interface for guest and host")
Cc: stable@dpdk.org

Signed-off-by: Marcin Hajkowski <marcinx.hajkowski@intel.com>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
 doc/guides/rel_notes/release_19_05.rst |  2 ++
 lib/librte_power/rte_power.c           | 30 ++++++++++++++++++--------
 lib/librte_power/rte_power.h           |  2 +-
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/doc/guides/rel_notes/release_19_05.rst b/doc/guides/rel_notes/release_19_05.rst
index c9d443e83..79f8ba76d 100644
--- a/doc/guides/rel_notes/release_19_05.rst
+++ b/doc/guides/rel_notes/release_19_05.rst
@@ -176,6 +176,8 @@ API Changes
   ``rte_vfio_container_dma_unmap`` have been extended with an option to
   request mapping or un-mapping to the default vfio container fd.
 
+* power: ``rte_power_set_env`` and ``rte_power_unset_env`` functions
+  have been modified to be thread safe.
 
 ABI Changes
 -----------
diff --git a/lib/librte_power/rte_power.c b/lib/librte_power/rte_power.c
index a05fbef94..540d69be7 100644
--- a/lib/librte_power/rte_power.c
+++ b/lib/librte_power/rte_power.c
@@ -2,7 +2,7 @@
  * Copyright(c) 2010-2014 Intel Corporation
  */
 
-#include <rte_atomic.h>
+#include <rte_spinlock.h>
 
 #include "rte_power.h"
 #include "power_acpi_cpufreq.h"
@@ -12,7 +12,7 @@
 
 enum power_management_env global_default_env = PM_ENV_NOT_SET;
 
-volatile uint32_t global_env_cfg_status = 0;
+static rte_spinlock_t global_env_cfg_lock = RTE_SPINLOCK_INITIALIZER;
 
 /* function pointers */
 rte_power_freqs_t rte_power_freqs  = NULL;
@@ -30,9 +30,15 @@ rte_power_get_capabilities_t rte_power_get_capabilities;
 int
 rte_power_set_env(enum power_management_env env)
 {
-	if (rte_atomic32_cmpset(&global_env_cfg_status, 0, 1) == 0) {
+	rte_spinlock_lock(&global_env_cfg_lock);
+
+	if (global_default_env != PM_ENV_NOT_SET) {
+		rte_spinlock_unlock(&global_env_cfg_lock);
 		return 0;
 	}
+
+	int ret = 0;
+
 	if (env == PM_ENV_ACPI_CPUFREQ) {
 		rte_power_freqs = power_acpi_cpufreq_freqs;
 		rte_power_get_freq = power_acpi_cpufreq_get_freq;
@@ -73,18 +79,24 @@ rte_power_set_env(enum power_management_env env)
 	} else {
 		RTE_LOG(ERR, POWER, "Invalid Power Management Environment(%d) set\n",
 				env);
-		rte_power_unset_env();
-		return -1;
+		ret = -1;
 	}
-	global_default_env = env;
-	return 0;
+
+	if (ret == 0)
+		global_default_env = env;
+	else
+		global_default_env = PM_ENV_NOT_SET;
+
+	rte_spinlock_unlock(&global_env_cfg_lock);
+	return ret;
 }
 
 void
 rte_power_unset_env(void)
 {
-	if (rte_atomic32_cmpset(&global_env_cfg_status, 1, 0) != 0)
-		global_default_env = PM_ENV_NOT_SET;
+	rte_spinlock_lock(&global_env_cfg_lock);
+	global_default_env = PM_ENV_NOT_SET;
+	rte_spinlock_unlock(&global_env_cfg_lock);
 }
 
 enum power_management_env
diff --git a/lib/librte_power/rte_power.h b/lib/librte_power/rte_power.h
index dee7af345..47db69f33 100644
--- a/lib/librte_power/rte_power.h
+++ b/lib/librte_power/rte_power.h
@@ -26,7 +26,7 @@ enum power_management_env {PM_ENV_NOT_SET, PM_ENV_ACPI_CPUFREQ, PM_ENV_KVM_VM,
 /**
  * Set the default power management implementation. If this is not called prior
  * to rte_power_init(), then auto-detect of the environment will take place.
- * It is not thread safe.
+ * It is thread safe.
  *
  * @param env
  *  env. The environment in which to initialise Power Management for.
-- 
2.17.2

  parent reply	other threads:[~2019-04-05 14:36 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-18 11:56 [dpdk-dev] [PATCH v2 1/4] " Hajkowski
2019-03-18 11:56 ` Hajkowski
2019-03-18 11:56 ` [dpdk-dev] [PATCH v2 2/4] power: return error in set env when power env already set Hajkowski
2019-03-18 11:56   ` Hajkowski
2019-03-19 10:57   ` Burakov, Anatoly
2019-03-19 10:57     ` Burakov, Anatoly
2019-03-18 11:56 ` [dpdk-dev] [PATCH v2 3/4] power: reset function pointers on unset env Hajkowski
2019-03-18 11:56   ` Hajkowski
2019-03-19 10:58   ` Burakov, Anatoly
2019-03-19 10:58     ` Burakov, Anatoly
2019-03-18 11:56 ` [dpdk-dev] [PATCH v2 4/4] power: add UTs for all power env types Hajkowski
2019-03-18 11:56   ` Hajkowski
2019-03-19 11:58   ` Burakov, Anatoly
2019-03-19 11:58     ` Burakov, Anatoly
2019-03-18 15:01 ` [dpdk-dev] [PATCH v2 1/4] power: fix non thread-safe power env modification Stephen Hemminger
2019-03-18 15:01   ` Stephen Hemminger
2019-03-19 10:57 ` Burakov, Anatoly
2019-03-19 10:57   ` Burakov, Anatoly
2019-03-29 14:14 ` [dpdk-dev] [dpdk-stable] " Thomas Monjalon
2019-03-29 14:14   ` Thomas Monjalon
2019-03-29 15:09   ` Burakov, Anatoly
2019-03-29 15:09     ` Burakov, Anatoly
2020-10-25 18:22     ` Thomas Monjalon
2020-10-28 13:53       ` David Hunt
2020-10-28 14:16         ` Thomas Monjalon
2019-04-05 14:35 ` Hajkowski [this message]
2019-04-05 14:35   ` [dpdk-dev] [PATCH] " Hajkowski
2019-04-22 20:22   ` Thomas Monjalon
2019-04-22 20:22     ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190405143535.2028-1-marcinx.hajkowski@intel.com \
    --to=marcinx.hajkowski@intel.com \
    --cc=anatoly.burakov@intel.com \
    --cc=david.hunt@intel.com \
    --cc=dev@dpdk.org \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).