eventdev: make driver-only headers private

[dpdk.git] / drivers / event / sw / sw_evdev.h

diff --git a/drivers/event/sw/sw_evdev.h b/drivers/event/sw/sw_evdev.h
index 436b8f3..5ab6465 100644 (file)
--- a/drivers/event/sw/sw_evdev.h
+++ b/drivers/event/sw/sw_evdev.h
@@ -5,8 +5,9 @@
 #ifndef _SW_EVDEV_H_
 #define _SW_EVDEV_H_
 
+#include "sw_evdev_log.h"
 #include <rte_eventdev.h>
-#include <rte_eventdev_pmd_vdev.h>
+#include <eventdev_pmd_vdev.h>
 #include <rte_atomic.h>
 
 #define SW_DEFAULT_CREDIT_QUANTA 32
@@ -28,7 +29,13 @@
 /* report dequeue burst sizes in buckets */
 #define SW_DEQ_STAT_BUCKET_SHIFT 2
 /* how many packets pulled from port by sched */
-#define SCHED_DEQUEUE_BURST_SIZE 32
+#define SCHED_DEQUEUE_DEFAULT_BURST_SIZE 32
+/* max buffer size */
+#define SCHED_DEQUEUE_MAX_BURST_SIZE 256
+
+/* Flush the pipeline after this many no enq to cq */
+#define SCHED_NO_ENQ_CYCLE_FLUSH 256
+
 
 #define SW_PORT_HIST_LIST (MAX_SW_PROD_Q_DEPTH) /* size of our history list */
 #define NUM_SAMPLES 64 /* how many data points use for average stats */
@@ -64,26 +71,6 @@ static const uint8_t sw_qe_flag_map[] = {
                QE_FLAG_VALID | QE_FLAG_COMPLETE | QE_FLAG_NOT_EOP,
 };
 
-#ifdef RTE_LIBRTE_PMD_EVDEV_SW_DEBUG
-#define SW_LOG_INFO(fmt, args...) \
-       RTE_LOG(INFO, EVENTDEV, "[%s] %s() line %u: " fmt "\n", \
-                       SW_PMD_NAME, \
-                       __func__, __LINE__, ## args)
-
-#define SW_LOG_DBG(fmt, args...) \
-       RTE_LOG(DEBUG, EVENTDEV, "[%s] %s() line %u: " fmt "\n", \
-                       SW_PMD_NAME, \
-                       __func__, __LINE__, ## args)
-#else
-#define SW_LOG_INFO(fmt, args...)
-#define SW_LOG_DBG(fmt, args...)
-#endif
-
-#define SW_LOG_ERR(fmt, args...) \
-       RTE_LOG(ERR, EVENTDEV, "[%s] %s() line %u: " fmt "\n", \
-                       SW_PMD_NAME, \
-                       __func__, __LINE__, ## args)
-
 /* Records basic event stats at a given point. Used in port and qid structs */
 struct sw_point_stats {
        uint64_t rx_pkts;
@@ -141,7 +128,7 @@ struct sw_qid {
 
        /* Track packet order for reordering when needed */
        struct reorder_buffer_entry *reorder_buffer; /*< pkts await reorder */
-       struct rte_ring *reorder_buffer_freelist; /* available reorder slots */
+       struct rob_ring *reorder_buffer_freelist; /* available reorder slots */
        uint32_t reorder_buffer_index; /* oldest valid reorder buffer entry */
        uint32_t window_size;          /* Used to wrap reorder_buffer_index */
 
@@ -167,6 +154,14 @@ struct sw_port {
        /* A numeric ID for the port */
        uint8_t id;
 
+       /* An atomic counter for when the port has been unlinked, and the
+        * scheduler has not yet acked this unlink - hence there may still be
+        * events in the buffers going to the port. When the unlinks in
+        * progress is read by the scheduler, no more events will be pushed to
+        * the port - hence the scheduler core can just assign zero.
+        */
+       uint8_t unlinks_in_progress;
+
        int16_t is_directed; /** Takes from a single directed QID */
        /**
         * For loadbalanced we can optimise pulling packets from
@@ -208,7 +203,7 @@ struct sw_port {
        uint32_t pp_buf_start;
        uint32_t pp_buf_count;
        uint16_t cq_buf_count;
-       struct rte_event pp_buf[SCHED_DEQUEUE_BURST_SIZE];
+       struct rte_event pp_buf[SCHED_DEQUEUE_MAX_BURST_SIZE];
        struct rte_event cq_buf[MAX_SW_CONS_Q_DEPTH];
 
        uint8_t num_qids_mapped;
@@ -225,6 +220,16 @@ struct sw_evdev {
        uint32_t xstats_count_mode_port;
        uint32_t xstats_count_mode_queue;
 
+       /* Minimum burst size*/
+       uint32_t sched_min_burst_size __rte_cache_aligned;
+       /* Port dequeue burst size*/
+       uint32_t sched_deq_burst_size;
+       /* Refill pp buffers only once per scheduler call*/
+       uint32_t refill_once_per_iter;
+       /* Current values */
+       uint32_t sched_flush_count;
+       uint32_t sched_min_burst;
+
        /* Contains all ports - load balanced and directed */
        struct sw_port ports[SW_PORTS_MAX] __rte_cache_aligned;
 
@@ -306,5 +311,6 @@ int sw_xstats_reset(struct rte_eventdev *dev,
                const uint32_t ids[],
                uint32_t nb_ids);
 
+int test_sw_eventdev(void);
 
 #endif /* _SW_EVDEV_H_ */