From: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
To: dev@dpdk.org, honnappa.nagarahalli@arm.com, jerinj@marvell.com,
hemant.agrawal@nxp.com, akhil.goyal@nxp.com,
ogerlitz@mellanox.com, ajit.khaparde@broadcom.com,
pbhagavatula@marvell.com
Cc: nd@arm.com, stable@dpdk.org
Subject: [dpdk-stable] [PATCH v2 1/2] eal/arm: generic counter based loop for CPU freq calculation
Date: Fri, 26 Jun 2020 15:35:01 -0500 [thread overview]
Message-ID: <20200626203502.20658-1-honnappa.nagarahalli@arm.com> (raw)
In-Reply-To: <20200608213417.9764-1-honnappa.nagarahalli@arm.com>
get_tsc_freq uses 'nanosleep' system call to calculate the CPU
frequency. However, 'nanosleep' results in the process getting
un-scheduled. The kernel saves and restores the PMU state. This
ensures that the PMU cycles are not counted towards a sleeping
process. When RTE_ARM_EAL_RDTSC_USE_PMU is defined, this results
in incorrect CPU frequency calculation. This logic is replaced
with generic counter based loop.
Bugzilla ID: 450
Fixes: f91bcbb2d9a6 ("eal/arm: use high-resolution cycle counter")
Cc: stable@dpdk.org
Signed-off-by: Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
Reviewed-by: Dharmik Thakkar <dharmik.thakkar@arm.com>
Reviewed-by: Phil Yang <phil.yang@arm.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
v2:
1) renamed functions (Jerin)
2) Aligned the frequency to 1MHz ceiling (Pavan)
3) Made all the inlines to always inline for consistency
lib/librte_eal/arm/include/rte_cycles_64.h | 45 +++++++++++++++++++---
lib/librte_eal/arm/rte_cycles.c | 27 +++++++++++--
2 files changed, 63 insertions(+), 9 deletions(-)
diff --git a/lib/librte_eal/arm/include/rte_cycles_64.h b/lib/librte_eal/arm/include/rte_cycles_64.h
index da557b6a1..e41f9dbd6 100644
--- a/lib/librte_eal/arm/include/rte_cycles_64.h
+++ b/lib/librte_eal/arm/include/rte_cycles_64.h
@@ -1,5 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2015 Cavium, Inc
+ * Copyright(c) 2020 Arm Limited
*/
#ifndef _RTE_CYCLES_ARM64_H_
@@ -11,6 +12,33 @@ extern "C" {
#include "generic/rte_cycles.h"
+/** Read generic counter frequency */
+static __rte_always_inline uint64_t
+__rte_arm64_cntfrq(void)
+{
+ uint64_t freq;
+
+ asm volatile("mrs %0, cntfrq_el0" : "=r" (freq));
+ return freq;
+}
+
+/** Read generic counter */
+static __rte_always_inline uint64_t
+__rte_arm64_cntvct(void)
+{
+ uint64_t tsc;
+
+ asm volatile("mrs %0, cntvct_el0" : "=r" (tsc));
+ return tsc;
+}
+
+static __rte_always_inline uint64_t
+__rte_arm64_cntvct_precise(void)
+{
+ asm volatile("isb" : : : "memory");
+ return __rte_arm64_cntvct();
+}
+
/**
* Read the time base register.
*
@@ -25,10 +53,7 @@ extern "C" {
static inline uint64_t
rte_rdtsc(void)
{
- uint64_t tsc;
-
- asm volatile("mrs %0, cntvct_el0" : "=r" (tsc));
- return tsc;
+ return __rte_arm64_cntvct();
}
#else
/**
@@ -49,14 +74,22 @@ rte_rdtsc(void)
* asm volatile("msr pmcr_el0, %0" : : "r" (val));
*
*/
-static inline uint64_t
-rte_rdtsc(void)
+
+/** Read PMU cycle counter */
+static __rte_always_inline uint64_t
+__rte_arm64_pmccntr(void)
{
uint64_t tsc;
asm volatile("mrs %0, pmccntr_el0" : "=r"(tsc));
return tsc;
}
+
+static inline uint64_t
+rte_rdtsc(void)
+{
+ return __rte_arm64_pmccntr();
+}
#endif
static inline uint64_t
diff --git a/lib/librte_eal/arm/rte_cycles.c b/lib/librte_eal/arm/rte_cycles.c
index 3500d523e..5bd29b24b 100644
--- a/lib/librte_eal/arm/rte_cycles.c
+++ b/lib/librte_eal/arm/rte_cycles.c
@@ -3,14 +3,35 @@
*/
#include "eal_private.h"
+#include "rte_cycles.h"
uint64_t
get_tsc_freq_arch(void)
{
#if defined RTE_ARCH_ARM64 && !defined RTE_ARM_EAL_RDTSC_USE_PMU
- uint64_t freq;
- asm volatile("mrs %0, cntfrq_el0" : "=r" (freq));
- return freq;
+ return __rte_arm64_cntfrq();
+#elif defined RTE_ARCH_ARM64 && defined RTE_ARM_EAL_RDTSC_USE_PMU
+#define CYC_PER_1MHZ 1E6
+ /* Use the generic counter ticks to calculate the PMU
+ * cycle frequency.
+ */
+ uint64_t ticks;
+ uint64_t start_ticks, cur_ticks;
+ uint64_t start_pmu_cycles, end_pmu_cycles;
+
+ /* Number of ticks for 1/10 second */
+ ticks = __rte_arm64_cntfrq() / 10;
+
+ start_ticks = __rte_arm64_cntvct_precise();
+ start_pmu_cycles = rte_rdtsc_precise();
+ do {
+ cur_ticks = __rte_arm64_cntvct();
+ } while ((cur_ticks - start_ticks) < ticks);
+ end_pmu_cycles = rte_rdtsc_precise();
+
+ /* Adjust the cycles to next 1Mhz */
+ return RTE_ALIGN_MUL_CEIL(end_pmu_cycles - start_pmu_cycles,
+ CYC_PER_1MHZ) * 10;
#else
return 0;
#endif
--
2.17.1
next prev parent reply other threads:[~2020-06-26 20:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-08 21:34 [dpdk-stable] [PATCH] eal: " Honnappa Nagarahalli
2020-06-24 12:50 ` [dpdk-stable] [dpdk-dev] " Jerin Jacob
2020-06-26 20:46 ` Honnappa Nagarahalli
2020-06-24 15:09 ` Pavan Nikhilesh Bhagavatula
2020-06-26 20:35 ` Honnappa Nagarahalli [this message]
2020-07-07 11:16 ` [dpdk-stable] [dpdk-dev] [PATCH v2 1/2] eal/arm: " David Marchand
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=20200626203502.20658-1-honnappa.nagarahalli@arm.com \
--to=honnappa.nagarahalli@arm.com \
--cc=ajit.khaparde@broadcom.com \
--cc=akhil.goyal@nxp.com \
--cc=dev@dpdk.org \
--cc=hemant.agrawal@nxp.com \
--cc=jerinj@marvell.com \
--cc=nd@arm.com \
--cc=ogerlitz@mellanox.com \
--cc=pbhagavatula@marvell.com \
--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).