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

ip_reass: use callout(9) directly instead of pr_slowtimo

Browse Source 
Reviewed by:		melifaro
Differential revision:	https://reviews.freebsd.org/D36236
This commit is contained in:
Gleb Smirnoff 2022-08-17 11:50:31 -07:00
parent 78b1fc05b2
commit 160f01f09f
4 changed files with 42 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/netinet/in_proto.c
View File

@ -113,7 +113,6 @@ struct protosw inetsw[] = {
.pr_domain = &inetdomain,
.pr_protocol = IPPROTO_IP,
.pr_flags = PR_CAPATTACH,
.pr_slowtimo = ip_slowtimo,
.pr_drain = ip_drain,
.pr_usrreqs = &nousrreqs
},

20
sys/netinet/ip_input.c
View File

@ -102,7 +102,6 @@ CTASSERT(sizeof(struct ip) == 20);
/* IP reassembly functions are defined in ip_reass.c. */
extern void ipreass_init(void);
extern void ipreass_drain(void);
extern void ipreass_slowtimo(void);
#ifdef VIMAGE
extern void ipreass_destroy(void);
#endif
@ -846,25 +845,6 @@ ip_input(struct mbuf *m)
m_freem(m);
}
/*
* IP timer processing;
* if a timer expires on a reassembly
* queue, discard it.
*/
void
ip_slowtimo(void)
{
VNET_ITERATOR_DECL(vnet_iter);
VNET_LIST_RLOCK_NOSLEEP();
VNET_FOREACH(vnet_iter) {
CURVNET_SET(vnet_iter);
ipreass_slowtimo();
CURVNET_RESTORE();
}
VNET_LIST_RUNLOCK_NOSLEEP();
}
void
ip_drain(void)
{

65
sys/netinet/ip_reass.c
View File

@ -93,7 +93,6 @@ VNET_DEFINE_STATIC(int, ipreass_maxbucketsize);
void ipreass_init(void);
void ipreass_drain(void);
void ipreass_slowtimo(void);
#ifdef VIMAGE
void ipreass_destroy(void);
#endif
@ -556,6 +555,48 @@ ip_reass(struct mbuf *m)
#undef GETIP
}
/*
* If a timer expires on a reassembly queue, discard it.
*/
static struct callout ipreass_callout;
static void
ipreass_slowtimo(void *arg __unused)
{
VNET_ITERATOR_DECL(vnet_iter);
struct ipq *fp, *tmp;
if (atomic_load_int(&nfrags) == 0)
return;
VNET_FOREACH(vnet_iter) {
CURVNET_SET(vnet_iter);
for (int i = 0; i < IPREASS_NHASH; i++) {
if (TAILQ_EMPTY(&V_ipq[i].head))
continue;
IPQ_LOCK(i);
TAILQ_FOREACH_SAFE(fp, &V_ipq[i].head, ipq_list, tmp)
if (--fp->ipq_ttl == 0)
ipq_timeout(&V_ipq[i], fp);
IPQ_UNLOCK(i);
}
CURVNET_RESTORE();
}
VNET_LIST_RUNLOCK_NOSLEEP();
callout_reset_sbt(&ipreass_callout, SBT_1MS * 500, SBT_1MS * 10,
ipreass_slowtimo, NULL, 0);
}
static void
ipreass_timer_init(void *arg __unused)
{
callout_init(&ipreass_callout, 1);
callout_reset_sbt(&ipreass_callout, SBT_1MS * 500, SBT_1MS * 10,
ipreass_slowtimo, NULL, 0);
}
SYSINIT(ipreass, SI_SUB_VNET_DONE, SI_ORDER_ANY, ipreass_timer_init, NULL);
/*
* Initialize IP reassembly structures.
*/
@ -585,28 +626,6 @@ ipreass_init(void)
}
}
/*
* If a timer expires on a reassembly queue, discard it.
*/
void
ipreass_slowtimo(void)
{
struct ipq *fp, *tmp;
if (atomic_load_int(&nfrags) == 0)
return;
for (int i = 0; i < IPREASS_NHASH; i++) {
if (TAILQ_EMPTY(&V_ipq[i].head))
continue;
IPQ_LOCK(i);
TAILQ_FOREACH_SAFE(fp, &V_ipq[i].head, ipq_list, tmp)
if (--fp->ipq_ttl == 0)
ipq_timeout(&V_ipq[i], fp);
IPQ_UNLOCK(i);
}
}
/*
* Drain off all datagram fragments.
*/

1
sys/netinet/ip_var.h
View File

@ -228,7 +228,6 @@ struct mbuf *
ip_reass(struct mbuf *);
void ip_savecontrol(struct inpcb *, struct mbuf **, struct ip *,
struct mbuf *);
void ip_slowtimo(void);
void ip_fillid(struct ip *);
int rip_ctloutput(struct socket *, struct sockopt *);
void rip_ctlinput(int, struct sockaddr *, void *);