Skip to content

Commit

Permalink
app/testpmd: check statistics query before printing
Browse files Browse the repository at this point in the history
[ upstream commit baef6bb ]

In function 'fwd_stats_display', if function 'rte_eth_stats_get' fails,
'stats' is uncertainty value. The display result will be abnormal.

This patch check the return value of 'rte_eth_stats_get' to avoid
display abnormal stats.

Fixes: 5332497 ("app/testpmd: display/clear forwarding stats on demand")

Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
Acked-by: Aman Singh <aman.deep.singh@intel.com>
  • Loading branch information
hushenggitcount authored and kevintraynor committed May 24, 2022
1 parent 66b7e33 commit 5e1545b
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 4 deletions.
10 changes: 8 additions & 2 deletions app/test-pmd/config.c
Expand Up @@ -248,14 +248,20 @@ nic_stats_display(portid_t port_id)
diff_ns;
uint64_t mpps_rx, mpps_tx, mbps_rx, mbps_tx;
struct rte_eth_stats stats;

static const char *nic_stats_border = "########################";
int ret;

if (port_id_is_invalid(port_id, ENABLED_WARN)) {
print_valid_ports();
return;
}
rte_eth_stats_get(port_id, &stats);
ret = rte_eth_stats_get(port_id, &stats);
if (ret != 0) {
fprintf(stderr,
"%s: Error: failed to get stats (port %u): %d",
__func__, port_id, ret);
return;
}
printf("\n %s NIC statistics for port %-2d %s\n",
nic_stats_border, port_id, nic_stats_border);

Expand Down
16 changes: 14 additions & 2 deletions app/test-pmd/testpmd.c
Expand Up @@ -1983,6 +1983,7 @@ fwd_stats_display(void)
struct rte_port *port;
streamid_t sm_id;
portid_t pt_id;
int ret;
int i;

memset(ports_stats, 0, sizeof(ports_stats));
Expand Down Expand Up @@ -2014,7 +2015,13 @@ fwd_stats_display(void)
pt_id = fwd_ports_ids[i];
port = &ports[pt_id];

rte_eth_stats_get(pt_id, &stats);
ret = rte_eth_stats_get(pt_id, &stats);
if (ret != 0) {
fprintf(stderr,
"%s: Error: failed to get stats (port %u): %d",
__func__, pt_id, ret);
continue;
}
stats.ipackets -= port->stats.ipackets;
stats.opackets -= port->stats.opackets;
stats.ibytes -= port->stats.ibytes;
Expand Down Expand Up @@ -2109,11 +2116,16 @@ fwd_stats_reset(void)
{
streamid_t sm_id;
portid_t pt_id;
int ret;
int i;

for (i = 0; i < cur_fwd_config.nb_fwd_ports; i++) {
pt_id = fwd_ports_ids[i];
rte_eth_stats_get(pt_id, &ports[pt_id].stats);
ret = rte_eth_stats_get(pt_id, &ports[pt_id].stats);
if (ret != 0)
fprintf(stderr,
"%s: Error: failed to clear stats (port %u):%d",
__func__, pt_id, ret);
}
for (sm_id = 0; sm_id < cur_fwd_config.nb_fwd_streams; sm_id++) {
struct fwd_stream *fs = fwd_streams[sm_id];
Expand Down

0 comments on commit 5e1545b

Please sign in to comment.