remove unused ring includes

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

diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c
index 72016c9..379ee01 100644 (file)
--- a/app/test-pmd/flowgen.c
+++ b/app/test-pmd/flowgen.c
@@ -57,7 +57,6 @@
 #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>
@@ -89,19 +88,8 @@ static struct ether_addr cfg_ether_dst       =
 #define IP_HDRLEN  0x05 /* default IP header length == five 32-bits words. */
 #define IP_VHL_DEF (IP_VERSION | IP_HDRLEN)
 
-static inline struct rte_mbuf *
-tx_mbuf_alloc(struct rte_mempool *mp)
-{
-       struct rte_mbuf *m;
-
-       m = __rte_mbuf_raw_alloc(mp);
-       __rte_mbuf_sanity_check_raw(m, 0);
-       return (m);
-}
-
-
 static inline uint16_t
-ip_sum(const uint16_t *hdr, int hdr_len)
+ip_sum(const unaligned_uint16_t *hdr, int hdr_len)
 {
        uint32_t sum = 0;
 
@@ -136,12 +124,13 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
        struct ether_hdr *eth_hdr;
        struct ipv4_hdr *ip_hdr;
        struct udp_hdr *udp_hdr;
-       uint16_t vlan_tci;
+       uint16_t vlan_tci, vlan_tci_outer;
        uint16_t ol_flags;
        uint16_t nb_rx;
        uint16_t nb_tx;
        uint16_t nb_pkt;
        uint16_t i;
+       uint32_t retry;
 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
        uint64_t start_tsc;
        uint64_t end_tsc;
@@ -163,10 +152,11 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
 
        mbp = current_fwd_lcore()->mbp;
        vlan_tci = ports[fs->tx_port].tx_vlan_id;
+       vlan_tci_outer = ports[fs->tx_port].tx_vlan_id_outer;
        ol_flags = ports[fs->tx_port].tx_ol_flags;
 
        for (nb_pkt = 0; nb_pkt < nb_pkt_per_burst; nb_pkt++) {
-               pkt = tx_mbuf_alloc(mbp);
+               pkt = rte_mbuf_raw_alloc(mbp);
                if (!pkt)
                        break;
 
@@ -193,7 +183,7 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
                                                           next_flow);
                ip_hdr->total_length    = RTE_CPU_TO_BE_16(pkt_size -
                                                           sizeof(*eth_hdr));
-               ip_hdr->hdr_checksum    = ip_sum((uint16_t *)ip_hdr,
+               ip_hdr->hdr_checksum    = ip_sum((unaligned_uint16_t *)ip_hdr,
                                                 sizeof(*ip_hdr));
 
                /* Initialize UDP header. */
@@ -208,6 +198,7 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
                pkt->pkt_len            = pkt_size;
                pkt->ol_flags           = ol_flags;
                pkt->vlan_tci           = vlan_tci;
+               pkt->vlan_tci_outer     = vlan_tci_outer;
                pkt->l2_len             = sizeof(struct ether_hdr);
                pkt->l3_len             = sizeof(struct ipv4_hdr);
                pkts_burst[nb_pkt]      = pkt;
@@ -216,6 +207,17 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
        }
 
        nb_tx = rte_eth_tx_burst(fs->tx_port, fs->tx_queue, pkts_burst, nb_pkt);
+       /*
+        * Retry if necessary
+        */
+       if (unlikely(nb_tx < nb_rx) && fs->retry_enabled) {
+               retry = 0;
+               while (nb_tx < nb_rx && 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_rx - nb_tx);
+               }
+       }
        fs->tx_packets += nb_tx;
 
 #ifdef RTE_TEST_PMD_RECORD_BURST_STATS