From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 67174A0A02;
Thu, 14 Jan 2021 15:46:59 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 7853E14130B;
Thu, 14 Jan 2021 15:46:30 +0100 (CET)
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
by mails.dpdk.org (Postfix) with ESMTP id 6AF26141316
for <dev@dpdk.org>; Thu, 14 Jan 2021 15:46:28 +0100 (CET)
IronPort-SDR: eGJVBc2qwhHUY1NI6SuaJ3hbX5rxh89ADaXPHyGd20+hF7u85ZYDdwiovIgpoL7BACvXFsAaTR
hWcti3eOHvzA==
X-IronPort-AV: E=McAfee;i="6000,8403,9863"; a="174870265"
X-IronPort-AV: E=Sophos;i="5.79,347,1602572400"; d="scan'208";a="174870265"
Received: from fmsmga001.fm.intel.com ([10.253.24.23])
by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
14 Jan 2021 06:46:28 -0800
IronPort-SDR: UteqMUgCscXe+OvfW88Busz3qviDTkDppOAorFaT7b4h+rjjhOh6VOsVBJ4rx3yKSeLVILrzx/
t8EKCAe9ru5g==
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.79,347,1602572400"; d="scan'208";a="465271320"
Received: from silpixa00399498.ir.intel.com (HELO
silpixa00399498.ger.corp.intel.com) ([10.237.222.179])
by fmsmga001.fm.intel.com with ESMTP; 14 Jan 2021 06:46:25 -0800
From: Anatoly Burakov <anatoly.burakov@intel.com>
To: dev@dpdk.org
Cc: Jan Viktorin <viktorin@rehivetech.com>,
Ruifeng Wang <ruifeng.wang@arm.com>, Jerin Jacob <jerinj@marvell.com>,
David Christensen <drc@linux.vnet.ibm.com>, Ray Kinsella <mdr@ashroe.eu>,
Neil Horman <nhorman@tuxdriver.com>,
Bruce Richardson <bruce.richardson@intel.com>,
Konstantin Ananyev <konstantin.ananyev@intel.com>, thomas@monjalon.net,
timothy.mcdaniel@intel.com, david.hunt@intel.com, chris.macnamara@intel.com
Date: Thu, 14 Jan 2021 14:46:06 +0000
Message-Id: <8fa37c3dbeb27434e9b5dac57112c2d0ba8144e7.1610635488.git.anatoly.burakov@intel.com>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <cover.1610635488.git.anatoly.burakov@intel.com>
References: <cover.1610473000.git.anatoly.burakov@intel.com>
<cover.1610635488.git.anatoly.burakov@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v17 04/11] eal: remove sync version of power
monitor
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Currently, the "sync" version of power monitor intrinsic is supposed to
be used for purposes of waking up a sleeping core. However, there are
better ways to achieve the same result, so remove the unneeded function.
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
lib/librte_eal/arm/rte_power_intrinsics.c | 14 -----
.../include/generic/rte_power_intrinsics.h | 38 -------------
lib/librte_eal/ppc/rte_power_intrinsics.c | 14 -----
lib/librte_eal/version.map | 1 -
lib/librte_eal/x86/rte_power_intrinsics.c | 54 -------------------
5 files changed, 121 deletions(-)
diff --git a/lib/librte_eal/arm/rte_power_intrinsics.c b/lib/librte_eal/arm/rte_power_intrinsics.c
index 5f1caaf25b..8d271dc0c1 100644
--- a/lib/librte_eal/arm/rte_power_intrinsics.c
+++ b/lib/librte_eal/arm/rte_power_intrinsics.c
@@ -17,20 +17,6 @@ rte_power_monitor(const struct rte_power_monitor_cond *pmc,
return -ENOTSUP;
}
-/**
- * This function is not supported on ARM.
- */
-int
-rte_power_monitor_sync(const struct rte_power_monitor_cond *pmc,
- const uint64_t tsc_timestamp, rte_spinlock_t *lck)
-{
- RTE_SET_USED(pmc);
- RTE_SET_USED(tsc_timestamp);
- RTE_SET_USED(lck);
-
- return -ENOTSUP;
-}
-
/**
* This function is not supported on ARM.
*/
diff --git a/lib/librte_eal/include/generic/rte_power_intrinsics.h b/lib/librte_eal/include/generic/rte_power_intrinsics.h
index 3ad53068d5..85343bc9eb 100644
--- a/lib/librte_eal/include/generic/rte_power_intrinsics.h
+++ b/lib/librte_eal/include/generic/rte_power_intrinsics.h
@@ -61,44 +61,6 @@ struct rte_power_monitor_cond {
__rte_experimental
int rte_power_monitor(const struct rte_power_monitor_cond *pmc,
const uint64_t tsc_timestamp);
-/**
- * @warning
- * @b EXPERIMENTAL: this API may change without prior notice
- *
- * Monitor specific address for changes. This will cause the CPU to enter an
- * architecture-defined optimized power state until either the specified
- * memory address is written to, a certain TSC timestamp is reached, or other
- * reasons cause the CPU to wake up.
- *
- * Additionally, an `expected` 64-bit value and 64-bit mask are provided. If
- * mask is non-zero, the current value pointed to by the `p` pointer will be
- * checked against the expected value, and if they match, the entering of
- * optimized power state may be aborted.
- *
- * This call will also lock a spinlock on entering sleep, and release it on
- * waking up the CPU.
- *
- * @warning It is responsibility of the user to check if this function is
- * supported at runtime using `rte_cpu_get_intrinsics_support()` API call.
- *
- * @param pmc
- * The monitoring condition structure.
- * @param tsc_timestamp
- * Maximum TSC timestamp to wait for. Note that the wait behavior is
- * architecture-dependent.
- * @param lck
- * A spinlock that must be locked before entering the function, will be
- * unlocked while the CPU is sleeping, and will be locked again once the CPU
- * wakes up.
- *
- * @return
- * 0 on success
- * -EINVAL on invalid parameters
- * -ENOTSUP if unsupported
- */
-__rte_experimental
-int rte_power_monitor_sync(const struct rte_power_monitor_cond *pmc,
- const uint64_t tsc_timestamp, rte_spinlock_t *lck);
/**
* @warning
diff --git a/lib/librte_eal/ppc/rte_power_intrinsics.c b/lib/librte_eal/ppc/rte_power_intrinsics.c
index 5e5a1fff5a..f7862ea324 100644
--- a/lib/librte_eal/ppc/rte_power_intrinsics.c
+++ b/lib/librte_eal/ppc/rte_power_intrinsics.c
@@ -17,20 +17,6 @@ rte_power_monitor(const struct rte_power_monitor_cond *pmc,
return -ENOTSUP;
}
-/**
- * This function is not supported on PPC64.
- */
-int
-rte_power_monitor_sync(const struct rte_power_monitor_cond *pmc,
- const uint64_t tsc_timestamp, rte_spinlock_t *lck)
-{
- RTE_SET_USED(pmc);
- RTE_SET_USED(tsc_timestamp);
- RTE_SET_USED(lck);
-
- return -ENOTSUP;
-}
-
/**
* This function is not supported on PPC64.
*/
diff --git a/lib/librte_eal/version.map b/lib/librte_eal/version.map
index 32eceb8869..1fcd1d3bed 100644
--- a/lib/librte_eal/version.map
+++ b/lib/librte_eal/version.map
@@ -406,7 +406,6 @@ EXPERIMENTAL {
# added in 21.02
rte_power_monitor;
- rte_power_monitor_sync;
rte_power_pause;
rte_thread_tls_key_create;
rte_thread_tls_key_delete;
diff --git a/lib/librte_eal/x86/rte_power_intrinsics.c b/lib/librte_eal/x86/rte_power_intrinsics.c
index 6be5c8b9f1..29247d8638 100644
--- a/lib/librte_eal/x86/rte_power_intrinsics.c
+++ b/lib/librte_eal/x86/rte_power_intrinsics.c
@@ -90,60 +90,6 @@ rte_power_monitor(const struct rte_power_monitor_cond *pmc,
return 0;
}
-/**
- * This function uses UMONITOR/UMWAIT instructions and will enter C0.2 state.
- * For more information about usage of these instructions, please refer to
- * Intel(R) 64 and IA-32 Architectures Software Developer's Manual.
- */
-int
-rte_power_monitor_sync(const struct rte_power_monitor_cond *pmc,
- const uint64_t tsc_timestamp, rte_spinlock_t *lck)
-{
- const uint32_t tsc_l = (uint32_t)tsc_timestamp;
- const uint32_t tsc_h = (uint32_t)(tsc_timestamp >> 32);
-
- /* prevent user from running this instruction if it's not supported */
- if (!wait_supported)
- return -ENOTSUP;
-
- if (pmc == NULL || lck == NULL)
- return -EINVAL;
-
- if (__check_val_size(pmc->data_sz) < 0)
- return -EINVAL;
-
- /*
- * we're using raw byte codes for now as only the newest compiler
- * versions support this instruction natively.
- */
-
- /* set address for UMONITOR */
- asm volatile(".byte 0xf3, 0x0f, 0xae, 0xf7;"
- :
- : "D"(pmc->addr));
-
- if (pmc->mask) {
- const uint64_t cur_value = __get_umwait_val(
- pmc->addr, pmc->data_sz);
- const uint64_t masked = cur_value & pmc->mask;
-
- /* if the masked value is already matching, abort */
- if (masked == pmc->val)
- return 0;
- }
- rte_spinlock_unlock(lck);
-
- /* execute UMWAIT */
- asm volatile(".byte 0xf2, 0x0f, 0xae, 0xf7;"
- : /* ignore rflags */
- : "D"(0), /* enter C0.2 */
- "a"(tsc_l), "d"(tsc_h));
-
- rte_spinlock_lock(lck);
-
- return 0;
-}
-
/**
* This function uses TPAUSE instruction and will enter C0.2 state. For more
* information about usage of this instruction, please refer to Intel(R) 64 and
--
2.25.1