OSDN Git Service

NFSv4.1: Again fix a race where CB_NOTIFY_LOCK fails to wake a waiter
authorYihao Wu <wuyihao@linux.alibaba.com>
Tue, 21 May 2019 17:57:10 +0000 (01:57 +0800)
committerAnna Schumaker <Anna.Schumaker@Netapp.com>
Thu, 30 May 2019 19:36:24 +0000 (15:36 -0400)
commit52b042ab9948cc367b61f9ca9c18603aa7813c3a
tree30972007c92d57b1a71c049bfffe840f0a1946a2
parent7987b694ade8cc465ce10fb3dceaa614f13ceaf3
NFSv4.1: Again fix a race where CB_NOTIFY_LOCK fails to wake a waiter

Commit b7dbcc0e433f "NFSv4.1: Fix a race where CB_NOTIFY_LOCK fails to wake a waiter"
found this bug. However it didn't fix it.

This commit replaces schedule_timeout() with wait_woken() and
default_wake_function() with woken_wake_function() in function
nfs4_retry_setlk() and nfs4_wake_lock_waiter(). wait_woken() uses
memory barriers in its implementation to avoid potential race condition
when putting a process into sleeping state and then waking it up.

Fixes: a1d617d8f134 ("nfs: allow blocking locks to be awoken by lock callbacks")
Cc: stable@vger.kernel.org #4.9+
Signed-off-by: Yihao Wu <wuyihao@linux.alibaba.com>
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
fs/nfs/nfs4proc.c