net/bnxt: fix null dereference in session cleanup

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

diff --git a/app/test-pmd/txonly.c b/app/test-pmd/txonly.c
index e45f884..fc039a6 100644 (file)
--- a/app/test-pmd/txonly.c
+++ b/app/test-pmd/txonly.c
@@ -24,7 +24,6 @@
 #include <rte_eal.h>
 #include <rte_per_lcore.h>
 #include <rte_lcore.h>
-#include <rte_atomic.h>
 #include <rte_branch_prediction.h>
 #include <rte_mempool.h>
 #include <rte_mbuf.h>
@@ -60,14 +59,10 @@ uint32_t tx_ip_dst_addr = (198U << 24) | (18 << 16) | (0 << 8) | 2;
 static struct rte_ipv4_hdr pkt_ip_hdr; /**< IP header of transmitted packets. */
 RTE_DEFINE_PER_LCORE(uint8_t, _ip_var); /**< IP address variation */
 static struct rte_udp_hdr pkt_udp_hdr; /**< UDP header of tx packets. */
-RTE_DEFINE_PER_LCORE(uint64_t, timestamp_qskew);
-                                       /**< Timestamp offset per queue */
-RTE_DEFINE_PER_LCORE(uint32_t, timestamp_idone); /**< Timestamp init done. */
 
 static uint64_t timestamp_mask; /**< Timestamp dynamic flag mask */
 static int32_t timestamp_off; /**< Timestamp dynamic field offset */
 static bool timestamp_enable; /**< Timestamp enable */
-static uint32_t timestamp_init_req; /**< Timestamp initialization request. */
 static uint64_t timestamp_initial[RTE_MAX_ETHPORTS];
 
 static void
@@ -175,14 +170,14 @@ update_pkt_header(struct rte_mbuf *pkt, uint32_t total_pkt_len)
                                        sizeof(struct rte_ether_hdr) +
                                        sizeof(struct rte_ipv4_hdr) +
                                        sizeof(struct rte_udp_hdr)));
-       /* updata udp pkt length */
+       /* update UDP packet length */
        udp_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_udp_hdr *,
                                sizeof(struct rte_ether_hdr) +
                                sizeof(struct rte_ipv4_hdr));
        pkt_len = (uint16_t) (pkt_data_len + sizeof(struct rte_udp_hdr));
        udp_hdr->dgram_len = RTE_CPU_TO_BE_16(pkt_len);
 
-       /* updata ip pkt length and csum */
+       /* update IP packet length and checksum */
        ip_hdr = rte_pktmbuf_mtod_offset(pkt, struct rte_ipv4_hdr *,
                                sizeof(struct rte_ether_hdr));
        ip_hdr->hdr_checksum = 0;
@@ -195,7 +190,7 @@ static inline bool
 pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,
                struct rte_ether_hdr *eth_hdr, const uint16_t vlan_tci,
                const uint16_t vlan_tci_outer, const uint64_t ol_flags,
-               const uint16_t idx, const struct fwd_stream *fs)
+               const uint16_t idx, struct fwd_stream *fs)
 {
        struct rte_mbuf *pkt_segs[RTE_MAX_SEGS_PER_PKT];
        struct rte_mbuf *pkt_seg;
@@ -214,7 +209,7 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,
 
        rte_pktmbuf_reset_headroom(pkt);
        pkt->data_len = tx_pkt_seg_lengths[0];
-       pkt->ol_flags &= EXT_ATTACHED_MBUF;
+       pkt->ol_flags &= RTE_MBUF_F_EXTERNAL;
        pkt->ol_flags |= ol_flags;
        pkt->vlan_tci = vlan_tci;
        pkt->vlan_tci_outer = vlan_tci_outer;
@@ -263,11 +258,10 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,
                update_pkt_header(pkt, pkt_len);
 
        if (unlikely(timestamp_enable)) {
-               uint64_t skew = RTE_PER_LCORE(timestamp_qskew);
+               uint64_t skew = fs->ts_skew;
                struct tx_timestamp timestamp_mark;
 
-               if (unlikely(timestamp_init_req !=
-                               RTE_PER_LCORE(timestamp_idone))) {
+               if (unlikely(!skew)) {
                        struct rte_eth_dev_info dev_info;
                        unsigned int txqs_n;
                        uint64_t phase;
@@ -290,8 +284,7 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,
                         */
                        skew = timestamp_initial[fs->tx_port] +
                               tx_pkt_times_inter + phase;
-                       RTE_PER_LCORE(timestamp_qskew) = skew;
-                       RTE_PER_LCORE(timestamp_idone) = timestamp_init_req;
+                       fs->ts_skew = skew;
                }
                timestamp_mark.pkt_idx = rte_cpu_to_be_16(idx);
                timestamp_mark.queue_idx = rte_cpu_to_be_16(fs->tx_queue);
@@ -301,14 +294,14 @@ pkt_burst_prepare(struct rte_mbuf *pkt, struct rte_mempool *mbp,
                        pkt->ol_flags |= timestamp_mask;
                        *RTE_MBUF_DYNFIELD
                                (pkt, timestamp_off, uint64_t *) = skew;
-                       RTE_PER_LCORE(timestamp_qskew) = skew;
+                       fs->ts_skew = skew;
                        timestamp_mark.ts = rte_cpu_to_be_64(skew);
                } else if (tx_pkt_times_intra) {
                        skew += tx_pkt_times_intra;
                        pkt->ol_flags |= timestamp_mask;
                        *RTE_MBUF_DYNFIELD
                                (pkt, timestamp_off, uint64_t *) = skew;
-                       RTE_PER_LCORE(timestamp_qskew) = skew;
+                       fs->ts_skew = skew;
                        timestamp_mark.ts = rte_cpu_to_be_64(skew);
                } else {
                        timestamp_mark.ts = RTE_BE64(0);
@@ -354,12 +347,12 @@ pkt_burst_transmit(struct fwd_stream *fs)
        tx_offloads = txp->dev_conf.txmode.offloads;
        vlan_tci = txp->tx_vlan_id;
        vlan_tci_outer = txp->tx_vlan_id_outer;
-       if (tx_offloads & DEV_TX_OFFLOAD_VLAN_INSERT)
-               ol_flags = PKT_TX_VLAN_PKT;
-       if (tx_offloads & DEV_TX_OFFLOAD_QINQ_INSERT)
-               ol_flags |= PKT_TX_QINQ_PKT;
-       if (tx_offloads & DEV_TX_OFFLOAD_MACSEC_INSERT)
-               ol_flags |= PKT_TX_MACSEC;
+       if (tx_offloads & RTE_ETH_TX_OFFLOAD_VLAN_INSERT)
+               ol_flags = RTE_MBUF_F_TX_VLAN;
+       if (tx_offloads & RTE_ETH_TX_OFFLOAD_QINQ_INSERT)
+               ol_flags |= RTE_MBUF_F_TX_QINQ;
+       if (tx_offloads & RTE_ETH_TX_OFFLOAD_MACSEC_INSERT)
+               ol_flags |= RTE_MBUF_F_TX_MACSEC;
 
        /*
         * Initialize Ethernet header.
@@ -462,7 +455,6 @@ tx_only_begin(portid_t pi)
        timestamp_enable = false;
        timestamp_mask = 0;
        timestamp_off = -1;
-       RTE_PER_LCORE(timestamp_qskew) = 0;
        dynf = rte_mbuf_dynflag_lookup
                                (RTE_MBUF_DYNFLAG_TX_TIMESTAMP_NAME, NULL);
        if (dynf >= 0)
@@ -505,7 +497,6 @@ tx_only_begin(portid_t pi)
                                return -EINVAL;
                        }
                }
-               timestamp_init_req++;
        }
 
        /* Make sure all settings are visible on forwarding cores.*/