net/mlx5: fix assert in doorbell lookup

[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 5796e31..7c77b24 100644 (file)
--- a/drivers/event/sw/sw_evdev.h
+++ b/drivers/event/sw/sw_evdev.h
@@ -5,6 +5,7 @@
 #ifndef _SW_EVDEV_H_
 #define _SW_EVDEV_H_
 
+#include "sw_evdev_log.h"
 #include <rte_eventdev.h>
 #include <rte_eventdev_pmd_vdev.h>
 #include <rte_atomic.h>
@@ -21,6 +22,10 @@
 #define MAX_SW_PROD_Q_DEPTH 4096
 #define SW_FRAGMENTS_MAX 16
 
+/* Should be power-of-two minus one, to leave room for the next pointer */
+#define SW_EVS_PER_Q_CHUNK 255
+#define SW_Q_CHUNK_SIZE ((SW_EVS_PER_Q_CHUNK + 1) * sizeof(struct rte_event))
+
 /* report dequeue burst sizes in buckets */
 #define SW_DEQ_STAT_BUCKET_SHIFT 2
 /* how many packets pulled from port by sched */
@@ -60,26 +65,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;
@@ -102,6 +87,14 @@ struct reorder_buffer_entry {
        struct rte_event fragments[SW_FRAGMENTS_MAX];
 };
 
+struct sw_iq {
+       struct sw_queue_chunk *head;
+       struct sw_queue_chunk *tail;
+       uint16_t head_idx;
+       uint16_t tail_idx;
+       uint16_t count;
+};
+
 struct sw_qid {
        /* set when the QID has been initialized */
        uint8_t initialized;
@@ -114,7 +107,7 @@ struct sw_qid {
        struct sw_point_stats stats;
 
        /* Internal priority rings for packets */
-       struct iq_ring *iq[SW_IQS_MAX];
+       struct sw_iq iq[SW_IQS_MAX];
        uint32_t iq_pkt_mask; /* A mask to indicate packets in an IQ */
        uint64_t iq_pkt_count[SW_IQS_MAX];
 
@@ -155,6 +148,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
@@ -173,6 +174,7 @@ struct sw_port {
        uint16_t outstanding_releases __rte_cache_aligned;
        uint16_t inflight_max; /* app requested max inflights for this port */
        uint16_t inflight_credits; /* num credits this port has right now */
+       uint8_t implicit_release; /* release events before dequeueing */
 
        uint16_t last_dequeue_burst_sz; /* how big the burst was */
        uint64_t last_dequeue_ticks; /* used to track burst processing time */
@@ -225,6 +227,8 @@ struct sw_evdev {
 
        /* Internal queues - one per logical queue */
        struct sw_qid qids[RTE_EVENT_MAX_QUEUES_PER_DEV] __rte_cache_aligned;
+       struct sw_queue_chunk *chunk_list_head;
+       struct sw_queue_chunk *chunks;
 
        /* Cache how many packets are in each cq */
        uint16_t cq_ring_space[SW_PORTS_MAX] __rte_cache_aligned;
@@ -291,5 +295,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_ */