git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
compress/qat: enable compression on GEN3
[dpdk.git] / drivers / net / bnxt / bnxt_txr.c
diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c
index 01db0cc..2745996 100644 (file)
--- a/drivers/net/bnxt/bnxt_txr.c
+++ b/drivers/net/bnxt/bnxt_txr.c
@@ -76,7 +76,7 @@ int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq, unsigned int socket_id)
        ring->ring_mask = ring->ring_size - 1;
        ring->bd = (void *)txr->tx_desc_ring;
        ring->bd_dma = txr->tx_desc_mapping;
-       ring->vmem_size = ring->ring_size * sizeof(struct bnxt_sw_tx_bd);
+       ring->vmem_size = ring->ring_size * sizeof(struct rte_mbuf *);
        ring->vmem = (void **)&txr->tx_buf_ring;
        ring->fw_ring_id = INVALID_HW_RING_ID;
 
@@ -104,6 +104,21 @@ int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq, unsigned int socket_id)
        return 0;
 }
 
+static bool
+bnxt_xmit_need_long_bd(struct rte_mbuf *tx_pkt, struct bnxt_tx_queue *txq)
+{
+       if (tx_pkt->ol_flags & (PKT_TX_TCP_SEG | PKT_TX_TCP_CKSUM |
+                               PKT_TX_UDP_CKSUM | PKT_TX_IP_CKSUM |
+                               PKT_TX_VLAN_PKT | PKT_TX_OUTER_IP_CKSUM |
+                               PKT_TX_TUNNEL_GRE | PKT_TX_TUNNEL_VXLAN |
+                               PKT_TX_TUNNEL_GENEVE | PKT_TX_IEEE1588_TMST |
+                               PKT_TX_QINQ_PKT) ||
+            (BNXT_TRUFLOW_EN(txq->bp) &&
+             (txq->bp->tx_cfa_action || txq->vfr_tx_cfa_action)))
+               return true;
+       return false;
+}
+
 static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
                                struct bnxt_tx_queue *txq,
                                uint16_t *coal_pkts,
@@ -116,10 +131,10 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
        struct tx_bd_long_hi *txbd1 = NULL;
        uint32_t vlan_tag_flags;
        bool long_bd = false;
-       unsigned short nr_bds = 0;
+       unsigned short nr_bds;
        uint16_t prod;
        struct rte_mbuf *m_seg;
-       struct bnxt_sw_tx_bd *tx_buf;
+       struct rte_mbuf **tx_buf;
        static const uint32_t lhint_arr[4] = {
                TX_BD_LONG_FLAGS_LHINT_LT512,
                TX_BD_LONG_FLAGS_LHINT_LT1K,
@@ -130,17 +145,9 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
        if (unlikely(is_bnxt_in_error(txq->bp)))
                return -EIO;
 
-       if (tx_pkt->ol_flags & (PKT_TX_TCP_SEG | PKT_TX_TCP_CKSUM |
-                               PKT_TX_UDP_CKSUM | PKT_TX_IP_CKSUM |
-                               PKT_TX_VLAN_PKT | PKT_TX_OUTER_IP_CKSUM |
-                               PKT_TX_TUNNEL_GRE | PKT_TX_TUNNEL_VXLAN |
-                               PKT_TX_TUNNEL_GENEVE | PKT_TX_IEEE1588_TMST |
-                               PKT_TX_QINQ_PKT) ||
-            (BNXT_TRUFLOW_EN(txq->bp) &&
-             (txq->bp->tx_cfa_action || txq->vfr_tx_cfa_action)))
-               long_bd = true;
-
+       long_bd = bnxt_xmit_need_long_bd(tx_pkt, txq);
        nr_bds = long_bd + tx_pkt->nb_segs;
+
        if (unlikely(bnxt_tx_avail(txq) < nr_bds))
                return -ENOMEM;
 
@@ -172,8 +179,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
 
        prod = RING_IDX(ring, txr->tx_raw_prod);
        tx_buf = &txr->tx_buf_ring[prod];
-       tx_buf->mbuf = tx_pkt;
-       tx_buf->nr_bds = nr_bds;
+       *tx_buf = tx_pkt;
 
        txbd = &txr->tx_desc_ring[prod];
        txbd->opaque = *coal_pkts;
@@ -181,11 +187,11 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
        txbd->flags_type |= TX_BD_SHORT_FLAGS_COAL_NOW;
        txbd->flags_type |= TX_BD_LONG_FLAGS_NO_CMPL;
        txbd->len = tx_pkt->data_len;
-       if (tx_pkt->pkt_len >= 2014)
+       if (tx_pkt->pkt_len >= 2048)
                txbd->flags_type |= TX_BD_LONG_FLAGS_LHINT_GTE2K;
        else
                txbd->flags_type |= lhint_arr[tx_pkt->pkt_len >> 9];
-       txbd->address = rte_cpu_to_le_64(rte_mbuf_data_iova(tx_buf->mbuf));
+       txbd->address = rte_cpu_to_le_64(rte_mbuf_data_iova(tx_pkt));
        *last_txbd = txbd;
 
        if (long_bd) {
@@ -193,18 +199,18 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
                vlan_tag_flags = 0;
 
                /* HW can accelerate only outer vlan in QinQ mode */
-               if (tx_buf->mbuf->ol_flags & PKT_TX_QINQ_PKT) {
+               if (tx_pkt->ol_flags & PKT_TX_QINQ_PKT) {
                        vlan_tag_flags = TX_BD_LONG_CFA_META_KEY_VLAN_TAG |
-                               tx_buf->mbuf->vlan_tci_outer;
+                               tx_pkt->vlan_tci_outer;
                        outer_tpid_bd = txq->bp->outer_tpid_bd &
                                BNXT_OUTER_TPID_BD_MASK;
                        vlan_tag_flags |= outer_tpid_bd;
-               } else if (tx_buf->mbuf->ol_flags & PKT_TX_VLAN_PKT) {
+               } else if (tx_pkt->ol_flags & PKT_TX_VLAN_PKT) {
                        /* shurd: Should this mask at
                         * TX_BD_LONG_CFA_META_VLAN_VID_MASK?
                         */
                        vlan_tag_flags = TX_BD_LONG_CFA_META_KEY_VLAN_TAG |
-                               tx_buf->mbuf->vlan_tci;
+                               tx_pkt->vlan_tci;
                        /* Currently supports 8021Q, 8021AD vlan offloads
                         * QINQ1, QINQ2, QINQ3 vlan headers are deprecated
                         */
@@ -325,7 +331,7 @@ static uint16_t bnxt_start_xmit(struct rte_mbuf *tx_pkt,
 
                prod = RING_IDX(ring, txr->tx_raw_prod);
                tx_buf = &txr->tx_buf_ring[prod];
-               tx_buf->mbuf = m_seg;
+               *tx_buf = m_seg;
 
                txbd = &txr->tx_desc_ring[prod];
                txbd->address = rte_cpu_to_le_64(rte_mbuf_data_iova(m_seg));
@@ -356,16 +362,17 @@ static void bnxt_tx_cmp_fast(struct bnxt_tx_queue *txq, int nr_pkts)
        int i, j;
 
        for (i = 0; i < nr_pkts; i++) {
-               struct bnxt_sw_tx_bd *tx_buf;
+               struct rte_mbuf **tx_buf;
                unsigned short nr_bds;
 
                tx_buf = &txr->tx_buf_ring[RING_IDX(ring, raw_cons)];
-               nr_bds = tx_buf->nr_bds;
+               nr_bds = (*tx_buf)->nb_segs +
+                        bnxt_xmit_need_long_bd(*tx_buf, txq);
                for (j = 0; j < nr_bds; j++) {
-                       if (tx_buf->mbuf) {
+                       if (*tx_buf) {
                                /* Add mbuf to the bulk free array */
-                               free[blk++] = tx_buf->mbuf;
-                               tx_buf->mbuf = NULL;
+                               free[blk++] = *tx_buf;
+                               *tx_buf = NULL;
                        }
                        raw_cons = RING_NEXT(raw_cons);
                        tx_buf = &txr->tx_buf_ring[RING_IDX(ring, raw_cons)];
@@ -389,14 +396,15 @@ static void bnxt_tx_cmp(struct bnxt_tx_queue *txq, int nr_pkts)
 
        for (i = 0; i < nr_pkts; i++) {
                struct rte_mbuf *mbuf;
-               struct bnxt_sw_tx_bd *tx_buf;
+               struct rte_mbuf **tx_buf;
                unsigned short nr_bds;
 
                tx_buf = &txr->tx_buf_ring[RING_IDX(ring, raw_cons)];
-               nr_bds = tx_buf->nr_bds;
+               nr_bds = (*tx_buf)->nb_segs +
+                        bnxt_xmit_need_long_bd(*tx_buf, txq);
                for (j = 0; j < nr_bds; j++) {
-                       mbuf = tx_buf->mbuf;
-                       tx_buf->mbuf = NULL;
+                       mbuf = *tx_buf;
+                       *tx_buf = NULL;
                        raw_cons = RING_NEXT(raw_cons);
                        tx_buf = &txr->tx_buf_ring[RING_IDX(ring, raw_cons)];
                        if (!mbuf)      /* long_bd's tx_buf ? */
DPDK repo used for reviews