d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tcp: purge the input queue from tcp_discardcb()

Browse Source 
The purge was intentionally removed in a540cdca31.  My assumption
was that the stacks that use the input queue always call the
tcp_handle_orphaned_packets() in their tfb_tcp_fb_fini method.
However, rack will skip doing that if t_fb_ptr is NULL and there are
scenarios when it is NULL, e.g. close(2) on a socket (but some
special close(2)).  Instead of working out all possible scenarios
let's put this safebelt back.

Reviewed by:		rrs
Differential Revision:	https://reviews.freebsd.org/D39696
This commit is contained in:
Gleb Smirnoff 2023-04-25 12:18:19 -07:00
parent f46a05b5d3
commit 144259f673
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netinet/tcp_subr.c
View File

@ -2379,6 +2379,7 @@ tcp_discardcb(struct tcpcb *tp)
{
struct inpcb *inp = tptoinpcb(tp);
struct socket *so = tptosocket(tp);
struct mbuf *m;
#ifdef INET6
bool isipv6 = (inp->inp_vflag & INP_IPV6) != 0;
#endif
@ -2422,7 +2423,13 @@ tcp_discardcb(struct tcpcb *tp)
#endif
CC_ALGO(tp) = NULL;
if ((m = STAILQ_FIRST(&tp->t_inqueue)) != NULL) {
struct mbuf *prev;
STAILQ_INIT(&tp->t_inqueue);
STAILQ_FOREACH_FROM_SAFE(m, &tp->t_inqueue, m_stailqpkt, prev)
m_freem(m);
}
TCPSTATES_DEC(tp->t_state);
if (tp->t_fb->tfb_tcp_fb_fini)
@ -2430,7 +2437,6 @@ tcp_discardcb(struct tcpcb *tp)
#ifdef TCP_BLACKBOX
tcp_log_tcpcbfini(tp);
#endif
MPASS(STAILQ_EMPTY(&tp->t_inqueue));
/*
* If we got enough samples through the srtt filter,