linux.git/fs/nfs, branch v3.13

Merge tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

2013-12-05T21:05:48+00:00

Pull NFS client bugfixes from Trond Myklebust:
 - Stable fix for a NFSv4.1 delegation and state recovery deadlock
 - Stable fix for a loop on irrecoverable errors when returning
   delegations
 - Fix a 3-way deadlock between layoutreturn, open, and state recovery
 - Update the MAINTAINERS file with contact information for Trond
   Myklebust
 - Close needs to handle NFS4ERR_ADMIN_REVOKED
 - Enabling v4.2 should not recompile nfsd and lockd
 - Fix a couple of compile warnings

* tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  nfs: fix do_div() warning by instead using sector_div()
  MAINTAINERS: Update contact information for Trond Myklebust
  NFSv4.1: Prevent a 3-way deadlock between layoutreturn, open and state recovery
  SUNRPC: do not fail gss proc NULL calls with EACCES
  NFSv4: close needs to handle NFS4ERR_ADMIN_REVOKED
  NFSv4: Update list of irrecoverable errors on DELEGRETURN
  NFSv4 wait on recovery for async session errors
  NFS: Fix a warning in nfs_setsecurity
  NFS: Enabling v4.2 should not recompile nfsd and lockd

nfs: fix do_div() warning by instead using sector_div()

2013-12-04T17:57:37+00:00

When compiling a 32bit kernel with CONFIG_LBDAF=n the compiler complains like
shown below.  Fix this warning by instead using sector_div() which is provided
by the kernel.h header file.

fs/nfs/blocklayout/extents.c: In function ‘normalize’:
include/asm-generic/div64.h:43:28: warning: comparison of distinct pointer types lacks a cast [enabled by default]
fs/nfs/blocklayout/extents.c:47:13: note: in expansion of macro ‘do_div’
nfs/blocklayout/extents.c:47:2: warning: right shift count >= width of type [enabled by default]
fs/nfs/blocklayout/extents.c:47:2: warning: passing argument 1 of ‘__div64_32’ from incompatible pointer type [enabled by default]
include/asm-generic/div64.h:35:17: note: expected ‘uint64_t *’ but argument is of type ‘sector_t *’
 extern uint32_t __div64_32(uint64_t *dividend, uint32_t divisor);

Signed-off-by: Helge Deller 
Signed-off-by: Trond Myklebust

NFSv4.1: Prevent a 3-way deadlock between layoutreturn, open and state recovery

2013-12-04T17:32:19+00:00

Andy Adamson reports:

The state manager is recovering expired state and recovery OPENs are being
processed. If kswapd is pruning inodes at the same time, a deadlock can occur
when kswapd calls evict_inode on an NFSv4.1 inode with a layout, and the
resultant layoutreturn gets an error that the state mangager is to handle,
causing the layoutreturn to wait on the (NFS client) cl_rpcwaitq.

At the same time an open is waiting for the inode deletion to complete in
__wait_on_freeing_inode.

If the open is either the open called by the state manager, or an open from
the same open owner that is holding the NFSv4 sequence id which causes the
OPEN from the state manager to wait for the sequence id on the Seqid_waitqueue,
then the state is deadlocked with kswapd.

The fix is simply to have layoutreturn ignore all errors except NFS4ERR_DELAY.
We already know that layouts are dropped on all server reboots, and that
it has to be coded to deal with the "forgetful client model" that doesn't
send layoutreturns.

Reported-by: Andy Adamson 
Link: http://lkml.kernel.org/r/1385402270-14284-1-git-send-email-andros@netapp.com
Signed-off-by: Trond Myklebust

NFSv4: close needs to handle NFS4ERR_ADMIN_REVOKED

2013-11-20T20:55:39+00:00

Also ensure that we zero out the stateid mode when exiting

Signed-off-by: Trond Myklebust

NFSv4: Update list of irrecoverable errors on DELEGRETURN

2013-11-20T20:54:27+00:00

If the DELEGRETURN errors out with something like NFS4ERR_BAD_STATEID
then there is no recovery possible. Just quit without returning an error.

Also, note that the client must not assume that the NFSv4 lease has been
renewed when it sees an error on DELEGRETURN.

Signed-off-by: Trond Myklebust 
Cc: stable@vger.kernel.org

NFSv4 wait on recovery for async session errors

2013-11-20T20:54:08+00:00

When the state manager is processing the NFS4CLNT_DELEGRETURN flag, session
draining is off, but DELEGRETURN can still get a session error.
The async handler calls nfs4_schedule_session_recovery returns -EAGAIN, and
the DELEGRETURN done then restarts the RPC task in the prepare state.
With the state manager still processing the NFS4CLNT_DELEGRETURN flag with
session draining off, these DELEGRETURNs will cycle with errors filling up the
session slots.

This prevents OPEN reclaims (from nfs_delegation_claim_opens) required by the
NFS4CLNT_DELEGRETURN state manager processing from completing, hanging the
state manager in the __rpc_wait_for_completion_task in nfs4_run_open_task
as seen in this kernel thread dump:

kernel: 4.12.32.53-ma D 0000000000000000     0  3393      2 0x00000000
kernel: ffff88013995fb60 0000000000000046 ffff880138cc5400 ffff88013a9df140
kernel: ffff8800000265c0 ffffffff8116eef0 ffff88013fc10080 0000000300000001
kernel: ffff88013a4ad058 ffff88013995ffd8 000000000000fbc8 ffff88013a4ad058
kernel: Call Trace:
kernel: [] ? cache_alloc_refill+0x1c0/0x240
kernel: [] ? rpc_wait_bit_killable+0x0/0xa0 [sunrpc]
kernel: [] rpc_wait_bit_killable+0x42/0xa0 [sunrpc]
kernel: [] __wait_on_bit+0x5f/0x90
kernel: [] ? rpc_wait_bit_killable+0x0/0xa0 [sunrpc]
kernel: [] out_of_line_wait_on_bit+0x78/0x90
kernel: [] ? wake_bit_function+0x0/0x50
kernel: [] __rpc_wait_for_completion_task+0x2d/0x30 [sunrpc]
kernel: [] nfs4_run_open_task+0x11c/0x160 [nfs]
kernel: [] nfs4_open_recover_helper+0x87/0x120 [nfs]
kernel: [] nfs4_open_recover+0xc6/0x150 [nfs]
kernel: [] ? nfs4_open_recoverdata_alloc+0x2f/0x60 [nfs]
kernel: [] nfs4_open_delegation_recall+0x6a/0xa0 [nfs]
kernel: [] nfs_end_delegation_return+0x120/0x2e0 [nfs]
kernel: [] ? queue_work+0x1f/0x30
kernel: [] nfs_client_return_marked_delegations+0xd7/0x110 [nfs]
kernel: [] nfs4_run_state_manager+0x548/0x620 [nfs]
kernel: [] ? nfs4_run_state_manager+0x0/0x620 [nfs]
kernel: [] kthread+0x96/0xa0
kernel: [] child_rip+0xa/0x20
kernel: [] ? kthread+0x0/0xa0
kernel: [] ? child_rip+0x0/0x20

The state manager can not therefore process the DELEGRETURN session errors.
Change the async handler to wait for recovery on session errors.

Signed-off-by: Andy Adamson 
Cc: stable@vger.kernel.org
Signed-off-by: Trond Myklebust

NFS: Fix a warning in nfs_setsecurity

2013-11-19T21:20:41+00:00

Fix the following warning:

linux-nfs/fs/nfs/inode.c:315:1: warning: ‘inline’ is not at
beginning of declaration [-Wold-style-declaration]

Signed-off-by: Trond Myklebust

NFS: Enabling v4.2 should not recompile nfsd and lockd

2013-11-19T21:20:40+00:00

When CONFIG_NFS_V4_2 is toggled nfsd and lockd will be recompiled,
instead of only the nfs client.  This patch moves a small amount of code
into the client directory to avoid unnecessary recompiles.

Signed-off-by: Anna Schumaker 
Signed-off-by: Trond Myklebust

Merge tag 'nfs-for-3.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

2013-11-16T21:14:56+00:00

Pull NFS client bugfixes:
 - Stable fix for data corruption when retransmitting O_DIRECT writes
 - Stable fix for a deep recursion/stack overflow bug in rpc_release_client
 - Stable fix for infinite looping when mounting a NFSv4.x volume
 - Fix a typo in the nfs mount option parser
 - Allow pNFS layouts to be compiled into the kernel when NFSv4.1 is

* tag 'nfs-for-3.13-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  nfs: fix pnfs Kconfig defaults
  NFS: correctly report misuse of "migration" mount option.
  nfs: don't retry detect_trunking with RPC_AUTH_UNIX more than once
  SUNRPC: Avoid deep recursion in rpc_release_client
  SUNRPC: Fix a data corruption issue when retransmitting RPC calls

nfs: fix pnfs Kconfig defaults

2013-11-15T18:41:43+00:00

Defaulting to m seem to prevent building the pnfs layout modules into the
kernel.  Default to the value of CONFIG_NFS_V4 make sure they are
built in for built-in NFSv4 support and modular for a modular NFSv4.

Signed-off-by: Christoph Hellwig 
Signed-off-by: Trond Myklebust