Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Funnel knote alloc/free into a single pair of functions. NFCI.

This commit is contained in:
thorpej 2022-07-13 03:23:07 +00:00
parent de194e1bf8
commit 7f1b6ee475
1 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sys/kern/kern_event.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: kern_event.c,v 1.141 2022/05/24 20:50:19 andvar Exp $ */ /* $NetBSD: kern_event.c,v 1.142 2022/07/13 03:23:07 thorpej Exp $ */
/*- /*-
* Copyright (c) 2008, 2009, 2021 The NetBSD Foundation, Inc. * Copyright (c) 2008, 2009, 2021 The NetBSD Foundation, Inc.
@ -63,7 +63,7 @@
#endif /* _KERNEL_OPT */ #endif /* _KERNEL_OPT */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.141 2022/05/24 20:50:19 andvar Exp $"); __KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.142 2022/07/13 03:23:07 thorpej Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -423,6 +423,22 @@ knote_detach_quiesce(struct knote *kn)
return false; return false;
} }
static inline struct knote *
knote_alloc(bool sleepok)
{
struct knote *kn;
kn = kmem_zalloc(sizeof(*kn), sleepok ? KM_SLEEP : KM_NOSLEEP);
return kn;
}
static inline void
knote_free(struct knote *kn)
{
kmem_free(kn, sizeof(*kn));
}
static int static int
filter_attach(struct knote *kn) filter_attach(struct knote *kn)
{ {
@ -952,8 +968,8 @@ knote_proc_fork_track(struct proc *p1, struct proc *p2, struct knote *okn)
struct knote *knchild, *kntrack; struct knote *knchild, *kntrack;
int error = 0; int error = 0;
knchild = kmem_zalloc(sizeof(*knchild), KM_NOSLEEP); knchild = knote_alloc(false);
kntrack = kmem_zalloc(sizeof(*knchild), KM_NOSLEEP); kntrack = knote_alloc(false);
if (__predict_false(knchild == NULL || kntrack == NULL)) { if (__predict_false(knchild == NULL || kntrack == NULL)) {
error = ENOMEM; error = ENOMEM;
goto out; goto out;
@ -1041,10 +1057,10 @@ knote_proc_fork_track(struct proc *p1, struct proc *p2, struct knote *okn)
out: out:
if (__predict_false(knchild != NULL)) { if (__predict_false(knchild != NULL)) {
kmem_free(knchild, sizeof(*knchild)); knote_free(knchild);
} }
if (__predict_false(kntrack != NULL)) { if (__predict_false(kntrack != NULL)) {
kmem_free(kntrack, sizeof(*kntrack)); knote_free(kntrack);
} }
mutex_enter(p1->p_lock); mutex_enter(p1->p_lock);
mutex_spin_enter(&kq->kq_lock); mutex_spin_enter(&kq->kq_lock);
@ -1756,14 +1772,14 @@ kqueue_register(struct kqueue *kq, struct kevent *kev)
error = 0; error = 0;
fd = 0; fd = 0;
newkn = kmem_zalloc(sizeof(*newkn), KM_SLEEP); newkn = knote_alloc(true);
rw_enter(&kqueue_filter_lock, RW_READER); rw_enter(&kqueue_filter_lock, RW_READER);
kfilter = kfilter_byfilter(kev->filter); kfilter = kfilter_byfilter(kev->filter);
if (kfilter == NULL || kfilter->filtops == NULL) { if (kfilter == NULL || kfilter->filtops == NULL) {
/* filter not found nor implemented */ /* filter not found nor implemented */
rw_exit(&kqueue_filter_lock); rw_exit(&kqueue_filter_lock);
kmem_free(newkn, sizeof(*newkn)); knote_free(newkn);
return (EINVAL); return (EINVAL);
} }
@ -1774,7 +1790,7 @@ kqueue_register(struct kqueue *kq, struct kevent *kev)
if (kev->ident > INT_MAX if (kev->ident > INT_MAX
|| (fp = fd_getfile(fd = kev->ident)) == NULL) { || (fp = fd_getfile(fd = kev->ident)) == NULL) {
rw_exit(&kqueue_filter_lock); rw_exit(&kqueue_filter_lock);
kmem_free(newkn, sizeof(*newkn)); knote_free(newkn);
return EBADF; return EBADF;
} }
mutex_enter(&fdp->fd_lock); mutex_enter(&fdp->fd_lock);
@ -1986,7 +2002,7 @@ kqueue_register(struct kqueue *kq, struct kevent *kev)
done: done:
rw_exit(&kqueue_filter_lock); rw_exit(&kqueue_filter_lock);
if (newkn != NULL) if (newkn != NULL)
kmem_free(newkn, sizeof(*newkn)); knote_free(newkn);
if (fp != NULL) if (fp != NULL)
fd_putfile(fd); fd_putfile(fd);
return (error); return (error);
@ -2680,7 +2696,7 @@ again:
if (kn->kn_fop->f_flags & FILTEROP_ISFD) if (kn->kn_fop->f_flags & FILTEROP_ISFD)
fd_putfile(kn->kn_id); fd_putfile(kn->kn_id);
atomic_dec_uint(&kn->kn_kfilter->refcnt); atomic_dec_uint(&kn->kn_kfilter->refcnt);
kmem_free(kn, sizeof(*kn)); knote_free(kn);
} }
/* /*