summaryrefslogtreecommitdiff
path: root/sys/kern
diff options
context:
space:
mode:
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/init_main.c2
-rw-r--r--sys/kern/kern_event.c43
-rw-r--r--sys/kern/kern_fork.c2
-rw-r--r--sys/kern/sys_pipe.c6
-rw-r--r--sys/kern/tty.c4
-rw-r--r--sys/kern/tty_pts.c8
-rw-r--r--sys/kern/uipc_mqueue.c4
-rw-r--r--sys/kern/uipc_socket.c12
-rw-r--r--sys/kern/vfs_aio.c4
-rw-r--r--sys/kern/vfs_subr.c47
10 files changed, 86 insertions, 46 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c
index 98c2b83bbae1..c84b189eb215 100644
--- a/sys/kern/init_main.c
+++ b/sys/kern/init_main.c
@@ -423,7 +423,7 @@ proc0_init(void *dummy __unused)
p->p_sysent = &null_sysvec;
p->p_flag = P_SYSTEM | P_INMEM;
p->p_state = PRS_NORMAL;
- knlist_init(&p->p_klist, &p->p_mtx, NULL, NULL, NULL);
+ knlist_init_mtx(&p->p_klist, &p->p_mtx);
STAILQ_INIT(&p->p_ktr);
p->p_nice = NZERO;
td->td_tid = PID_MAX + 1;
diff --git a/sys/kern/kern_event.c b/sys/kern/kern_event.c
index 4acfc49915fe..17157418654a 100644
--- a/sys/kern/kern_event.c
+++ b/sys/kern/kern_event.c
@@ -208,12 +208,10 @@ SYSCTL_INT(_kern, OID_AUTO, kq_calloutmax, CTLFLAG_RW,
} while (0)
#ifdef INVARIANTS
#define KNL_ASSERT_LOCKED(knl) do { \
- if (!knl->kl_locked((knl)->kl_lockarg)) \
- panic("knlist not locked, but should be"); \
+ knl->kl_assert_locked((knl)->kl_lockarg); \
} while (0)
-#define KNL_ASSERT_UNLOCKED(knl) do { \
- if (knl->kl_locked((knl)->kl_lockarg)) \
- panic("knlist locked, but should not be"); \
+#define KNL_ASSERT_UNLOCKED(knl) do { \
+ knl->kl_assert_unlocked((knl)->kl_lockarg); \
} while (0)
#else /* !INVARIANTS */
#define KNL_ASSERT_LOCKED(knl) do {} while(0)
@@ -577,7 +575,7 @@ kqueue(struct thread *td, struct kqueue_args *uap)
mtx_init(&kq->kq_lock, "kqueue", NULL, MTX_DEF|MTX_DUPOK);
TAILQ_INIT(&kq->kq_head);
kq->kq_fdp = fdp;
- knlist_init(&kq->kq_sel.si_note, &kq->kq_lock, NULL, NULL, NULL);
+ knlist_init_mtx(&kq->kq_sel.si_note, &kq->kq_lock);
TASK_INIT(&kq->kq_task, 0, kqueue_task, kq);
FILEDESC_XLOCK(fdp);
@@ -1723,7 +1721,6 @@ MTX_SYSINIT(knlist_lock, &knlist_lock, "knlist lock for lockless objects",
MTX_DEF);
static void knlist_mtx_lock(void *arg);
static void knlist_mtx_unlock(void *arg);
-static int knlist_mtx_locked(void *arg);
static void
knlist_mtx_lock(void *arg)
@@ -1737,15 +1734,22 @@ knlist_mtx_unlock(void *arg)
mtx_unlock((struct mtx *)arg);
}
-static int
-knlist_mtx_locked(void *arg)
+static void
+knlist_mtx_assert_locked(void *arg)
+{
+ mtx_assert((struct mtx *)arg, MA_OWNED);
+}
+
+static void
+knlist_mtx_assert_unlocked(void *arg)
{
- return (mtx_owned((struct mtx *)arg));
+ mtx_assert((struct mtx *)arg, MA_NOTOWNED);
}
void
knlist_init(struct knlist *knl, void *lock, void (*kl_lock)(void *),
- void (*kl_unlock)(void *), int (*kl_locked)(void *))
+ void (*kl_unlock)(void *),
+ void (*kl_assert_locked)(void *), void (*kl_assert_unlocked)(void *))
{
if (lock == NULL)
@@ -1761,15 +1765,26 @@ knlist_init(struct knlist *knl, void *lock, void (*kl_lock)(void *),
knl->kl_unlock = knlist_mtx_unlock;
else
knl->kl_unlock = kl_unlock;
- if (kl_locked == NULL)
- knl->kl_locked = knlist_mtx_locked;
+ if (kl_assert_locked == NULL)
+ knl->kl_assert_locked = knlist_mtx_assert_locked;
else
- knl->kl_locked = kl_locked;
+ knl->kl_assert_locked = kl_assert_locked;
+ if (kl_assert_unlocked == NULL)
+ knl->kl_assert_unlocked = knlist_mtx_assert_unlocked;
+ else
+ knl->kl_assert_unlocked = kl_assert_unlocked;
SLIST_INIT(&knl->kl_list);
}
void
+knlist_init_mtx(struct knlist *knl, struct mtx *lock)
+{
+
+ knlist_init(knl, lock, NULL, NULL, NULL, NULL);
+}
+
+void
knlist_destroy(struct knlist *knl)
{
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 43afbbf7fb4b..721d48d50535 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -304,7 +304,7 @@ norfproc_fail:
#ifdef MAC
mac_proc_init(newproc);
#endif
- knlist_init(&newproc->p_klist, &newproc->p_mtx, NULL, NULL, NULL);
+ knlist_init_mtx(&newproc->p_klist, &newproc->p_mtx);
STAILQ_INIT(&newproc->p_ktr);
/* We have to lock the process tree while we look for a pid. */
diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c
index f4adfcb23b8f..45dc0f6588f6 100644
--- a/sys/kern/sys_pipe.c
+++ b/sys/kern/sys_pipe.c
@@ -328,10 +328,8 @@ kern_pipe(struct thread *td, int fildes[2])
rpipe = &pp->pp_rpipe;
wpipe = &pp->pp_wpipe;
- knlist_init(&rpipe->pipe_sel.si_note, PIPE_MTX(rpipe), NULL, NULL,
- NULL);
- knlist_init(&wpipe->pipe_sel.si_note, PIPE_MTX(wpipe), NULL, NULL,
- NULL);
+ knlist_init_mtx(&rpipe->pipe_sel.si_note, PIPE_MTX(rpipe));
+ knlist_init_mtx(&wpipe->pipe_sel.si_note, PIPE_MTX(wpipe));
/* Only the forward direction pipe is backed by default */
if ((error = pipe_create(rpipe, 1)) != 0 ||
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 2fa5cf2ae408..162ae372633c 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -933,8 +933,8 @@ tty_alloc_mutex(struct ttydevsw *tsw, void *sc, struct mtx *mutex)
mtx_init(&tp->t_mtxobj, "ttymtx", NULL, MTX_DEF);
}
- knlist_init(&tp->t_inpoll.si_note, tp->t_mtx, NULL, NULL, NULL);
- knlist_init(&tp->t_outpoll.si_note, tp->t_mtx, NULL, NULL, NULL);
+ knlist_init_mtx(&tp->t_inpoll.si_note, tp->t_mtx);
+ knlist_init_mtx(&tp->t_outpoll.si_note, tp->t_mtx);
sx_xlock(&tty_list_sx);
TAILQ_INSERT_TAIL(&tty_list, tp, t_list);
diff --git a/sys/kern/tty_pts.c b/sys/kern/tty_pts.c
index 27e481e650be..0b196dd28134 100644
--- a/sys/kern/tty_pts.c
+++ b/sys/kern/tty_pts.c
@@ -742,8 +742,8 @@ pts_alloc(int fflags, struct thread *td, struct file *fp)
uihold(uid);
tp = tty_alloc(&pts_class, psc);
- knlist_init(&psc->pts_inpoll.si_note, tp->t_mtx, NULL, NULL, NULL);
- knlist_init(&psc->pts_outpoll.si_note, tp->t_mtx, NULL, NULL, NULL);
+ knlist_init_mtx(&psc->pts_inpoll.si_note, tp->t_mtx);
+ knlist_init_mtx(&psc->pts_outpoll.si_note, tp->t_mtx);
/* Expose the slave device as well. */
tty_makedev(tp, td->td_ucred, "pts/%u", psc->pts_unit);
@@ -782,8 +782,8 @@ pts_alloc_external(int fflags, struct thread *td, struct file *fp,
uihold(uid);
tp = tty_alloc(&pts_class, psc);
- knlist_init(&psc->pts_inpoll.si_note, tp->t_mtx, NULL, NULL, NULL);
- knlist_init(&psc->pts_outpoll.si_note, tp->t_mtx, NULL, NULL, NULL);
+ knlist_init_mtx(&psc->pts_inpoll.si_note, tp->t_mtx);
+ knlist_init_mtx(&psc->pts_outpoll.si_note, tp->t_mtx);
/* Expose the slave device as well. */
tty_makedev(tp, td->td_ucred, "%s", name);
diff --git a/sys/kern/uipc_mqueue.c b/sys/kern/uipc_mqueue.c
index 2a5028c3d027..69bf59c296c8 100644
--- a/sys/kern/uipc_mqueue.c
+++ b/sys/kern/uipc_mqueue.c
@@ -1531,8 +1531,8 @@ mqueue_alloc(const struct mq_attr *attr)
mq->mq_msgsize = default_msgsize;
}
mtx_init(&mq->mq_mutex, "mqueue lock", NULL, MTX_DEF);
- knlist_init(&mq->mq_rsel.si_note, &mq->mq_mutex, NULL, NULL, NULL);
- knlist_init(&mq->mq_wsel.si_note, &mq->mq_mutex, NULL, NULL, NULL);
+ knlist_init_mtx(&mq->mq_rsel.si_note, &mq->mq_mutex);
+ knlist_init_mtx(&mq->mq_wsel.si_note, &mq->mq_mutex);
atomic_add_int(&curmq, 1);
return (mq);
}
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
index 33679575805c..71856b3d0fe5 100644
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -376,10 +376,8 @@ socreate(int dom, struct socket **aso, int type, int proto,
#ifdef MAC
mac_socket_create(cred, so);
#endif
- knlist_init(&so->so_rcv.sb_sel.si_note, SOCKBUF_MTX(&so->so_rcv),
- NULL, NULL, NULL);
- knlist_init(&so->so_snd.sb_sel.si_note, SOCKBUF_MTX(&so->so_snd),
- NULL, NULL, NULL);
+ knlist_init_mtx(&so->so_rcv.sb_sel.si_note, SOCKBUF_MTX(&so->so_rcv));
+ knlist_init_mtx(&so->so_snd.sb_sel.si_note, SOCKBUF_MTX(&so->so_snd));
so->so_count = 1;
/*
* Auto-sizing of socket buffers is managed by the protocols and
@@ -445,10 +443,8 @@ sonewconn(struct socket *head, int connstatus)
#ifdef MAC
mac_socket_newconn(head, so);
#endif
- knlist_init(&so->so_rcv.sb_sel.si_note, SOCKBUF_MTX(&so->so_rcv),
- NULL, NULL, NULL);
- knlist_init(&so->so_snd.sb_sel.si_note, SOCKBUF_MTX(&so->so_snd),
- NULL, NULL, NULL);
+ knlist_init_mtx(&so->so_rcv.sb_sel.si_note, SOCKBUF_MTX(&so->so_rcv));
+ knlist_init_mtx(&so->so_snd.sb_sel.si_note, SOCKBUF_MTX(&so->so_snd));
if (soreserve(so, head->so_snd.sb_hiwat, head->so_rcv.sb_hiwat) ||
(*so->so_proto->pr_usrreqs->pru_attach)(so, 0, NULL)) {
sodealloc(so);
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index f22dea78845d..3f7596b7956c 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -1485,7 +1485,7 @@ aio_aqueue(struct thread *td, struct aiocb *job, struct aioliojob *lj,
aiocbe = uma_zalloc(aiocb_zone, M_WAITOK | M_ZERO);
aiocbe->inputcharge = 0;
aiocbe->outputcharge = 0;
- knlist_init(&aiocbe->klist, AIO_MTX(ki), NULL, NULL, NULL);
+ knlist_init_mtx(&aiocbe->klist, AIO_MTX(ki));
error = ops->copyin(job, &aiocbe->uaiocb);
if (error) {
@@ -2107,7 +2107,7 @@ kern_lio_listio(struct thread *td, int mode, struct aiocb * const *uacb_list,
lj->lioj_flags = 0;
lj->lioj_count = 0;
lj->lioj_finished_count = 0;
- knlist_init(&lj->klist, AIO_MTX(ki), NULL, NULL, NULL);
+ knlist_init_mtx(&lj->klist, AIO_MTX(ki));
ksiginfo_init(&lj->lioj_ksi);
/*
diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 47a504691692..7aca90ac4e3e 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -110,7 +110,8 @@ static void vnlru_free(int);
static void vgonel(struct vnode *);
static void vfs_knllock(void *arg);
static void vfs_knlunlock(void *arg);
-static int vfs_knllocked(void *arg);
+static void vfs_knl_assert_locked(void *arg);
+static void vfs_knl_assert_unlocked(void *arg);
static void destroy_vpollinfo(struct vpollinfo *vi);
/*
@@ -3271,7 +3272,7 @@ v_addpollinfo(struct vnode *vp)
vi = uma_zalloc(vnodepoll_zone, M_WAITOK);
mtx_init(&vi->vpi_lock, "vnode pollinfo", NULL, MTX_DEF);
knlist_init(&vi->vpi_selinfo.si_note, vp, vfs_knllock,
- vfs_knlunlock, vfs_knllocked);
+ vfs_knlunlock, vfs_knl_assert_locked, vfs_knl_assert_unlocked);
VI_LOCK(vp);
if (vp->v_pollinfo != NULL) {
VI_UNLOCK(vp);
@@ -3986,7 +3987,7 @@ static struct knlist fs_knlist;
static void
vfs_event_init(void *arg)
{
- knlist_init(&fs_knlist, NULL, NULL, NULL, NULL);
+ knlist_init_mtx(&fs_knlist, NULL);
}
/* XXX - correct order? */
SYSINIT(vfs_knlist, SI_SUB_VFS, SI_ORDER_ANY, vfs_event_init, NULL);
@@ -4099,12 +4100,24 @@ vfs_knlunlock(void *arg)
VOP_UNLOCK(vp, 0);
}
-static int
-vfs_knllocked(void *arg)
+static void
+vfs_knl_assert_locked(void *arg)
+{
+#ifdef DEBUG_VFS_LOCKS
+ struct vnode *vp = arg;
+
+ ASSERT_VOP_LOCKED(vp, "vfs_knl_assert_locked");
+#endif
+}
+
+static void
+vfs_knl_assert_unlocked(void *arg)
{
+#ifdef DEBUG_VFS_LOCKS
struct vnode *vp = arg;
- return (VOP_ISLOCKED(vp) == LK_EXCLUSIVE);
+ ASSERT_VOP_UNLOCKED(vp, "vfs_knl_assert_unlocked");
+#endif
}
int
@@ -4157,27 +4170,37 @@ filt_vfsread(struct knote *kn, long hint)
{
struct vnode *vp = (struct vnode *)kn->kn_hook;
struct vattr va;
+ int res;
/*
* filesystem is gone, so set the EOF flag and schedule
* the knote for deletion.
*/
if (hint == NOTE_REVOKE) {
+ VI_LOCK(vp);
kn->kn_flags |= (EV_EOF | EV_ONESHOT);
+ VI_UNLOCK(vp);
return (1);
}
if (VOP_GETATTR(vp, &va, curthread->td_ucred))
return (0);
+ VI_LOCK(vp);
kn->kn_data = va.va_size - kn->kn_fp->f_offset;
- return (kn->kn_data != 0);
+ res = (kn->kn_data != 0);
+ VI_UNLOCK(vp);
+ return (res);
}
/*ARGSUSED*/
static int
filt_vfswrite(struct knote *kn, long hint)
{
+ struct vnode *vp = (struct vnode *)kn->kn_hook;
+
+ VI_LOCK(vp);
+
/*
* filesystem is gone, so set the EOF flag and schedule
* the knote for deletion.
@@ -4186,19 +4209,27 @@ filt_vfswrite(struct knote *kn, long hint)
kn->kn_flags |= (EV_EOF | EV_ONESHOT);
kn->kn_data = 0;
+ VI_UNLOCK(vp);
return (1);
}
static int
filt_vfsvnode(struct knote *kn, long hint)
{
+ struct vnode *vp = (struct vnode *)kn->kn_hook;
+ int res;
+
+ VI_LOCK(vp);
if (kn->kn_sfflags & hint)
kn->kn_fflags |= hint;
if (hint == NOTE_REVOKE) {
kn->kn_flags |= EV_EOF;
+ VI_UNLOCK(vp);
return (1);
}
- return (kn->kn_fflags != 0);
+ res = (kn->kn_fflags != 0);
+ VI_UNLOCK(vp);
+ return (res);
}
int
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-07 09:42:01 +0000