git: 9c5137beb5f2 - main - ccr: Add per-port stats of queued and completed requests.

[John Baldwin]

The branch main has been updated by jhb:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=9c5137beb5f28292410888d0770bdf24c15e1312

commit 9c5137beb5f28292410888d0770bdf24c15e1312
Author:     John Baldwin <j...@freebsd.org>
AuthorDate: 2021-03-12 18:35:32 +0000
Commit:     John Baldwin <j...@freebsd.org>
CommitDate: 2021-03-12 18:59:35 +0000

    ccr: Add per-port stats of queued and completed requests.
    
    Reviewed by:    np
    Sponsored by:   Chelsio Communications
    Differential Revision:  https://reviews.freebsd.org/D29176
---
 sys/dev/cxgbe/crypto/t4_crypto.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/sys/dev/cxgbe/crypto/t4_crypto.c b/sys/dev/cxgbe/crypto/t4_crypto.c
index 46ea9d778fe3..8cb5924c6b4c 100644
--- a/sys/dev/cxgbe/crypto/t4_crypto.c
+++ b/sys/dev/cxgbe/crypto/t4_crypto.c
@@ -168,6 +168,9 @@ struct ccr_port {
        int rx_channel_id;
        int tx_channel_id;
        u_int active_sessions;
+
+       counter_u64_t stats_queued;
+       counter_u64_t stats_completed;
 };
 
 struct ccr_session {
@@ -2128,6 +2131,11 @@ ccr_sysctls(struct ccr_softc *sc)
                SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "active_sessions",
                    CTLFLAG_RD, &sc->ports[i].active_sessions, 0,
                    "Count of active sessions");
+               SYSCTL_ADD_COUNTER_U64(ctx, children, OID_AUTO, "queued",
+                   CTLFLAG_RD, &sc->ports[i].stats_queued, "Requests queued");
+               SYSCTL_ADD_COUNTER_U64(ctx, children, OID_AUTO, "completed",
+                   CTLFLAG_RD, &sc->ports[i].stats_completed,
+                   "Requests completed");
        }
 }
 
@@ -2141,6 +2149,8 @@ ccr_init_port(struct ccr_softc *sc, int port)
        sc->ports[port].rxq = &sc->adapter->sge.rxq[pi->vi->first_rxq];
        sc->ports[port].rx_channel_id = pi->rx_c_chan;
        sc->ports[port].tx_channel_id = pi->tx_chan;
+       sc->ports[port].stats_queued = counter_u64_alloc(M_WAITOK);
+       sc->ports[port].stats_completed = counter_u64_alloc(M_WAITOK);
        _Static_assert(sizeof(sc->port_mask) * NBBY >= MAX_NPORTS - 1,
            "Too many ports to fit in port_mask");
        sc->port_mask |= 1u << port;
@@ -2199,10 +2209,19 @@ ccr_attach(device_t dev)
        return (0);
 }
 
+static void
+ccr_free_port(struct ccr_softc *sc, int port)
+{
+
+       counter_u64_free(sc->ports[port].stats_queued);
+       counter_u64_free(sc->ports[port].stats_completed);
+}
+
 static int
 ccr_detach(device_t dev)
 {
        struct ccr_softc *sc;
+       int i;
 
        sc = device_get_softc(dev);
 
@@ -2230,6 +2249,9 @@ ccr_detach(device_t dev)
        counter_u64_free(sc->stats_sglist_error);
        counter_u64_free(sc->stats_process_error);
        counter_u64_free(sc->stats_sw_fallback);
+       for_each_port(sc->adapter, i) {
+               ccr_free_port(sc, i);
+       }
        sglist_free(sc->sg_iv_aad);
        free(sc->iv_aad_buf, M_CCR);
        sc->adapter->ccr_softc = NULL;
@@ -2827,6 +2849,7 @@ ccr_process(device_t dev, struct cryptop *crp, int hint)
                s->pending++;
 #endif
                counter_u64_add(sc->stats_inflight, 1);
+               counter_u64_add(s->port->stats_queued, 1);
        } else
                counter_u64_add(sc->stats_process_error, 1);
 
@@ -2871,6 +2894,7 @@ do_cpl6_fw_pld(struct sge_iq *iq, const struct rss_header 
*rss,
        mtx_unlock(&s->lock);
 #endif
        counter_u64_add(sc->stats_inflight, -1);
+       counter_u64_add(s->port->stats_completed, 1);
 
        switch (s->mode) {
        case HASH:
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"