svn commit: r342583 - in stable: 10/sys/dev/cxgbe/tom 11/sys/dev/cxgbe/tom 12/sys/dev/cxgbe/tom

[John Baldwin]

Author: jhb
Date: Sat Dec 29 00:30:17 2018
New Revision: 342583
URL: https://svnweb.freebsd.org/changeset/base/342583

Log:
  MFC 340304: Use tcp_state_change() in the cxgbe(4) TOE module.
  
  r254889 added tcp_state_change() as a centralized place to log state
  changes in TCP connections for DTrace.  r294869 and r296881 took
  advantage of this central location to manage per-state counters.
  However, TOE sockets were still performing some (but not all) state
  change updates via direct assignments to t_state.  This resulted in
  state counters underflowing when TOE was in use.  Fix by using
  tcp_state_change() when changing a TOE connection's state.

Modified:
  stable/12/sys/dev/cxgbe/tom/t4_cpl_io.c
Directory Properties:
  stable/12/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/10/sys/dev/cxgbe/tom/t4_cpl_io.c
  stable/11/sys/dev/cxgbe/tom/t4_cpl_io.c
Directory Properties:
  stable/10/   (props changed)
  stable/11/   (props changed)

Modified: stable/12/sys/dev/cxgbe/tom/t4_cpl_io.c
==============================================================================
--- stable/12/sys/dev/cxgbe/tom/t4_cpl_io.c	Sat Dec 29 00:06:41 2018	(r342582)
+++ stable/12/sys/dev/cxgbe/tom/t4_cpl_io.c	Sat Dec 29 00:30:17 2018	(r342583)
@@ -396,7 +396,7 @@ make_established(struct toepcb *toep, uint32_t snd_isn
 	CTR6(KTR_CXGBE, "%s: tid %d, so %p, inp %p, tp %p, toep %p",
 	    __func__, toep->tid, so, inp, tp, toep);
 
-	tp->t_state = TCPS_ESTABLISHED;
+	tcp_state_change(tp, TCPS_ESTABLISHED);
 	tp->t_starttime = ticks;
 	TCPSTAT_INC(tcps_connects);
 
@@ -1303,11 +1303,11 @@ do_peer_close(struct sge_iq *iq, const struct rss_head
 		/* FALLTHROUGH */ 
 
 	case TCPS_ESTABLISHED:
-		tp->t_state = TCPS_CLOSE_WAIT;
+		tcp_state_change(tp, TCPS_CLOSE_WAIT);
 		break;
 
 	case TCPS_FIN_WAIT_1:
-		tp->t_state = TCPS_CLOSING;
+		tcp_state_change(tp, TCPS_CLOSING);
 		break;
 
 	case TCPS_FIN_WAIT_2:
@@ -1389,7 +1389,7 @@ release:
 	case TCPS_FIN_WAIT_1:
 		if (so->so_rcv.sb_state & SBS_CANTRCVMORE)
 			soisdisconnected(so);
-		tp->t_state = TCPS_FIN_WAIT_2;
+		tcp_state_change(tp, TCPS_FIN_WAIT_2);
 		break;
 
 	default: