port: add ethdev stats

Added statistics for ethdev reader port.
Added statistics for ethdev writer port.
Added statistics for ethdev writer nodrop port.

Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>

diff --git a/lib/librte_port/rte_port_ethdev.c b/lib/librte_port/rte_port_ethdev.c
index 39ed72d..1f0c81c 100644 (file)
--- a/lib/librte_port/rte_port_ethdev.c
+++ b/lib/librte_port/rte_port_ethdev.c
@@ -42,7 +42,23 @@
 /*
  * Port ETHDEV Reader
  */
+#ifdef RTE_PORT_STATS_COLLECT
+
+#define RTE_PORT_ETHDEV_READER_STATS_PKTS_IN_ADD(port, val) \
+       port->stats.n_pkts_in += val
+#define RTE_PORT_ETHDEV_READER_STATS_PKTS_DROP_ADD(port, val) \
+       port->stats.n_pkts_drop += val
+
+#else
+
+#define RTE_PORT_ETHDEV_READER_STATS_PKTS_IN_ADD(port, val)
+#define RTE_PORT_ETHDEV_READER_STATS_PKTS_DROP_ADD(port, val)
+
+#endif
+
 struct rte_port_ethdev_reader {
+       struct rte_port_in_stats stats;
+
        uint16_t queue_id;
        uint8_t port_id;
 };
@@ -80,8 +96,11 @@ rte_port_ethdev_reader_rx(void *port, struct rte_mbuf **pkts, uint32_t n_pkts)
 {
        struct rte_port_ethdev_reader *p =
                (struct rte_port_ethdev_reader *) port;
+       uint16_t rx_pkt_cnt;
 
-       return rte_eth_rx_burst(p->port_id, p->queue_id, pkts, n_pkts);
+       rx_pkt_cnt = rte_eth_rx_burst(p->port_id, p->queue_id, pkts, n_pkts);
+       RTE_PORT_ETHDEV_READER_STATS_PKTS_IN_ADD(p, rx_pkt_cnt);
+       return rx_pkt_cnt;
 }
 
 static int
@@ -97,10 +116,41 @@ rte_port_ethdev_reader_free(void *port)
        return 0;
 }
 
+static int rte_port_ethdev_reader_stats_read(void *port,
+               struct rte_port_in_stats *stats, int clear)
+{
+       struct rte_port_ethdev_reader *p =
+                       (struct rte_port_ethdev_reader *) port;
+
+       if (stats != NULL)
+               memcpy(stats, &p->stats, sizeof(p->stats));
+
+       if (clear)
+               memset(&p->stats, 0, sizeof(p->stats));
+
+       return 0;
+}
+
 /*
  * Port ETHDEV Writer
  */
+#ifdef RTE_PORT_STATS_COLLECT
+
+#define RTE_PORT_ETHDEV_WRITER_STATS_PKTS_IN_ADD(port, val) \
+       port->stats.n_pkts_in += val
+#define RTE_PORT_ETHDEV_WRITER_STATS_PKTS_DROP_ADD(port, val) \
+       port->stats.n_pkts_drop += val
+
+#else
+
+#define RTE_PORT_ETHDEV_WRITER_STATS_PKTS_IN_ADD(port, val)
+#define RTE_PORT_ETHDEV_WRITER_STATS_PKTS_DROP_ADD(port, val)
+
+#endif
+
 struct rte_port_ethdev_writer {
+       struct rte_port_out_stats stats;
+
        struct rte_mbuf *tx_buf[2 * RTE_PORT_IN_BURST_SIZE_MAX];
        uint32_t tx_burst_sz;
        uint16_t tx_buf_count;
@@ -151,6 +201,7 @@ send_burst(struct rte_port_ethdev_writer *p)
        nb_tx = rte_eth_tx_burst(p->port_id, p->queue_id,
                         p->tx_buf, p->tx_buf_count);
 
+       RTE_PORT_ETHDEV_WRITER_STATS_PKTS_DROP_ADD(p, p->tx_buf_count - nb_tx);
        for ( ; nb_tx < p->tx_buf_count; nb_tx++)
                rte_pktmbuf_free(p->tx_buf[nb_tx]);
 
@@ -164,6 +215,7 @@ rte_port_ethdev_writer_tx(void *port, struct rte_mbuf *pkt)
                (struct rte_port_ethdev_writer *) port;
 
        p->tx_buf[p->tx_buf_count++] = pkt;
+       RTE_PORT_ETHDEV_WRITER_STATS_PKTS_IN_ADD(p, 1);
        if (p->tx_buf_count >= p->tx_burst_sz)
                send_burst(p);
 
@@ -189,9 +241,11 @@ rte_port_ethdev_writer_tx_bulk(void *port,
                if (tx_buf_count)
                        send_burst(p);
 
+               RTE_PORT_ETHDEV_WRITER_STATS_PKTS_IN_ADD(p, n_pkts);
                n_pkts_ok = rte_eth_tx_burst(p->port_id, p->queue_id, pkts,
                        n_pkts);
 
+               RTE_PORT_ETHDEV_WRITER_STATS_PKTS_DROP_ADD(p, n_pkts - n_pkts_ok);
                for ( ; n_pkts_ok < n_pkts; n_pkts_ok++) {
                        struct rte_mbuf *pkt = pkts[n_pkts_ok];
 
@@ -204,6 +258,7 @@ rte_port_ethdev_writer_tx_bulk(void *port,
                        struct rte_mbuf *pkt = pkts[pkt_index];
 
                        p->tx_buf[tx_buf_count++] = pkt;
+                       RTE_PORT_ETHDEV_WRITER_STATS_PKTS_IN_ADD(p, 1);
                        pkts_mask &= ~pkt_mask;
                }
 
@@ -241,10 +296,41 @@ rte_port_ethdev_writer_free(void *port)
        return 0;
 }
 
+static int rte_port_ethdev_writer_stats_read(void *port,
+               struct rte_port_out_stats *stats, int clear)
+{
+       struct rte_port_ethdev_writer *p =
+               (struct rte_port_ethdev_writer *) port;
+
+       if (stats != NULL)
+               memcpy(stats, &p->stats, sizeof(p->stats));
+
+       if (clear)
+               memset(&p->stats, 0, sizeof(p->stats));
+
+       return 0;
+}
+
 /*
  * Port ETHDEV Writer Nodrop
  */
+#ifdef RTE_PORT_STATS_COLLECT
+
+#define RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_IN_ADD(port, val) \
+       port->stats.n_pkts_in += val
+#define RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_DROP_ADD(port, val) \
+       port->stats.n_pkts_drop += val
+
+#else
+
+#define RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_IN_ADD(port, val)
+#define RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_DROP_ADD(port, val)
+
+#endif
+
 struct rte_port_ethdev_writer_nodrop {
+       struct rte_port_out_stats stats;
+
        struct rte_mbuf *tx_buf[2 * RTE_PORT_IN_BURST_SIZE_MAX];
        uint32_t tx_burst_sz;
        uint16_t tx_buf_count;
@@ -317,6 +403,7 @@ send_burst_nodrop(struct rte_port_ethdev_writer_nodrop *p)
        }
 
        /* We didn't send the packets in maximum allowed attempts */
+       RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_DROP_ADD(p, p->tx_buf_count - nb_tx);
        for ( ; nb_tx < p->tx_buf_count; nb_tx++)
                rte_pktmbuf_free(p->tx_buf[nb_tx]);
 
@@ -330,6 +417,7 @@ rte_port_ethdev_writer_nodrop_tx(void *port, struct rte_mbuf *pkt)
                (struct rte_port_ethdev_writer_nodrop *) port;
 
        p->tx_buf[p->tx_buf_count++] = pkt;
+       RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_IN_ADD(p, 1);
        if (p->tx_buf_count >= p->tx_burst_sz)
                send_burst_nodrop(p);
 
@@ -356,6 +444,7 @@ rte_port_ethdev_writer_nodrop_tx_bulk(void *port,
                if (tx_buf_count)
                        send_burst_nodrop(p);
 
+               RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_IN_ADD(p, n_pkts);
                n_pkts_ok = rte_eth_tx_burst(p->port_id, p->queue_id, pkts,
                        n_pkts);
 
@@ -378,6 +467,7 @@ rte_port_ethdev_writer_nodrop_tx_bulk(void *port,
                        struct rte_mbuf *pkt = pkts[pkt_index];
 
                        p->tx_buf[tx_buf_count++] = pkt;
+                       RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_IN_ADD(p, 1);
                        pkts_mask &= ~pkt_mask;
                }
 
@@ -415,6 +505,21 @@ rte_port_ethdev_writer_nodrop_free(void *port)
        return 0;
 }
 
+static int rte_port_ethdev_writer_nodrop_stats_read(void *port,
+               struct rte_port_out_stats *stats, int clear)
+{
+       struct rte_port_ethdev_writer_nodrop *p =
+               (struct rte_port_ethdev_writer_nodrop *) port;
+
+       if (stats != NULL)
+               memcpy(stats, &p->stats, sizeof(p->stats));
+
+       if (clear)
+               memset(&p->stats, 0, sizeof(p->stats));
+
+       return 0;
+}
+
 /*
  * Summary of port operations
  */
@@ -422,6 +527,7 @@ struct rte_port_in_ops rte_port_ethdev_reader_ops = {
        .f_create = rte_port_ethdev_reader_create,
        .f_free = rte_port_ethdev_reader_free,
        .f_rx = rte_port_ethdev_reader_rx,
+       .f_stats = rte_port_ethdev_reader_stats_read,
 };
 
 struct rte_port_out_ops rte_port_ethdev_writer_ops = {
@@ -430,6 +536,7 @@ struct rte_port_out_ops rte_port_ethdev_writer_ops = {
        .f_tx = rte_port_ethdev_writer_tx,
        .f_tx_bulk = rte_port_ethdev_writer_tx_bulk,
        .f_flush = rte_port_ethdev_writer_flush,
+       .f_stats = rte_port_ethdev_writer_stats_read,
 };
 
 struct rte_port_out_ops rte_port_ethdev_writer_nodrop_ops = {
@@ -438,4 +545,5 @@ struct rte_port_out_ops rte_port_ethdev_writer_nodrop_ops = {
        .f_tx = rte_port_ethdev_writer_nodrop_tx,
        .f_tx_bulk = rte_port_ethdev_writer_nodrop_tx_bulk,
        .f_flush = rte_port_ethdev_writer_nodrop_flush,
+       .f_stats = rte_port_ethdev_writer_nodrop_stats_read,
 };