2015-02-25 13:43:27

by Andrew W Elble

Subject: [PATCH] NFS: fix clp->cl_revoked list deletion causing softlock in nfsd

commit 2d4a532d385f ("nfsd: ensure that clp->cl_revoked list is
protected by clp->cl_lock") removed the use of the reaplist to
clean out clp->cl_revoked. It failed to change list_entry() to
walk clp->cl_revoked.next instead of reaplist.next

Fixes: 2d4a532d385f ("nfsd: ensure that clp->cl_revoked list is protected by clp->cl_lock")
Cc: [email protected]
Reported-by: Eric Meddaugh <[email protected]>
Tested-by: Eric Meddaugh <[email protected]>
Signed-off-by: Andrew Elble <[email protected]>
---
fs/nfsd/nfs4state.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index f6b2a09f793f..d2f2c37dc2db 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1638,7 +1638,7 @@ __destroy_client(struct nfs4_client *clp)
nfs4_put_stid(&dp->dl_stid);
}
while (!list_empty(&clp->cl_revoked)) {
- dp = list_entry(reaplist.next, struct nfs4_delegation, dl_recall_lru);
+ dp = list_entry(clp->cl_revoked.next, struct nfs4_delegation, dl_recall_lru);
list_del_init(&dp->dl_recall_lru);
nfs4_put_stid(&dp->dl_stid);
}
--
2.2.1

2015-02-26 00:30:47

by Jeff Layton

Subject: Re: [PATCH] NFS: fix clp->cl_revoked list deletion causing softlock in nfsd

On Wed, 25 Feb 2015 08:42:55 -0500
Andrew Elble <[email protected]> wrote:

> commit 2d4a532d385f ("nfsd: ensure that clp->cl_revoked list is
> protected by clp->cl_lock") removed the use of the reaplist to
> clean out clp->cl_revoked. It failed to change list_entry() to
> walk clp->cl_revoked.next instead of reaplist.next
>
> Fixes: 2d4a532d385f ("nfsd: ensure that clp->cl_revoked list is protected by clp->cl_lock")
> Cc: [email protected]
> Reported-by: Eric Meddaugh <[email protected]>
> Tested-by: Eric Meddaugh <[email protected]>
> Signed-off-by: Andrew Elble <[email protected]>
> ---
> fs/nfsd/nfs4state.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index f6b2a09f793f..d2f2c37dc2db 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -1638,7 +1638,7 @@ __destroy_client(struct nfs4_client *clp)
> nfs4_put_stid(&dp->dl_stid);
> }
> while (!list_empty(&clp->cl_revoked)) {
> - dp = list_entry(reaplist.next, struct nfs4_delegation, dl_recall_lru);
> + dp = list_entry(clp->cl_revoked.next, struct nfs4_delegation, dl_recall_lru);
> list_del_init(&dp->dl_recall_lru);
> nfs4_put_stid(&dp->dl_stid);
> }

Looks right.

Reviewed-by: Jeff Layton <[email protected]>

2015-02-26 14:28:42

by Jeff Layton

Subject: Re: [PATCH] NFS: fix clp->cl_revoked list deletion causing softlock in nfsd

On Wed, 25 Feb 2015 08:42:55 -0500
Andrew Elble <[email protected]> wrote:

> commit 2d4a532d385f ("nfsd: ensure that clp->cl_revoked list is
> protected by clp->cl_lock") removed the use of the reaplist to
> clean out clp->cl_revoked. It failed to change list_entry() to
> walk clp->cl_revoked.next instead of reaplist.next
>
> Fixes: 2d4a532d385f ("nfsd: ensure that clp->cl_revoked list is protected by clp->cl_lock")
> Cc: [email protected]
> Reported-by: Eric Meddaugh <[email protected]>
> Tested-by: Eric Meddaugh <[email protected]>
> Signed-off-by: Andrew Elble <[email protected]>
> ---
> fs/nfsd/nfs4state.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index f6b2a09f793f..d2f2c37dc2db 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -1638,7 +1638,7 @@ __destroy_client(struct nfs4_client *clp)
> nfs4_put_stid(&dp->dl_stid);
> }
> while (!list_empty(&clp->cl_revoked)) {
> - dp = list_entry(reaplist.next, struct nfs4_delegation, dl_recall_lru);
> + dp = list_entry(clp->cl_revoked.next, struct nfs4_delegation, dl_recall_lru);
> list_del_init(&dp->dl_recall_lru);
> nfs4_put_stid(&dp->dl_stid);
> }

Reviewed-by: Jeff Layton <[email protected]>

2015-02-25 22:53:04

by J. Bruce Fields

Subject: Re: [PATCH] NFS: fix clp->cl_revoked list deletion causing softlock in nfsd

Thanks, applying for 3.20.

--b.

> commit 2d4a532d385f ("nfsd: ensure that clp->cl_revoked list is
> protected by clp->cl_lock") removed the use of the reaplist to
> clean out clp->cl_revoked. It failed to change list_entry() to
> walk clp->cl_revoked.next instead of reaplist.next
>
> Fixes: 2d4a532d385f ("nfsd: ensure that clp->cl_revoked list is protected by clp->cl_lock")
> Cc: [email protected]
> Reported-by: Eric Meddaugh <[email protected]>
> Tested-by: Eric Meddaugh <[email protected]>
> Signed-off-by: Andrew Elble <[email protected]>
> ---
> fs/nfsd/nfs4state.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index f6b2a09f793f..d2f2c37dc2db 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -1638,7 +1638,7 @@ __destroy_client(struct nfs4_client *clp)
> nfs4_put_stid(&dp->dl_stid);
> }
> while (!list_empty(&clp->cl_revoked)) {
> - dp = list_entry(reaplist.next, struct nfs4_delegation, dl_recall_lru);
> + dp = list_entry(clp->cl_revoked.next, struct nfs4_delegation, dl_recall_lru);
> list_del_init(&dp->dl_recall_lru);
> nfs4_put_stid(&dp->dl_stid);
> }
> --
> 2.2.1