net/dpaa2: fix the Tx handling of non HW pool bufs

The current code is sending 8 packet in each internal loop.
In some of the conditions, mbuf is being allocated or freed.
In case of error, the code is returning without taking care of
such buffer. It is better to send already prepared buffer and err
for the current failure only.

Fixes: 9e5f3e6d3658 ("net/dpaa2: handle non-hardware backed buffer pool")
Cc: stable@dpdk.org
Signed-off-by: Hemant Agrawal <hemant.agrawal@nxp.com>

diff --git a/drivers/net/dpaa2/dpaa2_rxtx.c b/drivers/net/dpaa2/dpaa2_rxtx.c
index 75a06f5..7cfa73a 100644 (file)
--- a/drivers/net/dpaa2/dpaa2_rxtx.c
+++ b/drivers/net/dpaa2/dpaa2_rxtx.c
@@ -350,7 +350,6 @@ eth_copy_mbuf_to_fd(struct rte_mbuf *mbuf,
        if (rte_dpaa2_mbuf_alloc_bulk(
                rte_dpaa2_bpid_info[bpid].bp_list->mp, &mb, 1)) {
                PMD_TX_LOG(WARNING, "Unable to allocated DPAA2 buffer");
-               rte_pktmbuf_free(mbuf);
                return -1;
        }
        m = (struct rte_mbuf *)mb;
@@ -382,8 +381,6 @@ eth_copy_mbuf_to_fd(struct rte_mbuf *mbuf,
                rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size,
                DPAA2_GET_FD_OFFSET(fd),
                DPAA2_GET_FD_LEN(fd));
-       /*free the original packet */
-       rte_pktmbuf_free(mbuf);
 
        return 0;
 }
@@ -580,39 +577,35 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                                mp = mi->pool;
                        }
                        /* Not a hw_pkt pool allocated frame */
-                       if (!mp) {
+                       if (unlikely(!mp || !priv->bp_list)) {
                                PMD_TX_LOG(ERR, "err: no bpool attached");
-                               goto skip_tx;
+                               goto send_n_return;
                        }
+
                        if (mp->ops_index != priv->bp_list->dpaa2_ops_index) {
                                PMD_TX_LOG(ERR, "non hw offload bufffer ");
                                /* alloc should be from the default buffer pool
                                 * attached to this interface
                                 */
-                               if (priv->bp_list) {
-                                       bpid = priv->bp_list->buf_pool.bpid;
-                               } else {
-                                       PMD_TX_LOG(ERR,
-                                                  "err: no bpool attached");
-                                       num_tx = 0;
-                                       goto skip_tx;
-                               }
+                               bpid = priv->bp_list->buf_pool.bpid;
+
                                if (unlikely((*bufs)->nb_segs > 1)) {
                                        PMD_TX_LOG(ERR, "S/G support not added"
                                                " for non hw offload buffer");
-                                       goto skip_tx;
+                                       goto send_n_return;
                                }
                                if (eth_copy_mbuf_to_fd(*bufs,
                                                        &fd_arr[loop], bpid)) {
-                                       bufs++;
-                                       continue;
+                                       goto send_n_return;
                                }
+                               /* free the original packet */
+                               rte_pktmbuf_free(*bufs);
                        } else {
                                bpid = mempool_to_bpid(mp);
                                if (unlikely((*bufs)->nb_segs > 1)) {
                                        if (eth_mbuf_to_sg_fd(*bufs,
                                                        &fd_arr[loop], bpid))
-                                               goto skip_tx;
+                                               goto send_n_return;
                                } else {
                                        eth_mbuf_to_fd(*bufs,
                                                       &fd_arr[loop], bpid);
@@ -630,6 +623,20 @@ dpaa2_dev_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
                dpaa2_q->tx_pkts += frames_to_send;
                nb_pkts -= frames_to_send;
        }
+       return num_tx;
+
+send_n_return:
+       /* send any already prepared fd */
+       if (loop) {
+               unsigned int i = 0;
+
+               while (i < loop) {
+                       i += qbman_swp_enqueue_multiple(swp, &eqdesc,
+                                                       &fd_arr[i], loop - i);
+               }
+               num_tx += loop;
+               dpaa2_q->tx_pkts += loop;
+       }
 skip_tx:
        return num_tx;
 }