diff options
author | dfr <dfr@FreeBSD.org> | 2008-03-26 15:23:12 +0000 |
---|---|---|
committer | dfr <dfr@FreeBSD.org> | 2008-03-26 15:23:12 +0000 |
commit | 79d2dfdaa69db38c43daed9744a6dbd0568189b5 (patch) | |
tree | eaf6a0fa52bc76253126814ddab4cbf78722a8a5 /sys/conf | |
parent | 632e5d39f769e15274575347233e9d7aa364c0d6 (diff) | |
download | FreeBSD-src-79d2dfdaa69db38c43daed9744a6dbd0568189b5.zip FreeBSD-src-79d2dfdaa69db38c43daed9744a6dbd0568189b5.tar.gz |
Add the new kernel-mode NFS Lock Manager. To use it instead of the
user-mode lock manager, build a kernel with the NFSLOCKD option and
add '-k' to 'rpc_lockd_flags' in rc.conf.
Highlights include:
* Thread-safe kernel RPC client - many threads can use the same RPC
client handle safely with replies being de-multiplexed at the socket
upcall (typically driven directly by the NIC interrupt) and handed
off to whichever thread matches the reply. For UDP sockets, many RPC
clients can share the same socket. This allows the use of a single
privileged UDP port number to talk to an arbitrary number of remote
hosts.
* Single-threaded kernel RPC server. Adding support for multi-threaded
server would be relatively straightforward and would follow
approximately the Solaris KPI. A single thread should be sufficient
for the NLM since it should rarely block in normal operation.
* Kernel mode NLM server supporting cancel requests and granted
callbacks. I've tested the NLM server reasonably extensively - it
passes both my own tests and the NFS Connectathon locking tests
running on Solaris, Mac OS X and Ubuntu Linux.
* Userland NLM client supported. While the NLM server doesn't have
support for the local NFS client's locking needs, it does have to
field async replies and granted callbacks from remote NLMs that the
local client has contacted. We relay these replies to the userland
rpc.lockd over a local domain RPC socket.
* Robust deadlock detection for the local lock manager. In particular
it will detect deadlocks caused by a lock request that covers more
than one blocking request. As required by the NLM protocol, all
deadlock detection happens synchronously - a user is guaranteed that
if a lock request isn't rejected immediately, the lock will
eventually be granted. The old system allowed for a 'deferred
deadlock' condition where a blocked lock request could wake up and
find that some other deadlock-causing lock owner had beaten them to
the lock.
* Since both local and remote locks are managed by the same kernel
locking code, local and remote processes can safely use file locks
for mutual exclusion. Local processes have no fairness advantage
compared to remote processes when contending to lock a region that
has just been unlocked - the local lock manager enforces a strict
first-come first-served model for both local and remote lockers.
Sponsored by: Isilon Systems
PR: 95247 107555 115524 116679
MFC after: 2 weeks
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/NOTES | 1 | ||||
-rw-r--r-- | sys/conf/files | 32 | ||||
-rw-r--r-- | sys/conf/options | 2 |
3 files changed, 35 insertions, 0 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index b6be119..f0e422b 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -957,6 +957,7 @@ options FDESCFS #File descriptor filesystem options HPFS #OS/2 File system options MSDOSFS #MS DOS File System (FAT, FAT32) options NFSSERVER #Network File System server +options NFSLOCKD #Network Lock Manager options NTFS #NT File System options NULLFS #NULL filesystem # Broken (depends on NCP): diff --git a/sys/conf/files b/sys/conf/files index eac57fa..3f1c6e0 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -2031,6 +2031,12 @@ nfsserver/nfs_srvsock.c optional nfsserver nfsserver/nfs_srvcache.c optional nfsserver nfsserver/nfs_srvsubs.c optional nfsserver nfsserver/nfs_syscalls.c optional nfsserver +nlm/nlm_prot_clnt.c optional nfslockd +nlm/nlm_prot_impl.c optional nfslockd +nlm/nlm_prot_server.c optional nfslockd +nlm/nlm_prot_svc.c optional nfslockd +nlm/nlm_prot_xdr.c optional nfslockd +nlm/sm_inter_xdr.c optional nfslockd # crypto support opencrypto/cast.c optional crypto | ipsec opencrypto/criov.c optional crypto @@ -2057,7 +2063,27 @@ pci/intpm.c optional intpm pci pci/ncr.c optional ncr pci pci/nfsmb.c optional nfsmb pci pci/viapm.c optional viapm pci +rpc/auth_none.c optional krpc | nfslockd +rpc/auth_unix.c optional krpc | nfslockd +rpc/authunix_prot.c optional krpc | nfslockd +rpc/clnt_dg.c optional krpc | nfslockd +rpc/clnt_rc.c optional krpc | nfslockd +rpc/clnt_vc.c optional krpc | nfslockd +rpc/getnetconfig.c optional krpc | nfslockd +rpc/inet_ntop.c optional krpc | nfslockd +rpc/inet_pton.c optional krpc | nfslockd +rpc/rpc_callmsg.c optional krpc | nfslockd +rpc/rpc_generic.c optional krpc | nfslockd +rpc/rpc_prot.c optional krpc | nfslockd +rpc/rpcb_clnt.c optional krpc | nfslockd +rpc/rpcb_prot.c optional krpc | nfslockd rpc/rpcclnt.c optional nfsclient +rpc/svc.c optional krpc | nfslockd +rpc/svc_auth.c optional krpc | nfslockd +rpc/svc_auth_unix.c optional krpc | nfslockd +rpc/svc_dg.c optional krpc | nfslockd +rpc/svc_generic.c optional krpc | nfslockd +rpc/svc_vc.c optional krpc | nfslockd security/audit/audit.c optional audit security/audit/audit_arg.c optional audit security/audit/audit_bsm.c optional audit @@ -2142,6 +2168,12 @@ vm/vm_reserv.c standard vm/vm_unix.c standard vm/vm_zeroidle.c standard vm/vnode_pager.c standard +xdr/xdr.c optional krpc | nfslockd +xdr/xdr_array.c optional krpc | nfslockd +xdr/xdr_mbuf.c optional krpc | nfslockd +xdr/xdr_mem.c optional krpc | nfslockd +xdr/xdr_reference.c optional krpc | nfslockd +xdr/xdr_sizeof.c optional krpc | nfslockd # gnu/fs/xfs/xfs_alloc.c optional xfs \ compile-with "${NORMAL_C} -I$S/gnu/fs/xfs/FreeBSD -I$S/gnu/fs/xfs/FreeBSD/support -I$S/gnu/fs/xfs" \ diff --git a/sys/conf/options b/sys/conf/options index 77710be..c15a7eb 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -398,6 +398,8 @@ TCP_SIGNATURE opt_inet.h DEV_VLAN opt_vlan.h VLAN_ARRAY opt_vlan.h XBONEHACK +KRPC +NFSLOCKD # # SCTP |