event/sw: fix events mis-identified as needing reorder

[dpdk.git] / drivers / event / sw / sw_evdev_scheduler.c

diff --git a/drivers/event/sw/sw_evdev_scheduler.c b/drivers/event/sw/sw_evdev_scheduler.c
index c0fe6a3..a333a6f 100644 (file)
--- a/drivers/event/sw/sw_evdev_scheduler.c
+++ b/drivers/event/sw/sw_evdev_scheduler.c
@@ -51,6 +51,8 @@
 
 #define MAX_PER_IQ_DEQUEUE 48
 #define FLOWID_MASK (SW_QID_NUM_FIDS-1)
+/* use cheap bit mixing, we only need to lose a few bits */
+#define SW_HASH_FLOWID(f) (((f) ^ (f >> 10)) & FLOWID_MASK)
 
 static inline uint32_t
 sw_schedule_atomic_to_cq(struct sw_evdev *sw, struct sw_qid * const qid,
@@ -72,9 +74,7 @@ sw_schedule_atomic_to_cq(struct sw_evdev *sw, struct sw_qid * const qid,
        iq_ring_dequeue_burst(qid->iq[iq_num], qes, count);
        for (i = 0; i < count; i++) {
                const struct rte_event *qe = &qes[i];
-               /* use cheap bit mixing, we only need to lose a few bits */
-               uint32_t flow_id32 = (qes[i].flow_id) ^ (qes[i].flow_id >> 10);
-               const uint16_t flow_id = FLOWID_MASK & flow_id32;
+               const uint16_t flow_id = SW_HASH_FLOWID(qes[i].flow_id);
                struct sw_fid_t *fid = &qid->fids[flow_id];
                int cq = fid->cq;
 
@@ -183,8 +183,7 @@ sw_schedule_parallel_to_cq(struct sw_evdev *sw, struct sw_qid * const qid,
                qid->stats.tx_pkts++;
 
                const int head = (p->hist_head & (SW_PORT_HIST_LIST-1));
-
-               p->hist_list[head].fid = qe->flow_id;
+               p->hist_list[head].fid = SW_HASH_FLOWID(qe->flow_id);
                p->hist_list[head].qid = qid_id;
 
                if (keep_order)
@@ -376,7 +375,7 @@ sw_refill_pp_buf(struct sw_evdev *sw, struct sw_port *port)
 static inline uint32_t __attribute__((always_inline))
 __pull_port_lb(struct sw_evdev *sw, uint32_t port_id, int allow_reorder)
 {
-       static const struct reorder_buffer_entry dummy_rob;
+       static struct reorder_buffer_entry dummy_rob;
        uint32_t pkts_iter = 0;
        struct sw_port *port = &sw->ports[port_id];
 
@@ -449,6 +448,7 @@ __pull_port_lb(struct sw_evdev *sw, uint32_t port_id, int allow_reorder)
                                struct reorder_buffer_entry *rob_entry =
                                                hist_entry->rob_entry;
 
+                               hist_entry->rob_entry = NULL;
                                /* Although fragmentation not currently
                                 * supported by eventdev API, we support it
                                 * here. Open: How do we alert the user that