net/virtio: fix incorrect cast of void *

[dpdk.git] / app / test-pmd / txonly.c

diff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c
index 0ac2a08..309c738 100644 (file)
--- a/app/test-pmd/txonly.c
+++ b/app/test-pmd/txonly.c
@@ -49,18 +49,14 @@
 #include <rte_cycles.h>
 #include <rte_memory.h>
 #include <rte_memcpy.h>
-#include <rte_memzone.h>
 #include <rte_launch.h>
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
 #include <rte_atomic.h>
 #include <rte_branch_prediction.h>
-#include <rte_ring.h>
-#include <rte_memory.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
-#include <rte_memcpy.h>
 #include <rte_interrupts.h>
 #include <rte_pci.h>
 #include <rte_ether.h>
@@ -69,6 +65,7 @@
 #include <rte_tcp.h>
 #include <rte_udp.h>
 #include <rte_string_fns.h>
+#include <rte_flow.h>
 
 #include "testpmd.h"
 
@@ -193,6 +190,7 @@ pkt_burst_transmit(struct fwd_stream *fs)
        uint16_t nb_tx;
        uint16_t nb_pkt;
        uint16_t vlan_tci, vlan_tci_outer;
+       uint32_t retry;
        uint64_t ol_flags = 0;
        uint8_t  i;
 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
@@ -214,6 +212,8 @@ pkt_burst_transmit(struct fwd_stream *fs)
                ol_flags = PKT_TX_VLAN_PKT;
        if (txp->tx_ol_flags & TESTPMD_TX_OFFLOAD_INSERT_QINQ)
                ol_flags |= PKT_TX_QINQ_PKT;
+       if (txp->tx_ol_flags & TESTPMD_TX_OFFLOAD_MACSEC)
+               ol_flags |= PKT_TX_MACSEC;
        for (nb_pkt = 0; nb_pkt < nb_pkt_per_burst; nb_pkt++) {
                pkt = rte_mbuf_raw_alloc(mbp);
                if (pkt == NULL) {
@@ -222,6 +222,14 @@ pkt_burst_transmit(struct fwd_stream *fs)
                                return;
                        break;
                }
+
+               /*
+                * Using raw alloc is good to improve performance,
+                * but some consumers may use the headroom and so
+                * decrement data_off. We need to make sure it is
+                * reset to default value.
+                */
+               rte_pktmbuf_reset_headroom(pkt);
                pkt->data_len = tx_pkt_seg_lengths[0];
                pkt_seg = pkt;
                if (tx_pkt_split == TX_PKT_SPLIT_RND)
@@ -273,6 +281,17 @@ pkt_burst_transmit(struct fwd_stream *fs)
                pkts_burst[nb_pkt] = pkt;
        }
        nb_tx = rte_eth_tx_burst(fs->tx_port, fs->tx_queue, pkts_burst, nb_pkt);
+       /*
+        * Retry if necessary
+        */
+       if (unlikely(nb_tx < nb_pkt) && fs->retry_enabled) {
+               retry = 0;
+               while (nb_tx < nb_pkt && retry++ < burst_tx_retry_num) {
+                       rte_delay_us(burst_tx_delay_time);
+                       nb_tx += rte_eth_tx_burst(fs->tx_port, fs->tx_queue,
+                                       &pkts_burst[nb_tx], nb_pkt - nb_tx);
+               }
+       }
        fs->tx_packets += nb_tx;
 
 #ifdef RTE_TEST_PMD_RECORD_BURST_STATS