X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-pmd%2Fflowgen.c;h=9ceef3b54a15bca816d2e58b16d21bd4eca05673;hb=c8557ed434213fe11ecd867819823ea6865311d2;hp=03b72aaa56e21c3c5180f30269ff92b5599489c8;hpb=5fde1a75926bad69b430ce9d7e4da4e2447e1cb6;p=dpdk.git diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c index 03b72aaa56..9ceef3b54a 100644 --- a/app/test-pmd/flowgen.c +++ b/app/test-pmd/flowgen.c @@ -1,35 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2013 Tilera Corporation. All rights reserved. - * 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 @@ -54,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -70,8 +39,6 @@ #include "testpmd.h" -/* hardcoded configuration (for now) */ -static unsigned cfg_n_flows = 1024; static uint32_t cfg_ip_src = RTE_IPV4(10, 254, 0, 0); static uint32_t cfg_ip_dst = RTE_IPV4(10, 253, 0, 0); static uint16_t cfg_udp_src = 1000; @@ -83,24 +50,7 @@ static struct rte_ether_addr cfg_ether_dst = #define IP_DEFTTL 64 /* from RFC 1340. */ -static inline uint16_t -ip_sum(const unaligned_uint16_t *hdr, int hdr_len) -{ - uint32_t sum = 0; - - while (hdr_len > 1) - { - sum += *hdr++; - if (sum & 0x80000000) - sum = (sum & 0xFFFF) + (sum >> 16); - hdr_len -= 2; - } - - while (sum >> 16) - sum = (sum & 0xFFFF) + (sum >> 16); - - return ~sum; -} +RTE_DEFINE_PER_LCORE(int, _next_flow); /* * Multi-flow generation mode. @@ -115,7 +65,7 @@ pkt_burst_flow_gen(struct fwd_stream *fs) unsigned pkt_size = tx_pkt_length - 4; /* Adjust FCS */ struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; struct rte_mempool *mbp; - struct rte_mbuf *pkt; + struct rte_mbuf *pkt = NULL; struct rte_ether_hdr *eth_hdr; struct rte_ipv4_hdr *ip_hdr; struct rte_udp_hdr *udp_hdr; @@ -123,24 +73,21 @@ pkt_burst_flow_gen(struct fwd_stream *fs) uint64_t ol_flags = 0; uint16_t nb_rx; uint16_t nb_tx; + uint16_t nb_dropped; uint16_t nb_pkt; + uint16_t nb_clones = nb_pkt_flowgen_clones; uint16_t i; uint32_t retry; uint64_t tx_offloads; -#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES - uint64_t start_tsc; - uint64_t end_tsc; - uint64_t core_cycles; -#endif - static int next_flow = 0; + uint64_t start_tsc = 0; + int next_flow = RTE_PER_LCORE(_next_flow); -#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES - start_tsc = rte_rdtsc(); -#endif + get_start_cycles(&start_tsc); /* Receive a burst of packets and discard them. */ nb_rx = rte_eth_rx_burst(fs->rx_port, fs->rx_queue, pkts_burst, nb_pkt_per_burst); + inc_rx_burst_stats(fs, nb_rx); fs->rx_packets += nb_rx; for (i = 0; i < nb_rx; i++) @@ -151,101 +98,118 @@ pkt_burst_flow_gen(struct fwd_stream *fs) vlan_tci_outer = ports[fs->tx_port].tx_vlan_id_outer; tx_offloads = ports[fs->tx_port].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; + 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; for (nb_pkt = 0; nb_pkt < nb_pkt_per_burst; nb_pkt++) { - pkt = rte_mbuf_raw_alloc(mbp); - if (!pkt) - break; - - pkt->data_len = pkt_size; - pkt->next = NULL; - - /* Initialize Ethernet header. */ - eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); - rte_ether_addr_copy(&cfg_ether_dst, ð_hdr->d_addr); - rte_ether_addr_copy(&cfg_ether_src, ð_hdr->s_addr); - eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); - - /* Initialize IP header. */ - ip_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1); - memset(ip_hdr, 0, sizeof(*ip_hdr)); - ip_hdr->version_ihl = RTE_IPV4_VHL_DEF; - ip_hdr->type_of_service = 0; - ip_hdr->fragment_offset = 0; - ip_hdr->time_to_live = IP_DEFTTL; - ip_hdr->next_proto_id = IPPROTO_UDP; - ip_hdr->packet_id = 0; - ip_hdr->src_addr = rte_cpu_to_be_32(cfg_ip_src); - ip_hdr->dst_addr = rte_cpu_to_be_32(cfg_ip_dst + - next_flow); - ip_hdr->total_length = RTE_CPU_TO_BE_16(pkt_size - - sizeof(*eth_hdr)); - ip_hdr->hdr_checksum = ip_sum((unaligned_uint16_t *)ip_hdr, - sizeof(*ip_hdr)); - - /* Initialize UDP header. */ - udp_hdr = (struct rte_udp_hdr *)(ip_hdr + 1); - udp_hdr->src_port = rte_cpu_to_be_16(cfg_udp_src); - udp_hdr->dst_port = rte_cpu_to_be_16(cfg_udp_dst); - udp_hdr->dgram_cksum = 0; /* No UDP checksum. */ - udp_hdr->dgram_len = RTE_CPU_TO_BE_16(pkt_size - - sizeof(*eth_hdr) - - sizeof(*ip_hdr)); - pkt->nb_segs = 1; - 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 rte_ether_hdr); - pkt->l3_len = sizeof(struct rte_ipv4_hdr); - pkts_burst[nb_pkt] = pkt; - - next_flow = (next_flow + 1) % cfg_n_flows; + if (!nb_pkt || !nb_clones) { + nb_clones = nb_pkt_flowgen_clones; + /* Logic limitation */ + if (nb_clones > nb_pkt_per_burst) + nb_clones = nb_pkt_per_burst; + + pkt = rte_mbuf_raw_alloc(mbp); + if (!pkt) + break; + + pkt->data_len = pkt_size; + pkt->next = NULL; + + /* Initialize Ethernet header. */ + eth_hdr = rte_pktmbuf_mtod(pkt, struct rte_ether_hdr *); + rte_ether_addr_copy(&cfg_ether_dst, ð_hdr->dst_addr); + rte_ether_addr_copy(&cfg_ether_src, ð_hdr->src_addr); + eth_hdr->ether_type = rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4); + + /* Initialize IP header. */ + ip_hdr = (struct rte_ipv4_hdr *)(eth_hdr + 1); + memset(ip_hdr, 0, sizeof(*ip_hdr)); + ip_hdr->version_ihl = RTE_IPV4_VHL_DEF; + ip_hdr->type_of_service = 0; + ip_hdr->fragment_offset = 0; + ip_hdr->time_to_live = IP_DEFTTL; + ip_hdr->next_proto_id = IPPROTO_UDP; + ip_hdr->packet_id = 0; + ip_hdr->src_addr = rte_cpu_to_be_32(cfg_ip_src); + ip_hdr->dst_addr = rte_cpu_to_be_32(cfg_ip_dst + + next_flow); + ip_hdr->total_length = RTE_CPU_TO_BE_16(pkt_size - + sizeof(*eth_hdr)); + ip_hdr->hdr_checksum = rte_ipv4_cksum(ip_hdr); + + /* Initialize UDP header. */ + udp_hdr = (struct rte_udp_hdr *)(ip_hdr + 1); + udp_hdr->src_port = rte_cpu_to_be_16(cfg_udp_src); + udp_hdr->dst_port = rte_cpu_to_be_16(cfg_udp_dst); + udp_hdr->dgram_cksum = 0; /* No UDP checksum. */ + udp_hdr->dgram_len = RTE_CPU_TO_BE_16(pkt_size - + sizeof(*eth_hdr) - + sizeof(*ip_hdr)); + pkt->nb_segs = 1; + pkt->pkt_len = pkt_size; + pkt->ol_flags &= RTE_MBUF_F_EXTERNAL; + pkt->ol_flags |= ol_flags; + pkt->vlan_tci = vlan_tci; + pkt->vlan_tci_outer = vlan_tci_outer; + pkt->l2_len = sizeof(struct rte_ether_hdr); + pkt->l3_len = sizeof(struct rte_ipv4_hdr); + } else { + nb_clones--; + rte_mbuf_refcnt_update(pkt, 1); + } + pkts_burst[nb_pkt] = pkt; + + if (++next_flow >= nb_flows_flowgen) + next_flow = 0; } 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) { + if (unlikely(nb_tx < nb_pkt) && fs->retry_enabled) { retry = 0; - while (nb_tx < nb_rx && retry++ < burst_tx_retry_num) { + while (nb_tx < nb_pkt && 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); + &pkts_burst[nb_tx], nb_pkt - nb_tx); } } fs->tx_packets += nb_tx; -#ifdef RTE_TEST_PMD_RECORD_BURST_STATS - fs->tx_burst_stats.pkt_burst_spread[nb_tx]++; -#endif - if (unlikely(nb_tx < nb_pkt)) { + inc_tx_burst_stats(fs, nb_tx); + nb_dropped = nb_pkt - nb_tx; + if (unlikely(nb_dropped > 0)) { /* Back out the flow counter. */ - next_flow -= (nb_pkt - nb_tx); + next_flow -= nb_dropped; while (next_flow < 0) - next_flow += cfg_n_flows; + next_flow += nb_flows_flowgen; + fs->fwd_dropped += nb_dropped; do { rte_pktmbuf_free(pkts_burst[nb_tx]); } while (++nb_tx < nb_pkt); } -#ifdef RTE_TEST_PMD_RECORD_CORE_CYCLES - end_tsc = rte_rdtsc(); - core_cycles = (end_tsc - start_tsc); - fs->core_cycles = (uint64_t) (fs->core_cycles + core_cycles); -#endif + + RTE_PER_LCORE(_next_flow) = next_flow; + + get_end_cycles(fs, start_tsc); +} + +static int +flowgen_begin(portid_t pi) +{ + printf(" number of flows for port %u: %d\n", pi, nb_flows_flowgen); + return 0; } struct fwd_engine flow_gen_engine = { .fwd_mode_name = "flowgen", - .port_fwd_begin = NULL, + .port_fwd_begin = flowgen_begin, .port_fwd_end = NULL, .packet_fwd = pkt_burst_flow_gen, };