svn commit: r340304 - head/sys/dev/cxgbe/tom
John Baldwin
jhb at FreeBSD.org
Fri Nov 9 21:16:46 UTC 2018
Author: jhb
Date: Fri Nov 9 21:16:45 2018
New Revision: 340304
URL: https://svnweb.freebsd.org/changeset/base/340304
Log:
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.
Reviewed by: np, markj
MFC after: 1 month
Sponsored by: Chelsio Communications
Differential Revision: https://reviews.freebsd.org/D17915
Modified:
head/sys/dev/cxgbe/tom/t4_cpl_io.c
Modified: head/sys/dev/cxgbe/tom/t4_cpl_io.c
==============================================================================
--- head/sys/dev/cxgbe/tom/t4_cpl_io.c Fri Nov 9 21:02:07 2018 (r340303)
+++ head/sys/dev/cxgbe/tom/t4_cpl_io.c Fri Nov 9 21:16:45 2018 (r340304)
@@ -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:
More information about the svn-src-head
mailing list