app/testpmd: fix testpmd packets dump overlapping
PATCH 1/1 app/testpmd: fix testpmd packets dump overlapping
When testpmd enabled the verbosity for the received packets, if two packets was received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handled the multiple queues simultaneously.
The patch uses one string buffer that collects all the packet dump output into this buffer and then printout it at last, that guarantee to printout separately the dump output per packet.
--- app/test-pmd/util.c | 238 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 177 insertions(+), 61 deletions(-)
app/test-pmd/util.c +177 -61
@@ -12,15 +12,20 @@#include <rte_vxlan.h> #include <rte_ethdev.h> #include <rte_flow.h> +#include <rte_log.h> #include "testpmd.h" -static inline void -print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr) +#define MAX_STRING_LEN 8192 + +static inline int +print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr, +char print_buf[],int buf_size) {char buf[RTE_ETHER_ADDR_FMT_SIZE ]; +rte_ether_format_addr (buf,RTE_ETHER_ADDR_FMT_SIZE , eth_addr); -printf ("%s%s" , what, buf); +return snprintf (print_buf, buf_size,"%s%s" , what, buf); } static inline bool
@@ -74,13 +79,18 @@uint32_t vx_vni;const char *reason;int dynf_index; +int buf_size =MAX_STRING_LEN * nb_pkts; +char print_buf[buf_size]; +int cur_len =0 ; +memset (print_buf,0 ,sizeof (print_buf));if (!nb_pkts)return ; -printf ("port %u/queue %u: %s %u packets\n" , - port_id, queue, - is_rx ?"received" :"sent" , - (unsigned int ) nb_pkts); + cur_len +=snprintf (print_buf + cur_len, buf_size - cur_len, +"port %u/queue %u: %s %u packets\n" , + port_id, queue, + is_rx ?"received" :"sent" , + (unsigned int ) nb_pkts);for (i =0 ; i < nb_pkts; i++) {int ret;struct rte_flow_error error;
@@ -93,95 +103,183 @@ is_encapsulation =RTE_ETH_IS_TUNNEL_PKT (packet_type); ret =rte_flow_get_restore_info (port_id, mb, &info, &error);if (!ret) { -printf ("restore info:" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +"restore info:" );if (info.flags &RTE_FLOW_RESTORE_INFO_TUNNEL ) {struct port_flow_tunnel *port_tunnel; port_tunnel =port_flow_locate_tunnel (port_id, &info.tunnel); -printf (" - tunnel" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - tunnel" );if (port_tunnel) -printf (" #%u" , port_tunnel->id); + cur_len +=snprintf (print_buf + cur_len, + buf_size-cur_len, +" #%u" , + port_tunnel->id);else -printf (" %s" ,"-none-" ); -printf (" type %s" , -port_flow_tunnel_type (&info.tunnel)); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" %s" , +"-none-" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" type %s" , +port_flow_tunnel_type + (&info.tunnel)); }else { -printf (" - no tunnel info" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - no tunnel info" ); }if (info.flags &RTE_FLOW_RESTORE_INFO_ENCAPSULATED ) -printf (" - outer header present" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - outer header present" );else -printf (" - no outer header" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - no outer header" );if (info.flags &RTE_FLOW_RESTORE_INFO_GROUP_ID ) -printf (" - miss group %u" , info.group_id); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - miss group %u" , + info.group_id);else -printf (" - no miss group" ); -printf ("\n" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - no miss group" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len,"\n" ); } -print_ether_addr (" src=" , ð_hdr->s_addr); -print_ether_addr (" - dst=" , ð_hdr->d_addr); -printf (" - type=0x%04x - length=%u - nb_segs=%d" , - eth_type, (unsigned int ) mb->pkt_len, - (int )mb->nb_segs); + cur_len +=print_ether_addr (" src=" , ð_hdr->s_addr, + print_buf + cur_len, + buf_size); + cur_len +=print_ether_addr (" - dst=" , ð_hdr->d_addr, + print_buf + cur_len, + buf_size); + cur_len +=snprintf (print_buf + cur_len, buf_size - cur_len, +" - type=0x%04x - length=%u - nb_segs=%d" , + eth_type, (unsigned int ) mb->pkt_len, + (int )mb->nb_segs); ol_flags = mb->ol_flags;if (ol_flags &PKT_RX_RSS_HASH ) { -printf (" - RSS hash=0x%x" , (unsigned int ) mb->hash.rss); -printf (" - RSS queue=0x%x" , (unsigned int ) queue); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - RSS hash=0x%x" , + (unsigned int ) mb->hash.rss); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - RSS queue=0x%x" , + (unsigned int ) queue); }if (ol_flags &PKT_RX_FDIR ) { -printf (" - FDIR matched " ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - FDIR matched " );if (ol_flags &PKT_RX_FDIR_ID ) -printf ("ID=0x%x" , - mb->hash.fdir.hi); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +"ID=0x%x" , + mb->hash.fdir.hi);else if (ol_flags &PKT_RX_FDIR_FLX ) -printf ("flex bytes=0x%08x %08x" , - mb->hash.fdir.hi, mb->hash.fdir.lo); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +"flex bytes=0x%08x %08x" , + mb->hash.fdir.hi, + mb->hash.fdir.lo);else -printf ("hash=0x%x ID=0x%x " , - mb->hash.fdir.hash, mb->hash.fdir.id); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +"hash=0x%x ID=0x%x " , + mb->hash.fdir.hash, + mb->hash.fdir.id); }if (is_timestamp_enabled (mb)) -printf (" - timestamp %" PRIu64" " ,get_timestamp (mb)); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - timestamp %" PRIu64" " , +get_timestamp (mb));if (ol_flags &PKT_RX_QINQ ) -printf (" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x" , - mb->vlan_tci, mb->vlan_tci_outer); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - QinQ VLAN tci=0x%x, " +"VLAN tci outer=0x%x" , + mb->vlan_tci, + mb->vlan_tci_outer);else if (ol_flags &PKT_RX_VLAN ) -printf (" - VLAN tci=0x%x" , mb->vlan_tci); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - VLAN tci=0x%x" , + mb->vlan_tci);if (!is_rx && (ol_flags &PKT_TX_DYNF_METADATA )) -printf (" - Tx metadata: 0x%x" , - *RTE_FLOW_DYNF_METADATA (mb)); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - Tx metadata: 0x%x" , + *RTE_FLOW_DYNF_METADATA (mb));if (is_rx && (ol_flags &PKT_RX_DYNF_METADATA )) -printf (" - Rx metadata: 0x%x" , - *RTE_FLOW_DYNF_METADATA (mb)); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - Rx metadata: 0x%x" , + *RTE_FLOW_DYNF_METADATA (mb));for (dynf_index =0 ; dynf_index <64 ; dynf_index++) {if (dynf_names[dynf_index][0 ] !='\0' ) -printf (" - dynf %s: %d" , - dynf_names[dynf_index], - !!(ol_flags & (1UL << dynf_index))); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - dynf %s: %d" , + dynf_names[dynf_index], + !!(ol_flags & + (1UL << dynf_index))); }if (mb->packet_type) {rte_get_ptype_name (mb->packet_type, buf,sizeof (buf)); -printf (" - hw ptype: %s" , buf); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - hw ptype: %s" , buf); } sw_packet_type =rte_net_get_ptype (mb, &hdr_lens,RTE_PTYPE_ALL_MASK );rte_get_ptype_name (sw_packet_type, buf,sizeof (buf)); -printf (" - sw ptype: %s" , buf); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - sw ptype: %s" , buf);if (sw_packet_type &RTE_PTYPE_L2_MASK ) -printf (" - l2_len=%d" , hdr_lens.l2_len); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - l2_len=%d" , + hdr_lens.l2_len);if (sw_packet_type &RTE_PTYPE_L3_MASK ) -printf (" - l3_len=%d" , hdr_lens.l3_len); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - l3_len=%d" , + hdr_lens.l3_len);if (sw_packet_type &RTE_PTYPE_L4_MASK ) -printf (" - l4_len=%d" , hdr_lens.l4_len); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - l4_len=%d" , + hdr_lens.l4_len);if (sw_packet_type &RTE_PTYPE_TUNNEL_MASK ) -printf (" - tunnel_len=%d" , hdr_lens.tunnel_len); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - tunnel_len=%d" , + hdr_lens.tunnel_len);if (sw_packet_type &RTE_PTYPE_INNER_L2_MASK ) -printf (" - inner_l2_len=%d" , hdr_lens.inner_l2_len); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - inner_l2_len=%d" , + hdr_lens.inner_l2_len);if (sw_packet_type &RTE_PTYPE_INNER_L3_MASK ) -printf (" - inner_l3_len=%d" , hdr_lens.inner_l3_len); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - inner_l3_len=%d" , + hdr_lens.inner_l3_len);if (sw_packet_type &RTE_PTYPE_INNER_L4_MASK ) -printf (" - inner_l4_len=%d" , hdr_lens.inner_l4_len); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - inner_l4_len=%d" , + hdr_lens.inner_l4_len);if (is_encapsulation) {struct rte_ipv4_hdr *ipv4_hdr;struct rte_ipv6_hdr *ipv6_hdr;
@@ -218,19 +316,37 @@ l2_len + l3_len + l4_len); udp_port =RTE_BE_TO_CPU_16 (udp_hdr->dst_port); vx_vni =rte_be_to_cpu_32 (vxlan_hdr->vx_vni); -printf (" - VXLAN packet: packet type =%d, " -"Destination UDP port =%d, VNI = %d" , - packet_type, udp_port, vx_vni >>8 ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - VXLAN packet: packet " +"type =%d, Destination UDP " +"port =%d, VNI = %d" , + packet_type, udp_port, + vx_vni >>8 ); } } -printf (" - %s queue=0x%x" , is_rx ?"Receive" :"Send" , - (unsigned int ) queue); -printf ("\n" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - %s queue=0x%x" , + is_rx ?"Receive" :"Send" , + (unsigned int ) queue); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len,"\n" );rte_get_rx_ol_flag_list (mb->ol_flags, buf,sizeof (buf)); -printf (" ol_flags: %s\n" , buf); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" ol_flags: %s\n" , buf);if (rte_mbuf_check (mb,1 , &reason) <0 ) -printf ("INVALID mbuf: %s\n" , reason); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +"INVALID mbuf: %s\n" , + reason); } +if (cur_len >= buf_size) +TESTPMD_LOG (ERR ,"no enough buffer (size: %d) to store " +"the current dump output (size: %d)\n" , + buf_size, cur_len); +TESTPMD_LOG (INFO ,"%s" , print_buf); }uint16_t
Signature · 1 line
1.8.3.1
Quoted 5 lines · Jiawei Wang
When testpmd enabled the verbosity for the received packets, if two packets was received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handled the multiple queues simultaneously.
Hi Jiawei,
Is the problem observer only when having sampling? Do you observe the problem when multiple cores Rx?
Quoted 40 lines
The patch uses one string buffer that collects all the packet dump output into this buffer and then printout it at last, that guarantee to printout separately the dump output per packet.
Fixes d862c45 ("app/testpmd: move dumping packets to a separate function")Signed-off-by Jiawei Wang <[email protected]>--- app/test-pmd/util.c | 238 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 177 insertions(+), 61 deletions(-)app/test-pmd/util.c +8
-3@@ -12,15 +12,20 @@#include <rte_vxlan.h> #include <rte_ethdev.h> #include <rte_flow.h> +#include <rte_log.h> #include "testpmd.h" -static inline void -print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr) +#define MAX_STRING_LEN 8192 + +static inline int +print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr, +char print_buf[],int buf_size) {char buf[RTE_ETHER_ADDR_FMT_SIZE ]; +rte_ether_format_addr (buf,RTE_ETHER_ADDR_FMT_SIZE , eth_addr); -printf ("%s%s" , what, buf); +return snprintf (print_buf, buf_size,"%s%s" , what, buf); } static inline bool
app/test-pmd/util.c line 83
Quoted 5 lines
app/test-pmd/util.c +2
-0@@ -74,13 +79,18 @@uint32_t vx_vni;const char *reason;int dynf_index; +int buf_size =MAX_STRING_LEN * nb_pkts; +char print_buf[buf_size];
This is a large value to allocate from stack, specially with larger burst size. Allocating from heap is an option but it has a cost.
So what do you think print per packet, instead of print per burst? This also prevents display latency of the packet log.
Quoted 18 lines
app/test-pmd/util.c +7
-4+int cur_len =0 ; +memset (print_buf,0 ,sizeof (print_buf));if (!nb_pkts)return ; -printf ("port %u/queue %u: %s %u packets\n" , - port_id, queue, - is_rx ?"received" :"sent" , - (unsigned int ) nb_pkts); + cur_len +=snprintf (print_buf + cur_len, buf_size - cur_len, +"port %u/queue %u: %s %u packets\n" , + port_id, queue, + is_rx ?"received" :"sent" , + (unsigned int ) nb_pkts);for (i =0 ; i < nb_pkts; i++) {int ret;struct rte_flow_error error;
app/test-pmd/util.c line 108
Quoted 7 lines
app/test-pmd/util.c +3
-1@@ -93,95 +103,183 @@ is_encapsulation =RTE_ETH_IS_TUNNEL_PKT (packet_type); ret =rte_flow_get_restore_info (port_id, mb, &info, &error);if (!ret) { -printf ("restore info:" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +"restore info:" );
This is not safe.
'snprintf' returns size of the required buffer size, not written chars, this can make "buf_size - cur_len" a negative value at some point, and since 'size' type is unsigned negative value will be converted into a very large number and this will corrupt the stack.
<...>
app/test-pmd/util.c line 348
Quoted 4 lines
app/test-pmd/util.c +4
-0+if (cur_len >= buf_size) +TESTPMD_LOG (ERR ,"no enough buffer (size: %d) to store " +"the current dump output (size: %d)\n" , + buf_size, cur_len);
Instead of this error log, which I believe not very useful, why not append some chars at the end of the actual buffer to say it is truncated, something like
if (truncated)
TESTPMD_LOG(INFO, "%s ...", print_buf);
else
TESTPMD_LOG(INFO, "%s", print_buf);
Hi Ferruh,
Thanks for your comments.
Quoted 18 lines
-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Friday, November 13, 2020 12:45 AM
To: Jiawei(Jonny) Wang <[email protected]>; [email protected]; [email protected]; [email protected]; Ori Kam <[email protected]>; NBU-Contact-Thomas Monjalon <[email protected]>; Raslan Darawsheh <[email protected]>
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH] app/testpmd: fix testpmd packets dump overlappingQuoted 5 lines · Jiawei Wang
When testpmd enabled the verbosity for the received packets, if two packets was received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handled the multiple queues simultaneously.
Quoted 4 lines
Hi Jiawei,
Is the problem observer only when having sampling? Do you observe the problem when multiple cores Rx?
We saw this problem happened easily with sampling.
And yes, I also can see the overlapping when multiple core RX if Traffic generator using test-pmd with --txonly-multi-flow.
Quoted 55 lines
Quoted 11 lines
The patch uses one string buffer that collects all the packet dump output into this buffer and then printout it at last, that guarantee to printout separately the dump output per packet.
Fixes d862c45 ("app/testpmd: move dumping packets to a separatefunction")
Signed-off-by Jiawei Wang <[email protected]>--- app/test-pmd/util.c | 238++++++++++++++++++++++++++++++++++++++--------------
Quoted 11 lines
1 file changed, 177 insertions(+), 61 deletions(-)app/test-pmd/util.c index renamed from app/test-pmd/util.c +0
-0649bf8f..47b75b0 100644
app/test-pmd/util.c +1
-0@@ -12,15 +12,20 @@#include <rte_vxlan.h> #include <rte_ethdev.h> #include <rte_flow.h> +#include <rte_log.h> app/test-pmd/util.c line 23
Quoted 10 lines
app/test-pmd/util.c +4
-2#include "testpmd.h" -static inline void -print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr) +#define MAX_STRING_LEN 8192 + +static inline int +print_ether_addr(const char *what, const struct rte_ether_addr
*eth_addr,app/test-pmd/util.c
Quoted 5 lines
app/test-pmd/util.c +2
-0+ char print_buf[], int buf_size) { char buf[RTE_ETHER_ADDR_FMT_SIZE]; + rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE,
eth_addr);app/test-pmd/util.c line 83
Quoted 11 lines
app/test-pmd/util.c +1
-1-printf ("%s%s" , what, buf); +return snprintf (print_buf, buf_size,"%s%s" , what, buf); }static inline bool
app/test-pmd/util.c +2
-0@@ -74,13 +79,18 @@uint32_t vx_vni;const char *reason;int dynf_index; +int buf_size =MAX_STRING_LEN * nb_pkts; +char print_buf[buf_size];This is a large value to allocate from stack, specially with larger burst size. Allocating from heap is an option but it has a cost.
Quoted 2 lines
So what do you think print per packet, instead of print per burst? This also prevents display latency of the packet log.
Good idea, then we only need keep MAX_STRING_LEN stack size, each packet of burst can reuse the stack.
Quoted 24 lines
Quoted 24 lines
app/test-pmd/util.c +8
-5+int cur_len =0 ; +memset (print_buf,0 ,sizeof (print_buf));if (!nb_pkts)return ; -printf ("port %u/queue %u: %s %u packets\n" , - port_id, queue, - is_rx ?"received" :"sent" , - (unsigned int ) nb_pkts); + cur_len +=snprintf (print_buf + cur_len, buf_size - cur_len, +"port %u/queue %u: %s %u packets\n" , + port_id, queue, + is_rx ?"received" :"sent" , + (unsigned int ) nb_pkts);for (i =0 ; i < nb_pkts; i++) {int ret;struct rte_flow_error error;@@ -93,95 +103,183 @@ is_encapsulation =RTE_ETH_IS_TUNNEL_PKT (packet_type); ret =rte_flow_get_restore_info (port_id, mb, &info, &error);if (!ret) { -printf ("restore info:" ); + cur_len += snprintf(print_buf + cur_len,
Quoted 9 lines
app/test-pmd/util.c line 108
Quoted 2 lines
app/test-pmd/util.c +2
-0+ buf_size - cur_len, + "restore info:");This is not safe.
'snprintf' returns size of the required buffer size, not written chars, this can make "buf_size-cur_len" a negative value at some point, and since 'size' type is unsigned negative value will be converted into a very large number and this will corrupt the stack.
Yes, so we need add the checking for each snprintf calls, if truncated happened, then print the current buffer and dump will exit.
Quoted 11 lines
<...>
app/test-pmd/util.c line 348
Quoted 4 lines
app/test-pmd/util.c +4
-0+if (cur_len >= buf_size) +TESTPMD_LOG (ERR ,"no enough buffer (size: %d) to store " +"the current dump output (size: %d)\n" , + buf_size, cur_len);Instead of this error log, which I believe not very useful, why not append some chars at the end of the actual buffer to say it is truncated, something like
Quoted 4 lines
if (truncated)
TESTPMD_LOG(INFO, "%s ...", print_buf);
else
TESTPMD_LOG(INFO, "%s", print_buf);ok, I will remove the err log and append the message like " the dump output was truncated ...".
I will send V2 patch for above changes.
Thanks.
Jonny
PATCH v2 1/1 app/testpmd: fix testpmd packets dump overlapping
In reply to Jiawei WangWhen testpmd enabled the verbosity for the received packets, if two packets was received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handled the multiple queues simultaneously.
The patch uses one string buffer that collects all the packet dump output into this buffer and then printout it at last, that guarantee to printout separately the dump output per packet.
---
v2:
* Print dump output of per packet instead of per burst.
* Add the checking for return value of 'snprintf' and exit if required size exceed the print buffer size.
* Update the log messages.
--- app/test-pmd/util.c | 378 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 295 insertions(+), 83 deletions(-)
app/test-pmd/util.c +295 -83
@@ -12,15 +12,20 @@#include <rte_vxlan.h> #include <rte_ethdev.h> #include <rte_flow.h> +#include <rte_log.h> #include "testpmd.h" -static inline void -print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr) +#define MAX_STRING_LEN 8192 + +static inline int +print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr, +char print_buf[],int buf_size) {char buf[RTE_ETHER_ADDR_FMT_SIZE ]; +rte_ether_format_addr (buf,RTE_ETHER_ADDR_FMT_SIZE , eth_addr); -printf ("%s%s" , what, buf); +return snprintf (print_buf, buf_size,"%s%s" , what, buf); } static inline bool
@@ -74,13 +79,18 @@uint32_t vx_vni;const char *reason;int dynf_index; +int buf_size =MAX_STRING_LEN ; +char print_buf[buf_size]; +int cur_len =0 ; +memset (print_buf,0 ,sizeof (print_buf));if (!nb_pkts)return ; -printf ("port %u/queue %u: %s %u packets\n" , - port_id, queue, - is_rx ?"received" :"sent" , - (unsigned int ) nb_pkts); + cur_len +=snprintf (print_buf + cur_len, buf_size - cur_len, +"port %u/queue %u: %s %u packets\n" , + port_id, queue, + is_rx ?"received" :"sent" , + (unsigned int ) nb_pkts);for (i =0 ; i < nb_pkts; i++) {int ret;struct rte_flow_error error;
@@ -93,95 +103,269 @@ is_encapsulation =RTE_ETH_IS_TUNNEL_PKT (packet_type); ret =rte_flow_get_restore_info (port_id, mb, &info, &error);if (!ret) { -printf ("restore info:" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +"restore info:" ); +if (cur_len >= buf_size) + goto error;if (info.flags &RTE_FLOW_RESTORE_INFO_TUNNEL ) {struct port_flow_tunnel *port_tunnel; port_tunnel =port_flow_locate_tunnel (port_id, &info.tunnel); -printf (" - tunnel" ); -if (port_tunnel) -printf (" #%u" , port_tunnel->id); -else -printf (" %s" ,"-none-" ); -printf (" type %s" , -port_flow_tunnel_type (&info.tunnel)); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - tunnel" ); +if (cur_len >= buf_size) + goto error; +if (port_tunnel) { + cur_len +=snprintf (print_buf + cur_len, + buf_size-cur_len, +" #%u" , + port_tunnel->id); +if (cur_len >= buf_size) + goto error; + }else { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" %s" , +"-none-" ); +if (cur_len >= buf_size) + goto error; + } + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" type %s" , +port_flow_tunnel_type + (&info.tunnel)); +if (cur_len >= buf_size) + goto error; }else { -printf (" - no tunnel info" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - no tunnel info" ); +if (cur_len >= buf_size) + goto error; } -if (info.flags &RTE_FLOW_RESTORE_INFO_ENCAPSULATED ) -printf (" - outer header present" ); -else -printf (" - no outer header" ); -if (info.flags &RTE_FLOW_RESTORE_INFO_GROUP_ID ) -printf (" - miss group %u" , info.group_id); -else -printf (" - no miss group" ); -printf ("\n" ); +if (info.flags &RTE_FLOW_RESTORE_INFO_ENCAPSULATED ) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - outer header present" ); +if (cur_len >= buf_size) + goto error; + }else { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - no outer header" ); +if (cur_len >= buf_size) + goto error; + } +if (info.flags &RTE_FLOW_RESTORE_INFO_GROUP_ID ) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - miss group %u" , + info.group_id); +if (cur_len >= buf_size) + goto error; + }else { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - no miss group" ); +if (cur_len >= buf_size) + goto error; + } + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len,"\n" ); +if (cur_len >= buf_size) + goto error; } -print_ether_addr (" src=" , ð_hdr->s_addr); -print_ether_addr (" - dst=" , ð_hdr->d_addr); -printf (" - type=0x%04x - length=%u - nb_segs=%d" , - eth_type, (unsigned int ) mb->pkt_len, - (int )mb->nb_segs); + cur_len +=print_ether_addr (" src=" , ð_hdr->s_addr, + print_buf + cur_len, + buf_size); +if (cur_len >= buf_size) + goto error; + cur_len +=print_ether_addr (" - dst=" , ð_hdr->d_addr, + print_buf + cur_len, + buf_size); +if (cur_len >= buf_size) + goto error; + cur_len +=snprintf (print_buf + cur_len, buf_size - cur_len, +" - type=0x%04x - length=%u - nb_segs=%d" , + eth_type, (unsigned int ) mb->pkt_len, + (int )mb->nb_segs); +if (cur_len >= buf_size) + goto error; ol_flags = mb->ol_flags;if (ol_flags &PKT_RX_RSS_HASH ) { -printf (" - RSS hash=0x%x" , (unsigned int ) mb->hash.rss); -printf (" - RSS queue=0x%x" , (unsigned int ) queue); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - RSS hash=0x%x" , + (unsigned int ) mb->hash.rss); +if (cur_len >= buf_size) + goto error; + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - RSS queue=0x%x" , + (unsigned int ) queue); +if (cur_len >= buf_size) + goto error; }if (ol_flags &PKT_RX_FDIR ) { -printf (" - FDIR matched " ); -if (ol_flags &PKT_RX_FDIR_ID ) -printf ("ID=0x%x" , - mb->hash.fdir.hi); -else if (ol_flags &PKT_RX_FDIR_FLX ) -printf ("flex bytes=0x%08x %08x" , - mb->hash.fdir.hi, mb->hash.fdir.lo); -else -printf ("hash=0x%x ID=0x%x " , - mb->hash.fdir.hash, mb->hash.fdir.id); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - FDIR matched " ); +if (cur_len >= buf_size) + goto error; +if (ol_flags &PKT_RX_FDIR_ID ) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +"ID=0x%x" , + mb->hash.fdir.hi); +if (cur_len >= buf_size) + goto error; + }else if (ol_flags &PKT_RX_FDIR_FLX ) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +"flex bytes=0x%08x %08x" , + mb->hash.fdir.hi, + mb->hash.fdir.lo); +if (cur_len >= buf_size) + goto error; + }else { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +"hash=0x%x ID=0x%x " , + mb->hash.fdir.hash, + mb->hash.fdir.id); +if (cur_len >= buf_size) + goto error; + } + } +if (is_timestamp_enabled (mb)) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - timestamp %" PRIu64" " , +get_timestamp (mb)); +if (cur_len >= buf_size) + goto error; + } +if (ol_flags &PKT_RX_QINQ ) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - QinQ VLAN tci=0x%x, " +"VLAN tci outer=0x%x" , + mb->vlan_tci, + mb->vlan_tci_outer); +if (cur_len >= buf_size) + goto error; + }else if (ol_flags &PKT_RX_VLAN ) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - VLAN tci=0x%x" , + mb->vlan_tci); +if (cur_len >= buf_size) + goto error; + } +if (!is_rx && (ol_flags &PKT_TX_DYNF_METADATA )) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - Tx metadata: 0x%x" , + *RTE_FLOW_DYNF_METADATA (mb)); +if (cur_len >= buf_size) + goto error; + } +if (is_rx && (ol_flags &PKT_RX_DYNF_METADATA )) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - Rx metadata: 0x%x" , + *RTE_FLOW_DYNF_METADATA (mb)); +if (cur_len >= buf_size) + goto error; } -if (is_timestamp_enabled (mb)) -printf (" - timestamp %" PRIu64" " ,get_timestamp (mb)); -if (ol_flags &PKT_RX_QINQ ) -printf (" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x" , - mb->vlan_tci, mb->vlan_tci_outer); -else if (ol_flags &PKT_RX_VLAN ) -printf (" - VLAN tci=0x%x" , mb->vlan_tci); -if (!is_rx && (ol_flags &PKT_TX_DYNF_METADATA )) -printf (" - Tx metadata: 0x%x" , - *RTE_FLOW_DYNF_METADATA (mb)); -if (is_rx && (ol_flags &PKT_RX_DYNF_METADATA )) -printf (" - Rx metadata: 0x%x" , - *RTE_FLOW_DYNF_METADATA (mb));for (dynf_index =0 ; dynf_index <64 ; dynf_index++) { -if (dynf_names[dynf_index][0 ] !='\0' ) -printf (" - dynf %s: %d" , - dynf_names[dynf_index], - !!(ol_flags & (1UL << dynf_index))); +if (dynf_names[dynf_index][0 ] !='\0' ) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - dynf %s: %d" , + dynf_names[dynf_index], + !!(ol_flags & + (1UL << dynf_index))); +if (cur_len >= buf_size) + goto error; + } }if (mb->packet_type) {rte_get_ptype_name (mb->packet_type, buf,sizeof (buf)); -printf (" - hw ptype: %s" , buf); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - hw ptype: %s" , buf); +if (cur_len >= buf_size) + goto error; } sw_packet_type =rte_net_get_ptype (mb, &hdr_lens,RTE_PTYPE_ALL_MASK );rte_get_ptype_name (sw_packet_type, buf,sizeof (buf)); -printf (" - sw ptype: %s" , buf); -if (sw_packet_type &RTE_PTYPE_L2_MASK ) -printf (" - l2_len=%d" , hdr_lens.l2_len); -if (sw_packet_type &RTE_PTYPE_L3_MASK ) -printf (" - l3_len=%d" , hdr_lens.l3_len); -if (sw_packet_type &RTE_PTYPE_L4_MASK ) -printf (" - l4_len=%d" , hdr_lens.l4_len); -if (sw_packet_type &RTE_PTYPE_TUNNEL_MASK ) -printf (" - tunnel_len=%d" , hdr_lens.tunnel_len); -if (sw_packet_type &RTE_PTYPE_INNER_L2_MASK ) -printf (" - inner_l2_len=%d" , hdr_lens.inner_l2_len); -if (sw_packet_type &RTE_PTYPE_INNER_L3_MASK ) -printf (" - inner_l3_len=%d" , hdr_lens.inner_l3_len); -if (sw_packet_type &RTE_PTYPE_INNER_L4_MASK ) -printf (" - inner_l4_len=%d" , hdr_lens.inner_l4_len); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - sw ptype: %s" , buf); +if (cur_len >= buf_size) + goto error; +if (sw_packet_type &RTE_PTYPE_L2_MASK ) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - l2_len=%d" , + hdr_lens.l2_len); +if (cur_len >= buf_size) + goto error; + } +if (sw_packet_type &RTE_PTYPE_L3_MASK ) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - l3_len=%d" , + hdr_lens.l3_len); +if (cur_len >= buf_size) + goto error; + } +if (sw_packet_type &RTE_PTYPE_L4_MASK ) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - l4_len=%d" , + hdr_lens.l4_len); +if (cur_len >= buf_size) + goto error; + } +if (sw_packet_type &RTE_PTYPE_TUNNEL_MASK ) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - tunnel_len=%d" , + hdr_lens.tunnel_len); +if (cur_len >= buf_size) + goto error; + } +if (sw_packet_type &RTE_PTYPE_INNER_L2_MASK ) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - inner_l2_len=%d" , + hdr_lens.inner_l2_len); +if (cur_len >= buf_size) + goto error; + } +if (sw_packet_type &RTE_PTYPE_INNER_L3_MASK ) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - inner_l3_len=%d" , + hdr_lens.inner_l3_len); +if (cur_len >= buf_size) + goto error; + } +if (sw_packet_type &RTE_PTYPE_INNER_L4_MASK ) { + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - inner_l4_len=%d" , + hdr_lens.inner_l4_len); +if (cur_len >= buf_size) + goto error; + }if (is_encapsulation) {struct rte_ipv4_hdr *ipv4_hdr;struct rte_ipv6_hdr *ipv6_hdr;
@@ -218,19 +402,47 @@ l2_len + l3_len + l4_len); udp_port =RTE_BE_TO_CPU_16 (udp_hdr->dst_port); vx_vni =rte_be_to_cpu_32 (vxlan_hdr->vx_vni); -printf (" - VXLAN packet: packet type =%d, " -"Destination UDP port =%d, VNI = %d" , - packet_type, udp_port, vx_vni >>8 ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - VXLAN packet: packet " +"type =%d, Destination UDP " +"port =%d, VNI = %d" , + packet_type, udp_port, + vx_vni >>8 ); +if (cur_len >= buf_size) + goto error; } } -printf (" - %s queue=0x%x" , is_rx ?"Receive" :"Send" , - (unsigned int ) queue); -printf ("\n" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" - %s queue=0x%x" , + is_rx ?"Receive" :"Send" , + (unsigned int ) queue); +if (cur_len >= buf_size) + goto error; + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len,"\n" ); +if (cur_len >= buf_size) + goto error;rte_get_rx_ol_flag_list (mb->ol_flags, buf,sizeof (buf)); -printf (" ol_flags: %s\n" , buf); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +" ol_flags: %s\n" , buf); +if (cur_len >= buf_size) + goto error;if (rte_mbuf_check (mb,1 , &reason) <0 ) -printf ("INVALID mbuf: %s\n" , reason); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +"INVALID mbuf: %s\n" , + reason); +if (cur_len >= buf_size) + goto error; +TESTPMD_LOG (INFO ,"%s" , print_buf); + cur_len =0 ; } +return ; +error: +TESTPMD_LOG (INFO ,"%s the output was truncated ...\n" , print_buf); }uint16_t
Signature · 1 line
1.8.3.1
Quoted 26 lines · Jiawei Wang
When testpmd enabled the verbosity for the received packets, if two packets was received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handled the multiple queues simultaneously.
The patch uses one string buffer that collects all the packet dump output into this buffer and then printout it at last, that guarantee to printout separately the dump output per packet.
Fixes d862c45 ("app/testpmd: move dumping packets to a separate function")Signed-off-by Jiawei Wang <[email protected]>---
v2:
* Print dump output of per packet instead of per burst.
* Add the checking for return value of 'snprintf' and exit if required size exceed the print buffer size.
* Update the log messages.--- app/test-pmd/util.c | 378 ++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 295 insertions(+), 83 deletions(-)app/test-pmd/util.c +0
-0
app/test-pmd/util.c line 19
Quoted 10 lines
app/test-pmd/util.c +2
-2@@ -12,15 +12,20 @@#include <rte_vxlan.h> #include <rte_ethdev.h> #include <rte_flow.h> +#include <rte_log.h> #include "testpmd.h" -static inline void -print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr) +#define MAX_STRING_LEN 8192
Isn't '8192' too large for a single packet, what do you think for '2048'?
<...>
app/test-pmd/util.c line 108
Quoted 8 lines
app/test-pmd/util.c +3
-1@@ -93,95 +103,269 @@ is_encapsulation =RTE_ETH_IS_TUNNEL_PKT (packet_type); ret =rte_flow_get_restore_info (port_id, mb, &info, &error);if (!ret) { -printf ("restore info:" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +"restore info:" );
What do you think having a macro like below to simplfy the code:
#define FOO(buf, buf_size, cur_len, ...) \
do { \
if (cur_len >= buf_size) break; \
cur_len += snprintf(buf + cur_len, buf_size - cur_len, __VA_ARGS__); \} while (0)
It can be used as:
FOO(print_buf, buf_size, cur_len, "restore info:");
app/test-pmd/util.c line 110
Quoted 2 lines
app/test-pmd/util.c +2
-0+if (cur_len >= buf_size) + goto error;
This 'goto' goes out of the loop, not sure about breking the loop and not processing all packets if buffer is out of space for one of the packets. Anyway if you switch to macro above, the 'goto' is removed completely.
<...>
app/test-pmd/util.c line 440
Quoted 3 lines
app/test-pmd/util.c +3
-0+if (cur_len >= buf_size) + goto error; +TESTPMD_LOG (INFO ,"%s" , print_buf);
Using 'TESTPMD_LOG' appends "testpmd: " at the beggining of the each line, for this case it is noise I think, what do you think turning back to printf() as done originally?
app/test-pmd/util.c line 445
Quoted 5 lines
app/test-pmd/util.c +4
-0+ cur_len =0 ; } +return ; +error: +TESTPMD_LOG (INFO ,"%s the output was truncated ...\n" , print_buf);
What do you think having something shorter to notify the truncation, I think some special chars can work better, something like "...", "@@", "-->", "???" ?
Quoted 4 lines
app/test-pmd/util.c +0
-0}uint16_t
Hi Ferruh,
Quoted 46 lines
-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Tuesday, November 17, 2020 8:07 PM
To: Jiawei(Jonny) Wang <[email protected]>; [email protected]; [email protected]; [email protected]; Ori Kam <[email protected]>; NBU-Contact-Thomas Monjalon <[email protected]>; Raslan Darawsheh <[email protected]>
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v2] app/testpmd: fix testpmd packets dump overlappingQuoted 9 lines · Jiawei Wang
When testpmd enabled the verbosity for the received packets, if two packets was received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handled the multiple queues simultaneously.
The patch uses one string buffer that collects all the packet dump output into this buffer and then printout it at last, that guarantee to printout separately the dump output per packet.
Quoted 8 lines
Fixes d862c45 ("app/testpmd: move dumping packets to a separatefunction")
Signed-off-by Jiawei Wang <[email protected]>---
v2:
* Print dump output of per packet instead of per burst.
* Add the checking for return value of 'snprintf' and exit if required sizeexceed the print buffer size.
Quoted 3 lines
* Update the log messages.
--- app/test-pmd/util.c | 378++++++++++++++++++++++++++++++++++++++++------------
Quoted 12 lines
1 file changed, 295 insertions(+), 83 deletions(-)app/test-pmd/util.c index renamed from app/test-pmd/util.c +0
-0649bf8f..ffae590 100644
app/test-pmd/util.c +1
-0@@ -12,15 +12,20 @@#include <rte_vxlan.h> #include <rte_ethdev.h> #include <rte_flow.h> +#include <rte_log.h>
Quoted 9 lines
app/test-pmd/util.c line 19
Quoted 6 lines
app/test-pmd/util.c +1
-2#include "testpmd.h" -static inline void -print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr) +#define MAX_STRING_LEN 8192Isn't '8192' too large for a single packet, what do you think for '2048'?
2K is ok for the normal case, here consider the case that registered mbuf dynamic flags names,
Then total maximum length can reach to 64* RTE_MBUF_DYN_NAMESIZE = 4096
// char dynf_names[64][RTE_MBUF_DYN_NAMESIZE];
So 2048 is not enough if all dynf_names be configured as maximum length of dyn_names.
How about the 5K? I think should be enough for now.
Quoted 13 lines
<...>
app/test-pmd/util.c line 108
Quoted 8 lines
app/test-pmd/util.c +3
-1@@ -93,95 +103,269 @@ is_encapsulation =RTE_ETH_IS_TUNNEL_PKT (packet_type); ret =rte_flow_get_restore_info (port_id, mb, &info, &error);if (!ret) { -printf ("restore info:" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +"restore info:" );What do you think having a macro like below to simplfy the code:
Quoted 9 lines
#define FOO(buf, buf_size, cur_len, ...) \ do { \ if (cur_len >= buf_size) break; \ cur_len += snprintf(buf + cur_len, buf_size - cur_len, __VA_ARGS__); \ } while (0)It can be used as:
FOO(print_buf, buf_size, cur_len, "restore info:");
Agree, will move these common code into a MARCO,
I will use the "MKDUMPSTR" as MARCO name, means that making a dump string buffer.
Quoted 7 lines
app/test-pmd/util.c line 110
Quoted 2 lines
app/test-pmd/util.c +2
-0+if (cur_len >= buf_size) + goto error;This 'goto' goes out of the loop, not sure about breking the loop and not processing all packets if buffer is out of space for one of the packets. Anyway if you switch to macro above, the 'goto' is removed completely.
Use 'break' only break the do{} while and continue to following processing, but won't filled anymore into printbuf since it will break firstly in the MARCO checking. Or could use 'goto lable' instead 'break' in the marco?
Quoted 10 lines
<...>
app/test-pmd/util.c line 440
Quoted 3 lines
app/test-pmd/util.c +3
-0+if (cur_len >= buf_size) + goto error; +TESTPMD_LOG (INFO ,"%s" , print_buf);Using '
TESTPMD_LOG' appends "testpmd: " at the beggining of the each line, for this case it is noise I think, what do you think turning back toprintf()as done originally?
ok, will use the printf.
Quoted 9 lines
app/test-pmd/util.c line 445
Quoted 5 lines
app/test-pmd/util.c +4
-0+ cur_len =0 ; } +return ; +error: +TESTPMD_LOG (INFO ,"%s the output was truncated ...\n" , print_buf);What do you think having something shorter to notify the truncation, I think some special chars can work better, something like "...", "@@", "-->", "???" ?
ok, I will use simple chars for truncated case like below:
if (cur_len >= buf_size)
printf("%s ...\n", print_buf);Quoted 4 lines
Quoted 4 lines
}
uint16_t
Thanks for your comments, I will do the changes and send V3 patch.
Thanks.
Jonny
Quoted 57 lines · Jiawei(Jonny) Wang
Hi Ferruh,
Quoted 46 lines
-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Tuesday, November 17, 2020 8:07 PM
To: Jiawei(Jonny) Wang <[email protected]>; [email protected]; [email protected]; [email protected]; Ori Kam <[email protected]>; NBU-Contact-Thomas Monjalon <[email protected]>; Raslan Darawsheh <[email protected]>
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v2] app/testpmd: fix testpmd packets dump overlappingQuoted 9 lines · Jiawei Wang
When testpmd enabled the verbosity for the received packets, if two packets was received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handled the multiple queues simultaneously.
The patch uses one string buffer that collects all the packet dump output into this buffer and then printout it at last, that guarantee to printout separately the dump output per packet.
Quoted 8 lines
Fixes d862c45 ("app/testpmd: move dumping packets to a separatefunction")
Signed-off-by Jiawei Wang <[email protected]>---
v2:
* Print dump output of per packet instead of per burst.
* Add the checking for return value of 'snprintf' and exit if required sizeexceed the print buffer size.
Quoted 3 lines
* Update the log messages.
--- app/test-pmd/util.c | 378++++++++++++++++++++++++++++++++++++++++------------
Quoted 12 lines
1 file changed, 295 insertions(+), 83 deletions(-)app/test-pmd/util.c index renamed from app/test-pmd/util.c +0
-0649bf8f..ffae590 100644
app/test-pmd/util.c +1
-0@@ -12,15 +12,20 @@#include <rte_vxlan.h> #include <rte_ethdev.h> #include <rte_flow.h> +#include <rte_log.h> Quoted 9 lines
app/test-pmd/util.c line 19
Quoted 6 lines
app/test-pmd/util.c +1
-2#include "testpmd.h" -static inline void -print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr) +#define MAX_STRING_LEN 8192Isn't '8192' too large for a single packet, what do you think for '2048'?
Quoted 6 lines
2K is ok for the normal case, here consider the case that registered mbuf dynamic flags names,
Then total maximum length can reach to 64*RTE_MBUF_DYN_NAMESIZE= 4096
// char dynf_names[64][RTE_MBUF_DYN_NAMESIZE];
So 2048 is not enough if alldynf_namesbe configured as maximum length ofdyn_names.How about the 5K? I think should be enough for now.
OK, and no need to be tight, if there are cases requesting longer string perhaps can keep the size as it is.
Quoted 19 lines
Quoted 19 lines
<...>
app/test-pmd/util.c line 108
Quoted 8 lines
app/test-pmd/util.c +3
-1@@ -93,95 +103,269 @@ is_encapsulation =RTE_ETH_IS_TUNNEL_PKT (packet_type); ret =rte_flow_get_restore_info (port_id, mb, &info, &error);if (!ret) { -printf ("restore info:" ); + cur_len +=snprintf (print_buf + cur_len, + buf_size - cur_len, +"restore info:" );What do you think having a macro like below to simplfy the code:
#define FOO(buf, buf_size, cur_len, ...) \ do { \ if (cur_len >= buf_size) break; \ cur_len += snprintf(buf + cur_len, buf_size - cur_len, __VA_ARGS__); \ } while (0)
Quoted 6 lines
Quoted 3 lines
It can be used as:
FOO(print_buf, buf_size, cur_len, "restore info:");Agree, will move these common code into a MARCO,
I will use the "MKDUMPSTR" as MARCO name, means that making a dump string buffer.
Ack
Quoted 9 lines
Quoted 7 lines
app/test-pmd/util.c line 110
Quoted 2 lines
app/test-pmd/util.c +2
-0+if (cur_len >= buf_size) + goto error;This 'goto' goes out of the loop, not sure about breking the loop and not processing all packets if buffer is out of space for one of the packets. Anyway if you switch to macro above, the 'goto' is removed completely.
Use 'break' only break the do{} while and continue to following processing, but won't filled anymore into printbuf since it will break firstly in the MARCO checking. Or could use 'goto lable' instead 'break' in the marco?
I think cleaner to not have the 'goto', yes processing will continue but no space left case expected to happen very rare.
PATCH v3 1/1 app/testpmd: fix testpmd packets dump overlapping
In reply to Jiawei WangWhen testpmd enabled the verbosity for the received packets, if two packets were received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handling the multiple queues simultaneously.
The patch uses one string buffer that collects all the packet dump output into this buffer and then printouts it at last, that guarantees to printout separately the dump output per packet.
---
v3:
* Use the marco instead of function calls to simplfy code.
* Use the shorter chars '...' append into the dump to notify the truncation.
* Update the commit message.
* Rebase.
v2:
* Print dump output of per packet instead of per burst.
* Add the checking for return value of 'snprintf' and exit if required size exceed the print buffer size.
* Update the log messages.
--- app/test-pmd/util.c | 177 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 117 insertions(+), 60 deletions(-)
app/test-pmd/util.c +117 -60
@@ -15,12 +15,23 @@#include "testpmd.h" +#define MAX_STRING_LEN 8192 + +#define MKDUMPSTR (buf, buf_size, cur_len, ...) \ +do { \ + if (cur_len >= buf_size) \ + break; \ + cur_len += snprintf(buf + cur_len, buf_size - cur_len, __VA_ARGS__); \ +} while (0) +static inline void -print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr) +print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr, +char print_buf[],int buf_size,int *cur_len) {char buf[RTE_ETHER_ADDR_FMT_SIZE ]; +rte_ether_format_addr (buf,RTE_ETHER_ADDR_FMT_SIZE , eth_addr); -printf ("%s%s" , what, buf); +MKDUMPSTR (print_buf, buf_size, *cur_len,"%s%s" , what, buf); } static inline bool
@@ -74,13 +85,16 @@uint32_t vx_vni;const char *reason;int dynf_index; +int buf_size =MAX_STRING_LEN ; +char print_buf[buf_size]; +int cur_len =0 ; +memset (print_buf,0 ,sizeof (print_buf));if (!nb_pkts)return ; -printf ("port %u/queue %u: %s %u packets\n" , - port_id, queue, - is_rx ?"received" :"sent" , - (unsigned int ) nb_pkts); +MKDUMPSTR (print_buf, buf_size, cur_len, +"port %u/queue %u: %s %u packets\n" , port_id, queue, + is_rx ?"received" :"sent" , (unsigned int ) nb_pkts);for (i =0 ; i < nb_pkts; i++) {int ret;struct rte_flow_error error;
@@ -93,95 +107,128 @@ is_encapsulation =RTE_ETH_IS_TUNNEL_PKT (packet_type); ret =rte_flow_get_restore_info (port_id, mb, &info, &error);if (!ret) { -printf ("restore info:" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +"restore info:" );if (info.flags &RTE_FLOW_RESTORE_INFO_TUNNEL ) {struct port_flow_tunnel *port_tunnel; port_tunnel =port_flow_locate_tunnel (port_id, &info.tunnel); -printf (" - tunnel" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - tunnel" );if (port_tunnel) -printf (" #%u" , port_tunnel->id); +MKDUMPSTR (print_buf, buf_size, cur_len, +" #%u" , port_tunnel->id);else -printf (" %s" ,"-none-" ); -printf (" type %s" , -port_flow_tunnel_type (&info.tunnel)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" %s" ,"-none-" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" type %s" ,port_flow_tunnel_type + (&info.tunnel)); }else { -printf (" - no tunnel info" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - no tunnel info" ); }if (info.flags &RTE_FLOW_RESTORE_INFO_ENCAPSULATED ) -printf (" - outer header present" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - outer header present" );else -printf (" - no outer header" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - no outer header" );if (info.flags &RTE_FLOW_RESTORE_INFO_GROUP_ID ) -printf (" - miss group %u" , info.group_id); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - miss group %u" , info.group_id);else -printf (" - no miss group" ); -printf ("\n" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - no miss group" ); +MKDUMPSTR (print_buf, buf_size, cur_len,"\n" ); } -print_ether_addr (" src=" , ð_hdr->s_addr); -print_ether_addr (" - dst=" , ð_hdr->d_addr); -printf (" - type=0x%04x - length=%u - nb_segs=%d" , - eth_type, (unsigned int ) mb->pkt_len, - (int )mb->nb_segs); +print_ether_addr (" src=" , ð_hdr->s_addr, + print_buf, buf_size, &cur_len); +print_ether_addr (" - dst=" , ð_hdr->d_addr, + print_buf, buf_size, &cur_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - type=0x%04x - length=%u - nb_segs=%d" , + eth_type, (unsigned int ) mb->pkt_len, + (int )mb->nb_segs); ol_flags = mb->ol_flags;if (ol_flags &PKT_RX_RSS_HASH ) { -printf (" - RSS hash=0x%x" , (unsigned int ) mb->hash.rss); -printf (" - RSS queue=0x%x" , (unsigned int ) queue); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - RSS hash=0x%x" , + (unsigned int ) mb->hash.rss); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - RSS queue=0x%x" , (unsigned int ) queue); }if (ol_flags &PKT_RX_FDIR ) { -printf (" - FDIR matched " ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - FDIR matched " );if (ol_flags &PKT_RX_FDIR_ID ) -printf ("ID=0x%x" , - mb->hash.fdir.hi); +MKDUMPSTR (print_buf, buf_size, cur_len, +"ID=0x%x" , mb->hash.fdir.hi);else if (ol_flags &PKT_RX_FDIR_FLX ) -printf ("flex bytes=0x%08x %08x" , - mb->hash.fdir.hi, mb->hash.fdir.lo); +MKDUMPSTR (print_buf, buf_size, cur_len, +"flex bytes=0x%08x %08x" , + mb->hash.fdir.hi, mb->hash.fdir.lo);else -printf ("hash=0x%x ID=0x%x " , - mb->hash.fdir.hash, mb->hash.fdir.id); +MKDUMPSTR (print_buf, buf_size, cur_len, +"hash=0x%x ID=0x%x " , + mb->hash.fdir.hash, mb->hash.fdir.id); }if (is_timestamp_enabled (mb)) -printf (" - timestamp %" PRIu64" " ,get_timestamp (mb)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - timestamp %" PRIu64" " ,get_timestamp (mb));if (ol_flags &PKT_RX_QINQ ) -printf (" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x" , - mb->vlan_tci, mb->vlan_tci_outer); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x" , + mb->vlan_tci, mb->vlan_tci_outer);else if (ol_flags &PKT_RX_VLAN ) -printf (" - VLAN tci=0x%x" , mb->vlan_tci); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - VLAN tci=0x%x" , mb->vlan_tci);if (!is_rx && (ol_flags &PKT_TX_DYNF_METADATA )) -printf (" - Tx metadata: 0x%x" , - *RTE_FLOW_DYNF_METADATA (mb)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - Tx metadata: 0x%x" , + *RTE_FLOW_DYNF_METADATA (mb));if (is_rx && (ol_flags &PKT_RX_DYNF_METADATA )) -printf (" - Rx metadata: 0x%x" , - *RTE_FLOW_DYNF_METADATA (mb)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - Rx metadata: 0x%x" , + *RTE_FLOW_DYNF_METADATA (mb));for (dynf_index =0 ; dynf_index <64 ; dynf_index++) {if (dynf_names[dynf_index][0 ] !='\0' ) -printf (" - dynf %s: %d" , - dynf_names[dynf_index], - !!(ol_flags & (1UL << dynf_index))); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - dynf %s: %d" , + dynf_names[dynf_index], + !!(ol_flags & (1UL << dynf_index))); }if (mb->packet_type) {rte_get_ptype_name (mb->packet_type, buf,sizeof (buf)); -printf (" - hw ptype: %s" , buf); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - hw ptype: %s" , buf); } sw_packet_type =rte_net_get_ptype (mb, &hdr_lens,RTE_PTYPE_ALL_MASK );rte_get_ptype_name (sw_packet_type, buf,sizeof (buf)); -printf (" - sw ptype: %s" , buf); +MKDUMPSTR (print_buf, buf_size, cur_len," - sw ptype: %s" , buf);if (sw_packet_type &RTE_PTYPE_L2_MASK ) -printf (" - l2_len=%d" , hdr_lens.l2_len); +MKDUMPSTR (print_buf, buf_size, cur_len," - l2_len=%d" , + hdr_lens.l2_len);if (sw_packet_type &RTE_PTYPE_L3_MASK ) -printf (" - l3_len=%d" , hdr_lens.l3_len); +MKDUMPSTR (print_buf, buf_size, cur_len," - l3_len=%d" , + hdr_lens.l3_len);if (sw_packet_type &RTE_PTYPE_L4_MASK ) -printf (" - l4_len=%d" , hdr_lens.l4_len); +MKDUMPSTR (print_buf, buf_size, cur_len," - l4_len=%d" , + hdr_lens.l4_len);if (sw_packet_type &RTE_PTYPE_TUNNEL_MASK ) -printf (" - tunnel_len=%d" , hdr_lens.tunnel_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - tunnel_len=%d" , hdr_lens.tunnel_len);if (sw_packet_type &RTE_PTYPE_INNER_L2_MASK ) -printf (" - inner_l2_len=%d" , hdr_lens.inner_l2_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - inner_l2_len=%d" , hdr_lens.inner_l2_len);if (sw_packet_type &RTE_PTYPE_INNER_L3_MASK ) -printf (" - inner_l3_len=%d" , hdr_lens.inner_l3_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - inner_l3_len=%d" , hdr_lens.inner_l3_len);if (sw_packet_type &RTE_PTYPE_INNER_L4_MASK ) -printf (" - inner_l4_len=%d" , hdr_lens.inner_l4_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - inner_l4_len=%d" , hdr_lens.inner_l4_len);if (is_encapsulation) {struct rte_ipv4_hdr *ipv4_hdr;struct rte_ipv6_hdr *ipv6_hdr;
@@ -218,18 +265,28 @@ l2_len + l3_len + l4_len); udp_port =RTE_BE_TO_CPU_16 (udp_hdr->dst_port); vx_vni =rte_be_to_cpu_32 (vxlan_hdr->vx_vni); -printf (" - VXLAN packet: packet type =%d, " -"Destination UDP port =%d, VNI = %d" , - packet_type, udp_port, vx_vni >>8 ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - VXLAN packet: packet type =%d, " +"Destination UDP port =%d, VNI = %d" , + packet_type, udp_port, vx_vni >>8 ); } } -printf (" - %s queue=0x%x" , is_rx ?"Receive" :"Send" , - (unsigned int ) queue); -printf ("\n" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - %s queue=0x%x" , is_rx ?"Receive" :"Send" , + (unsigned int ) queue); +MKDUMPSTR (print_buf, buf_size, cur_len,"\n" );rte_get_rx_ol_flag_list (mb->ol_flags, buf,sizeof (buf)); -printf (" ol_flags: %s\n" , buf); +MKDUMPSTR (print_buf, buf_size, cur_len, +" ol_flags: %s\n" , buf);if (rte_mbuf_check (mb,1 , &reason) <0 ) -printf ("INVALID mbuf: %s\n" , reason); +MKDUMPSTR (print_buf, buf_size, cur_len, +"INVALID mbuf: %s\n" , reason); +if (cur_len >= buf_size) { +printf ("%s ...\n" , print_buf); +break ; + } +printf ("%s" , print_buf); + cur_len =0 ; } }
Signature · 1 line
1.8.3.1
Quoted 12 lines · Jiawei Wang
When testpmd enabled the verbosity for the received packets, if two packets were received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handling the multiple queues simultaneously.
The patch uses one string buffer that collects all the packet dump output into this buffer and then printouts it at last, that guarantees to printout separately the dump output per packet.
Fixes d862c45 ("app/testpmd: move dumping packets to a separate function")Signed-off-by Jiawei Wang <[email protected]>
<...>
app/test-pmd/util.c line 92
Quoted 9 lines
app/test-pmd/util.c +4
-0@@ -74,13 +85,16 @@uint32_t vx_vni;const char *reason;int dynf_index; +int buf_size =MAX_STRING_LEN ; +char print_buf[buf_size]; +int cur_len =0 ; +memset (print_buf,0 ,sizeof (print_buf));
Should 'print_buf' cleaned per each packet below, if not can we drop 'memset' completely?
<...>
app/test-pmd/util.c line 286
Quoted 3 lines
app/test-pmd/util.c +3
-0+if (cur_len >= buf_size) { +printf ("%s ...\n" , print_buf); +break ;
Why break here? Wouldn't just append some chars to indicate trancation and continue be OK?
Hi Ferruh,
Quoted 36 lines
-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Saturday, November 21, 2020 1:50 AM
To: Jiawei(Jonny) Wang <[email protected]>; [email protected]; [email protected]; [email protected]; Ori Kam <[email protected]>; Slava Ovsiienko <[email protected]>; NBU- Contact-Thomas Monjalon <[email protected]>; Raslan Darawsheh <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH v3] app/testpmd: fix testpmd packets dump overlappingQuoted 13 lines · Jiawei Wang
When testpmd enabled the verbosity for the received packets, if two packets were received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handling the multiple queues simultaneously.
The patch uses one string buffer that collects all the packet dump output into this buffer and then printouts it at last, that guarantees to printout separately the dump output per packet.
Fixes d862c45 ("app/testpmd: move dumping packets to a separatefunction")
Signed-off-by Jiawei Wang <[email protected]><...>
Quoted 8 lines
app/test-pmd/util.c +3
-0@@ -74,13 +85,16 @@uint32_t vx_vni;const char *reason;int dynf_index; +int buf_size =MAX_STRING_LEN ; +char print_buf[buf_size]; +int cur_len =0 ;
Quoted 5 lines
app/test-pmd/util.c line 92
Quoted 1 line
app/test-pmd/util.c +1
-0+memset (print_buf,0 ,sizeof (print_buf));Should '
print_buf' cleaned per each packet below, if not can we drop 'memset' completely?
Since the 'snprintf' always append the a terminating null character('\0') after the written string, and in the code the following character be appended start from previous null character, so only one '\0' will be appended in the last 'snprintf' calls,
snprintf(buf + cur_len, buf_size - cur_len ..
At the last 'printf("%s") will print the string buffer up to a terminating null character ('\0'). so it's ok even not 'memset' calls to clean 'print_buf' per each packets.
Quoted 10 lines
<...>
app/test-pmd/util.c line 286
Quoted 3 lines
app/test-pmd/util.c +3
-0+if (cur_len >= buf_size) { +printf ("%s ...\n" , print_buf); +break ;Why break here? Wouldn't just append some chars to indicate trancation and continue be OK?
Yes, doesn't need 'break' here.
Quoted 43 lines · Jiawei(Jonny) Wang
Hi Ferruh,
Quoted 36 lines
-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Saturday, November 21, 2020 1:50 AM
To: Jiawei(Jonny) Wang <[email protected]>; [email protected]; [email protected]; [email protected]; Ori Kam <[email protected]>; Slava Ovsiienko <[email protected]>; NBU- Contact-Thomas Monjalon <[email protected]>; Raslan Darawsheh <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH v3] app/testpmd: fix testpmd packets dump overlappingQuoted 13 lines · Jiawei Wang
When testpmd enabled the verbosity for the received packets, if two packets were received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handling the multiple queues simultaneously.
The patch uses one string buffer that collects all the packet dump output into this buffer and then printouts it at last, that guarantees to printout separately the dump output per packet.
Fixes d862c45 ("app/testpmd: move dumping packets to a separatefunction")
Signed-off-by Jiawei Wang <[email protected]><...>
Quoted 8 lines
app/test-pmd/util.c +3
-0@@ -74,13 +85,16 @@uint32_t vx_vni;const char *reason;int dynf_index; +int buf_size =MAX_STRING_LEN ; +char print_buf[buf_size]; +int cur_len =0 ;Quoted 5 lines
app/test-pmd/util.c line 92
Quoted 1 line
app/test-pmd/util.c +1
-0+memset (print_buf,0 ,sizeof (print_buf));Should '
print_buf' cleaned per each packet below, if not can we drop 'memset' completely?
Quoted 6 lines
Since the 'snprintf' always append the a terminating null character('\0') after the written string, and in the code the following character be appended start from previous null character, so only one '\0' will be appended in the last 'snprintf' calls,
snprintf(buf +cur_len,buf_size-cur_len..
At the last 'printf("%s")will print the string buffer up to a terminating null character ('\0'). so it's ok even not 'memset' calls to clean 'print_buf' per each packets.
agree, so why not drop the memset completely?
Hi Ferruh,
Quoted 61 lines
-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Monday, November 23, 2020 6:23 PM
To: Jiawei(Jonny) Wang <[email protected]>; [email protected]; [email protected]; [email protected]; Ori Kam <[email protected]>; Slava Ovsiienko <[email protected]>; NBU- Contact-Thomas Monjalon <[email protected]>; Raslan Darawsheh <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH v3] app/testpmd: fix testpmd packets dump overlappingQuoted 19 lines · Jiawei(Jonny) Wang
Hi Ferruh,
Quoted 17 lines
-----Original Message-----
From: Ferruh Yigit <[email protected]>
Sent: Saturday, November 21, 2020 1:50 AM
To: Jiawei(Jonny) Wang <[email protected]>; [email protected]; [email protected]; [email protected]; Ori Kam <[email protected]>; Slava Ovsiienko <[email protected]>; NBU- Contact-Thomas Monjalon <[email protected]>; Raslan Darawsheh <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH v3] app/testpmd: fix testpmd packets dump overlappingQuoted 4 lines · Jiawei Wang
When testpmd enabled the verbosity for the received packets, if two packets were received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handling the multiple queues
simultaneously.
Quoted 20 lines
Quoted 20 lines
Quoted 9 lines
The patch uses one string buffer that collects all the packet dump output into this buffer and then printouts it at last, that guarantees to printout separately the dump output per packet.
Fixes d862c45 ("app/testpmd: move dumping packets to a separatefunction")
Signed-off-by Jiawei Wang <[email protected]><...>
Quoted 8 lines
app/test-pmd/util.c +3
-0@@ -74,13 +85,16 @@uint32_t vx_vni;const char *reason;int dynf_index; +int buf_size =MAX_STRING_LEN ; +char print_buf[buf_size]; +int cur_len =0 ;Quoted 3 lines
Quoted 3 lines
app/test-pmd/util.c line 92
Quoted 1 line
app/test-pmd/util.c +1
-0+memset (print_buf,0 ,sizeof (print_buf));Should '
print_buf' cleaned per each packet below, if not can we drop'memset'
Quoted 5 lines
Quoted 2 lines
completely?
Since the 'snprintf' always append the a terminating null character('\0') after the written string, and in the code the following character be appended start from previous null character, so only
Quoted 7 lines
one '\0' will be appended in the last 'snprintf' calls,
Quoted 2 lines
snprintf(buf +
cur_len,buf_size-cur_len..
At the last 'printf("%s")will print the string buffer up to a terminating nullcharacter ('\0').
Quoted 1 line
so it's ok even not 'memset' calls to clean '
print_buf' per each packets.agree, so why not drop the memset completely?
Yes, don't need memset before 'snprintf' calls, removed it in the latest patch: https://patchwork.dpdk.org/patch/84465/
Thanks.
PATCH v4 1/1 app/testpmd: fix testpmd packets dump overlapping
In reply to Jiawei WangWhen testpmd enabled the verbosity for the received packets, if two packets were received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handling the multiple queues simultaneously.
The patch uses one string buffer that collects all the packet dump output into this buffer and then printouts it at last, that guarantees to printout separately the dump output per packet.
---
v4:
* Remove 'break' the loop if trancation and contiue to handle next packet.
v3:
* Use the marco instead of function calls to simplfy code.
* Use the shorter chars '...' append into the dump to notify the truncation.
* Update the commit message.
* Rebase.
v2:
* Print dump output of per packet instead of per burst.
* Add the checking for return value of 'snprintf' and exit if required size exceed the print buffer size.
* Update the log messages.
--- app/test-pmd/util.c | 176 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 116 insertions(+), 60 deletions(-)
app/test-pmd/util.c +116 -60
@@ -15,12 +15,23 @@#include "testpmd.h" +#define MAX_STRING_LEN 8192 + +#define MKDUMPSTR (buf, buf_size, cur_len, ...) \ +do { \ + if (cur_len >= buf_size) \ + break; \ + cur_len += snprintf(buf + cur_len, buf_size - cur_len, __VA_ARGS__); \ +} while (0) +static inline void -print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr) +print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr, +char print_buf[],int buf_size,int *cur_len) {char buf[RTE_ETHER_ADDR_FMT_SIZE ]; +rte_ether_format_addr (buf,RTE_ETHER_ADDR_FMT_SIZE , eth_addr); -printf ("%s%s" , what, buf); +MKDUMPSTR (print_buf, buf_size, *cur_len,"%s%s" , what, buf); } static inline bool
@@ -74,13 +85,16 @@uint32_t vx_vni;const char *reason;int dynf_index; +int buf_size =MAX_STRING_LEN ; +char print_buf[buf_size]; +int cur_len =0 ; +memset (print_buf,0 ,sizeof (print_buf));if (!nb_pkts)return ; -printf ("port %u/queue %u: %s %u packets\n" , - port_id, queue, - is_rx ?"received" :"sent" , - (unsigned int ) nb_pkts); +MKDUMPSTR (print_buf, buf_size, cur_len, +"port %u/queue %u: %s %u packets\n" , port_id, queue, + is_rx ?"received" :"sent" , (unsigned int ) nb_pkts);for (i =0 ; i < nb_pkts; i++) {int ret;struct rte_flow_error error;
@@ -93,95 +107,128 @@ is_encapsulation =RTE_ETH_IS_TUNNEL_PKT (packet_type); ret =rte_flow_get_restore_info (port_id, mb, &info, &error);if (!ret) { -printf ("restore info:" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +"restore info:" );if (info.flags &RTE_FLOW_RESTORE_INFO_TUNNEL ) {struct port_flow_tunnel *port_tunnel; port_tunnel =port_flow_locate_tunnel (port_id, &info.tunnel); -printf (" - tunnel" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - tunnel" );if (port_tunnel) -printf (" #%u" , port_tunnel->id); +MKDUMPSTR (print_buf, buf_size, cur_len, +" #%u" , port_tunnel->id);else -printf (" %s" ,"-none-" ); -printf (" type %s" , -port_flow_tunnel_type (&info.tunnel)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" %s" ,"-none-" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" type %s" ,port_flow_tunnel_type + (&info.tunnel)); }else { -printf (" - no tunnel info" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - no tunnel info" ); }if (info.flags &RTE_FLOW_RESTORE_INFO_ENCAPSULATED ) -printf (" - outer header present" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - outer header present" );else -printf (" - no outer header" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - no outer header" );if (info.flags &RTE_FLOW_RESTORE_INFO_GROUP_ID ) -printf (" - miss group %u" , info.group_id); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - miss group %u" , info.group_id);else -printf (" - no miss group" ); -printf ("\n" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - no miss group" ); +MKDUMPSTR (print_buf, buf_size, cur_len,"\n" ); } -print_ether_addr (" src=" , ð_hdr->s_addr); -print_ether_addr (" - dst=" , ð_hdr->d_addr); -printf (" - type=0x%04x - length=%u - nb_segs=%d" , - eth_type, (unsigned int ) mb->pkt_len, - (int )mb->nb_segs); +print_ether_addr (" src=" , ð_hdr->s_addr, + print_buf, buf_size, &cur_len); +print_ether_addr (" - dst=" , ð_hdr->d_addr, + print_buf, buf_size, &cur_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - type=0x%04x - length=%u - nb_segs=%d" , + eth_type, (unsigned int ) mb->pkt_len, + (int )mb->nb_segs); ol_flags = mb->ol_flags;if (ol_flags &PKT_RX_RSS_HASH ) { -printf (" - RSS hash=0x%x" , (unsigned int ) mb->hash.rss); -printf (" - RSS queue=0x%x" , (unsigned int ) queue); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - RSS hash=0x%x" , + (unsigned int ) mb->hash.rss); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - RSS queue=0x%x" , (unsigned int ) queue); }if (ol_flags &PKT_RX_FDIR ) { -printf (" - FDIR matched " ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - FDIR matched " );if (ol_flags &PKT_RX_FDIR_ID ) -printf ("ID=0x%x" , - mb->hash.fdir.hi); +MKDUMPSTR (print_buf, buf_size, cur_len, +"ID=0x%x" , mb->hash.fdir.hi);else if (ol_flags &PKT_RX_FDIR_FLX ) -printf ("flex bytes=0x%08x %08x" , - mb->hash.fdir.hi, mb->hash.fdir.lo); +MKDUMPSTR (print_buf, buf_size, cur_len, +"flex bytes=0x%08x %08x" , + mb->hash.fdir.hi, mb->hash.fdir.lo);else -printf ("hash=0x%x ID=0x%x " , - mb->hash.fdir.hash, mb->hash.fdir.id); +MKDUMPSTR (print_buf, buf_size, cur_len, +"hash=0x%x ID=0x%x " , + mb->hash.fdir.hash, mb->hash.fdir.id); }if (is_timestamp_enabled (mb)) -printf (" - timestamp %" PRIu64" " ,get_timestamp (mb)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - timestamp %" PRIu64" " ,get_timestamp (mb));if (ol_flags &PKT_RX_QINQ ) -printf (" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x" , - mb->vlan_tci, mb->vlan_tci_outer); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x" , + mb->vlan_tci, mb->vlan_tci_outer);else if (ol_flags &PKT_RX_VLAN ) -printf (" - VLAN tci=0x%x" , mb->vlan_tci); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - VLAN tci=0x%x" , mb->vlan_tci);if (!is_rx && (ol_flags &PKT_TX_DYNF_METADATA )) -printf (" - Tx metadata: 0x%x" , - *RTE_FLOW_DYNF_METADATA (mb)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - Tx metadata: 0x%x" , + *RTE_FLOW_DYNF_METADATA (mb));if (is_rx && (ol_flags &PKT_RX_DYNF_METADATA )) -printf (" - Rx metadata: 0x%x" , - *RTE_FLOW_DYNF_METADATA (mb)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - Rx metadata: 0x%x" , + *RTE_FLOW_DYNF_METADATA (mb));for (dynf_index =0 ; dynf_index <64 ; dynf_index++) {if (dynf_names[dynf_index][0 ] !='\0' ) -printf (" - dynf %s: %d" , - dynf_names[dynf_index], - !!(ol_flags & (1UL << dynf_index))); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - dynf %s: %d" , + dynf_names[dynf_index], + !!(ol_flags & (1UL << dynf_index))); }if (mb->packet_type) {rte_get_ptype_name (mb->packet_type, buf,sizeof (buf)); -printf (" - hw ptype: %s" , buf); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - hw ptype: %s" , buf); } sw_packet_type =rte_net_get_ptype (mb, &hdr_lens,RTE_PTYPE_ALL_MASK );rte_get_ptype_name (sw_packet_type, buf,sizeof (buf)); -printf (" - sw ptype: %s" , buf); +MKDUMPSTR (print_buf, buf_size, cur_len," - sw ptype: %s" , buf);if (sw_packet_type &RTE_PTYPE_L2_MASK ) -printf (" - l2_len=%d" , hdr_lens.l2_len); +MKDUMPSTR (print_buf, buf_size, cur_len," - l2_len=%d" , + hdr_lens.l2_len);if (sw_packet_type &RTE_PTYPE_L3_MASK ) -printf (" - l3_len=%d" , hdr_lens.l3_len); +MKDUMPSTR (print_buf, buf_size, cur_len," - l3_len=%d" , + hdr_lens.l3_len);if (sw_packet_type &RTE_PTYPE_L4_MASK ) -printf (" - l4_len=%d" , hdr_lens.l4_len); +MKDUMPSTR (print_buf, buf_size, cur_len," - l4_len=%d" , + hdr_lens.l4_len);if (sw_packet_type &RTE_PTYPE_TUNNEL_MASK ) -printf (" - tunnel_len=%d" , hdr_lens.tunnel_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - tunnel_len=%d" , hdr_lens.tunnel_len);if (sw_packet_type &RTE_PTYPE_INNER_L2_MASK ) -printf (" - inner_l2_len=%d" , hdr_lens.inner_l2_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - inner_l2_len=%d" , hdr_lens.inner_l2_len);if (sw_packet_type &RTE_PTYPE_INNER_L3_MASK ) -printf (" - inner_l3_len=%d" , hdr_lens.inner_l3_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - inner_l3_len=%d" , hdr_lens.inner_l3_len);if (sw_packet_type &RTE_PTYPE_INNER_L4_MASK ) -printf (" - inner_l4_len=%d" , hdr_lens.inner_l4_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - inner_l4_len=%d" , hdr_lens.inner_l4_len);if (is_encapsulation) {struct rte_ipv4_hdr *ipv4_hdr;struct rte_ipv6_hdr *ipv6_hdr;
@@ -218,18 +265,27 @@ l2_len + l3_len + l4_len); udp_port =RTE_BE_TO_CPU_16 (udp_hdr->dst_port); vx_vni =rte_be_to_cpu_32 (vxlan_hdr->vx_vni); -printf (" - VXLAN packet: packet type =%d, " -"Destination UDP port =%d, VNI = %d" , - packet_type, udp_port, vx_vni >>8 ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - VXLAN packet: packet type =%d, " +"Destination UDP port =%d, VNI = %d" , + packet_type, udp_port, vx_vni >>8 ); } } -printf (" - %s queue=0x%x" , is_rx ?"Receive" :"Send" , - (unsigned int ) queue); -printf ("\n" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - %s queue=0x%x" , is_rx ?"Receive" :"Send" , + (unsigned int ) queue); +MKDUMPSTR (print_buf, buf_size, cur_len,"\n" );rte_get_rx_ol_flag_list (mb->ol_flags, buf,sizeof (buf)); -printf (" ol_flags: %s\n" , buf); +MKDUMPSTR (print_buf, buf_size, cur_len, +" ol_flags: %s\n" , buf);if (rte_mbuf_check (mb,1 , &reason) <0 ) -printf ("INVALID mbuf: %s\n" , reason); +MKDUMPSTR (print_buf, buf_size, cur_len, +"INVALID mbuf: %s\n" , reason); +if (cur_len >= buf_size) +printf ("%s ...\n" , print_buf); +else +printf ("%s" , print_buf); + cur_len =0 ; } }
Signature · 1 line
1.8.3.1
PATCH v5 1/1 app/testpmd: fix testpmd packets dump overlapping
When testpmd enabled the verbosity for the received packets, if two packets were received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handling the multiple queues simultaneously.
The patch uses one string buffer that collects all the packet dump output into this buffer and then printouts it at last, that guarantees to printout separately the dump output per packet.
---
v5:
* Remove memset function calls before snprintf calls.
v4:
* Remove 'break' the loop if trancation and contiue to handle next packet.
v3:
* Use the marco instead of function calls to simplfy code.
* Use the shorter chars '...' append into the dump to notify the truncation.
* Update the commit message.
* Rebase.
v2:
* Print dump output of per packet instead of per burst.
* Add the checking for return value of 'snprintf' and exit if required size exceed the print buffer size.
* Update the log messages.
--- app/test-pmd/util.c | 175 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 115 insertions(+), 60 deletions(-)
app/test-pmd/util.c +115 -60
@@ -15,12 +15,23 @@#include "testpmd.h" +#define MAX_STRING_LEN 8192 + +#define MKDUMPSTR (buf, buf_size, cur_len, ...) \ +do { \ + if (cur_len >= buf_size) \ + break; \ + cur_len += snprintf(buf + cur_len, buf_size - cur_len, __VA_ARGS__); \ +} while (0) +static inline void -print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr) +print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr, +char print_buf[],int buf_size,int *cur_len) {char buf[RTE_ETHER_ADDR_FMT_SIZE ]; +rte_ether_format_addr (buf,RTE_ETHER_ADDR_FMT_SIZE , eth_addr); -printf ("%s%s" , what, buf); +MKDUMPSTR (print_buf, buf_size, *cur_len,"%s%s" , what, buf); } static inline bool
@@ -74,13 +85,15 @@uint32_t vx_vni;const char *reason;int dynf_index; +int buf_size =MAX_STRING_LEN ; +char print_buf[buf_size]; +int cur_len =0 ;if (!nb_pkts)return ; -printf ("port %u/queue %u: %s %u packets\n" , - port_id, queue, - is_rx ?"received" :"sent" , - (unsigned int ) nb_pkts); +MKDUMPSTR (print_buf, buf_size, cur_len, +"port %u/queue %u: %s %u packets\n" , port_id, queue, + is_rx ?"received" :"sent" , (unsigned int ) nb_pkts);for (i =0 ; i < nb_pkts; i++) {int ret;struct rte_flow_error error;
@@ -93,95 +106,128 @@ is_encapsulation =RTE_ETH_IS_TUNNEL_PKT (packet_type); ret =rte_flow_get_restore_info (port_id, mb, &info, &error);if (!ret) { -printf ("restore info:" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +"restore info:" );if (info.flags &RTE_FLOW_RESTORE_INFO_TUNNEL ) {struct port_flow_tunnel *port_tunnel; port_tunnel =port_flow_locate_tunnel (port_id, &info.tunnel); -printf (" - tunnel" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - tunnel" );if (port_tunnel) -printf (" #%u" , port_tunnel->id); +MKDUMPSTR (print_buf, buf_size, cur_len, +" #%u" , port_tunnel->id);else -printf (" %s" ,"-none-" ); -printf (" type %s" , -port_flow_tunnel_type (&info.tunnel)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" %s" ,"-none-" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" type %s" ,port_flow_tunnel_type + (&info.tunnel)); }else { -printf (" - no tunnel info" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - no tunnel info" ); }if (info.flags &RTE_FLOW_RESTORE_INFO_ENCAPSULATED ) -printf (" - outer header present" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - outer header present" );else -printf (" - no outer header" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - no outer header" );if (info.flags &RTE_FLOW_RESTORE_INFO_GROUP_ID ) -printf (" - miss group %u" , info.group_id); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - miss group %u" , info.group_id);else -printf (" - no miss group" ); -printf ("\n" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - no miss group" ); +MKDUMPSTR (print_buf, buf_size, cur_len,"\n" ); } -print_ether_addr (" src=" , ð_hdr->s_addr); -print_ether_addr (" - dst=" , ð_hdr->d_addr); -printf (" - type=0x%04x - length=%u - nb_segs=%d" , - eth_type, (unsigned int ) mb->pkt_len, - (int )mb->nb_segs); +print_ether_addr (" src=" , ð_hdr->s_addr, + print_buf, buf_size, &cur_len); +print_ether_addr (" - dst=" , ð_hdr->d_addr, + print_buf, buf_size, &cur_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - type=0x%04x - length=%u - nb_segs=%d" , + eth_type, (unsigned int ) mb->pkt_len, + (int )mb->nb_segs); ol_flags = mb->ol_flags;if (ol_flags &PKT_RX_RSS_HASH ) { -printf (" - RSS hash=0x%x" , (unsigned int ) mb->hash.rss); -printf (" - RSS queue=0x%x" , (unsigned int ) queue); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - RSS hash=0x%x" , + (unsigned int ) mb->hash.rss); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - RSS queue=0x%x" , (unsigned int ) queue); }if (ol_flags &PKT_RX_FDIR ) { -printf (" - FDIR matched " ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - FDIR matched " );if (ol_flags &PKT_RX_FDIR_ID ) -printf ("ID=0x%x" , - mb->hash.fdir.hi); +MKDUMPSTR (print_buf, buf_size, cur_len, +"ID=0x%x" , mb->hash.fdir.hi);else if (ol_flags &PKT_RX_FDIR_FLX ) -printf ("flex bytes=0x%08x %08x" , - mb->hash.fdir.hi, mb->hash.fdir.lo); +MKDUMPSTR (print_buf, buf_size, cur_len, +"flex bytes=0x%08x %08x" , + mb->hash.fdir.hi, mb->hash.fdir.lo);else -printf ("hash=0x%x ID=0x%x " , - mb->hash.fdir.hash, mb->hash.fdir.id); +MKDUMPSTR (print_buf, buf_size, cur_len, +"hash=0x%x ID=0x%x " , + mb->hash.fdir.hash, mb->hash.fdir.id); }if (is_timestamp_enabled (mb)) -printf (" - timestamp %" PRIu64" " ,get_timestamp (mb)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - timestamp %" PRIu64" " ,get_timestamp (mb));if (ol_flags &PKT_RX_QINQ ) -printf (" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x" , - mb->vlan_tci, mb->vlan_tci_outer); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x" , + mb->vlan_tci, mb->vlan_tci_outer);else if (ol_flags &PKT_RX_VLAN ) -printf (" - VLAN tci=0x%x" , mb->vlan_tci); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - VLAN tci=0x%x" , mb->vlan_tci);if (!is_rx && (ol_flags &PKT_TX_DYNF_METADATA )) -printf (" - Tx metadata: 0x%x" , - *RTE_FLOW_DYNF_METADATA (mb)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - Tx metadata: 0x%x" , + *RTE_FLOW_DYNF_METADATA (mb));if (is_rx && (ol_flags &PKT_RX_DYNF_METADATA )) -printf (" - Rx metadata: 0x%x" , - *RTE_FLOW_DYNF_METADATA (mb)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - Rx metadata: 0x%x" , + *RTE_FLOW_DYNF_METADATA (mb));for (dynf_index =0 ; dynf_index <64 ; dynf_index++) {if (dynf_names[dynf_index][0 ] !='\0' ) -printf (" - dynf %s: %d" , - dynf_names[dynf_index], - !!(ol_flags & (1UL << dynf_index))); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - dynf %s: %d" , + dynf_names[dynf_index], + !!(ol_flags & (1UL << dynf_index))); }if (mb->packet_type) {rte_get_ptype_name (mb->packet_type, buf,sizeof (buf)); -printf (" - hw ptype: %s" , buf); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - hw ptype: %s" , buf); } sw_packet_type =rte_net_get_ptype (mb, &hdr_lens,RTE_PTYPE_ALL_MASK );rte_get_ptype_name (sw_packet_type, buf,sizeof (buf)); -printf (" - sw ptype: %s" , buf); +MKDUMPSTR (print_buf, buf_size, cur_len," - sw ptype: %s" , buf);if (sw_packet_type &RTE_PTYPE_L2_MASK ) -printf (" - l2_len=%d" , hdr_lens.l2_len); +MKDUMPSTR (print_buf, buf_size, cur_len," - l2_len=%d" , + hdr_lens.l2_len);if (sw_packet_type &RTE_PTYPE_L3_MASK ) -printf (" - l3_len=%d" , hdr_lens.l3_len); +MKDUMPSTR (print_buf, buf_size, cur_len," - l3_len=%d" , + hdr_lens.l3_len);if (sw_packet_type &RTE_PTYPE_L4_MASK ) -printf (" - l4_len=%d" , hdr_lens.l4_len); +MKDUMPSTR (print_buf, buf_size, cur_len," - l4_len=%d" , + hdr_lens.l4_len);if (sw_packet_type &RTE_PTYPE_TUNNEL_MASK ) -printf (" - tunnel_len=%d" , hdr_lens.tunnel_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - tunnel_len=%d" , hdr_lens.tunnel_len);if (sw_packet_type &RTE_PTYPE_INNER_L2_MASK ) -printf (" - inner_l2_len=%d" , hdr_lens.inner_l2_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - inner_l2_len=%d" , hdr_lens.inner_l2_len);if (sw_packet_type &RTE_PTYPE_INNER_L3_MASK ) -printf (" - inner_l3_len=%d" , hdr_lens.inner_l3_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - inner_l3_len=%d" , hdr_lens.inner_l3_len);if (sw_packet_type &RTE_PTYPE_INNER_L4_MASK ) -printf (" - inner_l4_len=%d" , hdr_lens.inner_l4_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - inner_l4_len=%d" , hdr_lens.inner_l4_len);if (is_encapsulation) {struct rte_ipv4_hdr *ipv4_hdr;struct rte_ipv6_hdr *ipv6_hdr;
@@ -218,18 +264,27 @@ l2_len + l3_len + l4_len); udp_port =RTE_BE_TO_CPU_16 (udp_hdr->dst_port); vx_vni =rte_be_to_cpu_32 (vxlan_hdr->vx_vni); -printf (" - VXLAN packet: packet type =%d, " -"Destination UDP port =%d, VNI = %d" , - packet_type, udp_port, vx_vni >>8 ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - VXLAN packet: packet type =%d, " +"Destination UDP port =%d, VNI = %d" , + packet_type, udp_port, vx_vni >>8 ); } } -printf (" - %s queue=0x%x" , is_rx ?"Receive" :"Send" , - (unsigned int ) queue); -printf ("\n" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - %s queue=0x%x" , is_rx ?"Receive" :"Send" , + (unsigned int ) queue); +MKDUMPSTR (print_buf, buf_size, cur_len,"\n" );rte_get_rx_ol_flag_list (mb->ol_flags, buf,sizeof (buf)); -printf (" ol_flags: %s\n" , buf); +MKDUMPSTR (print_buf, buf_size, cur_len, +" ol_flags: %s\n" , buf);if (rte_mbuf_check (mb,1 , &reason) <0 ) -printf ("INVALID mbuf: %s\n" , reason); +MKDUMPSTR (print_buf, buf_size, cur_len, +"INVALID mbuf: %s\n" , reason); +if (cur_len >= buf_size) +printf ("%s ...\n" , print_buf); +else +printf ("%s" , print_buf); + cur_len =0 ; } }
Signature · 1 line
1.8.3.1
Quoted 5 lines · Jiawei Wang
When testpmd enabled the verbosity for the received packets, if two packets were received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handling the multiple queues simultaneously.
Quoted 8 lines
The patch uses one string buffer that collects all the packet dump output into this buffer and then printouts it at last, that guarantees to printout separately the dump output per packet.
Fixes d862c45 ("app/testpmd: move dumping packets to a separate function")Signed-off-by Jiawei Wang <[email protected]>
Although this looks safe, this is also not so critical, not sure to get for this release or not.
PATCH v6 1/1 app/testpmd: fix testpmd packets dump overlapping
In reply to Jiawei WangWhen testpmd enabled the verbosity for the received packets, if two packets were received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handling the multiple queues simultaneously.
The patch uses one string buffer that collects all the packet dump output into this buffer and then printouts it at last, that guarantees to printout separately the dump output per packet.
---
v6:
* Rebase the latest code.
v5:
* Remove memset function calls before snprintf calls.
v4:
* Remove 'break' the loop if trancation and contiue to handle next packet.
v3:
* Use the marco instead of function calls to simplfy code.
* Use the shorter chars '...' append into the dump to notify the truncation.
* Update the commit message.
* Rebase.
v2:
* Print dump output of per packet instead of per burst.
* Add the checking for return value of 'snprintf' and exit if required size exceed the print buffer size.
* Update the log messages.
--- app/test-pmd/util.c | 175 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 115 insertions(+), 60 deletions(-)
app/test-pmd/util.c +115 -60
@@ -15,12 +15,23 @@#include "testpmd.h" +#define MAX_STRING_LEN 8192 + +#define MKDUMPSTR (buf, buf_size, cur_len, ...) \ +do { \ + if (cur_len >= buf_size) \ + break; \ + cur_len += snprintf(buf + cur_len, buf_size - cur_len, __VA_ARGS__); \ +} while (0) +static inline void -print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr) +print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr, +char print_buf[],int buf_size,int *cur_len) {char buf[RTE_ETHER_ADDR_FMT_SIZE ]; +rte_ether_format_addr (buf,RTE_ETHER_ADDR_FMT_SIZE , eth_addr); -printf ("%s%s" , what, buf); +MKDUMPSTR (print_buf, buf_size, *cur_len,"%s%s" , what, buf); } static inline bool
@@ -74,13 +85,15 @@uint32_t vx_vni;const char *reason;int dynf_index; +int buf_size =MAX_STRING_LEN ; +char print_buf[buf_size]; +int cur_len =0 ;if (!nb_pkts)return ; -printf ("port %u/queue %u: %s %u packets\n" , - port_id, queue, - is_rx ?"received" :"sent" , - (unsigned int ) nb_pkts); +MKDUMPSTR (print_buf, buf_size, cur_len, +"port %u/queue %u: %s %u packets\n" , port_id, queue, + is_rx ?"received" :"sent" , (unsigned int ) nb_pkts);for (i =0 ; i < nb_pkts; i++) {int ret;struct rte_flow_error error;
@@ -93,95 +106,128 @@ is_encapsulation =RTE_ETH_IS_TUNNEL_PKT (packet_type); ret =rte_flow_get_restore_info (port_id, mb, &info, &error);if (!ret) { -printf ("restore info:" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +"restore info:" );if (info.flags &RTE_FLOW_RESTORE_INFO_TUNNEL ) {struct port_flow_tunnel *port_tunnel; port_tunnel =port_flow_locate_tunnel (port_id, &info.tunnel); -printf (" - tunnel" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - tunnel" );if (port_tunnel) -printf (" #%u" , port_tunnel->id); +MKDUMPSTR (print_buf, buf_size, cur_len, +" #%u" , port_tunnel->id);else -printf (" %s" ,"-none-" ); -printf (" type %s" , -port_flow_tunnel_type (&info.tunnel)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" %s" ,"-none-" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" type %s" ,port_flow_tunnel_type + (&info.tunnel)); }else { -printf (" - no tunnel info" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - no tunnel info" ); }if (info.flags &RTE_FLOW_RESTORE_INFO_ENCAPSULATED ) -printf (" - outer header present" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - outer header present" );else -printf (" - no outer header" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - no outer header" );if (info.flags &RTE_FLOW_RESTORE_INFO_GROUP_ID ) -printf (" - miss group %u" , info.group_id); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - miss group %u" , info.group_id);else -printf (" - no miss group" ); -printf ("\n" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - no miss group" ); +MKDUMPSTR (print_buf, buf_size, cur_len,"\n" ); } -print_ether_addr (" src=" , ð_hdr->s_addr); -print_ether_addr (" - dst=" , ð_hdr->d_addr); -printf (" - type=0x%04x - length=%u - nb_segs=%d" , - eth_type, (unsigned int ) mb->pkt_len, - (int )mb->nb_segs); +print_ether_addr (" src=" , ð_hdr->s_addr, + print_buf, buf_size, &cur_len); +print_ether_addr (" - dst=" , ð_hdr->d_addr, + print_buf, buf_size, &cur_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - type=0x%04x - length=%u - nb_segs=%d" , + eth_type, (unsigned int ) mb->pkt_len, + (int )mb->nb_segs); ol_flags = mb->ol_flags;if (ol_flags &PKT_RX_RSS_HASH ) { -printf (" - RSS hash=0x%x" , (unsigned int ) mb->hash.rss); -printf (" - RSS queue=0x%x" , (unsigned int ) queue); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - RSS hash=0x%x" , + (unsigned int ) mb->hash.rss); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - RSS queue=0x%x" , (unsigned int ) queue); }if (ol_flags &PKT_RX_FDIR ) { -printf (" - FDIR matched " ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - FDIR matched " );if (ol_flags &PKT_RX_FDIR_ID ) -printf ("ID=0x%x" , - mb->hash.fdir.hi); +MKDUMPSTR (print_buf, buf_size, cur_len, +"ID=0x%x" , mb->hash.fdir.hi);else if (ol_flags &PKT_RX_FDIR_FLX ) -printf ("flex bytes=0x%08x %08x" , - mb->hash.fdir.hi, mb->hash.fdir.lo); +MKDUMPSTR (print_buf, buf_size, cur_len, +"flex bytes=0x%08x %08x" , + mb->hash.fdir.hi, mb->hash.fdir.lo);else -printf ("hash=0x%x ID=0x%x " , - mb->hash.fdir.hash, mb->hash.fdir.id); +MKDUMPSTR (print_buf, buf_size, cur_len, +"hash=0x%x ID=0x%x " , + mb->hash.fdir.hash, mb->hash.fdir.id); }if (is_timestamp_enabled (mb)) -printf (" - timestamp %" PRIu64" " ,get_timestamp (mb)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - timestamp %" PRIu64" " ,get_timestamp (mb));if (ol_flags &PKT_RX_QINQ ) -printf (" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x" , - mb->vlan_tci, mb->vlan_tci_outer); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x" , + mb->vlan_tci, mb->vlan_tci_outer);else if (ol_flags &PKT_RX_VLAN ) -printf (" - VLAN tci=0x%x" , mb->vlan_tci); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - VLAN tci=0x%x" , mb->vlan_tci);if (!is_rx && (ol_flags &PKT_TX_DYNF_METADATA )) -printf (" - Tx metadata: 0x%x" , - *RTE_FLOW_DYNF_METADATA (mb)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - Tx metadata: 0x%x" , + *RTE_FLOW_DYNF_METADATA (mb));if (is_rx && (ol_flags &PKT_RX_DYNF_METADATA )) -printf (" - Rx metadata: 0x%x" , - *RTE_FLOW_DYNF_METADATA (mb)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - Rx metadata: 0x%x" , + *RTE_FLOW_DYNF_METADATA (mb));for (dynf_index =0 ; dynf_index <64 ; dynf_index++) {if (dynf_names[dynf_index][0 ] !='\0' ) -printf (" - dynf %s: %d" , - dynf_names[dynf_index], - !!(ol_flags & (1UL << dynf_index))); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - dynf %s: %d" , + dynf_names[dynf_index], + !!(ol_flags & (1UL << dynf_index))); }if (mb->packet_type) {rte_get_ptype_name (mb->packet_type, buf,sizeof (buf)); -printf (" - hw ptype: %s" , buf); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - hw ptype: %s" , buf); } sw_packet_type =rte_net_get_ptype (mb, &hdr_lens,RTE_PTYPE_ALL_MASK );rte_get_ptype_name (sw_packet_type, buf,sizeof (buf)); -printf (" - sw ptype: %s" , buf); +MKDUMPSTR (print_buf, buf_size, cur_len," - sw ptype: %s" , buf);if (sw_packet_type &RTE_PTYPE_L2_MASK ) -printf (" - l2_len=%d" , hdr_lens.l2_len); +MKDUMPSTR (print_buf, buf_size, cur_len," - l2_len=%d" , + hdr_lens.l2_len);if (sw_packet_type &RTE_PTYPE_L3_MASK ) -printf (" - l3_len=%d" , hdr_lens.l3_len); +MKDUMPSTR (print_buf, buf_size, cur_len," - l3_len=%d" , + hdr_lens.l3_len);if (sw_packet_type &RTE_PTYPE_L4_MASK ) -printf (" - l4_len=%d" , hdr_lens.l4_len); +MKDUMPSTR (print_buf, buf_size, cur_len," - l4_len=%d" , + hdr_lens.l4_len);if (sw_packet_type &RTE_PTYPE_TUNNEL_MASK ) -printf (" - tunnel_len=%d" , hdr_lens.tunnel_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - tunnel_len=%d" , hdr_lens.tunnel_len);if (sw_packet_type &RTE_PTYPE_INNER_L2_MASK ) -printf (" - inner_l2_len=%d" , hdr_lens.inner_l2_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - inner_l2_len=%d" , hdr_lens.inner_l2_len);if (sw_packet_type &RTE_PTYPE_INNER_L3_MASK ) -printf (" - inner_l3_len=%d" , hdr_lens.inner_l3_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - inner_l3_len=%d" , hdr_lens.inner_l3_len);if (sw_packet_type &RTE_PTYPE_INNER_L4_MASK ) -printf (" - inner_l4_len=%d" , hdr_lens.inner_l4_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - inner_l4_len=%d" , hdr_lens.inner_l4_len);if (is_encapsulation) {struct rte_ipv4_hdr *ipv4_hdr;struct rte_ipv6_hdr *ipv6_hdr;
@@ -218,18 +264,27 @@ l2_len + l3_len + l4_len); udp_port =RTE_BE_TO_CPU_16 (udp_hdr->dst_port); vx_vni =rte_be_to_cpu_32 (vxlan_hdr->vx_vni); -printf (" - VXLAN packet: packet type =%d, " -"Destination UDP port =%d, VNI = %d" , - packet_type, udp_port, vx_vni >>8 ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - VXLAN packet: packet type =%d, " +"Destination UDP port =%d, VNI = %d" , + packet_type, udp_port, vx_vni >>8 ); } } -printf (" - %s queue=0x%x" , is_rx ?"Receive" :"Send" , - (unsigned int ) queue); -printf ("\n" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - %s queue=0x%x" , is_rx ?"Receive" :"Send" , + (unsigned int ) queue); +MKDUMPSTR (print_buf, buf_size, cur_len,"\n" );rte_get_rx_ol_flag_list (mb->ol_flags, buf,sizeof (buf)); -printf (" ol_flags: %s\n" , buf); +MKDUMPSTR (print_buf, buf_size, cur_len, +" ol_flags: %s\n" , buf);if (rte_mbuf_check (mb,1 , &reason) <0 ) -printf ("INVALID mbuf: %s\n" , reason); +MKDUMPSTR (print_buf, buf_size, cur_len, +"INVALID mbuf: %s\n" , reason); +if (cur_len >= buf_size) +printf ("%s ...\n" , print_buf); +else +printf ("%s" , print_buf); + cur_len =0 ; } }
Signature · 1 line
1.8.3.1
app/test-pmd/util.c line 29
Quoted 2 lines · On Wed, 6 Jan 2021 16:13:37 +0200 Jiawei Wang <[email protected]> wrote:
app/test-pmd/util.c +2
-0+print_ether_addr(const char *what, const struct rte_ether_addr *eth_addr, + char print_buf[], int buf_size, int *cur_len)
Use size_t instead of int for sizes?
The length can never be negative?
Quoted 17 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, January 6, 2021 11:55 PM
To: Jiawei(Jonny) Wang <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Ori Kam <[email protected]>; Slava Ovsiienko <[email protected]>; NBU-Contact-Thomas Monjalon <[email protected]>; Raslan Darawsheh <[email protected]>; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6] app/testpmd: fix testpmd packets dump overlappingOn Wed, 6 Jan 2021 16:13:37 +0200
Jiawei Wang <[email protected]> wrote:
Quoted 6 lines
Quoted 1 line
+print_ether_addr(const char *what, const struct
rte_ether_addr
*eth_addr,app/test-pmd/util.c line 29
Quoted 1 line
app/test-pmd/util.c +1
-0+ char print_buf[], int buf_size, int *cur_len)Use
size_tinstead of int for sizes?
The length can never be negative?
The buf_size and cur_len always >0, buf_size means that the total size of string buffer, default is 8K, the cur_len means that the current location of putting the new dump output, start from 0.
Thanks.
app/test-pmd/util.c line 89
Quoted 2 lines · On Wed, 6 Jan 2021 16:13:37 +0200 Jiawei Wang <[email protected]> wrote:
app/test-pmd/util.c +2
-0+int buf_size =MAX_STRING_LEN ; +char print_buf[buf_size];
Don't use dynamic sized array if you don't have to. Various static checkers can see look for out of bounds access to fixed size array.
Quoted 17 lines
-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Wednesday, January 6, 2021 11:56 PM
To: Jiawei(Jonny) Wang <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Ori Kam <[email protected]>; Slava Ovsiienko <[email protected]>; NBU-Contact-Thomas Monjalon <[email protected]>; Raslan Darawsheh <[email protected]>; [email protected]
Subject: Re: [dpdk-dev] [PATCH v6] app/testpmd: fix testpmd packets dump overlappingOn Wed, 6 Jan 2021 16:13:37 +0200
Jiawei Wang <[email protected]> wrote:
Quoted 6 lines
app/test-pmd/util.c line 89
Quoted 2 lines
app/test-pmd/util.c +2
-0+int buf_size =MAX_STRING_LEN ; +char print_buf[buf_size];Don't use dynamic sized array if you don't have to.
Various static checkers can see look for out of bounds access to fixed size array.
Ok, I will change to :
char print_buf[MAX_STRING_LEN];
Thanks.
PATCH v7 1/1 app/testpmd: fix testpmd packets dump overlapping
In reply to Jiawei WangWhen testpmd enabled the verbosity for the received packets, if two packets were received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handling the multiple queues simultaneously.
The patch uses one string buffer that collects all the packet dump output into this buffer and then printouts it at last, that guarantees to printout separately the dump output per packet.
---
v7:
* Use the fixed sized array.
* Use the size_t format for length definition.
* Rebase the latest code.
v6:
* Rebase the latest code.
v5:
* Remove memset function calls before snprintf calls.
v4:
* Remove 'break' the loop if trancation and contiue to handle next packet.
v3:
* Use the marco instead of function calls to simplfy code.
* Use the shorter chars '...' append into the dump to notify the truncation.
* Update the commit message.
* Rebase.
v2:
* Print dump output of per packet instead of per burst.
* Add the checking for return value of 'snprintf' and exit if required size exceed the print buffer size.
* Update the log messages.
--- app/test-pmd/util.c | 175 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 115 insertions(+), 60 deletions(-)
app/test-pmd/util.c +115 -60
@@ -15,12 +15,23 @@#include "testpmd.h" +#define MAX_STRING_LEN 8192 + +#define MKDUMPSTR (buf, buf_size, cur_len, ...) \ +do { \ + if (cur_len >= buf_size) \ + break; \ + cur_len += snprintf(buf + cur_len, buf_size - cur_len, __VA_ARGS__); \ +} while (0) +static inline void -print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr) +print_ether_addr (const char *what,const struct rte_ether_addr *eth_addr, +char print_buf[],size_t buf_size,size_t *cur_len) {char buf[RTE_ETHER_ADDR_FMT_SIZE ]; +rte_ether_format_addr (buf,RTE_ETHER_ADDR_FMT_SIZE , eth_addr); -printf ("%s%s" , what, buf); +MKDUMPSTR (print_buf, buf_size, *cur_len,"%s%s" , what, buf); } static inline bool
@@ -74,13 +85,15 @@uint32_t vx_vni;const char *reason;int dynf_index; +char print_buf[MAX_STRING_LEN ]; +size_t buf_size =MAX_STRING_LEN ; +size_t cur_len =0 ;if (!nb_pkts)return ; -printf ("port %u/queue %u: %s %u packets\n" , - port_id, queue, - is_rx ?"received" :"sent" , - (unsigned int ) nb_pkts); +MKDUMPSTR (print_buf, buf_size, cur_len, +"port %u/queue %u: %s %u packets\n" , port_id, queue, + is_rx ?"received" :"sent" , (unsigned int ) nb_pkts);for (i =0 ; i < nb_pkts; i++) {int ret;struct rte_flow_error error;
@@ -93,95 +106,128 @@ is_encapsulation =RTE_ETH_IS_TUNNEL_PKT (packet_type); ret =rte_flow_get_restore_info (port_id, mb, &info, &error);if (!ret) { -printf ("restore info:" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +"restore info:" );if (info.flags &RTE_FLOW_RESTORE_INFO_TUNNEL ) {struct port_flow_tunnel *port_tunnel; port_tunnel =port_flow_locate_tunnel (port_id, &info.tunnel); -printf (" - tunnel" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - tunnel" );if (port_tunnel) -printf (" #%u" , port_tunnel->id); +MKDUMPSTR (print_buf, buf_size, cur_len, +" #%u" , port_tunnel->id);else -printf (" %s" ,"-none-" ); -printf (" type %s" , -port_flow_tunnel_type (&info.tunnel)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" %s" ,"-none-" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" type %s" ,port_flow_tunnel_type + (&info.tunnel)); }else { -printf (" - no tunnel info" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - no tunnel info" ); }if (info.flags &RTE_FLOW_RESTORE_INFO_ENCAPSULATED ) -printf (" - outer header present" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - outer header present" );else -printf (" - no outer header" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - no outer header" );if (info.flags &RTE_FLOW_RESTORE_INFO_GROUP_ID ) -printf (" - miss group %u" , info.group_id); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - miss group %u" , info.group_id);else -printf (" - no miss group" ); -printf ("\n" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - no miss group" ); +MKDUMPSTR (print_buf, buf_size, cur_len,"\n" ); } -print_ether_addr (" src=" , ð_hdr->s_addr); -print_ether_addr (" - dst=" , ð_hdr->d_addr); -printf (" - type=0x%04x - length=%u - nb_segs=%d" , - eth_type, (unsigned int ) mb->pkt_len, - (int )mb->nb_segs); +print_ether_addr (" src=" , ð_hdr->s_addr, + print_buf, buf_size, &cur_len); +print_ether_addr (" - dst=" , ð_hdr->d_addr, + print_buf, buf_size, &cur_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - type=0x%04x - length=%u - nb_segs=%d" , + eth_type, (unsigned int ) mb->pkt_len, + (int )mb->nb_segs); ol_flags = mb->ol_flags;if (ol_flags &PKT_RX_RSS_HASH ) { -printf (" - RSS hash=0x%x" , (unsigned int ) mb->hash.rss); -printf (" - RSS queue=0x%x" , (unsigned int ) queue); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - RSS hash=0x%x" , + (unsigned int ) mb->hash.rss); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - RSS queue=0x%x" , (unsigned int ) queue); }if (ol_flags &PKT_RX_FDIR ) { -printf (" - FDIR matched " ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - FDIR matched " );if (ol_flags &PKT_RX_FDIR_ID ) -printf ("ID=0x%x" , - mb->hash.fdir.hi); +MKDUMPSTR (print_buf, buf_size, cur_len, +"ID=0x%x" , mb->hash.fdir.hi);else if (ol_flags &PKT_RX_FDIR_FLX ) -printf ("flex bytes=0x%08x %08x" , - mb->hash.fdir.hi, mb->hash.fdir.lo); +MKDUMPSTR (print_buf, buf_size, cur_len, +"flex bytes=0x%08x %08x" , + mb->hash.fdir.hi, mb->hash.fdir.lo);else -printf ("hash=0x%x ID=0x%x " , - mb->hash.fdir.hash, mb->hash.fdir.id); +MKDUMPSTR (print_buf, buf_size, cur_len, +"hash=0x%x ID=0x%x " , + mb->hash.fdir.hash, mb->hash.fdir.id); }if (is_timestamp_enabled (mb)) -printf (" - timestamp %" PRIu64" " ,get_timestamp (mb)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - timestamp %" PRIu64" " ,get_timestamp (mb));if (ol_flags &PKT_RX_QINQ ) -printf (" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x" , - mb->vlan_tci, mb->vlan_tci_outer); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - QinQ VLAN tci=0x%x, VLAN tci outer=0x%x" , + mb->vlan_tci, mb->vlan_tci_outer);else if (ol_flags &PKT_RX_VLAN ) -printf (" - VLAN tci=0x%x" , mb->vlan_tci); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - VLAN tci=0x%x" , mb->vlan_tci);if (!is_rx && (ol_flags &PKT_TX_DYNF_METADATA )) -printf (" - Tx metadata: 0x%x" , - *RTE_FLOW_DYNF_METADATA (mb)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - Tx metadata: 0x%x" , + *RTE_FLOW_DYNF_METADATA (mb));if (is_rx && (ol_flags &PKT_RX_DYNF_METADATA )) -printf (" - Rx metadata: 0x%x" , - *RTE_FLOW_DYNF_METADATA (mb)); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - Rx metadata: 0x%x" , + *RTE_FLOW_DYNF_METADATA (mb));for (dynf_index =0 ; dynf_index <64 ; dynf_index++) {if (dynf_names[dynf_index][0 ] !='\0' ) -printf (" - dynf %s: %d" , - dynf_names[dynf_index], - !!(ol_flags & (1UL << dynf_index))); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - dynf %s: %d" , + dynf_names[dynf_index], + !!(ol_flags & (1UL << dynf_index))); }if (mb->packet_type) {rte_get_ptype_name (mb->packet_type, buf,sizeof (buf)); -printf (" - hw ptype: %s" , buf); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - hw ptype: %s" , buf); } sw_packet_type =rte_net_get_ptype (mb, &hdr_lens,RTE_PTYPE_ALL_MASK );rte_get_ptype_name (sw_packet_type, buf,sizeof (buf)); -printf (" - sw ptype: %s" , buf); +MKDUMPSTR (print_buf, buf_size, cur_len," - sw ptype: %s" , buf);if (sw_packet_type &RTE_PTYPE_L2_MASK ) -printf (" - l2_len=%d" , hdr_lens.l2_len); +MKDUMPSTR (print_buf, buf_size, cur_len," - l2_len=%d" , + hdr_lens.l2_len);if (sw_packet_type &RTE_PTYPE_L3_MASK ) -printf (" - l3_len=%d" , hdr_lens.l3_len); +MKDUMPSTR (print_buf, buf_size, cur_len," - l3_len=%d" , + hdr_lens.l3_len);if (sw_packet_type &RTE_PTYPE_L4_MASK ) -printf (" - l4_len=%d" , hdr_lens.l4_len); +MKDUMPSTR (print_buf, buf_size, cur_len," - l4_len=%d" , + hdr_lens.l4_len);if (sw_packet_type &RTE_PTYPE_TUNNEL_MASK ) -printf (" - tunnel_len=%d" , hdr_lens.tunnel_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - tunnel_len=%d" , hdr_lens.tunnel_len);if (sw_packet_type &RTE_PTYPE_INNER_L2_MASK ) -printf (" - inner_l2_len=%d" , hdr_lens.inner_l2_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - inner_l2_len=%d" , hdr_lens.inner_l2_len);if (sw_packet_type &RTE_PTYPE_INNER_L3_MASK ) -printf (" - inner_l3_len=%d" , hdr_lens.inner_l3_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - inner_l3_len=%d" , hdr_lens.inner_l3_len);if (sw_packet_type &RTE_PTYPE_INNER_L4_MASK ) -printf (" - inner_l4_len=%d" , hdr_lens.inner_l4_len); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - inner_l4_len=%d" , hdr_lens.inner_l4_len);if (is_encapsulation) {struct rte_ipv4_hdr *ipv4_hdr;struct rte_ipv6_hdr *ipv6_hdr;
@@ -218,18 +264,27 @@ l2_len + l3_len + l4_len); udp_port =RTE_BE_TO_CPU_16 (udp_hdr->dst_port); vx_vni =rte_be_to_cpu_32 (vxlan_hdr->vx_vni); -printf (" - VXLAN packet: packet type =%d, " -"Destination UDP port =%d, VNI = %d" , - packet_type, udp_port, vx_vni >>8 ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - VXLAN packet: packet type =%d, " +"Destination UDP port =%d, VNI = %d" , + packet_type, udp_port, vx_vni >>8 ); } } -printf (" - %s queue=0x%x" , is_rx ?"Receive" :"Send" , - (unsigned int ) queue); -printf ("\n" ); +MKDUMPSTR (print_buf, buf_size, cur_len, +" - %s queue=0x%x" , is_rx ?"Receive" :"Send" , + (unsigned int ) queue); +MKDUMPSTR (print_buf, buf_size, cur_len,"\n" );rte_get_rx_ol_flag_list (mb->ol_flags, buf,sizeof (buf)); -printf (" ol_flags: %s\n" , buf); +MKDUMPSTR (print_buf, buf_size, cur_len, +" ol_flags: %s\n" , buf);if (rte_mbuf_check (mb,1 , &reason) <0 ) -printf ("INVALID mbuf: %s\n" , reason); +MKDUMPSTR (print_buf, buf_size, cur_len, +"INVALID mbuf: %s\n" , reason); +if (cur_len >= buf_size) +printf ("%s ...\n" , print_buf); +else +printf ("%s" , print_buf); + cur_len =0 ; } }
Signature · 1 line
1.8.3.1
Ferruh Yigit
AppliedQuoted 9 lines · Jiawei Wang
When testpmd enabled the verbosity for the received packets, if two packets were received at the same time, for example, sampling packet and normal packet, the dump output of these packets may be overlapping due to multiple core handling the multiple queues simultaneously.
The patch uses one string buffer that collects all the packet dump output into this buffer and then printouts it at last, that guarantees to printout separately the dump output per packet.
Quoted 5 lines
Fixes d862c45 ("app/testpmd: move dumping packets to a separate function")Signed-off-by Jiawei Wang <[email protected]>Reviewed-by Ferruh Yigit <[email protected]>
Applied to dpdk-next-net/main, thanks.