Index: head/sys/conf/files =================================================================== --- head/sys/conf/files +++ head/sys/conf/files @@ -3489,10 +3489,10 @@ fs/msdosfs/msdosfs_lookup.c optional msdosfs fs/msdosfs/msdosfs_vfsops.c optional msdosfs fs/msdosfs/msdosfs_vnops.c optional msdosfs -fs/nfs/nfs_commonkrpc.c optional nfscl | nfsd -fs/nfs/nfs_commonsubs.c optional nfscl | nfsd -fs/nfs/nfs_commonport.c optional nfscl | nfsd -fs/nfs/nfs_commonacl.c optional nfscl | nfsd +fs/nfs/nfs_commonkrpc.c optional nfscl | nfslockd | nfsd +fs/nfs/nfs_commonsubs.c optional nfscl | nfslockd | nfsd +fs/nfs/nfs_commonport.c optional nfscl | nfslockd | nfsd +fs/nfs/nfs_commonacl.c optional nfscl | nfslockd | nfsd fs/nfsclient/nfs_clcomsubs.c optional nfscl fs/nfsclient/nfs_clsubs.c optional nfscl fs/nfsclient/nfs_clstate.c optional nfscl @@ -4434,8 +4434,7 @@ nfs/krpc_subr.c optional bootp nfscl nfs/nfs_diskless.c optional nfscl nfs_root nfs/nfs_fha.c optional nfsd -nfs/nfs_lock.c optional nfscl | nfslockd | nfsd -nfs/nfs_nfssvc.c optional nfscl | nfsd +nfs/nfs_nfssvc.c optional nfscl | nfslockd | nfsd nlm/nlm_advlock.c optional nfslockd | nfsd nlm/nlm_prot_clnt.c optional nfslockd | nfsd nlm/nlm_prot_impl.c optional nfslockd | nfsd Index: head/sys/fs/nfs/nfs_commonport.c =================================================================== --- head/sys/fs/nfs/nfs_commonport.c +++ head/sys/fs/nfs/nfs_commonport.c @@ -74,6 +74,8 @@ volatile int nfsrv_devidcnt = 0; void (*nfsd_call_servertimer)(void) = NULL; void (*ncl_call_invalcaches)(struct vnode *) = NULL; +vop_advlock_t *nfs_advlock_p = NULL; +vop_reclaim_t *nfs_reclaim_p = NULL; int nfs_pnfsio(task_fn_t *, void *); Index: head/sys/fs/nfsclient/nfs_clport.c =================================================================== --- head/sys/fs/nfsclient/nfs_clport.c +++ head/sys/fs/nfsclient/nfs_clport.c @@ -1412,5 +1412,4 @@ MODULE_DEPEND(nfscl, nfscommon, 1, 1, 1); MODULE_DEPEND(nfscl, krpc, 1, 1, 1); MODULE_DEPEND(nfscl, nfssvc, 1, 1, 1); -MODULE_DEPEND(nfscl, nfslock, 1, 1, 1); Index: head/sys/fs/nfsclient/nfs_clvfsops.c =================================================================== --- head/sys/fs/nfsclient/nfs_clvfsops.c +++ head/sys/fs/nfsclient/nfs_clvfsops.c @@ -152,7 +152,6 @@ MODULE_DEPEND(nfs, nfscommon, 1, 1, 1); MODULE_DEPEND(nfs, krpc, 1, 1, 1); MODULE_DEPEND(nfs, nfssvc, 1, 1, 1); -MODULE_DEPEND(nfs, nfslock, 1, 1, 1); /* * This structure is now defined in sys/nfs/nfs_diskless.c so that it Index: head/sys/fs/nfsserver/nfs_nfsdport.c =================================================================== --- head/sys/fs/nfsserver/nfs_nfsdport.c +++ head/sys/fs/nfsserver/nfs_nfsdport.c @@ -6443,7 +6443,6 @@ /* So that loader and kldload(2) can find us, wherever we are.. */ MODULE_VERSION(nfsd, 1); MODULE_DEPEND(nfsd, nfscommon, 1, 1, 1); -MODULE_DEPEND(nfsd, nfslock, 1, 1, 1); MODULE_DEPEND(nfsd, nfslockd, 1, 1, 1); MODULE_DEPEND(nfsd, krpc, 1, 1, 1); MODULE_DEPEND(nfsd, nfssvc, 1, 1, 1); Index: head/sys/kern/kern_exit.c =================================================================== --- head/sys/kern/kern_exit.c +++ head/sys/kern/kern_exit.c @@ -96,9 +96,6 @@ SDT_PROVIDER_DECLARE(proc); SDT_PROBE_DEFINE1(proc, , , exit, "int"); -/* Hook for NFS teardown procedure. */ -void (*nlminfo_release_p)(struct proc *p); - struct proc * proc_realparent(struct proc *child) { @@ -364,12 +361,6 @@ * F_SETOWN with our pid. */ funsetownlst(&p->p_sigiolst); - - /* - * If this process has an nlminfo data area (for lockd), release it - */ - if (nlminfo_release_p != NULL && p->p_nlminfo != NULL) - (*nlminfo_release_p)(p); /* * Close open files and release open-file table. Index: head/sys/kern/kern_thread.c =================================================================== --- head/sys/kern/kern_thread.c +++ head/sys/kern/kern_thread.c @@ -90,11 +90,11 @@ "struct proc KBI p_flag"); _Static_assert(offsetof(struct proc, p_pid) == 0xbc, "struct proc KBI p_pid"); -_Static_assert(offsetof(struct proc, p_filemon) == 0x3c0, +_Static_assert(offsetof(struct proc, p_filemon) == 0x3b8, "struct proc KBI p_filemon"); -_Static_assert(offsetof(struct proc, p_comm) == 0x3d8, +_Static_assert(offsetof(struct proc, p_comm) == 0x3d0, "struct proc KBI p_comm"); -_Static_assert(offsetof(struct proc, p_emuldata) == 0x4b8, +_Static_assert(offsetof(struct proc, p_emuldata) == 0x4b0, "struct proc KBI p_emuldata"); #endif #ifdef __i386__ @@ -110,11 +110,11 @@ "struct proc KBI p_flag"); _Static_assert(offsetof(struct proc, p_pid) == 0x74, "struct proc KBI p_pid"); -_Static_assert(offsetof(struct proc, p_filemon) == 0x26c, +_Static_assert(offsetof(struct proc, p_filemon) == 0x268, "struct proc KBI p_filemon"); -_Static_assert(offsetof(struct proc, p_comm) == 0x280, +_Static_assert(offsetof(struct proc, p_comm) == 0x27c, "struct proc KBI p_comm"); -_Static_assert(offsetof(struct proc, p_emuldata) == 0x30c, +_Static_assert(offsetof(struct proc, p_emuldata) == 0x308, "struct proc KBI p_emuldata"); #endif Index: head/sys/modules/Makefile =================================================================== --- head/sys/modules/Makefile +++ head/sys/modules/Makefile @@ -259,7 +259,6 @@ nfscl \ nfscommon \ nfsd \ - nfslock \ nfslockd \ nfssvc \ nge \ Index: head/sys/modules/nfslock/Makefile =================================================================== --- head/sys/modules/nfslock/Makefile +++ head/sys/modules/nfslock/Makefile @@ -1,9 +0,0 @@ -# $FreeBSD$ - -.PATH: ${SRCTOP}/sys/nfs -KMOD= nfslock -SRCS= vnode_if.h \ - nfs_lock.c \ - opt_nfs.h - -.include Index: head/sys/nfs/nfs_lock.c =================================================================== --- head/sys/nfs/nfs_lock.c +++ head/sys/nfs/nfs_lock.c @@ -1,404 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-3-Clause - * - * Copyright (c) 1997 Berkeley Software Design, Inc. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Berkeley Software Design Inc's name may not be used to endorse or - * promote products derived from this software without specific prior - * written permission. - * - * THIS SOFTWARE IS PROVIDED BY BERKELEY SOFTWARE DESIGN INC ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL BERKELEY SOFTWARE DESIGN INC BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * from BSDI nfs_lock.c,v 2.4 1998/12/14 23:49:56 jch Exp - */ - -#include -__FBSDID("$FreeBSD$"); - -#include -#include -#include -#include -#include /* for hz */ -#include -#include -#include -#include /* for hz */ /* Must come after sys/malloc.h */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include -#include -#include -#include -#include -#include - -extern void (*nlminfo_release_p)(struct proc *p); - -vop_advlock_t *nfs_advlock_p = nfs_dolock; -vop_reclaim_t *nfs_reclaim_p = NULL; - -static MALLOC_DEFINE(M_NFSLOCK, "nfsclient_lock", "NFS lock request"); -static MALLOC_DEFINE(M_NLMINFO, "nfsclient_nlminfo", - "NFS lock process structure"); - -static int nfslockdans(struct thread *td, struct lockd_ans *ansp); -static void nlminfo_release(struct proc *p); -/* - * -------------------------------------------------------------------- - * A miniature device driver which the userland uses to talk to us. - * - */ - -static struct cdev *nfslock_dev; -static struct mtx nfslock_mtx; -static int nfslock_isopen; -static TAILQ_HEAD(,__lock_msg) nfslock_list; - -static int -nfslock_open(struct cdev *dev, int oflags, int devtype, struct thread *td) -{ - int error; - - gone_in(13, "uses Giant; replace with NFSLOCKD/nfslockd.ko"); - error = priv_check(td, PRIV_NFS_LOCKD); - if (error) - return (error); - - mtx_lock(&nfslock_mtx); - if (!nfslock_isopen) { - error = 0; - nfslock_isopen = 1; - } else { - error = EOPNOTSUPP; - } - mtx_unlock(&nfslock_mtx); - - return (error); -} - -static int -nfslock_close(struct cdev *dev, int fflag, int devtype, struct thread *td) -{ - struct __lock_msg *lm; - - mtx_lock(&nfslock_mtx); - nfslock_isopen = 0; - while (!TAILQ_EMPTY(&nfslock_list)) { - lm = TAILQ_FIRST(&nfslock_list); - /* XXX: answer request */ - TAILQ_REMOVE(&nfslock_list, lm, lm_link); - free(lm, M_NFSLOCK); - } - mtx_unlock(&nfslock_mtx); - return (0); -} - -static int -nfslock_read(struct cdev *dev, struct uio *uio, int ioflag) -{ - int error; - struct __lock_msg *lm; - - if (uio->uio_resid != sizeof *lm) - return (EOPNOTSUPP); - lm = NULL; - error = 0; - mtx_lock(&nfslock_mtx); - while (TAILQ_EMPTY(&nfslock_list)) { - error = msleep(&nfslock_list, &nfslock_mtx, PSOCK | PCATCH, - "nfslockd", 0); - if (error) - break; - } - if (!error) { - lm = TAILQ_FIRST(&nfslock_list); - TAILQ_REMOVE(&nfslock_list, lm, lm_link); - } - mtx_unlock(&nfslock_mtx); - if (!error) { - error = uiomove(lm, sizeof *lm, uio); - free(lm, M_NFSLOCK); - } - return (error); -} - -static int -nfslock_write(struct cdev *dev, struct uio *uio, int ioflag) -{ - struct lockd_ans la; - int error; - - if (uio->uio_resid != sizeof la) - return (EOPNOTSUPP); - error = uiomove(&la, sizeof la, uio); - if (!error) - error = nfslockdans(curthread, &la); - return (error); -} - -static int -nfslock_send(struct __lock_msg *lm) -{ - struct __lock_msg *lm2; - int error; - - error = 0; - lm2 = malloc(sizeof *lm2, M_NFSLOCK, M_WAITOK); - mtx_lock(&nfslock_mtx); - if (nfslock_isopen) { - memcpy(lm2, lm, sizeof *lm2); - TAILQ_INSERT_TAIL(&nfslock_list, lm2, lm_link); - wakeup(&nfslock_list); - } else { - error = EOPNOTSUPP; - } - mtx_unlock(&nfslock_mtx); - if (error) - free(lm2, M_NFSLOCK); - return (error); -} - -static struct cdevsw nfslock_cdevsw = { - .d_version = D_VERSION, - .d_open = nfslock_open, - .d_close = nfslock_close, - .d_read = nfslock_read, - .d_write = nfslock_write, - .d_name = "nfslock" -}; - -static int -nfslock_modevent(module_t mod __unused, int type, void *data __unused) -{ - - switch (type) { - case MOD_LOAD: - if (bootverbose) - printf("nfslock: pseudo-device\n"); - mtx_init(&nfslock_mtx, "nfslock", NULL, MTX_DEF); - TAILQ_INIT(&nfslock_list); - nlminfo_release_p = nlminfo_release; - nfslock_dev = make_dev(&nfslock_cdevsw, 0, - UID_ROOT, GID_KMEM, 0600, _PATH_NFSLCKDEV); - return (0); - default: - return (EOPNOTSUPP); - } -} - -DEV_MODULE(nfslock, nfslock_modevent, NULL); -MODULE_VERSION(nfslock, 1); - - -/* - * XXX - * We have to let the process know if the call succeeded. I'm using an extra - * field in the p_nlminfo field in the proc structure, as it is already for - * lockd stuff. - */ - -/* - * nfs_advlock -- - * NFS advisory byte-level locks. - * - * The vnode shall be (shared) locked on the entry, it is - * unconditionally unlocked after. - */ -int -nfs_dolock(struct vop_advlock_args *ap) -{ - LOCKD_MSG msg; - struct thread *td; - struct vnode *vp; - int error; - struct flock *fl; - struct proc *p; - struct nfsmount *nmp; - struct timeval boottime; - - td = curthread; - p = td->td_proc; - - vp = ap->a_vp; - fl = ap->a_fl; - nmp = VFSTONFS(vp->v_mount); - - ASSERT_VOP_LOCKED(vp, "nfs_dolock"); - - nmp->nm_getinfo(vp, msg.lm_fh, &msg.lm_fh_len, &msg.lm_addr, - &msg.lm_nfsv3, NULL, NULL); - VOP_UNLOCK(vp); - - /* - * the NLM protocol doesn't allow the server to return an error - * on ranges, so we do it. - */ - if (fl->l_whence != SEEK_END) { - if ((fl->l_whence != SEEK_CUR && fl->l_whence != SEEK_SET) || - fl->l_start < 0 || - (fl->l_len < 0 && - (fl->l_start == 0 || fl->l_start + fl->l_len < 0))) - return (EINVAL); - if (fl->l_len > 0 && - (fl->l_len - 1 > OFF_MAX - fl->l_start)) - return (EOVERFLOW); - } - - /* - * Fill in the information structure. - */ - msg.lm_version = LOCKD_MSG_VERSION; - msg.lm_msg_ident.pid = p->p_pid; - - mtx_lock(&Giant); - /* - * if there is no nfsowner table yet, allocate one. - */ - if (p->p_nlminfo == NULL) { - p->p_nlminfo = malloc(sizeof(struct nlminfo), - M_NLMINFO, M_WAITOK | M_ZERO); - p->p_nlminfo->pid_start = p->p_stats->p_start; - getboottime(&boottime); - timevaladd(&p->p_nlminfo->pid_start, &boottime); - } - msg.lm_msg_ident.pid_start = p->p_nlminfo->pid_start; - msg.lm_msg_ident.msg_seq = ++(p->p_nlminfo->msg_seq); - - msg.lm_fl = *fl; - msg.lm_wait = ap->a_flags & F_WAIT; - msg.lm_getlk = ap->a_op == F_GETLK; - cru2x(td->td_ucred, &msg.lm_cred); - - for (;;) { - error = nfslock_send(&msg); - if (error) - goto out; - - /* Unlocks succeed immediately. */ - if (fl->l_type == F_UNLCK) - goto out; - - /* - * Retry after 20 seconds if we haven't gotten a response yet. - * This number was picked out of thin air... but is longer - * then even a reasonably loaded system should take (at least - * on a local network). XXX Probably should use a back-off - * scheme. - * - * XXX: No PCATCH here since we currently have no useful - * way to signal to the userland rpc.lockd that the request - * has been aborted. Once the rpc.lockd implementation - * can handle aborts, and we report them properly, - * PCATCH can be put back. In the mean time, if we did - * permit aborting, the lock attempt would "get lost" - * and the lock would get stuck in the locked state. - */ - error = tsleep(p->p_nlminfo, PUSER, "lockd", 20*hz); - if (error != 0) { - if (error == EWOULDBLOCK) { - /* - * We timed out, so we rewrite the request - * to the fifo. - */ - continue; - } - - break; - } - - if (msg.lm_getlk && p->p_nlminfo->retcode == 0) { - if (p->p_nlminfo->set_getlk_pid) { - fl->l_sysid = 0; /* XXX */ - fl->l_pid = p->p_nlminfo->getlk_pid; - } else { - fl->l_type = F_UNLCK; - } - } - error = p->p_nlminfo->retcode; - break; - } - out: - mtx_unlock(&Giant); - return (error); -} - -/* - * nfslockdans -- - * NFS advisory byte-level locks answer from the lock daemon. - */ -static int -nfslockdans(struct thread *td, struct lockd_ans *ansp) -{ - struct proc *targetp; - - /* the version should match, or we're out of sync */ - if (ansp->la_vers != LOCKD_ANS_VERSION) - return (EINVAL); - - /* Find the process, set its return errno and wake it up. */ - if ((targetp = pfind(ansp->la_msg_ident.pid)) == NULL) - return (ESRCH); - - /* verify the pid hasn't been reused (if we can), and it isn't waiting - * for an answer from a more recent request. We return an EPIPE if - * the match fails, because we've already used ESRCH above, and this - * is sort of like writing on a pipe after the reader has closed it. - */ - if (targetp->p_nlminfo == NULL || - ((ansp->la_msg_ident.msg_seq != -1) && - (timevalcmp(&targetp->p_nlminfo->pid_start, - &ansp->la_msg_ident.pid_start, !=) || - targetp->p_nlminfo->msg_seq != ansp->la_msg_ident.msg_seq))) { - PROC_UNLOCK(targetp); - return (EPIPE); - } - - targetp->p_nlminfo->retcode = ansp->la_errno; - targetp->p_nlminfo->set_getlk_pid = ansp->la_set_getlk_pid; - targetp->p_nlminfo->getlk_pid = ansp->la_getlk_pid; - - wakeup(targetp->p_nlminfo); - - PROC_UNLOCK(targetp); - return (0); -} - -/* - * Free nlminfo attached to process. - */ -void -nlminfo_release(struct proc *p) -{ - free(p->p_nlminfo, M_NLMINFO); - p->p_nlminfo = NULL; -} Index: head/sys/nlm/nlm_prot_impl.c =================================================================== --- head/sys/nlm/nlm_prot_impl.c +++ head/sys/nlm/nlm_prot_impl.c @@ -2411,5 +2411,5 @@ /* So that loader and kldload(2) can find us, wherever we are.. */ MODULE_DEPEND(nfslockd, krpc, 1, 1, 1); -MODULE_DEPEND(nfslockd, nfslock, 1, 1, 1); +MODULE_DEPEND(nfslockd, nfscommon, 1, 1, 1); MODULE_VERSION(nfslockd, 1); Index: head/sys/sys/proc.h =================================================================== --- head/sys/sys/proc.h +++ head/sys/sys/proc.h @@ -182,7 +182,6 @@ struct kdtrace_proc; struct kdtrace_thread; struct mqueue_notifier; -struct nlminfo; struct p_sched; struct proc; struct procdesc; @@ -645,7 +644,6 @@ int p_sigparent; /* (c) Signal to parent on exit. */ int p_sig; /* (n) For core dump/debugger XXX. */ u_int p_ptevents; /* (c + e) ptrace() event mask. */ - struct nlminfo *p_nlminfo; /* (?) Only used by/for lockd. */ struct kaioinfo *p_aioinfo; /* (y) ASYNC I/O info. */ struct thread *p_singlethread;/* (c + j) If single threading this is it */ int p_suspcount; /* (j) Num threads in suspended mode. */