[v8,3/8] net/af_packet: use generic SW stats
Checks
Commit Message
Use the new generic SW stats.
Add a note about how errors and kernel full should be handled.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
drivers/net/af_packet/rte_eth_af_packet.c | 78 +++++------------------
1 file changed, 17 insertions(+), 61 deletions(-)
@@ -10,6 +10,7 @@
#include <rte_mbuf.h>
#include <ethdev_driver.h>
#include <ethdev_vdev.h>
+#include <ethdev_swstats.h>
#include <rte_malloc.h>
#include <rte_kvargs.h>
#include <bus_vdev_driver.h>
@@ -51,8 +52,7 @@ struct pkt_rx_queue {
uint16_t in_port;
uint8_t vlan_strip;
- volatile unsigned long rx_pkts;
- volatile unsigned long rx_bytes;
+ struct rte_eth_counters stats;
};
struct pkt_tx_queue {
@@ -64,11 +64,10 @@ struct pkt_tx_queue {
unsigned int framecount;
unsigned int framenum;
- volatile unsigned long tx_pkts;
- volatile unsigned long err_pkts;
- volatile unsigned long tx_bytes;
+ struct rte_eth_counters stats;
};
+
struct pmd_internals {
unsigned nb_queues;
@@ -168,9 +167,10 @@ eth_af_packet_rx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
num_rx_bytes += mbuf->pkt_len;
}
pkt_q->framenum = framenum;
- pkt_q->rx_pkts += num_rx;
- pkt_q->rx_bytes += num_rx_bytes;
- return num_rx;
+
+ rte_eth_count_packets(&pkt_q->stats, num_rx, num_rx_bytes);
+
+ return i;
}
/*
@@ -294,19 +294,16 @@ eth_af_packet_tx(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts)
if (sendto(pkt_q->sockfd, NULL, 0, MSG_DONTWAIT, NULL, 0) == -1 &&
errno != ENOBUFS && errno != EAGAIN) {
/*
- * In case of a ENOBUFS/EAGAIN error all of the enqueued
- * packets will be considered successful even though only some
- * are sent.
+ * FIXME: if sendto fails kernel is busy should return 0
+ * and not free the mbufs. Other errors should free the
+ * buts and increment the tx error count.
*/
-
num_tx = 0;
num_tx_bytes = 0;
}
pkt_q->framenum = framenum;
- pkt_q->tx_pkts += num_tx;
- pkt_q->err_pkts += i - num_tx;
- pkt_q->tx_bytes += num_tx_bytes;
+ rte_eth_count_packets(&pkt_q->stats, num_tx, num_tx_bytes);
return i;
}
@@ -386,58 +383,17 @@ eth_dev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
}
static int
-eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *igb_stats)
+eth_stats_get(struct rte_eth_dev *dev, struct rte_eth_stats *stats)
{
- unsigned i, imax;
- unsigned long rx_total = 0, tx_total = 0, tx_err_total = 0;
- unsigned long rx_bytes_total = 0, tx_bytes_total = 0;
- const struct pmd_internals *internal = dev->data->dev_private;
-
- imax = (internal->nb_queues < RTE_ETHDEV_QUEUE_STAT_CNTRS ?
- internal->nb_queues : RTE_ETHDEV_QUEUE_STAT_CNTRS);
- for (i = 0; i < imax; i++) {
- igb_stats->q_ipackets[i] = internal->rx_queue[i].rx_pkts;
- igb_stats->q_ibytes[i] = internal->rx_queue[i].rx_bytes;
- rx_total += igb_stats->q_ipackets[i];
- rx_bytes_total += igb_stats->q_ibytes[i];
- }
-
- imax = (internal->nb_queues < RTE_ETHDEV_QUEUE_STAT_CNTRS ?
- internal->nb_queues : RTE_ETHDEV_QUEUE_STAT_CNTRS);
- for (i = 0; i < imax; i++) {
- igb_stats->q_opackets[i] = internal->tx_queue[i].tx_pkts;
- igb_stats->q_obytes[i] = internal->tx_queue[i].tx_bytes;
- tx_total += igb_stats->q_opackets[i];
- tx_err_total += internal->tx_queue[i].err_pkts;
- tx_bytes_total += igb_stats->q_obytes[i];
- }
-
- igb_stats->ipackets = rx_total;
- igb_stats->ibytes = rx_bytes_total;
- igb_stats->opackets = tx_total;
- igb_stats->oerrors = tx_err_total;
- igb_stats->obytes = tx_bytes_total;
- return 0;
+ return rte_eth_counters_stats_get(dev, offsetof(struct pkt_tx_queue, stats),
+ offsetof(struct pkt_rx_queue, stats), stats);
}
static int
eth_stats_reset(struct rte_eth_dev *dev)
{
- unsigned i;
- struct pmd_internals *internal = dev->data->dev_private;
-
- for (i = 0; i < internal->nb_queues; i++) {
- internal->rx_queue[i].rx_pkts = 0;
- internal->rx_queue[i].rx_bytes = 0;
- }
-
- for (i = 0; i < internal->nb_queues; i++) {
- internal->tx_queue[i].tx_pkts = 0;
- internal->tx_queue[i].err_pkts = 0;
- internal->tx_queue[i].tx_bytes = 0;
- }
-
- return 0;
+ return rte_eth_counters_reset(dev, offsetof(struct pkt_tx_queue, stats),
+ offsetof(struct pkt_rx_queue, stats));
}
static int