From: Jerin Jacob <jerinjacobk@gmail.com>
To: Pavan Nikhilesh <pbhagavatula@marvell.com>
Cc: Jerin Jacob <jerinj@marvell.com>, dpdk-dev <dev@dpdk.org>
Subject: Re: [dpdk-dev] [PATCH v2 4/4] event/octeontx2: timer always use virtual counter
Date: Mon, 22 Mar 2021 21:43:06 +0530 [thread overview]
Message-ID: <CALBAE1Mj4L_7pg7h-PiPYQYhXpud4YT1tbyY0gvePOhh2R0-Ug@mail.gmail.com> (raw)
In-Reply-To: <20210321084915.2649-4-pbhagavatula@marvell.com>
On Sun, Mar 21, 2021 at 2:20 PM <pbhagavatula@marvell.com> wrote:
>
> From: Pavan Nikhilesh <pbhagavatula@marvell.com>
>
> Use virtual counter for estimating current bucket as PMU cannot be
> reliably used to estimate time.
>
> Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
There is a genuine Travis build issue with this patch. Please check
http://patches.dpdk.org/project/dpdk/patch/20210321084915.2649-4-pbhagavatula@marvell.com/
https://travis-ci.com/github/ovsrobot/dpdk/builds/220728709
> ---
> drivers/event/octeontx2/otx2_tim_evdev.c | 19 +++--------------
> drivers/event/octeontx2/otx2_tim_evdev.h | 26 +++++++++++++++++++++++
> drivers/event/octeontx2/otx2_tim_worker.c | 4 ++--
> drivers/event/octeontx2/otx2_tim_worker.h | 2 +-
> 4 files changed, 32 insertions(+), 19 deletions(-)
>
> diff --git a/drivers/event/octeontx2/otx2_tim_evdev.c b/drivers/event/octeontx2/otx2_tim_evdev.c
> index 4fb002ddb..926c2dce6 100644
> --- a/drivers/event/octeontx2/otx2_tim_evdev.c
> +++ b/drivers/event/octeontx2/otx2_tim_evdev.c
> @@ -354,7 +354,7 @@ otx2_tim_calibrate_start_tsc(struct otx2_tim_ring *tim_ring)
>
> for (icount = 0; icount < OTX2_TIM_CALIB_ITER; icount++) {
> real_bkt = otx2_read64(tim_ring->base + TIM_LF_RING_REL) >> 44;
> - bkt_cyc = rte_rdtsc();
> + bkt_cyc = tim_cntvct();
> bucket = (bkt_cyc - tim_ring->ring_start_cyc) /
> tim_ring->tck_int;
> bucket = bucket % (tim_ring->nb_bkts);
> @@ -389,20 +389,8 @@ otx2_tim_ring_start(const struct rte_event_timer_adapter *adptr)
> tim_err_desc(rc);
> goto fail;
> }
> -#ifdef RTE_ARM_EAL_RDTSC_USE_PMU
> - uint64_t tenns_stmp, tenns_diff;
> - uint64_t pmu_stmp;
> -
> - pmu_stmp = rte_rdtsc();
> - asm volatile("mrs %0, cntvct_el0" : "=r" (tenns_stmp));
> -
> - tenns_diff = tenns_stmp - rsp->timestarted;
> - pmu_stmp = pmu_stmp - (NSEC2TICK(tenns_diff * 10, rte_get_timer_hz()));
> - tim_ring->ring_start_cyc = pmu_stmp;
> -#else
> tim_ring->ring_start_cyc = rsp->timestarted;
> -#endif
> - tim_ring->tck_int = NSEC2TICK(tim_ring->tck_nsec, rte_get_timer_hz());
> + tim_ring->tck_int = NSEC2TICK(tim_ring->tck_nsec, tim_cntfrq());
> tim_ring->tot_int = tim_ring->tck_int * tim_ring->nb_bkts;
> tim_ring->fast_div = rte_reciprocal_value_u64(tim_ring->tck_int);
> tim_ring->fast_bkt = rte_reciprocal_value_u64(tim_ring->nb_bkts);
> @@ -470,8 +458,7 @@ otx2_tim_stats_get(const struct rte_event_timer_adapter *adapter,
> struct rte_event_timer_adapter_stats *stats)
> {
> struct otx2_tim_ring *tim_ring = adapter->data->adapter_priv;
> - uint64_t bkt_cyc = rte_rdtsc() - tim_ring->ring_start_cyc;
> -
> + uint64_t bkt_cyc = tim_cntvct() - tim_ring->ring_start_cyc;
>
> stats->evtim_exp_count = __atomic_load_n(&tim_ring->arm_cnt,
> __ATOMIC_RELAXED);
> diff --git a/drivers/event/octeontx2/otx2_tim_evdev.h b/drivers/event/octeontx2/otx2_tim_evdev.h
> index 0667d4576..410880e14 100644
> --- a/drivers/event/octeontx2/otx2_tim_evdev.h
> +++ b/drivers/event/octeontx2/otx2_tim_evdev.h
> @@ -176,6 +176,32 @@ tim_priv_get(void)
> return mz->addr;
> }
>
> +#ifdef RTE_ARCH_ARM64
> +static inline uint64_t
> +tim_cntvct(void)
> +{
> + return __rte_arm64_cntvct();
> +}
> +
> +static inline uint64_t
> +tim_cntfrq(void)
> +{
> + return __rte_arm64_cntfrq();
> +}
> +#else
> +static inline uint64_t
> +tim_cntvct(void)
> +{
> + return 0;
> +}
> +
> +static inline uint64_t
> +tim_cntfrq(void)
> +{
> + return 0;
> +}
> +#endif
> +
> #define TIM_ARM_FASTPATH_MODES \
> FP(sp, 0, 0, 0, OTX2_TIM_ENA_DFB | OTX2_TIM_SP) \
> FP(mp, 0, 0, 1, OTX2_TIM_ENA_DFB | OTX2_TIM_MP) \
> diff --git a/drivers/event/octeontx2/otx2_tim_worker.c b/drivers/event/octeontx2/otx2_tim_worker.c
> index 6a3511ec0..9ee07958f 100644
> --- a/drivers/event/octeontx2/otx2_tim_worker.c
> +++ b/drivers/event/octeontx2/otx2_tim_worker.c
> @@ -41,12 +41,12 @@ tim_format_event(const struct rte_event_timer * const tim,
> static inline void
> tim_sync_start_cyc(struct otx2_tim_ring *tim_ring)
> {
> - uint64_t cur_cyc = rte_rdtsc();
> + uint64_t cur_cyc = tim_cntvct();
> uint32_t real_bkt;
>
> if (cur_cyc - tim_ring->last_updt_cyc > tim_ring->tot_int) {
> real_bkt = otx2_read64(tim_ring->base + TIM_LF_RING_REL) >> 44;
> - cur_cyc = rte_rdtsc();
> + cur_cyc = tim_cntvct();
>
> tim_ring->ring_start_cyc = cur_cyc -
> (real_bkt * tim_ring->tck_int);
> diff --git a/drivers/event/octeontx2/otx2_tim_worker.h b/drivers/event/octeontx2/otx2_tim_worker.h
> index aa69da96c..582b9c1b9 100644
> --- a/drivers/event/octeontx2/otx2_tim_worker.h
> +++ b/drivers/event/octeontx2/otx2_tim_worker.h
> @@ -132,7 +132,7 @@ tim_get_target_bucket(struct otx2_tim_ring *const tim_ring,
> const uint32_t rel_bkt, struct otx2_tim_bkt **bkt,
> struct otx2_tim_bkt **mirr_bkt)
> {
> - const uint64_t bkt_cyc = rte_rdtsc() - tim_ring->ring_start_cyc;
> + const uint64_t bkt_cyc = tim_cntvct() - tim_ring->ring_start_cyc;
> uint64_t bucket =
> rte_reciprocal_divide_u64(bkt_cyc, &tim_ring->fast_div) +
> rel_bkt;
> --
> 2.17.1
>
next prev parent reply other threads:[~2021-03-22 16:13 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-25 12:23 [dpdk-dev] [PATCH 1/4] event/octeontx2: simplify timer bucket estimation pbhagavatula
2021-02-25 12:23 ` [dpdk-dev] [PATCH 2/4] event/octeontx2: optimize timer arm routine pbhagavatula
2021-02-25 12:23 ` [dpdk-dev] [PATCH 3/4] event/octeontx2: reduce chunk pool memory usage pbhagavatula
2021-03-20 13:30 ` Jerin Jacob
2021-02-25 12:23 ` [dpdk-dev] [PATCH 4/4] event/octeontx2: timer always use virtual counter pbhagavatula
2021-03-20 13:34 ` Jerin Jacob
2021-03-21 7:11 ` [dpdk-dev] [EXT] " Pavan Nikhilesh Bhagavatula
2021-03-21 8:49 ` [dpdk-dev] [PATCH v2 1/4] event/octeontx2: simplify timer bucket estimation pbhagavatula
2021-03-21 8:49 ` [dpdk-dev] [PATCH v2 2/4] event/octeontx2: optimize timer arm routine pbhagavatula
2021-03-21 8:49 ` [dpdk-dev] [PATCH v2 3/4] event/octeontx2: reduce chunk pool memory usage pbhagavatula
2021-03-21 8:49 ` [dpdk-dev] [PATCH v2 4/4] event/octeontx2: timer always use virtual counter pbhagavatula
2021-03-22 16:13 ` Jerin Jacob [this message]
2021-03-23 8:44 ` [dpdk-dev] [PATCH v3 1/4] event/octeontx2: simplify timer bucket estimation pbhagavatula
2021-03-23 8:44 ` [dpdk-dev] [PATCH v3 2/4] event/octeontx2: optimize timer arm routine pbhagavatula
2021-03-23 8:44 ` [dpdk-dev] [PATCH v3 3/4] event/octeontx2: reduce chunk pool memory usage pbhagavatula
2021-03-23 8:44 ` [dpdk-dev] [PATCH v3 4/4] event/octeontx2: timer always use virtual counter pbhagavatula
2021-03-24 7:44 ` [dpdk-dev] [PATCH v3 1/4] event/octeontx2: simplify timer bucket estimation Jerin Jacob
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=CALBAE1Mj4L_7pg7h-PiPYQYhXpud4YT1tbyY0gvePOhh2R0-Ug@mail.gmail.com \
--to=jerinjacobk@gmail.com \
--cc=dev@dpdk.org \
--cc=jerinj@marvell.com \
--cc=pbhagavatula@marvell.com \
/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).