diff options
| author | Don Lewis <truckman@FreeBSD.org> | 2002-07-28 19:59:31 +0000 |
|---|---|---|
| committer | Don Lewis <truckman@FreeBSD.org> | 2002-07-28 19:59:31 +0000 |
| commit | 5c38b6dbce8b0e199cc285982440e9459ad4ffa8 (patch) | |
| tree | 6dda6f0898c9f15fca929e63e72b3882862e67e1 /sys/kern | |
| parent | b44ba1a844ff3b351139591b8eeff6273e566a45 (diff) | |
| download | src-5c38b6dbce8b0e199cc285982440e9459ad4ffa8.tar.gz src-5c38b6dbce8b0e199cc285982440e9459ad4ffa8.zip | |
Wire the sysctl output buffer before grabbing any locks to prevent
SYSCTL_OUT() from blocking while locks are held. This should
only be done when it would be inconvenient to make a temporary copy of
the data and defer calling SYSCTL_OUT() until after the locks are
released.
Notes
Notes:
svn path=/head/; revision=100831
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_descrip.c | 1 | ||||
| -rw-r--r-- | sys/kern/kern_fork.c | 1 | ||||
| -rw-r--r-- | sys/kern/kern_proc.c | 1 | ||||
| -rw-r--r-- | sys/kern/vfs_subr.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index 43a7e448831e..06aca87e677d 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -2043,6 +2043,7 @@ sysctl_kern_file(SYSCTL_HANDLER_ARGS) int error; struct file *fp; + sysctl_wire_old_buffer(req, 0); sx_slock(&filelist_lock); if (!req->oldptr) { /* diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 53b3eedd365a..18644dfbdb79 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -193,6 +193,7 @@ sysctl_kern_randompid(SYSCTL_HANDLER_ARGS) { int error, pid; + sysctl_wire_old_buffer(req, sizeof(int)); sx_xlock(&allproc_lock); pid = randompid; error = sysctl_handle_int(oidp, &pid, 0, req); diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index 3547196038cc..6cf9fe9a5646 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -1023,6 +1023,7 @@ sysctl_kern_proc(SYSCTL_HANDLER_ARGS) if (error) return (error); } + sysctl_wire_old_buffer(req, 0); sx_slock(&allproc_lock); for (doingzomb=0 ; doingzomb < 2 ; doingzomb++) { if (!doingzomb) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 4d87718b39f5..168478202021 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -2652,6 +2652,7 @@ sysctl_vnode(SYSCTL_HANDLER_ARGS) return (SYSCTL_OUT(req, 0, (numvnodes + KINFO_VNODESLOP) * (VPTRSZ + VNODESZ))); + sysctl_wire_old_buffer(req, 0); mtx_lock(&mountlist_mtx); for (mp = TAILQ_FIRST(&mountlist); mp != NULL; mp = nmp) { if (vfs_busy(mp, LK_NOWAIT, &mountlist_mtx, td)) { |