git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net/bnxt: fix Rx next consumer index in mbuf alloc fail
[dpdk.git] / drivers / net / bnxt / bnxt_rxr.c
diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index eb555c4..e2f09ad 100644 (file)
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -260,25 +260,25 @@ static void bnxt_tpa_start(struct bnxt_rx_queue *rxq,
        mbuf->pkt_len = rte_le_to_cpu_32(tpa_start->len);
        mbuf->data_len = mbuf->pkt_len;
        mbuf->port = rxq->port_id;
-       mbuf->ol_flags = PKT_RX_LRO;
+       mbuf->ol_flags = RTE_MBUF_F_RX_LRO;
 
        bnxt_tpa_get_metadata(rxq->bp, tpa_info, tpa_start, tpa_start1);
 
        if (likely(tpa_info->hash_valid)) {
                mbuf->hash.rss = tpa_info->rss_hash;
-               mbuf->ol_flags |= PKT_RX_RSS_HASH;
+               mbuf->ol_flags |= RTE_MBUF_F_RX_RSS_HASH;
        } else if (tpa_info->cfa_code_valid) {
                mbuf->hash.fdir.id = tpa_info->cfa_code;
-               mbuf->ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID;
+               mbuf->ol_flags |= RTE_MBUF_F_RX_FDIR | RTE_MBUF_F_RX_FDIR_ID;
        }
 
        if (tpa_info->vlan_valid && BNXT_RX_VLAN_STRIP_EN(rxq->bp)) {
                mbuf->vlan_tci = tpa_info->vlan;
-               mbuf->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
+               mbuf->ol_flags |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;
        }
 
        if (likely(tpa_info->l4_csum_valid))
-               mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
+               mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
 
        /* recycle next mbuf */
        data_cons = RING_NEXT(data_cons);
@@ -576,34 +576,34 @@ bnxt_init_ol_flags_tables(struct bnxt_rx_queue *rxq)
 
                if (BNXT_RX_VLAN_STRIP_EN(rxq->bp)) {
                        if (i & RX_PKT_CMPL_FLAGS2_META_FORMAT_VLAN)
-                               pt[i] |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
+                               pt[i] |= RTE_MBUF_F_RX_VLAN | RTE_MBUF_F_RX_VLAN_STRIPPED;
                }
 
                if (i & (RX_PKT_CMPL_FLAGS2_T_IP_CS_CALC << 3)) {
                        /* Tunnel case. */
                        if (outer_cksum_enabled) {
                                if (i & RX_PKT_CMPL_FLAGS2_IP_CS_CALC)
-                                       pt[i] |= PKT_RX_IP_CKSUM_GOOD;
+                                       pt[i] |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
 
                                if (i & RX_PKT_CMPL_FLAGS2_L4_CS_CALC)
-                                       pt[i] |= PKT_RX_L4_CKSUM_GOOD;
+                                       pt[i] |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
 
                                if (i & RX_PKT_CMPL_FLAGS2_T_L4_CS_CALC)
-                                       pt[i] |= PKT_RX_OUTER_L4_CKSUM_GOOD;
+                                       pt[i] |= RTE_MBUF_F_RX_OUTER_L4_CKSUM_GOOD;
                        } else {
                                if (i & RX_PKT_CMPL_FLAGS2_T_IP_CS_CALC)
-                                       pt[i] |= PKT_RX_IP_CKSUM_GOOD;
+                                       pt[i] |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
 
                                if (i & RX_PKT_CMPL_FLAGS2_T_L4_CS_CALC)
-                                       pt[i] |= PKT_RX_L4_CKSUM_GOOD;
+                                       pt[i] |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
                        }
                } else {
                        /* Non-tunnel case. */
                        if (i & RX_PKT_CMPL_FLAGS2_IP_CS_CALC)
-                               pt[i] |= PKT_RX_IP_CKSUM_GOOD;
+                               pt[i] |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
 
                        if (i & RX_PKT_CMPL_FLAGS2_L4_CS_CALC)
-                               pt[i] |= PKT_RX_L4_CKSUM_GOOD;
+                               pt[i] |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
                }
        }
 
@@ -616,30 +616,30 @@ bnxt_init_ol_flags_tables(struct bnxt_rx_queue *rxq)
                        /* Tunnel case. */
                        if (outer_cksum_enabled) {
                                if (i & (RX_PKT_CMPL_ERRORS_IP_CS_ERROR >> 4))
-                                       pt[i] |= PKT_RX_IP_CKSUM_BAD;
+                                       pt[i] |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
 
                                if (i & (RX_PKT_CMPL_ERRORS_T_IP_CS_ERROR >> 4))
-                                       pt[i] |= PKT_RX_OUTER_IP_CKSUM_BAD;
+                                       pt[i] |= RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD;
 
                                if (i & (RX_PKT_CMPL_ERRORS_L4_CS_ERROR >> 4))
-                                       pt[i] |= PKT_RX_L4_CKSUM_BAD;
+                                       pt[i] |= RTE_MBUF_F_RX_L4_CKSUM_BAD;
 
                                if (i & (RX_PKT_CMPL_ERRORS_T_L4_CS_ERROR >> 4))
-                                       pt[i] |= PKT_RX_OUTER_L4_CKSUM_BAD;
+                                       pt[i] |= RTE_MBUF_F_RX_OUTER_L4_CKSUM_BAD;
                        } else {
                                if (i & (RX_PKT_CMPL_ERRORS_T_IP_CS_ERROR >> 4))
-                                       pt[i] |= PKT_RX_IP_CKSUM_BAD;
+                                       pt[i] |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
 
                                if (i & (RX_PKT_CMPL_ERRORS_T_L4_CS_ERROR >> 4))
-                                       pt[i] |= PKT_RX_L4_CKSUM_BAD;
+                                       pt[i] |= RTE_MBUF_F_RX_L4_CKSUM_BAD;
                        }
                } else {
                        /* Non-tunnel case. */
                        if (i & (RX_PKT_CMPL_ERRORS_IP_CS_ERROR >> 4))
-                               pt[i] |= PKT_RX_IP_CKSUM_BAD;
+                               pt[i] |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
 
                        if (i & (RX_PKT_CMPL_ERRORS_L4_CS_ERROR >> 4))
-                               pt[i] |= PKT_RX_L4_CKSUM_BAD;
+                               pt[i] |= RTE_MBUF_F_RX_L4_CKSUM_BAD;
                }
        }
 }
@@ -677,13 +677,13 @@ bnxt_set_ol_flags(struct bnxt_rx_ring_info *rxr, struct rx_pkt_cmpl *rxcmp,
 
        if (flags_type & RX_PKT_CMPL_FLAGS_RSS_VALID) {
                mbuf->hash.rss = rte_le_to_cpu_32(rxcmp->rss_hash);
-               ol_flags |= PKT_RX_RSS_HASH;
+               ol_flags |= RTE_MBUF_F_RX_RSS_HASH;
        }
 
 #ifdef RTE_LIBRTE_IEEE1588
        if (unlikely((flags_type & RX_PKT_CMPL_FLAGS_MASK) ==
                     RX_PKT_CMPL_FLAGS_ITYPE_PTP_W_TIMESTAMP))
-               ol_flags |= PKT_RX_IEEE1588_PTP | PKT_RX_IEEE1588_TMST;
+               ol_flags |= RTE_MBUF_F_RX_IEEE1588_PTP | RTE_MBUF_F_RX_IEEE1588_TMST;
 #endif
 
        mbuf->ol_flags = ol_flags;
@@ -807,7 +807,7 @@ bnxt_ulp_set_mark_in_mbuf(struct bnxt *bp, struct rx_pkt_cmpl_hi *rxcmp1,
                mbuf->hash.fdir.hi = mark_id;
                *bnxt_cfa_code_dynfield(mbuf) = cfa_code & 0xffffffffull;
                mbuf->hash.fdir.id = rxcmp1->cfa_code;
-               mbuf->ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID;
+               mbuf->ol_flags |= RTE_MBUF_F_RX_FDIR | RTE_MBUF_F_RX_FDIR_ID;
                return mark_id;
        }
 
@@ -823,9 +823,6 @@ void bnxt_set_mark_in_mbuf(struct bnxt *bp,
                           struct rte_mbuf *mbuf)
 {
        uint32_t cfa_code = 0;
-       uint8_t meta_fmt = 0;
-       uint16_t flags2 = 0;
-       uint32_t meta =  0;
 
        cfa_code = rte_le_to_cpu_16(rxcmp1->cfa_code);
        if (!cfa_code)
@@ -834,27 +831,8 @@ void bnxt_set_mark_in_mbuf(struct bnxt *bp,
        if (cfa_code && !bp->mark_table[cfa_code].valid)
                return;
 
-       flags2 = rte_le_to_cpu_16(rxcmp1->flags2);
-       meta = rte_le_to_cpu_32(rxcmp1->metadata);
-       if (meta) {
-               meta >>= BNXT_RX_META_CFA_CODE_SHIFT;
-
-               /* The flags field holds extra bits of info from [6:4]
-                * which indicate if the flow is in TCAM or EM or EEM
-                */
-               meta_fmt = (flags2 & BNXT_CFA_META_FMT_MASK) >>
-                          BNXT_CFA_META_FMT_SHFT;
-
-               /* meta_fmt == 4 => 'b100 => 'b10x => EM.
-                * meta_fmt == 5 => 'b101 => 'b10x => EM + VLAN
-                * meta_fmt == 6 => 'b110 => 'b11x => EEM
-                * meta_fmt == 7 => 'b111 => 'b11x => EEM + VLAN.
-                */
-               meta_fmt >>= BNXT_CFA_META_FMT_EM_EEM_SHFT;
-       }
-
        mbuf->hash.fdir.hi = bp->mark_table[cfa_code].mark_id;
-       mbuf->ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID;
+       mbuf->ol_flags |= RTE_MBUF_F_RX_FDIR | RTE_MBUF_F_RX_FDIR_ID;
 }
 
 static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
@@ -1008,6 +986,7 @@ reuse_rx_mbuf:
                goto rx;
        }
        rxr->rx_raw_prod = raw_prod;
+rx:
        rxr->rx_next_cons = RING_IDX(rxr->rx_ring_struct, RING_NEXT(cons));
 
        if (BNXT_TRUFLOW_EN(bp) && (BNXT_VF_IS_TRUSTED(bp) || BNXT_PF(bp)) &&
@@ -1026,7 +1005,6 @@ reuse_rx_mbuf:
         * All MBUFs are allocated with the same size under DPDK,
         * no optimization for rx_copy_thresh
         */
-rx:
        *rx_pkt = mbuf;
 
 next_rx:
@@ -1369,6 +1347,9 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)
                rxr->rx_buf_ring[i] = &rxq->fake_mbuf;
        }
 
+       /* Explicitly reset this driver internal tracker on a ring init */
+       rxr->rx_next_cons = 0;
+
        if (!bnxt_need_agg_ring(rxq->bp->eth_dev))
                return 0;
 
@@ -1407,9 +1388,6 @@ int bnxt_init_one_rx_ring(struct bnxt_rx_queue *rxq)
        }
        PMD_DRV_LOG(DEBUG, "TPA alloc Done!\n");
 
-       /* Explicitly reset this driver internal tracker on a ring init */
-       rxr->rx_next_cons = 0;
-
        return 0;
 }
 
DPDK repo used for reviews