Skip to content

Commit

Permalink
net/vhost: fix xstats after clearing stats
Browse files Browse the repository at this point in the history 
[ upstream commit d4fbb27 ]

The PMD API allows stats and xstats values to be cleared separately.
This is a problem for the vhost PMD since some of the xstats values are
derived from existing stats values.  For example:

testpmd> show port xstats all
...
tx_unicast_packets: 17562959
...
testpmd> clear port stats all
...
show port xstats all
...
tx_unicast_packets: 18446744073709551615
...

Modify the driver so that stats and xstats values are stored, updated,
and cleared separately.

Fixes: 4d6cf2a ("net/vhost: add extended statistics")

Signed-off-by: David Christensen <drc@linux.vnet.ibm.com>
Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin@redhat.com>
  • Loading branch information
@drchristensen @bluca
drchristensen authored and bluca committed Nov 9, 2020
1 parent 3e92f86 commit 8123d10
Showing 1 changed file with 38 additions and 38 deletions.
76 changes: 38 additions & 38 deletions drivers/net/vhost/rte_eth_vhost.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ enum vhost_xstats_pkts {
VHOST_BROADCAST_PKT,
VHOST_MULTICAST_PKT,
VHOST_UNICAST_PKT,
VHOST_PKT,
VHOST_BYTE,
VHOST_MISSED_PKT,
VHOST_ERRORS_PKT,
VHOST_ERRORS_FRAGMENTED,
VHOST_ERRORS_JABBER,
Expand Down Expand Up @@ -143,11 +146,11 @@ struct vhost_xstats_name_off {
/* [rx]_is prepended to the name string here */
static const struct vhost_xstats_name_off vhost_rxport_stat_strings[] = {
{"good_packets",
offsetof(struct vhost_queue, stats.pkts)},
offsetof(struct vhost_queue, stats.xstats[VHOST_PKT])},
{"total_bytes",
offsetof(struct vhost_queue, stats.bytes)},
offsetof(struct vhost_queue, stats.xstats[VHOST_BYTE])},
{"missed_pkts",
offsetof(struct vhost_queue, stats.missed_pkts)},
offsetof(struct vhost_queue, stats.xstats[VHOST_MISSED_PKT])},
{"broadcast_packets",
offsetof(struct vhost_queue, stats.xstats[VHOST_BROADCAST_PKT])},
{"multicast_packets",
Expand Down Expand Up @@ -183,11 +186,11 @@ static const struct vhost_xstats_name_off vhost_rxport_stat_strings[] = {
/* [tx]_ is prepended to the name string here */
static const struct vhost_xstats_name_off vhost_txport_stat_strings[] = {
{"good_packets",
offsetof(struct vhost_queue, stats.pkts)},
offsetof(struct vhost_queue, stats.xstats[VHOST_PKT])},
{"total_bytes",
offsetof(struct vhost_queue, stats.bytes)},
offsetof(struct vhost_queue, stats.xstats[VHOST_BYTE])},
{"missed_pkts",
offsetof(struct vhost_queue, stats.missed_pkts)},
offsetof(struct vhost_queue, stats.xstats[VHOST_MISSED_PKT])},
{"broadcast_packets",
offsetof(struct vhost_queue, stats.xstats[VHOST_BROADCAST_PKT])},
{"multicast_packets",
Expand Down Expand Up @@ -281,23 +284,6 @@ vhost_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
if (n < nxstats)
return nxstats;

for (i = 0; i < dev->data->nb_rx_queues; i++) {
vq = dev->data->rx_queues[i];
if (!vq)
continue;
vq->stats.xstats[VHOST_UNICAST_PKT] = vq->stats.pkts
- (vq->stats.xstats[VHOST_BROADCAST_PKT]
+ vq->stats.xstats[VHOST_MULTICAST_PKT]);
}
for (i = 0; i < dev->data->nb_tx_queues; i++) {
vq = dev->data->tx_queues[i];
if (!vq)
continue;
vq->stats.xstats[VHOST_UNICAST_PKT] = vq->stats.pkts
+ vq->stats.missed_pkts
- (vq->stats.xstats[VHOST_BROADCAST_PKT]
+ vq->stats.xstats[VHOST_MULTICAST_PKT]);
}
for (t = 0; t < VHOST_NB_XSTATS_RXPORT; t++) {
xstats[count].value = 0;
for (i = 0; i < dev->data->nb_rx_queues; i++) {
Expand Down Expand Up @@ -328,7 +314,7 @@ vhost_dev_xstats_get(struct rte_eth_dev *dev, struct rte_eth_xstat *xstats,
}

static inline void
vhost_count_multicast_broadcast(struct vhost_queue *vq,
vhost_count_xcast_packets(struct vhost_queue *vq,
struct rte_mbuf *mbuf)
{
struct rte_ether_addr *ea = NULL;
Expand All @@ -340,20 +326,27 @@ vhost_count_multicast_broadcast(struct vhost_queue *vq,
pstats->xstats[VHOST_BROADCAST_PKT]++;
else
pstats->xstats[VHOST_MULTICAST_PKT]++;
} else {
pstats->xstats[VHOST_UNICAST_PKT]++;
}
}

static void
vhost_update_packet_xstats(struct vhost_queue *vq,
struct rte_mbuf **bufs,
uint16_t count)
vhost_update_packet_xstats(struct vhost_queue *vq, struct rte_mbuf **bufs,
uint16_t count, uint64_t nb_bytes,
uint64_t nb_missed)
{
uint32_t pkt_len = 0;
uint64_t i = 0;
uint64_t index;
struct vhost_stats *pstats = &vq->stats;

pstats->xstats[VHOST_BYTE] += nb_bytes;
pstats->xstats[VHOST_MISSED_PKT] += nb_missed;
pstats->xstats[VHOST_UNICAST_PKT] += nb_missed;

for (i = 0; i < count ; i++) {
pstats->xstats[VHOST_PKT]++;
pkt_len = bufs[i]->pkt_len;
if (pkt_len == 64) {
pstats->xstats[VHOST_64_PKT]++;
Expand All @@ -369,7 +362,7 @@ vhost_update_packet_xstats(struct vhost_queue *vq,
else if (pkt_len > 1522)
pstats->xstats[VHOST_1523_TO_MAX_PKT]++;
}
vhost_count_multicast_broadcast(vq, bufs[i]);
vhost_count_xcast_packets(vq, bufs[i]);
}
}

Expand All @@ -379,6 +372,7 @@ eth_vhost_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
struct vhost_queue *r = q;
uint16_t i, nb_rx = 0;
uint16_t nb_receive = nb_bufs;
uint64_t nb_bytes = 0;

if (unlikely(rte_atomic32_read(&r->allow_queuing) == 0))
return 0;
Expand Down Expand Up @@ -413,10 +407,11 @@ eth_vhost_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
if (r->internal->vlan_strip)
rte_vlan_strip(bufs[i]);

r->stats.bytes += bufs[i]->pkt_len;
nb_bytes += bufs[i]->pkt_len;
}

vhost_update_packet_xstats(r, bufs, nb_rx);
r->stats.bytes += nb_bytes;
vhost_update_packet_xstats(r, bufs, nb_rx, nb_bytes, 0);

out:
rte_atomic32_set(&r->while_queuing, 0);
Expand All @@ -430,6 +425,8 @@ eth_vhost_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
struct vhost_queue *r = q;
uint16_t i, nb_tx = 0;
uint16_t nb_send = 0;
uint64_t nb_bytes = 0;
uint64_t nb_missed = 0;

if (unlikely(rte_atomic32_read(&r->allow_queuing) == 0))
return 0;
Expand Down Expand Up @@ -470,20 +467,23 @@ eth_vhost_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
break;
}

for (i = 0; likely(i < nb_tx); i++)
nb_bytes += bufs[i]->pkt_len;

nb_missed = nb_bufs - nb_tx;

r->stats.pkts += nb_tx;
r->stats.bytes += nb_bytes;
r->stats.missed_pkts += nb_bufs - nb_tx;

for (i = 0; likely(i < nb_tx); i++)
r->stats.bytes += bufs[i]->pkt_len;

vhost_update_packet_xstats(r, bufs, nb_tx);
vhost_update_packet_xstats(r, bufs, nb_tx, nb_bytes, nb_missed);

/* According to RFC2863 page42 section ifHCOutMulticastPkts and
* ifHCOutBroadcastPkts, the counters "multicast" and "broadcast"
* are increased when packets are not transmitted successfully.
/* According to RFC2863, ifHCOutUcastPkts, ifHCOutMulticastPkts and
* ifHCOutBroadcastPkts counters are increased when packets are not
* transmitted successfully.
*/
for (i = nb_tx; i < nb_bufs; i++)
vhost_count_multicast_broadcast(r, bufs[i]);
vhost_count_xcast_packets(r, bufs[i]);

for (i = 0; likely(i < nb_tx); i++)
rte_pktmbuf_free(bufs[i]);
Expand Down

0 comments on commit 8123d10

Please sign in to comment.