net/enic: fix Rx drop counters

rx_no_bufs is a hardware counter of packets dropped on the
interface due to no host buffers and should be used to update
r_stats->imissed counter instead of rx_nombuf.

Include rx_drop in ierrors. rx_drop is incremented if packets
arrive when the receive queue is disabled.

Add a structure and functions for initializing and clearing
software counters. Add count of Rx mbuf allocation failures
(rx_nombuf) as the first counter.

Fixes: fefed3d1e62c ("enic: new driver")

Signed-off-by: John Daley <johndale@cisco.com>

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 09f3853..584d49b 100644 (file)
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -91,6 +91,10 @@ struct enic_fdir {
        struct enic_fdir_node *nodes[ENICPMD_FDIR_MAX];
 };
 
+struct enic_soft_stats {
+       rte_atomic64_t rx_nombuf;
+};
+
 /* Per-instance private data structure */
 struct enic {
        struct enic *next;
@@ -133,6 +137,9 @@ struct enic {
        /* interrupt resource */
        struct vnic_intr intr;
        unsigned int intr_count;
+
+       /* software counters */
+       struct enic_soft_stats soft_stats;
 };
 
 static inline unsigned int enic_cq_rq(__rte_unused struct enic *enic, unsigned int rq)

diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index bbbe660..c002ef3 100644 (file)
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -211,15 +211,30 @@ void enic_send_pkt(struct enic *enic, struct vnic_wq *wq,
                          0 /*wrid*/);
 }
 
+static void enic_clear_soft_stats(struct enic *enic)
+{
+       struct enic_soft_stats *soft_stats = &enic->soft_stats;
+       rte_atomic64_clear(&soft_stats->rx_nombuf);
+}
+
+static void enic_init_soft_stats(struct enic *enic)
+{
+       struct enic_soft_stats *soft_stats = &enic->soft_stats;
+       rte_atomic64_init(&soft_stats->rx_nombuf);
+       enic_clear_soft_stats(enic);
+}
+
 void enic_dev_stats_clear(struct enic *enic)
 {
        if (vnic_dev_stats_clear(enic->vdev))
                dev_err(enic, "Error in clearing stats\n");
+       enic_clear_soft_stats(enic);
 }
 
 void enic_dev_stats_get(struct enic *enic, struct rte_eth_stats *r_stats)
 {
        struct vnic_stats *stats;
+       struct enic_soft_stats *soft_stats;
 
        if (vnic_dev_stats_dump(enic->vdev, &stats)) {
                dev_err(enic, "Error in getting stats\n");
@@ -232,12 +247,13 @@ void enic_dev_stats_get(struct enic *enic, struct rte_eth_stats *r_stats)
        r_stats->ibytes = stats->rx.rx_bytes_ok;
        r_stats->obytes = stats->tx.tx_bytes_ok;
 
-       r_stats->ierrors = stats->rx.rx_errors;
+       r_stats->ierrors = stats->rx.rx_errors + stats->rx.rx_drop;
        r_stats->oerrors = stats->tx.tx_errors;
 
-       r_stats->imissed = stats->rx.rx_drop;
+       r_stats->imissed = stats->rx.rx_no_bufs;
 
-       r_stats->rx_nombuf = stats->rx.rx_no_bufs;
+       soft_stats = &enic->soft_stats;
+       r_stats->rx_nombuf = rte_atomic64_read(&soft_stats->rx_nombuf);
 }
 
 void enic_del_mac_address(struct enic *enic)
@@ -795,6 +811,8 @@ int enic_setup_finish(struct enic *enic)
 {
        int ret;
 
+       enic_init_soft_stats(enic);
+
        ret = enic_set_rss_nic_cfg(enic);
        if (ret) {
                dev_err(enic, "Failed to config nic, aborting.\n");

diff --git a/drivers/net/enic/enic_rx.c b/drivers/net/enic/enic_rx.c
index 6459e97..6bfc91a 100644 (file)
--- a/drivers/net/enic/enic_rx.c
+++ b/drivers/net/enic/enic_rx.c
@@ -275,10 +275,7 @@ enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
                /* allocate a new mbuf */
                nmb = rte_mbuf_raw_alloc(rq->mp);
                if (nmb == NULL) {
-                       dev_err(enic, "RX mbuf alloc failed port=%u qid=%u",
-                       enic->port_id, (unsigned)rq->index);
-                       rte_eth_devices[enic->port_id].
-                                       data->rx_mbuf_alloc_failed++;
+                       rte_atomic64_inc(&enic->soft_stats.rx_nombuf);
                        break;
                }