[RFC] app/testpmd: tx pkt clones parameter in flowgen
diff mbox series

Message ID 20200924113414.483-1-irusskikh@marvell.com
State Superseded
Delegated to: Ferruh Yigit
Headers show
Series
  • [RFC] app/testpmd: tx pkt clones parameter in flowgen
Related show

Checks

Context Check Description
ci/Intel-compilation fail Compilation issues
ci/checkpatch success coding style OK

Commit Message

Igor Russkikh Sept. 24, 2020, 11:34 a.m. UTC
When testing high performance numbers, it is often that CPU performance
limits the max values device can reach (both in pps and in gbps)

Here instead of recreating each packet separately, we use clones counter
to resend the same mbuf to the line multiple times.

PMDs handle that transparently due to reference counting inside of mbuf.

Verified on Marvell qede and atlantic PMDs.

Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
---
 app/test-pmd/flowgen.c                | 100 ++++++++++++++------------
 app/test-pmd/parameters.c             |  12 ++++
 app/test-pmd/testpmd.c                |   1 +
 app/test-pmd/testpmd.h                |   1 +
 doc/guides/testpmd_app_ug/run_app.rst |   7 ++
 5 files changed, 74 insertions(+), 47 deletions(-)

Comments

Stephen Hemminger Sept. 24, 2020, 2:56 p.m. UTC | #1
On Thu, 24 Sep 2020 14:34:14 +0300
Igor Russkikh <irusskikh@marvell.com> wrote:

> When testing high performance numbers, it is often that CPU performance
> limits the max values device can reach (both in pps and in gbps)
> 
> Here instead of recreating each packet separately, we use clones counter
> to resend the same mbuf to the line multiple times.
> 
> PMDs handle that transparently due to reference counting inside of mbuf.
> 
> Verified on Marvell qede and atlantic PMDs.
> 
> Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
> ---
>  app/test-pmd/flowgen.c                | 100 ++++++++++++++------------
>  app/test-pmd/parameters.c             |  12 ++++
>  app/test-pmd/testpmd.c                |   1 +
>  app/test-pmd/testpmd.h                |   1 +
>  doc/guides/testpmd_app_ug/run_app.rst |   7 ++
>  5 files changed, 74 insertions(+), 47 deletions(-)
> 
> diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c
> index acf3e2460..b6f6e7a0e 100644
> --- a/app/test-pmd/flowgen.c
> +++ b/app/test-pmd/flowgen.c
> @@ -94,6 +94,7 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
>  	uint16_t nb_rx;
>  	uint16_t nb_tx;
>  	uint16_t nb_pkt;
> +	uint16_t nb_clones = nb_pkt_clones;
>  	uint16_t i;
>  	uint32_t retry;
>  	uint64_t tx_offloads;
> @@ -123,53 +124,58 @@ pkt_burst_flow_gen(struct fwd_stream *fs)
>  		ol_flags |= PKT_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, &eth_hdr->d_addr);
> -		rte_ether_addr_copy(&cfg_ether_src, &eth_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		&= EXT_ATTACHED_MBUF;
> -		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;
> +		if (!nb_pkt || !nb_clones) {
> +			nb_clones = nb_pkt_clones;
> +			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, &eth_hdr->d_addr);
> +			rte_ether_addr_copy(&cfg_ether_src, &eth_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		&= EXT_ATTACHED_MBUF;
> +			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--;
> +		}
> +		pkts_burst[nb_pkt] = pkt;
>  
>  		next_flow = (next_flow + 1) % cfg_n_flows;
>  	}


This doesn't look safe. You can't just send same mbuf N times without incrementing
the reference count.
Igor Russkikh Sept. 25, 2020, 8:44 a.m. UTC | #2
>> +		} else {
>> +			nb_clones--;
>> +		}
>> +		pkts_burst[nb_pkt] = pkt;
>>  
>>  		next_flow = (next_flow + 1) % cfg_n_flows;
>>  	}
> 
> 
> This doesn't look safe. You can't just send same mbuf N times without
> incrementing
> the reference count.

Hi Stephen,

You are right, of course we need refcnt increment here.

It looks like it worked for me, because occasionally its possible to execute
rte_pktmbuf_free multiple times over mbuf with refcnt==1 without any immediate
side effects.

Will repost.

Thanks,
  Igor

Patch
diff mbox series

diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c
index acf3e2460..b6f6e7a0e 100644
--- a/app/test-pmd/flowgen.c
+++ b/app/test-pmd/flowgen.c
@@ -94,6 +94,7 @@  pkt_burst_flow_gen(struct fwd_stream *fs)
 	uint16_t nb_rx;
 	uint16_t nb_tx;
 	uint16_t nb_pkt;
+	uint16_t nb_clones = nb_pkt_clones;
 	uint16_t i;
 	uint32_t retry;
 	uint64_t tx_offloads;
@@ -123,53 +124,58 @@  pkt_burst_flow_gen(struct fwd_stream *fs)
 		ol_flags |= PKT_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, &eth_hdr->d_addr);
-		rte_ether_addr_copy(&cfg_ether_src, &eth_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		&= EXT_ATTACHED_MBUF;
-		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;
+		if (!nb_pkt || !nb_clones) {
+			nb_clones = nb_pkt_clones;
+			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, &eth_hdr->d_addr);
+			rte_ether_addr_copy(&cfg_ether_src, &eth_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		&= EXT_ATTACHED_MBUF;
+			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--;
+		}
+		pkts_burst[nb_pkt] = pkt;
 
 		next_flow = (next_flow + 1) % cfg_n_flows;
 	}
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 1ead59579..a2863bf8d 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -161,6 +161,7 @@  usage(char* progname)
 	printf("  --hairpinq=N: set the number of hairpin queues per port to "
 	       "N.\n");
 	printf("  --burst=N: set the number of packets per burst to N.\n");
+	printf("  --clones=N: set the number of single packet clones to send. Should be less than burst value.\n");
 	printf("  --mbcache=N: set the cache of mbuf memory pool to N.\n");
 	printf("  --rxpt=N: set prefetch threshold register of RX rings to N.\n");
 	printf("  --rxht=N: set the host threshold register of RX rings to N.\n");
@@ -645,6 +646,7 @@  launch_args_parse(int argc, char** argv)
 		{ "txd",			1, 0, 0 },
 		{ "hairpinq",			1, 0, 0 },
 		{ "burst",			1, 0, 0 },
+		{ "clones",			1, 0, 0 },
 		{ "mbcache",			1, 0, 0 },
 		{ "txpt",			1, 0, 0 },
 		{ "txht",			1, 0, 0 },
@@ -1151,6 +1153,16 @@  launch_args_parse(int argc, char** argv)
 				else
 					nb_pkt_per_burst = (uint16_t) n;
 			}
+			if (!strcmp(lgopts[opt_idx].name, "clones")) {
+				n = atoi(optarg);
+				if ((n >= 0) &&
+				    (n <= nb_pkt_per_burst))
+					nb_pkt_clones = (uint16_t) n;
+				else
+					rte_exit(EXIT_FAILURE,
+						 "clones must be >= 0 and <= %d (burst)\n",
+						 nb_pkt_per_burst);
+			}
 			if (!strcmp(lgopts[opt_idx].name, "mbcache")) {
 				n = atoi(optarg);
 				if ((n >= 0) &&
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index fe6450cc0..18b4b63d1 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -228,6 +228,7 @@  uint32_t tx_pkt_times_intra;
 /**< Timings for send scheduling in TXONLY mode, time between packets. */
 
 uint16_t nb_pkt_per_burst = DEF_PKT_BURST; /**< Number of packets per burst. */
+uint16_t nb_pkt_clones; /**< Number of tx packet clones to send. */
 uint16_t mb_mempool_cache = DEF_MBUF_CACHE; /**< Size of mbuf mempool cache. */
 
 /* current configuration is in DCB or not,0 means it is not in DCB mode */
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index f139fe7a0..7337b5b94 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -431,6 +431,7 @@  extern enum tx_pkt_split tx_pkt_split;
 extern uint8_t txonly_multi_flow;
 
 extern uint16_t nb_pkt_per_burst;
+extern uint16_t nb_pkt_clones;
 extern uint16_t mb_mempool_cache;
 extern int8_t rx_pthresh;
 extern int8_t rx_hthresh;
diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst
index e2539f693..42c2efb1f 100644
--- a/doc/guides/testpmd_app_ug/run_app.rst
+++ b/doc/guides/testpmd_app_ug/run_app.rst
@@ -296,6 +296,13 @@  The command line options are:
     If set to 0, driver default is used if defined. Else, if driver
     default is not defined, default of 32 is used.
 
+*   ``--clones=N``
+
+    Set the number of each packet clones to be sent in `flowgen` mode.
+    Sending clones reduces host CPU load on creating packets and may help
+    in testing extreme speeds or maxing out tx packet performance.
+    N should be not zero, but less than 'burst' parameter.
+
 *   ``--mbcache=N``
 
     Set the cache of mbuf memory pools to N, where 0 <= N <= 512.