event/octeontx2: use c11 atomics for statistics
diff mbox series

Message ID 20200327085558.1136-1-pbhagavatula@marvell.com
State Accepted, archived
Delegated to: Jerin Jacob
Headers show
Series
  • event/octeontx2: use c11 atomics for statistics
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/iol-testing success Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/checkpatch success coding style OK

Commit Message

Pavan Nikhilesh Bhagavatula March 27, 2020, 8:55 a.m. UTC
From: Pavan Nikhilesh <pbhagavatula@marvell.com>

Use c11 atomics with RELAXED ordering instead of rte_atomic ops which
enforce unnessary barries on arm64.

Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
---
 drivers/event/octeontx2/otx2_tim_evdev.c  | 5 +++--
 drivers/event/octeontx2/otx2_tim_evdev.h  | 2 +-
 drivers/event/octeontx2/otx2_tim_worker.c | 5 +++--
 3 files changed, 7 insertions(+), 5 deletions(-)

--
2.17.1

Comments

Phil Yang March 30, 2020, 6:25 a.m. UTC | #1
> -----Original Message-----
> From: pbhagavatula@marvell.com <pbhagavatula@marvell.com>
> Sent: Friday, March 27, 2020 4:56 PM
> To: jerinj@marvell.com; Honnappa Nagarahalli
> <Honnappa.Nagarahalli@arm.com>; Phil Yang <Phil.Yang@arm.com>; Pavan
> Nikhilesh <pbhagavatula@marvell.com>
> Cc: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH] event/octeontx2: use c11 atomics for statistics
> 
> From: Pavan Nikhilesh <pbhagavatula@marvell.com>
> 
> Use c11 atomics with RELAXED ordering instead of rte_atomic ops which
> enforce unnessary barries on arm64.
> 
> Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
> ---
>  drivers/event/octeontx2/otx2_tim_evdev.c  | 5 +++--
>  drivers/event/octeontx2/otx2_tim_evdev.h  | 2 +-
>  drivers/event/octeontx2/otx2_tim_worker.c | 5 +++--
>  3 files changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/event/octeontx2/otx2_tim_evdev.c
> b/drivers/event/octeontx2/otx2_tim_evdev.c
> index cd0dcde24..4c24cc8a6 100644
> --- a/drivers/event/octeontx2/otx2_tim_evdev.c
> +++ b/drivers/event/octeontx2/otx2_tim_evdev.c
> @@ -526,7 +526,8 @@ otx2_tim_stats_get(const struct
> rte_event_timer_adapter *adapter,
>  	uint64_t bkt_cyc = rte_rdtsc() - tim_ring->ring_start_cyc;
> 
> 
> -	stats->evtim_exp_count = rte_atomic64_read(&tim_ring->arm_cnt);
> +	stats->evtim_exp_count = __atomic_load_n(&tim_ring->arm_cnt,
> +						 __ATOMIC_RELAXED);
>  	stats->ev_enq_count = stats->evtim_exp_count;
>  	stats->adapter_tick_count = rte_reciprocal_divide_u64(bkt_cyc,
>  				&tim_ring->fast_div);
> @@ -538,7 +539,7 @@ otx2_tim_stats_reset(const struct
> rte_event_timer_adapter *adapter)
>  {
>  	struct otx2_tim_ring *tim_ring = adapter->data->adapter_priv;
> 
> -	rte_atomic64_clear(&tim_ring->arm_cnt);
> +	__atomic_store_n(&tim_ring->arm_cnt, 0, __ATOMIC_RELAXED);

Both otx2_tim_stats_get & otx2_tim_stats_reset operations are handled in the same thread,
and the arm_cmn read & store operations are sequential consistent in this case. 
So RELAXED memory ordering here is enough.

>  	return 0;
>  }
> 
> diff --git a/drivers/event/octeontx2/otx2_tim_evdev.h
> b/drivers/event/octeontx2/otx2_tim_evdev.h
> index 56895dcbf..44e3c7b51 100644
> --- a/drivers/event/octeontx2/otx2_tim_evdev.h
> +++ b/drivers/event/octeontx2/otx2_tim_evdev.h
> @@ -149,7 +149,7 @@ struct otx2_tim_ring {
>  	struct otx2_tim_bkt *bkt;
>  	struct rte_mempool *chunk_pool;
>  	struct rte_reciprocal_u64 fast_div;
> -	rte_atomic64_t arm_cnt;
> +	uint64_t arm_cnt;
>  	uint8_t prod_type_sp;
>  	uint8_t enable_stats;
>  	uint8_t disable_npa;
> diff --git a/drivers/event/octeontx2/otx2_tim_worker.c
> b/drivers/event/octeontx2/otx2_tim_worker.c
> index 104674c79..4b5cfdc72 100644
> --- a/drivers/event/octeontx2/otx2_tim_worker.c
> +++ b/drivers/event/octeontx2/otx2_tim_worker.c
> @@ -88,7 +88,7 @@ tim_timer_arm_burst(const struct
> rte_event_timer_adapter *adptr,
>  	}
> 
>  	if (flags & OTX2_TIM_ENA_STATS)
> -		rte_atomic64_add(&tim_ring->arm_cnt, index);
> +		__atomic_fetch_add(&tim_ring->arm_cnt, index,
> __ATOMIC_RELAXED);
> 
>  	return index;
>  }
> @@ -130,7 +130,8 @@ tim_timer_arm_tmo_brst(const struct
> rte_event_timer_adapter *adptr,
>  			break;
>  	}
>  	if (flags & OTX2_TIM_ENA_STATS)
> -		rte_atomic64_add(&tim_ring->arm_cnt, set_timers);
> +		__atomic_fetch_add(&tim_ring->arm_cnt, set_timers,
> +				   __ATOMIC_RELAXED);
> 
>  	return set_timers;
>  }
> --
> 2.17.1

It goods good to me.

Reviewed-by: Phil Yang <phil.yang@arm.com>

Thanks,
Phil
Jerin Jacob April 4, 2020, 4:39 p.m. UTC | #2
On Mon, Mar 30, 2020 at 11:56 AM Phil Yang <Phil.Yang@arm.com> wrote:

> >       if (flags & OTX2_TIM_ENA_STATS)
> > -             rte_atomic64_add(&tim_ring->arm_cnt, index);
> > +             __atomic_fetch_add(&tim_ring->arm_cnt, index,
> > __ATOMIC_RELAXED);
> >
> >       return index;
> >  }
> > @@ -130,7 +130,8 @@ tim_timer_arm_tmo_brst(const struct
> > rte_event_timer_adapter *adptr,
> >                       break;
> >       }
> >       if (flags & OTX2_TIM_ENA_STATS)
> > -             rte_atomic64_add(&tim_ring->arm_cnt, set_timers);
> > +             __atomic_fetch_add(&tim_ring->arm_cnt, set_timers,
> > +                                __ATOMIC_RELAXED);
> >
> >       return set_timers;
> >  }
> > --
> > 2.17.1
>
> It goods good to me.
>
> Reviewed-by: Phil Yang <phil.yang@arm.com>

Applied to dpdk-next-eventdev/master. Thanks.


>
> Thanks,
> Phil

Patch
diff mbox series

diff --git a/drivers/event/octeontx2/otx2_tim_evdev.c b/drivers/event/octeontx2/otx2_tim_evdev.c
index cd0dcde24..4c24cc8a6 100644
--- a/drivers/event/octeontx2/otx2_tim_evdev.c
+++ b/drivers/event/octeontx2/otx2_tim_evdev.c
@@ -526,7 +526,8 @@  otx2_tim_stats_get(const struct rte_event_timer_adapter *adapter,
 	uint64_t bkt_cyc = rte_rdtsc() - tim_ring->ring_start_cyc;


-	stats->evtim_exp_count = rte_atomic64_read(&tim_ring->arm_cnt);
+	stats->evtim_exp_count = __atomic_load_n(&tim_ring->arm_cnt,
+						 __ATOMIC_RELAXED);
 	stats->ev_enq_count = stats->evtim_exp_count;
 	stats->adapter_tick_count = rte_reciprocal_divide_u64(bkt_cyc,
 				&tim_ring->fast_div);
@@ -538,7 +539,7 @@  otx2_tim_stats_reset(const struct rte_event_timer_adapter *adapter)
 {
 	struct otx2_tim_ring *tim_ring = adapter->data->adapter_priv;

-	rte_atomic64_clear(&tim_ring->arm_cnt);
+	__atomic_store_n(&tim_ring->arm_cnt, 0, __ATOMIC_RELAXED);
 	return 0;
 }

diff --git a/drivers/event/octeontx2/otx2_tim_evdev.h b/drivers/event/octeontx2/otx2_tim_evdev.h
index 56895dcbf..44e3c7b51 100644
--- a/drivers/event/octeontx2/otx2_tim_evdev.h
+++ b/drivers/event/octeontx2/otx2_tim_evdev.h
@@ -149,7 +149,7 @@  struct otx2_tim_ring {
 	struct otx2_tim_bkt *bkt;
 	struct rte_mempool *chunk_pool;
 	struct rte_reciprocal_u64 fast_div;
-	rte_atomic64_t arm_cnt;
+	uint64_t arm_cnt;
 	uint8_t prod_type_sp;
 	uint8_t enable_stats;
 	uint8_t disable_npa;
diff --git a/drivers/event/octeontx2/otx2_tim_worker.c b/drivers/event/octeontx2/otx2_tim_worker.c
index 104674c79..4b5cfdc72 100644
--- a/drivers/event/octeontx2/otx2_tim_worker.c
+++ b/drivers/event/octeontx2/otx2_tim_worker.c
@@ -88,7 +88,7 @@  tim_timer_arm_burst(const struct rte_event_timer_adapter *adptr,
 	}

 	if (flags & OTX2_TIM_ENA_STATS)
-		rte_atomic64_add(&tim_ring->arm_cnt, index);
+		__atomic_fetch_add(&tim_ring->arm_cnt, index, __ATOMIC_RELAXED);

 	return index;
 }
@@ -130,7 +130,8 @@  tim_timer_arm_tmo_brst(const struct rte_event_timer_adapter *adptr,
 			break;
 	}
 	if (flags & OTX2_TIM_ENA_STATS)
-		rte_atomic64_add(&tim_ring->arm_cnt, set_timers);
+		__atomic_fetch_add(&tim_ring->arm_cnt, set_timers,
+				   __ATOMIC_RELAXED);

 	return set_timers;
 }