upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

tcp/hpts: make stacks responsible for clearing themselves out HPTS

Browse source 
There already is the tfb_tcp_timer_stop_all method that is supposed to stop
all time events associated with a given tcpcb by given stack.  Some time
ago it was doing actual callout_stop().  Today bbr/rack just mark their
internal state as inactive in their tfb_tcp_timer_stop_all methods, but
tcpcb stays in HPTS wheel and potentially called in from HPTS.  Change the
methods to also call tcp_hpts_remove().  Note: I'm not sure if internal
flag is still relevant once we are out of HPTS wheel.

Call the method when connection goes into TCP_CLOSED state, instead of
calling it later when tcpcb is freed.  Also call it when we switch between
stacks.

Reviewed by:		tuexen, rrs
Differential Revision:	https://reviews.freebsd.org/D42857

(cherry picked from commit d2ef52ef3dee38cccb7f54d33ecc2a4b944dad9d)
This commit is contained in:
Gleb Smirnoff 2023-12-04 10:19:46 -08:00
parent 76deefc548
commit 08cad73479
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sys/netinet/tcp_stacks/bbr.c
View file

@ -5278,6 +5278,9 @@ bbr_stopall(struct tcpcb *tp)
bbr = (struct tcp_bbr *)tp->t_fb_ptr;
bbr->rc_all_timers_stopped = 1;
tcp_hpts_remove(tp);
return (0);
}

4
sys/netinet/tcp_stacks/rack.c
View file

@ -8213,8 +8213,12 @@ static int
rack_stopall(struct tcpcb *tp)
{
struct tcp_rack *rack;
rack = (struct tcp_rack *)tp->t_fb_ptr;
rack->t_timers_stopped = 1;
tcp_hpts_remove(tp);
return (0);
}

8
sys/netinet/tcp_subr.c
View file

@ -2381,9 +2381,6 @@ tcp_discardcb(struct tcpcb *tp)
INP_WLOCK_ASSERT(inp);
tcp_timer_stop(tp);
if (tp->t_fb->tfb_tcp_timer_stop_all) {
tp->t_fb->tfb_tcp_timer_stop_all(tp);
}
/* free the reassembly queue, if any */
tcp_reass_flush(tp);
@ -2523,9 +2520,8 @@ tcp_close(struct tcpcb *tp)
tcp_fastopen_decrement_counter(tp->t_tfo_pending);
tp->t_tfo_pending = NULL;
}
#ifdef TCPHPTS
tcp_hpts_remove(tp);
#endif
if (tp->t_fb->tfb_tcp_timer_stop_all != NULL)
tp->t_fb->tfb_tcp_timer_stop_all(tp);
in_pcbdrop(inp);
TCPSTAT_INC(tcps_closed);
if (tp->t_state != TCPS_CLOSED)

6
sys/netinet/tcp_usrreq.c
View file

@ -1759,10 +1759,8 @@ tcp_ctloutput_set(struct inpcb *inp, struct sockopt *sopt)
* Ensure the new stack takes ownership with a
* clean slate on peak rate threshold.
*/
#ifdef TCPHPTS
/* Assure that we are not on any hpts */
tcp_hpts_remove(tp);
#endif
if (tp->t_fb->tfb_tcp_timer_stop_all != NULL)
tp->t_fb->tfb_tcp_timer_stop_all(tp);
if (blk->tfb_tcp_fb_init) {
error = (*blk->tfb_tcp_fb_init)(tp, &ptr);
if (error) {