svn commit: r357890 - in head/sys/dev/cxgbe: . crypto

[John Baldwin]

Author: jhb
Date: Thu Feb 13 22:55:45 2020
New Revision: 357890
URL: https://svnweb.freebsd.org/changeset/base/357890

Log:
  Remove the per-TXQ tls_wrs stat.
  
  It duplicated the kern_tls_records stat and was not conditional on NIC
  TLS being enabled.
  
  Reviewed by:	np
  Sponsored by:	Chelsio Communications
  Differential Revision:	https://reviews.freebsd.org/D23670

Modified:
  head/sys/dev/cxgbe/adapter.h
  head/sys/dev/cxgbe/crypto/t4_kern_tls.c
  head/sys/dev/cxgbe/t4_main.c
  head/sys/dev/cxgbe/t4_sge.c

Modified: head/sys/dev/cxgbe/adapter.h
==============================================================================
--- head/sys/dev/cxgbe/adapter.h	Thu Feb 13 22:22:55 2020	(r357889)
+++ head/sys/dev/cxgbe/adapter.h	Thu Feb 13 22:55:45 2020	(r357890)
@@ -574,7 +574,6 @@ struct sge_txq {
 	uint64_t txpkts0_pkts;	/* # of frames in type0 coalesced tx WRs */
 	uint64_t txpkts1_pkts;	/* # of frames in type1 coalesced tx WRs */
 	uint64_t raw_wrs;	/* # of raw work requests (alloc_wr_mbuf) */
-	uint64_t tls_wrs;	/* # of TLS work requests */
 
 	uint64_t kern_tls_records;
 	uint64_t kern_tls_short;

Modified: head/sys/dev/cxgbe/crypto/t4_kern_tls.c
==============================================================================
--- head/sys/dev/cxgbe/crypto/t4_kern_tls.c	Thu Feb 13 22:22:55 2020	(r357889)
+++ head/sys/dev/cxgbe/crypto/t4_kern_tls.c	Thu Feb 13 22:55:45 2020	(r357890)
@@ -2082,7 +2082,6 @@ ktls_write_tls_wr(struct tlspcb *tlsp, struct sge_txq 
 
 	ndesc += howmany(wr_len, EQ_ESIZE);
 	MPASS(ndesc <= available);
-	txq->tls_wrs++;
 
 	txq->kern_tls_records++;
 	txq->kern_tls_octets += tlen - mtod(m_tls, vm_offset_t);

Modified: head/sys/dev/cxgbe/t4_main.c
==============================================================================
--- head/sys/dev/cxgbe/t4_main.c	Thu Feb 13 22:22:55 2020	(r357889)
+++ head/sys/dev/cxgbe/t4_main.c	Thu Feb 13 22:55:45 2020	(r357890)
@@ -10359,7 +10359,6 @@ clear_stats(struct adapter *sc, u_int port_id)
 				txq->txpkts0_pkts = 0;
 				txq->txpkts1_pkts = 0;
 				txq->raw_wrs = 0;
-				txq->tls_wrs = 0;
 				txq->kern_tls_records = 0;
 				txq->kern_tls_short = 0;
 				txq->kern_tls_partial = 0;

Modified: head/sys/dev/cxgbe/t4_sge.c
==============================================================================
--- head/sys/dev/cxgbe/t4_sge.c	Thu Feb 13 22:22:55 2020	(r357889)
+++ head/sys/dev/cxgbe/t4_sge.c	Thu Feb 13 22:55:45 2020	(r357890)
@@ -4204,8 +4204,6 @@ alloc_txq(struct vi_info *vi, struct sge_txq *txq, int
 	    "# of frames tx'd using type1 txpkts work requests");
 	SYSCTL_ADD_UQUAD(&vi->ctx, children, OID_AUTO, "raw_wrs", CTLFLAG_RD,
 	    &txq->raw_wrs, "# of raw work requests (non-packets)");
-	SYSCTL_ADD_UQUAD(&vi->ctx, children, OID_AUTO, "tls_wrs", CTLFLAG_RD,
-	    &txq->tls_wrs, "# of TLS work requests (TLS records)");
 
 #ifdef KERN_TLS
 	if (sc->flags & KERN_TLS_OK) {