ethdev: introduce generic dummy packet burst function

[dpdk.git] / drivers / net / mlx5 / mlx5_rx.h

diff --git a/drivers/net/mlx5/mlx5_rx.h b/drivers/net/mlx5/mlx5_rx.h
index 298d1b1..7e41781 100644 (file)
--- a/drivers/net/mlx5/mlx5_rx.h
+++ b/drivers/net/mlx5/mlx5_rx.h
@@ -88,8 +88,8 @@ struct mlx5_rxq_data {
        unsigned int elts_n:4; /* Log 2 of Mbufs. */
        unsigned int rss_hash:1; /* RSS hash result is enabled. */
        unsigned int mark:1; /* Marked flow available on the queue. */
-       unsigned int strd_num_n:5; /* Log 2 of the number of stride. */
-       unsigned int strd_sz_n:4; /* Log 2 of stride size. */
+       unsigned int log_strd_num:5; /* Log 2 of the number of stride. */
+       unsigned int log_strd_sz:4; /* Log 2 of stride size. */
        unsigned int strd_shift_en:1; /* Enable 2bytes shift on a stride. */
        unsigned int err_state:2; /* enum mlx5_rxq_err_state. */
        unsigned int strd_scatter_en:1; /* Scattered packets from a stride. */
@@ -161,9 +161,11 @@ struct mlx5_rxq_ctrl {
        uint16_t share_qid; /* Shared RxQ ID in group. */
        unsigned int started:1; /* Whether (shared) RXQ has been started. */
        unsigned int irq:1; /* Whether IRQ is enabled. */
-       uint32_t flow_mark_n; /* Number of Mark/Flag flows using this Queue. */
        uint32_t flow_tunnels_n[MLX5_FLOW_TUNNEL]; /* Tunnels counters. */
        uint32_t wqn; /* WQ number. */
+       uint32_t rxseg_n; /* Number of split segment descriptions. */
+       struct rte_eth_rxseg_split rxseg[MLX5_MAX_RXQ_NSEG];
+       /* Saved original buffer split segment configuration. */
        uint16_t dump_file_n; /* Number of dump files. */
 };
 
@@ -225,13 +227,16 @@ struct mlx5_ind_table_obj *mlx5_ind_table_obj_get(struct rte_eth_dev *dev,
                                                  uint32_t queues_n);
 int mlx5_ind_table_obj_release(struct rte_eth_dev *dev,
                               struct mlx5_ind_table_obj *ind_tbl,
-                              bool standalone);
+                              bool standalone,
+                              bool deref_rxqs);
 int mlx5_ind_table_obj_setup(struct rte_eth_dev *dev,
-                            struct mlx5_ind_table_obj *ind_tbl);
+                            struct mlx5_ind_table_obj *ind_tbl,
+                            bool ref_qs);
 int mlx5_ind_table_obj_modify(struct rte_eth_dev *dev,
                              struct mlx5_ind_table_obj *ind_tbl,
                              uint16_t *queues, const uint32_t queues_n,
-                             bool standalone);
+                             bool standalone,
+                             bool ref_new_qs, bool deref_old_qs);
 int mlx5_ind_table_obj_attach(struct rte_eth_dev *dev,
                              struct mlx5_ind_table_obj *ind_tbl);
 int mlx5_ind_table_obj_detach(struct rte_eth_dev *dev,
@@ -270,8 +275,6 @@ __rte_noinline int mlx5_rx_err_handle(struct mlx5_rxq_data *rxq, uint8_t vec);
 void mlx5_mprq_buf_free(struct mlx5_mprq_buf *buf);
 uint16_t mlx5_rx_burst_mprq(void *dpdk_rxq, struct rte_mbuf **pkts,
                            uint16_t pkts_n);
-uint16_t removed_rx_burst(void *dpdk_rxq, struct rte_mbuf **pkts,
-                         uint16_t pkts_n);
 int mlx5_rx_descriptor_status(void *rx_queue, uint16_t offset);
 uint32_t mlx5_rx_queue_count(void *rx_queue);
 void mlx5_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
@@ -316,8 +319,7 @@ mlx5_rx_addr2mr(struct mlx5_rxq_data *rxq, uintptr_t addr)
        if (likely(lkey != UINT32_MAX))
                return lkey;
        mp = mlx5_rxq_mprq_enabled(rxq) ? rxq->mprq_mp : rxq->mp;
-       return mlx5_mr_mempool2mr_bh(&mr_ctrl->cdev->mr_scache, mr_ctrl,
-                                    mp, addr);
+       return mlx5_mr_mempool2mr_bh(mr_ctrl, mp, addr);
 }
 
 /**
@@ -338,7 +340,6 @@ mlx5_rx_mb2mr(struct mlx5_rxq_data *rxq, struct rte_mbuf *mb)
 {
        struct mlx5_mr_ctrl *mr_ctrl = &rxq->mr_ctrl;
        uintptr_t addr = (uintptr_t)mb->buf_addr;
-       struct mlx5_rxq_ctrl *rxq_ctrl;
        uint32_t lkey;
 
        /* Linear search on MR cache array. */
@@ -346,13 +347,8 @@ mlx5_rx_mb2mr(struct mlx5_rxq_data *rxq, struct rte_mbuf *mb)
                                   MLX5_MR_CACHE_N, addr);
        if (likely(lkey != UINT32_MAX))
                return lkey;
-       /*
-        * Slower search in the mempool database on miss.
-        * During queue creation rxq->sh is not yet set, so we use rxq_ctrl.
-        */
-       rxq_ctrl = container_of(rxq, struct mlx5_rxq_ctrl, rxq);
-       return mlx5_mr_mempool2mr_bh(&rxq_ctrl->sh->cdev->mr_scache,
-                                    mr_ctrl, mb->pool, addr);
+       /* Slower search in the mempool database on miss. */
+       return mlx5_mr_mempool2mr_bh(mr_ctrl, mb->pool, addr);
 }
 
 /**
@@ -402,7 +398,7 @@ mlx5_timestamp_set(struct rte_mbuf *mbuf, int offset,
 static __rte_always_inline void
 mprq_buf_replace(struct mlx5_rxq_data *rxq, uint16_t rq_idx)
 {
-       const uint32_t strd_n = 1 << rxq->strd_num_n;
+       const uint32_t strd_n = RTE_BIT32(rxq->log_strd_num);
        struct mlx5_mprq_buf *rep = rxq->mprq_repl;
        volatile struct mlx5_wqe_data_seg *wqe =
                &((volatile struct mlx5_wqe_mprq *)rxq->wqes)[rq_idx].dseg;
@@ -460,8 +456,8 @@ static __rte_always_inline enum mlx5_rqx_code
 mprq_buf_to_pkt(struct mlx5_rxq_data *rxq, struct rte_mbuf *pkt, uint32_t len,
                struct mlx5_mprq_buf *buf, uint16_t strd_idx, uint16_t strd_cnt)
 {
-       const uint32_t strd_n = 1 << rxq->strd_num_n;
-       const uint16_t strd_sz = 1 << rxq->strd_sz_n;
+       const uint32_t strd_n = RTE_BIT32(rxq->log_strd_num);
+       const uint16_t strd_sz = RTE_BIT32(rxq->log_strd_sz);
        const uint16_t strd_shift =
                MLX5_MPRQ_STRIDE_SHIFT_BYTE * rxq->strd_shift_en;
        const int32_t hdrm_overlap =
@@ -544,7 +540,7 @@ mprq_buf_to_pkt(struct mlx5_rxq_data *rxq, struct rte_mbuf *pkt, uint32_t len,
                                          buf_len, shinfo);
                /* Set mbuf head-room. */
                SET_DATA_OFF(pkt, RTE_PKTMBUF_HEADROOM);
-               MLX5_ASSERT(pkt->ol_flags == RTE_MBUF_F_EXTERNAL);
+               MLX5_ASSERT(pkt->ol_flags & RTE_MBUF_F_EXTERNAL);
                MLX5_ASSERT(rte_pktmbuf_tailroom(pkt) >=
                        len - (hdrm_overlap > 0 ? hdrm_overlap : 0));
                DATA_LEN(pkt) = len;
@@ -606,7 +602,7 @@ mlx5_check_mprq_support(struct rte_eth_dev *dev)
 static __rte_always_inline int
 mlx5_rxq_mprq_enabled(struct mlx5_rxq_data *rxq)
 {
-       return rxq->strd_num_n > 0;
+       return rxq->log_strd_num > 0;
 }
 
 /**