Re: [dpdk-dev] [PATCH v4 5/8] test app: adding support for generating variable sized packet bursts

["Liang, Cunming" <cunming.liang@intel.com>]

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Declan Doherty
> Sent: Tuesday, September 30, 2014 5:58 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH v4 5/8] test app: adding support for generating
> variable sized packet bursts
> 
> 
> Signed-off-by: Declan Doherty <declan.doherty@intel.com>
> ---
>  app/test/packet_burst_generator.c | 25 ++++++++-----------------
>  app/test/packet_burst_generator.h |  6 +++++-
>  app/test/test_link_bonding.c      | 14 +++++++++-----
>  3 files changed, 22 insertions(+), 23 deletions(-)
> 
> diff --git a/app/test/packet_burst_generator.c
> b/app/test/packet_burst_generator.c
> index 9e747a4..b2824dc 100644
> --- a/app/test/packet_burst_generator.c
> +++ b/app/test/packet_burst_generator.c
> @@ -74,8 +74,7 @@ static inline void
>  copy_buf_to_pkt(void *buf, unsigned len, struct rte_mbuf *pkt, unsigned offset)
>  {
>  	if (offset + len <= pkt->data_len) {
> -		rte_memcpy(rte_pktmbuf_mtod(pkt, char *) + offset,
> -				buf, (size_t) len);
> +		rte_memcpy(rte_pktmbuf_mtod(pkt, char *) + offset, buf,
> (size_t) len);
>  		return;
>  	}
>  	copy_buf_to_pkt_segs(buf, len, pkt, offset);
> @@ -191,20 +190,12 @@ initialize_ipv4_header(struct ipv4_hdr *ip_hdr, uint32_t
> src_addr,
>   */
>  #define RTE_MAX_SEGS_PER_PKT 255 /**< pkt.nb_segs is a 8-bit unsigned char.
> */
> 
> -#define TXONLY_DEF_PACKET_LEN 64
> -#define TXONLY_DEF_PACKET_LEN_128 128
> -
> -uint16_t tx_pkt_length = TXONLY_DEF_PACKET_LEN;
> -uint16_t tx_pkt_seg_lengths[RTE_MAX_SEGS_PER_PKT] = {
> -		TXONLY_DEF_PACKET_LEN_128,
> -};
> -
> -uint8_t  tx_pkt_nb_segs = 1;
> 
>  int
>  generate_packet_burst(struct rte_mempool *mp, struct rte_mbuf **pkts_burst,
>  		struct ether_hdr *eth_hdr, uint8_t vlan_enabled, void *ip_hdr,
> -		uint8_t ipv4, struct udp_hdr *udp_hdr, int nb_pkt_per_burst)
> +		uint8_t ipv4, struct udp_hdr *udp_hdr, int nb_pkt_per_burst,
> +		uint8_t pkt_len, uint8_t nb_pkt_segs)
>  {
>  	int i, nb_pkt = 0;
>  	size_t eth_hdr_size;
> @@ -221,9 +212,9 @@ nomore_mbuf:
>  			break;
>  		}
> 
> -		pkt->data_len = tx_pkt_seg_lengths[0];
> +		pkt->data_len = pkt_len;
>  		pkt_seg = pkt;
> -		for (i = 1; i < tx_pkt_nb_segs; i++) {
> +		for (i = 1; i < nb_pkt_segs; i++) {
>  			pkt_seg->next = rte_pktmbuf_alloc(mp);
>  			if (pkt_seg->next == NULL) {
>  				pkt->nb_segs = i;
> @@ -231,7 +222,7 @@ nomore_mbuf:
>  				goto nomore_mbuf;
>  			}
>  			pkt_seg = pkt_seg->next;
> -			pkt_seg->data_len = tx_pkt_seg_lengths[i];
> +			pkt_seg->data_len = pkt_len;
>  		}
>  		pkt_seg->next = NULL; /* Last segment of packet. */
> 
> @@ -259,8 +250,8 @@ nomore_mbuf:
>  		 * Complete first mbuf of packet and append it to the
>  		 * burst of packets to be transmitted.
>  		 */
> -		pkt->nb_segs = tx_pkt_nb_segs;
> -		pkt->pkt_len = tx_pkt_length;
> +		pkt->nb_segs = nb_pkt_segs;
> +		pkt->pkt_len = pkt_len;
>  		pkt->l2_len = eth_hdr_size;
> 
>  		if (ipv4) {
> diff --git a/app/test/packet_burst_generator.h
> b/app/test/packet_burst_generator.h
> index 5b3cd6c..f86589e 100644
> --- a/app/test/packet_burst_generator.h
> +++ b/app/test/packet_burst_generator.h
> @@ -47,6 +47,9 @@ extern "C" {
>  #define IPV4_ADDR(a, b, c, d)(((a & 0xff) << 24) | ((b & 0xff) << 16) | \
>  		((c & 0xff) << 8) | (d & 0xff))
> 
> +#define PACKET_BURST_GEN_PKT_LEN 60
> +#define PACKET_BURST_GEN_PKT_LEN_128 128
> +
> 
>  void
>  initialize_eth_header(struct ether_hdr *eth_hdr, struct ether_addr *src_mac,
> @@ -68,7 +71,8 @@ initialize_ipv4_header(struct ipv4_hdr *ip_hdr, uint32_t
> src_addr,
>  int
>  generate_packet_burst(struct rte_mempool *mp, struct rte_mbuf **pkts_burst,
>  		struct ether_hdr *eth_hdr, uint8_t vlan_enabled, void *ip_hdr,
> -		uint8_t ipv4, struct udp_hdr *udp_hdr, int nb_pkt_per_burst);
> +		uint8_t ipv4, struct udp_hdr *udp_hdr, int nb_pkt_per_burst,
> +		uint8_t pkt_len, uint8_t nb_pkt_segs);
> 
>  #ifdef __cplusplus
>  }
> diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
> index 1a847eb..50355a3 100644
> --- a/app/test/test_link_bonding.c
> +++ b/app/test/test_link_bonding.c
> @@ -1338,7 +1338,8 @@ generate_test_burst(struct rte_mbuf **pkts_burst,
> uint16_t burst_size,
>  	/* Generate burst of packets to transmit */
>  	generated_burst_size = generate_packet_burst(test_params-
> >mbuf_pool,
>  			pkts_burst,	test_params->pkt_eth_hdr, vlan, ip_hdr,
> ipv4,
> -			test_params->pkt_udp_hdr, burst_size);
> +			test_params->pkt_udp_hdr, burst_size,
> PACKET_BURST_GEN_PKT_LEN_128,
> +			1);
>  	if (generated_burst_size != burst_size) {
>  		printf("Failed to generate packet burst");
>  		return -1;
> @@ -2056,7 +2057,7 @@ test_activebackup_tx_burst(void)
>  	/* Generate a burst of packets to transmit */
>  	generated_burst_size = generate_packet_burst(test_params-
> >mbuf_pool,
>  			pkts_burst,	test_params->pkt_eth_hdr, 0,
> test_params->pkt_ipv4_hdr,
> -			1, test_params->pkt_udp_hdr, burst_size);
> +			1, test_params->pkt_udp_hdr, burst_size,
> PACKET_BURST_GEN_PKT_LEN, 1);
>  	if (generated_burst_size != burst_size)
>  		return -1;
> 
> @@ -2709,7 +2710,8 @@ test_balance_l2_tx_burst(void)
>  	/* Generate a burst 1 of packets to transmit */
>  	if (generate_packet_burst(test_params->mbuf_pool, &pkts_burst[0][0],
>  			test_params->pkt_eth_hdr, 0, test_params-
> >pkt_ipv4_hdr, 1,
> -			test_params->pkt_udp_hdr, burst_size[0]) !=
> burst_size[0])
> +			test_params->pkt_udp_hdr, burst_size[0],
> +			PACKET_BURST_GEN_PKT_LEN, 1) != burst_size[0])
>  		return -1;
> 
>  	initialize_eth_header(test_params->pkt_eth_hdr,
> @@ -2718,7 +2720,8 @@ test_balance_l2_tx_burst(void)
>  	/* Generate a burst 2 of packets to transmit */
>  	if (generate_packet_burst(test_params->mbuf_pool, &pkts_burst[1][0],
>  			test_params->pkt_eth_hdr, 0, test_params-
> >pkt_ipv4_hdr, 1,
> -			test_params->pkt_udp_hdr, burst_size[1]) !=
> burst_size[1])
> +			test_params->pkt_udp_hdr, burst_size[1],
> +			PACKET_BURST_GEN_PKT_LEN, 1) != burst_size[1])
>  		return -1;
> 
>  	/* Send burst 1 on bonded port */
> @@ -3672,7 +3675,8 @@ test_broadcast_tx_burst(void)
>  	/* Generate a burst of packets to transmit */
>  	generated_burst_size = generate_packet_burst(test_params-
> >mbuf_pool,
>  			pkts_burst,	test_params->pkt_eth_hdr, 0,
> test_params->pkt_ipv4_hdr,
> -			1, test_params->pkt_udp_hdr, burst_size);
> +			1, test_params->pkt_udp_hdr, burst_size,
> PACKET_BURST_GEN_PKT_LEN,
> +			1);
>  	if (generated_burst_size != burst_size)
>  		return -1;
> 
> --
> 1.7.12.2

Acked-by: Cunming Liang <cunming.liang@intel.com>