app/testpmd: remove hardcoded descriptors limit

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

diff --git a/app/test-pmd/macswap.c b/app/test-pmd/macswap.c
index 19cda0e..8428c26 100644 (file)
--- a/app/test-pmd/macswap.c
+++ b/app/test-pmd/macswap.c
@@ -1,34 +1,5 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2014 Tilera Corporation. All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Tilera Corporation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright 2014-2020 Mellanox Technologies, Ltd
  */
 
 #include <stdarg.h>
@@ -49,7 +20,6 @@
 #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>
@@ -67,6 +37,13 @@
 #include <rte_flow.h>
 
 #include "testpmd.h"
+#if defined(RTE_ARCH_X86)
+#include "macswap_sse.h"
+#elif defined(RTE_MACHINE_CPUFLAG_NEON)
+#include "macswap_neon.h"
+#else
+#include "macswap.h"
+#endif
 
 /*
  * MAC swap forwarding mode: Swap the source and the destination Ethernet
@@ -77,14 +54,9 @@ pkt_burst_mac_swap(struct fwd_stream *fs)
 {
        struct rte_mbuf  *pkts_burst[MAX_PKT_BURST];
        struct rte_port  *txp;
-       struct rte_mbuf  *mb;
-       struct ether_hdr *eth_hdr;
-       struct ether_addr addr;
        uint16_t nb_rx;
        uint16_t nb_tx;
-       uint16_t i;
        uint32_t retry;
-       uint64_t ol_flags = 0;
 #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES
        uint64_t start_tsc;
        uint64_t end_tsc;
@@ -108,30 +80,9 @@ pkt_burst_mac_swap(struct fwd_stream *fs)
 #endif
        fs->rx_packets += nb_rx;
        txp = &ports[fs->tx_port];
-       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;
-       if (txp->tx_ol_flags & TESTPMD_TX_OFFLOAD_MACSEC)
-               ol_flags |= PKT_TX_MACSEC;
-       for (i = 0; i < nb_rx; i++) {
-               if (likely(i < nb_rx - 1))
-                       rte_prefetch0(rte_pktmbuf_mtod(pkts_burst[i + 1],
-                                                      void *));
-               mb = pkts_burst[i];
-               eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *);
 
-               /* Swap dest and src mac addresses. */
-               ether_addr_copy(&eth_hdr->d_addr, &addr);
-               ether_addr_copy(&eth_hdr->s_addr, &eth_hdr->d_addr);
-               ether_addr_copy(&addr, &eth_hdr->s_addr);
+       do_macswap(pkts_burst, nb_rx, txp);
 
-               mb->ol_flags = ol_flags;
-               mb->l2_len = sizeof(struct ether_hdr);
-               mb->l3_len = sizeof(struct ipv4_hdr);
-               mb->vlan_tci = txp->tx_vlan_id;
-               mb->vlan_tci_outer = txp->tx_vlan_id_outer;
-       }
        nb_tx = rte_eth_tx_burst(fs->tx_port, fs->tx_queue, pkts_burst, nb_rx);
        /*
         * Retry if necessary