[PATCH 1/3] NFSv4: Ensure that we remove delegations before recovering

[PATCH 1/3] NFSv4: Ensure that we remove delegations before recovering

[Trond Myklebust]

NFSv4.0 does not have TEST_STATEID/FREE_STATEID functionality, so
unlike NFSv4.1, the recovery procedure when stateids have expired
requires us to just forget the delegation.

http://lkml.kernel.org/r/CAN-5tyHwG=Cn2Q9KsHWadewjpTTy_K26ee+UnSvHvG4192p-Xw@mail.gmail.com
Cc: stable@vger.kernel.org
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
 fs/nfs/nfs4proc.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 405bd95c1f58..d8f352d8c75f 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -2109,6 +2109,14 @@ static int nfs4_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *sta
 	return ret;
 }
 
+static int nfs40_open_expired(struct nfs4_state_owner *sp, struct nfs4_state *state)
+{
+	/* NFSv4.0 doesn't allow for delegation recovery on open expire */
+	if (test_bit(NFS_DELEGATED_STATE, &state->flags))
+		nfs_remove_bad_delegation(state->inode);
+	return nfs4_open_expired(sp, state);
+}
+
 #if defined(CONFIG_NFS_V4_1)
 static void nfs41_clear_delegation_stateid(struct nfs4_state *state)
 {
@@ -8341,7 +8349,7 @@ static const struct nfs4_state_recovery_ops nfs41_reboot_recovery_ops = {
 static const struct nfs4_state_recovery_ops nfs40_nograce_recovery_ops = {
 	.owner_flag_bit = NFS_OWNER_RECLAIM_NOGRACE,
 	.state_flag_bit	= NFS_STATE_RECLAIM_NOGRACE,
-	.recover_open	= nfs4_open_expired,
+	.recover_open	= nfs40_open_expired,
 	.recover_lock	= nfs4_lock_expired,
 	.establish_clid = nfs4_init_clientid,
 };
-- 
1.9.3

[PATCH 2/3] NFSv4: Ensure that we call FREE_STATEID when NFSv4.x stateids are revoked

[Trond Myklebust]

NFSv4.x (x>0) requires us to call TEST_STATEID+FREE_STATEID if a stateid is
revoked. We will currently fail to do this if the stateid is a delegation.

http://lkml.kernel.org/r/CAN-5tyHwG=Cn2Q9KsHWadewjpTTy_K26ee+UnSvHvG4192p-Xw@mail.gmail.com
Cc: stable@vger.kernel.org
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
 fs/nfs/nfs4proc.c | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index d8f352d8c75f..6cf49af3092d 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -370,11 +370,6 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc
 		case -NFS4ERR_DELEG_REVOKED:
 		case -NFS4ERR_ADMIN_REVOKED:
 		case -NFS4ERR_BAD_STATEID:
-			if (inode != NULL && nfs4_have_delegation(inode, FMODE_READ)) {
-				nfs_remove_bad_delegation(inode);
-				exception->retry = 1;
-				break;
-			}
 			if (state == NULL)
 				break;
 			ret = nfs4_schedule_stateid_recovery(server, state);
@@ -4849,9 +4844,6 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server,
 		case -NFS4ERR_DELEG_REVOKED:
 		case -NFS4ERR_ADMIN_REVOKED:
 		case -NFS4ERR_BAD_STATEID:
-			if (state == NULL)
-				break;
-			nfs_remove_bad_delegation(state->inode);
 		case -NFS4ERR_OPENMODE:
 			if (state == NULL)
 				break;
-- 
1.9.3

[PATCH 3/3] NFS: Don't try to reclaim delegation open state if recovery failed

[Trond Myklebust]

If state recovery failed, then we should not attempt to reclaim delegated
state.

http://lkml.kernel.org/r/CAN-5tyHwG=Cn2Q9KsHWadewjpTTy_K26ee+UnSvHvG4192p-Xw@mail.gmail.com
Cc: stable@vger.kernel.org
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
---
 fs/nfs/delegation.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
index 5853f53db732..4904a1dba937 100644
--- a/fs/nfs/delegation.c
+++ b/fs/nfs/delegation.c
@@ -125,6 +125,8 @@ again:
 			continue;
 		if (!test_bit(NFS_DELEGATED_STATE, &state->flags))
 			continue;
+		if (!nfs4_valid_open_stateid(state))
+			continue;
 		if (!nfs4_stateid_match(&state->stateid, stateid))
 			continue;
 		get_nfs_open_context(ctx);
-- 
1.9.3

Re: [PATCH 2/3] NFSv4: Ensure that we call FREE_STATEID when NFSv4.x stateids are revoked

[Anna Schumaker]

Hey Trond,

On 11/04/2014 06:36 PM, Trond Myklebust wrote:
> NFSv4.x (x>0) requires us to call TEST_STATEID+FREE_STATEID if a stateid is
> revoked. We will currently fail to do this if the stateid is a delegation.
>
> http://lkml.kernel.org/r/CAN-5tyHwG=Cn2Q9KsHWadewjpTTy_K26ee+UnSvHvG4192p-Xw@mail.gmail.com
> Cc: stable@vger.kernel.org
> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
> ---
>  fs/nfs/nfs4proc.c | 8 --------
>  1 file changed, 8 deletions(-)
>
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index d8f352d8c75f..6cf49af3092d 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -370,11 +370,6 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc
>  		case -NFS4ERR_DELEG_REVOKED:
>  		case -NFS4ERR_ADMIN_REVOKED:
>  		case -NFS4ERR_BAD_STATEID:
> -			if (inode != NULL && nfs4_have_delegation(inode, FMODE_READ)) {
> -				nfs_remove_bad_delegation(inode);
> -				exception->retry = 1;
> -				break;
> -			}
>  			if (state == NULL)
>  				break;
>  			ret = nfs4_schedule_stateid_recovery(server, state);
> @@ -4849,9 +4844,6 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server,
>  		case -NFS4ERR_DELEG_REVOKED:
>  		case -NFS4ERR_ADMIN_REVOKED:
>  		case -NFS4ERR_BAD_STATEID:
> -			if (state == NULL)
> -				break;
> -			nfs_remove_bad_delegation(state->inode);

Does filelayout_async_handle_error() need to be updated in the same way?  They are the only remaining caller of nfs_remove_bad_delegation().

Thanks,
Anna

>  		case -NFS4ERR_OPENMODE:
>  			if (state == NULL)
>  				break;

Re: [PATCH 2/3] NFSv4: Ensure that we call FREE_STATEID when NFSv4.x stateids are revoked

[Trond Myklebust]

On Wed, Nov 5, 2014 at 9:49 AM, Anna Schumaker
<Anna.Schumaker@netapp.com> wrote:
> Hey Trond,
>
> On 11/04/2014 06:36 PM, Trond Myklebust wrote:
>> NFSv4.x (x>0) requires us to call TEST_STATEID+FREE_STATEID if a stateid is
>> revoked. We will currently fail to do this if the stateid is a delegation.
>>
>> http://lkml.kernel.org/r/CAN-5tyHwG=Cn2Q9KsHWadewjpTTy_K26ee+UnSvHvG4192p-Xw@mail.gmail.com
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
>> ---
>>  fs/nfs/nfs4proc.c | 8 --------
>>  1 file changed, 8 deletions(-)
>>
>> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
>> index d8f352d8c75f..6cf49af3092d 100644
>> --- a/fs/nfs/nfs4proc.c
>> +++ b/fs/nfs/nfs4proc.c
>> @@ -370,11 +370,6 @@ static int nfs4_handle_exception(struct nfs_server *server, int errorcode, struc
>>               case -NFS4ERR_DELEG_REVOKED:
>>               case -NFS4ERR_ADMIN_REVOKED:
>>               case -NFS4ERR_BAD_STATEID:
>> -                     if (inode != NULL && nfs4_have_delegation(inode, FMODE_READ)) {
>> -                             nfs_remove_bad_delegation(inode);
>> -                             exception->retry = 1;
>> -                             break;
>> -                     }
>>                       if (state == NULL)
>>                               break;
>>                       ret = nfs4_schedule_stateid_recovery(server, state);
>> @@ -4849,9 +4844,6 @@ nfs4_async_handle_error(struct rpc_task *task, const struct nfs_server *server,
>>               case -NFS4ERR_DELEG_REVOKED:
>>               case -NFS4ERR_ADMIN_REVOKED:
>>               case -NFS4ERR_BAD_STATEID:
>> -                     if (state == NULL)
>> -                             break;
>> -                     nfs_remove_bad_delegation(state->inode);
>
> Does filelayout_async_handle_error() need to be updated in the same way?  They are the only remaining caller of nfs_remove_bad_delegation().
>

Oops. Yes, that would be correct.

-- 
Trond Myklebust

Linux NFS client maintainer, PrimaryData

trond.myklebust@primarydata.com