From a825afdbb9f3a15c1004113a20556cceb4cc2410 Mon Sep 17 00:00:00 2001 From: Qi Zhang Date: Sun, 16 Dec 2018 08:58:33 +0800 Subject: [PATCH] app/testpmd: move MAC swap functions Move macswap workload to dedicate function, so we can further enable platform specific optimized version. Signed-off-by: Qi Zhang Reviewed-by: Ferruh Yigit Acked-by: Bernard Iremonger --- app/test-pmd/macswap.c | 32 ++---------------------- app/test-pmd/macswap.h | 40 ++++++++++++++++++++++++++++++ app/test-pmd/macswap_common.h | 46 +++++++++++++++++++++++++++++++++++ 3 files changed, 88 insertions(+), 30 deletions(-) create mode 100644 app/test-pmd/macswap.h create mode 100644 app/test-pmd/macswap_common.h diff --git a/app/test-pmd/macswap.c b/app/test-pmd/macswap.c index a8384d5b81..849194fe20 100644 --- a/app/test-pmd/macswap.c +++ b/app/test-pmd/macswap.c @@ -66,6 +66,7 @@ #include #include "testpmd.h" +#include "macswap.h" /* * MAC swap forwarding mode: Swap the source and the destination Ethernet @@ -76,15 +77,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; - uint64_t tx_offloads; #ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES uint64_t start_tsc; uint64_t end_tsc; @@ -108,32 +103,9 @@ pkt_burst_mac_swap(struct fwd_stream *fs) #endif fs->rx_packets += nb_rx; txp = &ports[fs->tx_port]; - tx_offloads = txp->dev_conf.txmode.offloads; - 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; - 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(ð_hdr->d_addr, &addr); - ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); - ether_addr_copy(&addr, ð_hdr->s_addr); + do_macswap(pkts_burst, nb_rx, txp); - mb->ol_flags &= IND_ATTACHED_MBUF | EXT_ATTACHED_MBUF; - 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 diff --git a/app/test-pmd/macswap.h b/app/test-pmd/macswap.h new file mode 100644 index 0000000000..bfa9b0edac --- /dev/null +++ b/app/test-pmd/macswap.h @@ -0,0 +1,40 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018 Intel Corporation + */ + +#ifndef _MACSWAP_H_ +#define _MACSWAP_H_ + +#include "macswap_common.h" + +static inline void +do_macswap(struct rte_mbuf *pkts[], uint16_t nb, + struct rte_port *txp) +{ + struct ether_hdr *eth_hdr; + struct rte_mbuf *mb; + struct ether_addr addr; + uint64_t ol_flags; + int i; + + ol_flags = ol_flags_init(txp->dev_conf.txmode.offloads); + vlan_qinq_set(pkts, nb, ol_flags, + txp->tx_vlan_id, txp->tx_vlan_id_outer); + + for (i = 0; i < nb; i++) { + if (likely(i < nb - 1)) + rte_prefetch0(rte_pktmbuf_mtod(pkts[i+1], void *)); + mb = pkts[i]; + + eth_hdr = rte_pktmbuf_mtod(mb, struct ether_hdr *); + + /* Swap dest and src mac addresses. */ + ether_addr_copy(ð_hdr->d_addr, &addr); + ether_addr_copy(ð_hdr->s_addr, ð_hdr->d_addr); + ether_addr_copy(&addr, ð_hdr->s_addr); + + mbuf_field_set(mb, ol_flags); + } +} + +#endif /* _MACSWAP_H_ */ diff --git a/app/test-pmd/macswap_common.h b/app/test-pmd/macswap_common.h new file mode 100644 index 0000000000..19754cdd10 --- /dev/null +++ b/app/test-pmd/macswap_common.h @@ -0,0 +1,46 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018 Intel Corporation + */ + +#ifndef _MACSWAP_COMMON_H_ +#define _MACSWAP_COMMON_H_ + +static inline uint64_t +ol_flags_init(uint64_t tx_offload) +{ + uint64_t ol_flags = 0; + + ol_flags |= (tx_offload & DEV_TX_OFFLOAD_VLAN_INSERT) ? + PKT_TX_VLAN : 0; + ol_flags |= (tx_offload & DEV_TX_OFFLOAD_QINQ_INSERT) ? + PKT_TX_QINQ : 0; + ol_flags |= (tx_offload & DEV_TX_OFFLOAD_MACSEC_INSERT) ? + PKT_TX_MACSEC : 0; + + return ol_flags; +} + +static inline void +vlan_qinq_set(struct rte_mbuf *pkts[], uint16_t nb, + uint64_t ol_flags, uint16_t vlan, uint16_t outer_vlan) +{ + int i; + + if (ol_flags & PKT_TX_VLAN) + for (i = 0; i < nb; i++) + pkts[i]->vlan_tci = vlan; + if (ol_flags & PKT_TX_QINQ) + for (i = 0; i < nb; i++) + pkts[i]->vlan_tci_outer = outer_vlan; +} + +static inline void +mbuf_field_set(struct rte_mbuf *mb, uint64_t ol_flags) +{ + mb->ol_flags &= IND_ATTACHED_MBUF | EXT_ATTACHED_MBUF; + mb->ol_flags |= ol_flags; + mb->l2_len = sizeof(struct ether_hdr); + mb->l3_len = sizeof(struct ipv4_hdr); +} + +#endif /* _MACSWAP_COMMON_H_ */ -- 2.20.1