@@ -384,6 +384,7 @@ CONFIG_RTE_LIBRTE_REORDER=y
CONFIG_RTE_LIBRTE_PORT=y
CONFIG_RTE_PORT_ETHDEV_READER_STATS_COLLECT=n
CONFIG_RTE_PORT_ETHDEV_WRITER_STATS_COLLECT=n
+CONFIG_RTE_PORT_ETHDEV_WRITER_NODROP_STATS_COLLECT=n
#
# Compile librte_table
@@ -391,6 +391,7 @@ CONFIG_RTE_LIBRTE_REORDER=y
CONFIG_RTE_LIBRTE_PORT=y
CONFIG_RTE_PORT_ETHDEV_READER_STATS_COLLECT=n
CONFIG_RTE_PORT_ETHDEV_WRITER_STATS_COLLECT=n
+CONFIG_RTE_PORT_ETHDEV_WRITER_NODROP_STATS_COLLECT=n
#
# Compile librte_table
@@ -364,7 +364,23 @@ static int rte_port_ethdev_writer_stats_read(void *port,
*/
#define RTE_PORT_ETHDEV_WRITER_NODROP_APPROACH 1
+#ifdef RTE_PORT_ETHDEV_WRITER_NODROP_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;
@@ -437,6 +453,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]);
@@ -450,6 +467,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);
@@ -470,6 +488,7 @@ rte_port_ethdev_writer_nodrop_tx_bulk(void *port,
uint64_t n_pkts = __builtin_popcountll(pkts_mask);
uint32_t i;
+ RTE_PORT_ETHDEV_WRITER_NODROP_STATS_PKTS_IN_ADD(p, n_pkts);
for (i = 0; i < n_pkts; i++) {
struct rte_mbuf *pkt = pkts[i];
@@ -484,6 +503,7 @@ rte_port_ethdev_writer_nodrop_tx_bulk(void *port,
struct rte_mbuf *pkt = pkts[pkt_index];
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);
pkts_mask &= ~pkt_mask;
@@ -515,6 +535,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);
@@ -537,6 +558,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;
}
@@ -580,6 +602,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
*/
@@ -605,4 +642,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,
};