mbuf: add raw allocation function

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

diff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c
index f8027f1..0ac2a08 100644 (file)
--- a/app/test-pmd/txonly.c
+++ b/app/test-pmd/txonly.c
@@ -86,16 +86,6 @@
 static struct ipv4_hdr  pkt_ip_hdr;  /**< IP header of transmitted packets. */
 static struct udp_hdr pkt_udp_hdr; /**< UDP header of transmitted packets. */
 
-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 void
 copy_buf_to_pkt_segs(void* buf, unsigned len, struct rte_mbuf *pkt,
                     unsigned offset)
@@ -202,7 +192,7 @@ pkt_burst_transmit(struct fwd_stream *fs)
        struct ether_hdr eth_hdr;
        uint16_t nb_tx;
        uint16_t nb_pkt;
-       uint16_t vlan_tci;
+       uint16_t vlan_tci, vlan_tci_outer;
        uint64_t ol_flags = 0;
        uint8_t  i;
 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
@@ -210,6 +200,7 @@ pkt_burst_transmit(struct fwd_stream *fs)
        uint64_t end_tsc;
        uint64_t core_cycles;
 #endif
+       uint32_t nb_segs, pkt_len;
 
 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
        start_tsc = rte_rdtsc();
@@ -218,10 +209,13 @@ pkt_burst_transmit(struct fwd_stream *fs)
        mbp = current_fwd_lcore()->mbp;
        txp = &ports[fs->tx_port];
        vlan_tci = txp->tx_vlan_id;
+       vlan_tci_outer = txp->tx_vlan_id_outer;
        if (txp->tx_ol_flags & TESTPMD_TX_OFFLOAD_INSERT_VLAN)
                ol_flags = PKT_TX_VLAN_PKT;
+       if (txp->tx_ol_flags & TESTPMD_TX_OFFLOAD_INSERT_QINQ)
+               ol_flags |= PKT_TX_QINQ_PKT;
        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 == NULL) {
                nomore_mbuf:
                        if (nb_pkt == 0)
@@ -230,8 +224,13 @@ pkt_burst_transmit(struct fwd_stream *fs)
                }
                pkt->data_len = tx_pkt_seg_lengths[0];
                pkt_seg = pkt;
-               for (i = 1; i < tx_pkt_nb_segs; i++) {
-                       pkt_seg->next = tx_mbuf_alloc(mbp);
+               if (tx_pkt_split == TX_PKT_SPLIT_RND)
+                       nb_segs = random() % tx_pkt_nb_segs + 1;
+               else
+                       nb_segs = tx_pkt_nb_segs;
+               pkt_len = pkt->data_len;
+               for (i = 1; i < nb_segs; i++) {
+                       pkt_seg->next = rte_mbuf_raw_alloc(mbp);
                        if (pkt_seg->next == NULL) {
                                pkt->nb_segs = i;
                                rte_pktmbuf_free(pkt);
@@ -239,6 +238,7 @@ pkt_burst_transmit(struct fwd_stream *fs)
                        }
                        pkt_seg = pkt_seg->next;
                        pkt_seg->data_len = tx_pkt_seg_lengths[i];
+                       pkt_len += pkt_seg->data_len;
                }
                pkt_seg->next = NULL; /* Last segment of packet. */
 
@@ -263,10 +263,11 @@ pkt_burst_transmit(struct fwd_stream *fs)
                 * Complete first mbuf of packet and append it to the
                 * burst of packets to be transmitted.
                 */
-               pkt->nb_segs = tx_pkt_nb_segs;
-               pkt->pkt_len = tx_pkt_length;
+               pkt->nb_segs = nb_segs;
+               pkt->pkt_len = pkt_len;
                pkt->ol_flags = ol_flags;
-               pkt->vlan_tci  = vlan_tci;
+               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;