Page MenuHomeFreeBSD

D29297.id87346.diff
No OneTemporary

D29297.id87346.diff

diff --git a/sys/dev/cxgbe/adapter.h b/sys/dev/cxgbe/adapter.h
--- a/sys/dev/cxgbe/adapter.h
+++ b/sys/dev/cxgbe/adapter.h
@@ -712,6 +712,8 @@
/* ofld_txq: SGE egress queue + miscellaneous items */
struct sge_ofld_txq {
struct sge_wrq wrq;
+ counter_u64_t tx_iscsi_pdus;
+ counter_u64_t tx_iscsi_octets;
counter_u64_t tx_toe_tls_records;
counter_u64_t tx_toe_tls_octets;
} __aligned(CACHE_LINE_SIZE);
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c
--- a/sys/dev/cxgbe/t4_main.c
+++ b/sys/dev/cxgbe/t4_main.c
@@ -10756,6 +10756,8 @@
for_each_ofld_txq(vi, i, ofld_txq) {
ofld_txq->wrq.tx_wrs_direct = 0;
ofld_txq->wrq.tx_wrs_copied = 0;
+ counter_u64_zero(ofld_txq->tx_iscsi_pdus);
+ counter_u64_zero(ofld_txq->tx_iscsi_octets);
counter_u64_zero(ofld_txq->tx_toe_tls_records);
counter_u64_zero(ofld_txq->tx_toe_tls_octets);
}
diff --git a/sys/dev/cxgbe/t4_sge.c b/sys/dev/cxgbe/t4_sge.c
--- a/sys/dev/cxgbe/t4_sge.c
+++ b/sys/dev/cxgbe/t4_sge.c
@@ -4507,8 +4507,16 @@
if (rc != 0)
return (rc);
+ ofld_txq->tx_iscsi_pdus = counter_u64_alloc(M_WAITOK);
+ ofld_txq->tx_iscsi_octets = counter_u64_alloc(M_WAITOK);
ofld_txq->tx_toe_tls_records = counter_u64_alloc(M_WAITOK);
ofld_txq->tx_toe_tls_octets = counter_u64_alloc(M_WAITOK);
+ SYSCTL_ADD_COUNTER_U64(&vi->ctx, children, OID_AUTO,
+ "tx_iscsi_pdus", CTLFLAG_RD, &ofld_txq->tx_iscsi_pdus,
+ "# of iSCSI PDUs transmitted");
+ SYSCTL_ADD_COUNTER_U64(&vi->ctx, children, OID_AUTO,
+ "tx_iscsi_octets", CTLFLAG_RD, &ofld_txq->tx_iscsi_octets,
+ "# of payload octets in transmitted iSCSI PDUs");
SYSCTL_ADD_COUNTER_U64(&vi->ctx, children, OID_AUTO,
"tx_toe_tls_records", CTLFLAG_RD, &ofld_txq->tx_toe_tls_records,
"# of TOE TLS records transmitted");
@@ -4529,6 +4537,8 @@
if (rc != 0)
return (rc);
+ counter_u64_free(ofld_txq->tx_iscsi_pdus);
+ counter_u64_free(ofld_txq->tx_iscsi_octets);
counter_u64_free(ofld_txq->tx_toe_tls_records);
counter_u64_free(ofld_txq->tx_toe_tls_octets);
diff --git a/sys/dev/cxgbe/tom/t4_cpl_io.c b/sys/dev/cxgbe/tom/t4_cpl_io.c
--- a/sys/dev/cxgbe/tom/t4_cpl_io.c
+++ b/sys/dev/cxgbe/tom/t4_cpl_io.c
@@ -1092,6 +1092,9 @@
}
toep->txsd_avail--;
+ counter_u64_add(toep->ofld_txq->tx_iscsi_pdus, 1);
+ counter_u64_add(toep->ofld_txq->tx_iscsi_octets, plen);
+
t4_l2t_send(sc, wr, toep->l2te);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 16, 10:47 PM (19 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28792387
Default Alt Text
D29297.id87346.diff (2 KB)

Event Timeline