event/octeontx: add burst mode for timer arm

Signed-off-by: Pavan Nikhilesh <pbhagavatula@caviumnetworks.com>

diff --git a/drivers/event/octeontx/timvf_evdev.c b/drivers/event/octeontx/timvf_evdev.c
index 3b698b7..b54d8b8 100644 (file)
--- a/drivers/event/octeontx/timvf_evdev.c
+++ b/drivers/event/octeontx/timvf_evdev.c
@@ -327,6 +327,9 @@ timvf_timer_adapter_caps_get(const struct rte_eventdev *dev, uint64_t flags,
                        timvf_timer_arm_burst_mp_stats :
                        timvf_timer_arm_burst_mp;
 
+       timvf_ops.arm_tmo_tick_burst = enable_stats ?
+               timvf_timer_arm_tmo_brst_stats :
+               timvf_timer_arm_tmo_brst;
        timvf_ops.cancel_burst = timvf_timer_cancel_burst;
        *caps = RTE_EVENT_TIMER_ADAPTER_CAP_INTERNAL_PORT;
        *ops = &timvf_ops;

diff --git a/drivers/event/octeontx/timvf_evdev.h b/drivers/event/octeontx/timvf_evdev.h
index 01ffac0..2e90570 100644 (file)
--- a/drivers/event/octeontx/timvf_evdev.h
+++ b/drivers/event/octeontx/timvf_evdev.h
@@ -207,6 +207,13 @@ uint16_t timvf_timer_arm_burst_mp(const struct rte_event_timer_adapter *adptr,
 uint16_t timvf_timer_arm_burst_mp_stats(
                const struct rte_event_timer_adapter *adptr,
                struct rte_event_timer **tim, const uint16_t nb_timers);
+uint16_t timvf_timer_arm_tmo_brst(const struct rte_event_timer_adapter *adptr,
+               struct rte_event_timer **tim, const uint64_t timeout_tick,
+               const uint16_t nb_timers);
+uint16_t timvf_timer_arm_tmo_brst_stats(
+               const struct rte_event_timer_adapter *adptr,
+               struct rte_event_timer **tim, const uint64_t timeout_tick,
+               const uint16_t nb_timers);
 void timvf_set_chunk_refill(struct timvf_ring * const timr);
 
 #endif /* __TIMVF_EVDEV_H__ */

diff --git a/drivers/event/octeontx/timvf_worker.c b/drivers/event/octeontx/timvf_worker.c
index 52b212c..02e17b6 100644 (file)
--- a/drivers/event/octeontx/timvf_worker.c
+++ b/drivers/event/octeontx/timvf_worker.c
@@ -137,6 +137,59 @@ timvf_timer_arm_burst_mp_stats(const struct rte_event_timer_adapter *adptr,
        return ret;
 }
 
+uint16_t
+timvf_timer_arm_tmo_brst(const struct rte_event_timer_adapter *adptr,
+               struct rte_event_timer **tim, const uint64_t timeout_tick,
+               const uint16_t nb_timers)
+{
+       int ret;
+       uint16_t set_timers = 0;
+       uint16_t idx;
+       uint16_t arr_idx = 0;
+       struct timvf_ring *timr = adptr->data->adapter_priv;
+       struct tim_mem_entry entry[TIMVF_MAX_BURST] __rte_cache_aligned;
+
+       if (unlikely(!timeout_tick || timeout_tick >= timr->nb_bkts)) {
+               const enum rte_event_timer_state state = timeout_tick ?
+                       RTE_EVENT_TIMER_ERROR_TOOLATE :
+                       RTE_EVENT_TIMER_ERROR_TOOEARLY;
+               for (idx = 0; idx < nb_timers; idx++)
+                       tim[idx]->state = state;
+               rte_errno = EINVAL;
+               return 0;
+       }
+
+       while (arr_idx < nb_timers) {
+               for (idx = 0; idx < TIMVF_MAX_BURST && (arr_idx < nb_timers);
+                               idx++, arr_idx++) {
+                       timvf_format_event(tim[arr_idx], &entry[idx]);
+               }
+               ret = timvf_add_entry_brst(timr, timeout_tick, &tim[set_timers],
+                               entry, idx);
+               set_timers += ret;
+               if (ret != idx)
+                       break;
+       }
+
+       return set_timers;
+}
+
+
+uint16_t
+timvf_timer_arm_tmo_brst_stats(const struct rte_event_timer_adapter *adptr,
+               struct rte_event_timer **tim, const uint64_t timeout_tick,
+               const uint16_t nb_timers)
+{
+       uint16_t set_timers;
+       struct timvf_ring *timr = adptr->data->adapter_priv;
+
+       set_timers = timvf_timer_arm_tmo_brst(adptr, tim, timeout_tick,
+                       nb_timers);
+       timr->tim_arm_cnt += set_timers;
+
+       return set_timers;
+}
+
 void
 timvf_set_chunk_refill(struct timvf_ring * const timr)
 {

diff --git a/drivers/event/octeontx/timvf_worker.h b/drivers/event/octeontx/timvf_worker.h
index c3a669d..93254cd 100644 (file)
--- a/drivers/event/octeontx/timvf_worker.h
+++ b/drivers/event/octeontx/timvf_worker.h
@@ -324,3 +324,98 @@ __retry:
        tim->state = RTE_EVENT_TIMER_ARMED;
        return 0;
 }
+
+static inline uint16_t
+timvf_cpy_wrk(uint16_t index, uint16_t cpy_lmt,
+               struct tim_mem_entry *chunk,
+               struct rte_event_timer ** const tim,
+               const struct tim_mem_entry * const ents,
+               const struct tim_mem_bucket * const bkt)
+{
+       for (; index < cpy_lmt; index++) {
+               *chunk = *(ents + index);
+               tim[index]->impl_opaque[0] = (uintptr_t)chunk++;
+               tim[index]->impl_opaque[1] = (uintptr_t)bkt;
+               tim[index]->state = RTE_EVENT_TIMER_ARMED;
+       }
+
+       return index;
+}
+
+/* Burst mode functions */
+static inline int
+timvf_add_entry_brst(struct timvf_ring * const timr, const uint16_t rel_bkt,
+               struct rte_event_timer ** const tim,
+               const struct tim_mem_entry *ents,
+               const uint16_t nb_timers)
+{
+       int16_t rem;
+       int16_t crem;
+       uint8_t lock_cnt;
+       uint16_t index = 0;
+       uint16_t chunk_remainder;
+       uint64_t lock_sema;
+       struct tim_mem_bucket *bkt;
+       struct tim_mem_entry *chunk;
+
+__retry:
+       bkt = timvf_get_target_bucket(timr, rel_bkt);
+
+       /* Only one thread beyond this. */
+       lock_sema = timr_bkt_inc_lock(bkt);
+       lock_cnt = (uint8_t)
+               ((lock_sema >> TIM_BUCKET_W1_S_LOCK) & TIM_BUCKET_W1_M_LOCK);
+
+       if (lock_cnt) {
+               timr_bkt_dec_lock(bkt);
+               goto __retry;
+       }
+
+       /* Bucket related checks. */
+       if (unlikely(timr_bkt_get_hbt(lock_sema))) {
+               timr_bkt_dec_lock(bkt);
+               goto __retry;
+       }
+
+       chunk_remainder = timr_bkt_fetch_rem(lock_sema);
+       rem = chunk_remainder - nb_timers;
+       if (rem < 0) {
+               crem = nb_chunk_slots - chunk_remainder;
+               if (chunk_remainder && crem) {
+                       chunk = ((struct tim_mem_entry *)
+                                       (uintptr_t)bkt->current_chunk) + crem;
+
+                       index = timvf_cpy_wrk(index, chunk_remainder,
+                                       chunk, tim, ents, bkt);
+                       timr_bkt_sub_rem(bkt, chunk_remainder);
+                       timr_bkt_add_nent(bkt, chunk_remainder);
+               }
+               rem = nb_timers - chunk_remainder;
+               ents = ents + chunk_remainder;
+
+               chunk = timr->refill_chunk(bkt, timr);
+               if (unlikely(chunk == NULL)) {
+                       timr_bkt_dec_lock(bkt);
+                       rte_errno = ENOMEM;
+                       tim[index]->state = RTE_EVENT_TIMER_ERROR;
+                       return crem;
+               }
+               *(uint64_t *)(chunk + nb_chunk_slots) = 0;
+               bkt->current_chunk = (uintptr_t) chunk;
+
+               index = timvf_cpy_wrk(index, nb_timers, chunk, tim, ents, bkt);
+               timr_bkt_set_rem(bkt, nb_chunk_slots - rem);
+               timr_bkt_add_nent(bkt, rem);
+       } else {
+               chunk = (struct tim_mem_entry *)(uintptr_t)bkt->current_chunk;
+               chunk += (nb_chunk_slots - chunk_remainder);
+
+               index = timvf_cpy_wrk(index, nb_timers,
+                               chunk, tim, ents, bkt);
+               timr_bkt_sub_rem(bkt, nb_timers);
+               timr_bkt_add_nent(bkt, nb_timers);
+       }
+
+       timr_bkt_dec_lock(bkt);
+       return nb_timers;
+}