svn commit: r360718 - in stable/12/sys/dev/cxgbe: . tom
John Baldwin
jhb at FreeBSD.org
Wed May 6 22:49:22 UTC 2020
Author: jhb
Date: Wed May 6 22:49:21 2020
New Revision: 360718
URL: https://svnweb.freebsd.org/changeset/base/360718
Log:
MFC 358415: Rename TOE TLS stats from [rt]x_tls_* to [rt]x_toe_tls_*.
This more clearly differentiates TLS records encrypted and decrypted
in TOE connections from those encrypted via NIC TLS.
Sponsored by: Chelsio Communications
Modified:
stable/12/sys/dev/cxgbe/adapter.h
stable/12/sys/dev/cxgbe/t4_main.c
stable/12/sys/dev/cxgbe/tom/t4_tls.c
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/cxgbe/adapter.h
==============================================================================
--- stable/12/sys/dev/cxgbe/adapter.h Wed May 6 22:44:53 2020 (r360717)
+++ stable/12/sys/dev/cxgbe/adapter.h Wed May 6 22:49:21 2020 (r360718)
@@ -304,10 +304,10 @@ struct port_info {
struct port_stats stats;
u_int tnl_cong_drops;
u_int tx_parse_error;
- u_long tx_tls_records;
- u_long tx_tls_octets;
- u_long rx_tls_records;
- u_long rx_tls_octets;
+ u_long tx_toe_tls_records;
+ u_long tx_toe_tls_octets;
+ u_long rx_toe_tls_records;
+ u_long rx_toe_tls_octets;
struct callout tick;
};
Modified: stable/12/sys/dev/cxgbe/t4_main.c
==============================================================================
--- stable/12/sys/dev/cxgbe/t4_main.c Wed May 6 22:44:53 2020 (r360717)
+++ stable/12/sys/dev/cxgbe/t4_main.c Wed May 6 22:49:21 2020 (r360718)
@@ -6731,17 +6731,17 @@ cxgbe_sysctls(struct port_info *pi)
#undef SYSCTL_ADD_T4_PORTSTAT
- SYSCTL_ADD_ULONG(ctx, children, OID_AUTO, "tx_tls_records",
- CTLFLAG_RD, &pi->tx_tls_records,
+ SYSCTL_ADD_ULONG(ctx, children, OID_AUTO, "tx_toe_tls_records",
+ CTLFLAG_RD, &pi->tx_toe_tls_records,
"# of TLS records transmitted");
- SYSCTL_ADD_ULONG(ctx, children, OID_AUTO, "tx_tls_octets",
- CTLFLAG_RD, &pi->tx_tls_octets,
+ SYSCTL_ADD_ULONG(ctx, children, OID_AUTO, "tx_toe_tls_octets",
+ CTLFLAG_RD, &pi->tx_toe_tls_octets,
"# of payload octets in transmitted TLS records");
- SYSCTL_ADD_ULONG(ctx, children, OID_AUTO, "rx_tls_records",
- CTLFLAG_RD, &pi->rx_tls_records,
+ SYSCTL_ADD_ULONG(ctx, children, OID_AUTO, "rx_toe_tls_records",
+ CTLFLAG_RD, &pi->rx_toe_tls_records,
"# of TLS records received");
- SYSCTL_ADD_ULONG(ctx, children, OID_AUTO, "rx_tls_octets",
- CTLFLAG_RD, &pi->rx_tls_octets,
+ SYSCTL_ADD_ULONG(ctx, children, OID_AUTO, "rx_toe_tls_octets",
+ CTLFLAG_RD, &pi->rx_toe_tls_octets,
"# of payload octets in received TLS records");
}
Modified: stable/12/sys/dev/cxgbe/tom/t4_tls.c
==============================================================================
--- stable/12/sys/dev/cxgbe/tom/t4_tls.c Wed May 6 22:44:53 2020 (r360717)
+++ stable/12/sys/dev/cxgbe/tom/t4_tls.c Wed May 6 22:49:21 2020 (r360718)
@@ -1368,8 +1368,8 @@ t4_push_tls_records(struct adapter *sc, struct toepcb
}
toep->txsd_avail--;
- atomic_add_long(&toep->vi->pi->tx_tls_records, 1);
- atomic_add_long(&toep->vi->pi->tx_tls_octets, plen);
+ atomic_add_long(&toep->vi->pi->tx_toe_tls_records, 1);
+ atomic_add_long(&toep->vi->pi->tx_toe_tls_octets, plen);
t4_l2t_send(sc, wr, toep->l2te);
}
@@ -1404,7 +1404,7 @@ do_tls_data(struct sge_iq *iq, const struct rss_header
m_adj(m, sizeof(*cpl));
len = m->m_pkthdr.len;
- atomic_add_long(&toep->vi->pi->rx_tls_octets, len);
+ atomic_add_long(&toep->vi->pi->rx_toe_tls_octets, len);
KASSERT(len == G_CPL_TLS_DATA_LENGTH(be32toh(cpl->length_pkd)),
("%s: payload length mismatch", __func__));
@@ -1467,7 +1467,7 @@ do_rx_tls_cmp(struct sge_iq *iq, const struct rss_head
m_adj(m, sizeof(*cpl));
len = m->m_pkthdr.len;
- atomic_add_long(&toep->vi->pi->rx_tls_records, 1);
+ atomic_add_long(&toep->vi->pi->rx_toe_tls_records, 1);
KASSERT(len == G_CPL_RX_TLS_CMP_LENGTH(be32toh(cpl->pdulength_length)),
("%s: payload length mismatch", __func__));
More information about the svn-src-stable
mailing list