linux-toradex.git/fs/lockd, branch v2.6.30.2

lockd: fix list corruption on lockd restart

2009-05-06T21:19:36+00:00

If lockd is signalled soon enough after restart then locks_start_grace()
will try to re-add an entry to a list and trigger a lock corruption
warning.

Thanks to Wang Chen for the problem report and diagnosis.

WARNING: at lib/list_debug.c:26 __list_add+0x27/0x5c()
...
list_add corruption. next->prev should be prev (ef8fe958), but was ef8ff128.  (next=ef8ff128).
...
Pid: 23062, comm: lockd Tainted: G        W  2.6.30-rc2 #3
Call Trace:
[] warn_slowpath+0x71/0xa0
[] ? update_curr+0x11d/0x125
[] ? trace_hardirqs_on_caller+0x18/0x150
[] ? trace_hardirqs_on+0xb/0xd
[] ? _raw_spin_lock+0x53/0xfa
[] __list_add+0x27/0x5c
[] locks_start_grace+0x22/0x30 [lockd]
[] set_grace_period+0x39/0x53 [lockd]
[] ? lock_kernel+0x1c/0x28
[] lockd+0x64/0x164 [lockd]
[] ? trace_hardirqs_on_caller+0x18/0x150
[] ? complete+0x34/0x3e
[] ? lockd+0x0/0x164 [lockd]
[] ? lockd+0x0/0x164 [lockd]
[] kthread+0x45/0x6b
[] ? kthread+0x0/0x6b
[] kernel_thread_helper+0x7/0x10

Reported-by: Wang Chen 
Signed-off-by: J. Bruce Fields 
Cc: stable@kernel.org

Merge branch 'for-2.6.30' of git://linux-nfs.org/~bfields/linux

2009-04-06T20:25:56+00:00

* 'for-2.6.30' of git://linux-nfs.org/~bfields/linux: (81 commits)
  nfsd41: define nfsd4_set_statp as noop for !CONFIG_NFSD_V4
  nfsd41: define NFSD_DRC_SIZE_SHIFT in set_max_drc
  nfsd41: Documentation/filesystems/nfs41-server.txt
  nfsd41: CREATE_EXCLUSIVE4_1
  nfsd41: SUPPATTR_EXCLCREAT attribute
  nfsd41: support for 3-word long attribute bitmask
  nfsd: dynamically skip encoded fattr bitmap in _nfsd4_verify
  nfsd41: pass writable attrs mask to nfsd4_decode_fattr
  nfsd41: provide support for minor version 1 at rpc level
  nfsd41: control nfsv4.1 svc via /proc/fs/nfsd/versions
  nfsd41: add OPEN4_SHARE_ACCESS_WANT nfs4_stateid bmap
  nfsd41: access_valid
  nfsd41: clientid handling
  nfsd41: check encode size for sessions maxresponse cached
  nfsd41: stateid handling
  nfsd: pass nfsd4_compound_state* to nfs4_preprocess_{state,seq}id_op
  nfsd41: destroy_session operation
  nfsd41: non-page DRC for solo sequence responses
  nfsd41: Add a create session replay cache
  nfsd41: create_session operation
  ...

NSM: Fix unaligned accesses in nsm_init_private()

2009-04-01T17:24:14+00:00

This fixes unaligned accesses in nsm_init_private() when
creating nlm_reboot keys.

Signed-off-by: Mans Rullgard 
Reviewed-by: Chuck Lever 
Signed-off-by: Trond Myklebust

lockd: Start PF_INET6 listener only if IPv6 support is available

2009-03-28T20:01:16+00:00

Apparently a lot of people need to disable IPv6 completely on their
distributor-built systems, which have CONFIG_IPV6_MODULE enabled at
build time.

They do this by blacklisting the ipv6.ko module.  This causes the
creation of the lockd service listener to fail if CONFIG_IPV6_MODULE
is set, but the module cannot be loaded.

Now that the kernel's PF_INET6 RPC listeners are completely separate
from PF_INET listeners, we can always start PF_INET.  Then lockd can
try to start PF_INET6, but it isn't required to be available.

Note this has the added benefit that NLM callbacks from AF_INET6
servers will never come from AF_INET remotes.  We no longer have to
worry about matching mapped IPv4 addresses to AF_INET when comparing
addresses.

Signed-off-by: Chuck Lever 
Signed-off-by: Trond Myklebust

NFS: Revert creation of IPv6 listeners for lockd and NFSv4 callbacks

2009-03-28T19:55:06+00:00

We're about to convert over to using separate PF_INET and PF_INET6
listeners, instead of a single PF_INET6 listener that also receives
AF_INET requests and maps them to AF_INET6.

Clear the way by removing the logic in lockd and the NFSv4 callback
server that creates an AF_INET6 service listener.

Signed-off-by: Chuck Lever 
Signed-off-by: Trond Myklebust

SUNRPC: Remove @family argument from svc_create() and svc_create_pooled()

2009-03-28T19:54:48+00:00

Since an RPC service listener's protocol family is specified now via
svc_create_xprt(), it no longer needs to be passed to svc_create() or
svc_create_pooled().  Remove that argument from the synopsis of those
functions, and remove the sv_family field from the svc_serv struct.

Signed-off-by: Chuck Lever 
Signed-off-by: Trond Myklebust

SUNRPC: Change svc_create_xprt() to take a @family argument

2009-03-28T19:54:36+00:00

The sv_family field is going away.  Pass a protocol family argument to
svc_create_xprt() instead of extracting the family from the passed-in
svc_serv struct.

Again, as this is a listener socket and not an address, we make this
new argument an "int" protocol family, instead of an "sa_family_t."

Signed-off-by: Chuck Lever 
Signed-off-by: Trond Myklebust

lockd: clean up blocking lock cases of nlsmvc_lock()

2009-03-18T21:30:50+00:00

No change in behavior, just rearranging the switch so that we break out
of the switch if and only if we're in the wait case.

Signed-off-by: Miklos Szeredi 
Signed-off-by: J. Bruce Fields

NLM: Fix GRANT callback address comparison when IPv6 is enabled

2009-03-11T00:33:20+00:00

The NFS mount command may pass an AF_INET server address to lockd.  If
lockd happens to be using a PF_INET6 listener, the nlm_cmp_addr() in
nlmclnt_grant() will fail to match requests from that host because they
will all have a mapped IPv4 AF_INET6 address.

Adopt the same solution used in nfs_sockaddr_match_ipaddr() for NFSv4
callbacks: if either address is AF_INET, map it to an AF_INET6 address
before doing the comparison.

Signed-off-by: Chuck Lever 
Signed-off-by: Trond Myklebust

lockd: fix regression in lockd's handling of blocked locks

2009-02-09T18:19:46+00:00

If a client requests a blocking lock, is denied, then requests it again,
then here in nlmsvc_lock() we will call vfs_lock_file() without FL_SLEEP
set, because we've already queued a block and don't need the locks code
to do it again.

But that means vfs_lock_file() will return -EAGAIN instead of
FILE_LOCK_DENIED.  So we still need to translate that -EAGAIN return
into a nlm_lck_blocked error in this case, and put ourselves back on
lockd's block list.

The bug was introduced by bde74e4bc64415b1 "locks: add special return
value for asynchronous locks".

Thanks to Frank van Maarseveen for the report; his original test
case was essentially

	for i in `seq 30`; do flock /nfsmount/foo sleep 10 & done

Tested-by: Frank van Maarseveen 
Reported-by: Frank van Maarseveen 
Cc: Miklos Szeredi 
Signed-off-by: J. Bruce Fields