Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork

Configure Feed

Select the types of activity you want to include in your feed.

NFSv4.1: Fix a race where CB_NOTIFY_LOCK fails to wake a waiter

nfs4_retry_setlk() sets the task's state to TASK_INTERRUPTIBLE within the
same region protected by the wait_queue's lock after checking for a
notification from CB_NOTIFY_LOCK callback. However, after releasing that
lock, a wakeup for that task may race in before the call to
freezable_schedule_timeout_interruptible() and set TASK_WAKING, then
freezable_schedule_timeout_interruptible() will set the state back to
TASK_INTERRUPTIBLE before the task will sleep. The result is that the task
will sleep for the entire duration of the timeout.

Since we've already set TASK_INTERRUPTIBLE in the locked section, just use
freezable_schedule_timout() instead.

Fixes: a1d617d8f134 ("nfs: allow blocking locks to be awoken by lock callbacks")
Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Cc: stable@vger.kernel.org # v4.9+
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>

authored by

Benjamin Coddington and committed by
Anna Schumaker
b7dbcc0e 6ba80d43

+1 -1
+1 -1
fs/nfs/nfs4proc.c
··· 6495 6495 set_current_state(TASK_INTERRUPTIBLE); 6496 6496 spin_unlock_irqrestore(&q->lock, flags); 6497 6497 6498 - freezable_schedule_timeout_interruptible(NFS4_LOCK_MAXTIMEOUT); 6498 + freezable_schedule_timeout(NFS4_LOCK_MAXTIMEOUT); 6499 6499 } 6500 6500 6501 6501 finish_wait(q, &wait);