svn commit: r360763 - stable/11/sys/netinet

[Michael Tuexen]

Author: tuexen
Date: Thu May  7 03:17:52 2020
New Revision: 360763
URL: https://svnweb.freebsd.org/changeset/base/360763

Log:
  MFC r357768: Optimize timer starting
  
  Don't start an SCTP timer using a net, which has been removed.
  
  Submitted by:		Taylor Brandstetter

Modified:
  stable/11/sys/netinet/sctp_pcb.c
  stable/11/sys/netinet/sctputil.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netinet/sctp_pcb.c
==============================================================================
--- stable/11/sys/netinet/sctp_pcb.c	Thu May  7 03:15:59 2020	(r360762)
+++ stable/11/sys/netinet/sctp_pcb.c	Thu May  7 03:17:52 2020	(r360763)
@@ -4483,6 +4483,7 @@ out:
 	    SCTP_FROM_SCTP_PCB + SCTP_LOC_9);
 	sctp_timer_stop(SCTP_TIMER_TYPE_HEARTBEAT, inp, stcb, net,
 	    SCTP_FROM_SCTP_PCB + SCTP_LOC_10);
+	net->dest_state |= SCTP_ADDR_BEING_DELETED;
 	sctp_free_remote_addr(net);
 }
 

Modified: stable/11/sys/netinet/sctputil.c
==============================================================================
--- stable/11/sys/netinet/sctputil.c	Thu May  7 03:15:59 2020	(r360762)
+++ stable/11/sys/netinet/sctputil.c	Thu May  7 03:17:52 2020	(r360763)
@@ -2047,6 +2047,10 @@ sctp_timer_start(int t_type, struct sctp_inpcb *inp, s
 	if (stcb) {
 		SCTP_TCB_LOCK_ASSERT(stcb);
 	}
+	/* Don't restart timer on net that's been removed. */
+	if (net != NULL && (net->dest_state & SCTP_ADDR_BEING_DELETED)) {
+		return;
+	}
 	switch (t_type) {
 	case SCTP_TIMER_TYPE_ADDR_WQ:
 		/* Only 1 tick away :-) */