From: Rik van Riel <riel@surriel.com>
To: linux-xfs@vger.kernel.org
Cc: kernel-team@fb.com, linux-kernel@vger.kernel.org,
"Darrick J. Wong" <darrick.wong@oracle.com>,
"David Chinner" <dchinner@redhat.com>
Subject: [PATCH] fs,xfs: fix missed wakeup on l_flush_wait
Date: Tue, 7 May 2019 13:05:28 -0400 [thread overview]
Message-ID: <20190507130528.1d3d471b@imladris.surriel.com> (raw)
The code in xlog_wait uses the spinlock to make adding the task to
the wait queue, and setting the task state to UNINTERRUPTIBLE atomic
with respect to the waker.
Doing the wakeup after releasing the spinlock opens up the following
race condition:
- add task to wait queue
- wake up task
- set task state to UNINTERRUPTIBLE
Simply moving the spin_unlock to after the wake_up_all results
in the waker not being able to see a task on the waitqueue before
it has set its state to UNINTERRUPTIBLE.
The lock ordering of taking the waitqueue lock inside the l_icloglock
is already used inside xlog_wait; it is unclear why the waker was doing
things differently.
Signed-off-by: Rik van Riel <riel@surriel.com>
Reported-by: Chris Mason <clm@fb.com>
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c
index c3b610b687d1..8b9be76b2412 100644
--- a/fs/xfs/xfs_log.c
+++ b/fs/xfs/xfs_log.c
@@ -2710,7 +2710,6 @@ xlog_state_do_callback(
int funcdidcallbacks; /* flag: function did callbacks */
int repeats; /* for issuing console warnings if
* looping too many times */
- int wake = 0;
spin_lock(&log->l_icloglock);
first_iclog = iclog = log->l_iclog;
@@ -2912,11 +2911,9 @@ xlog_state_do_callback(
#endif
if (log->l_iclog->ic_state & (XLOG_STATE_ACTIVE|XLOG_STATE_IOERROR))
- wake = 1;
- spin_unlock(&log->l_icloglock);
-
- if (wake)
wake_up_all(&log->l_flush_wait);
+
+ spin_unlock(&log->l_icloglock);
}
next reply other threads:[~2019-05-07 17:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-07 17:05 Rik van Riel [this message]
2019-05-07 21:22 ` [PATCH] fs,xfs: fix missed wakeup on l_flush_wait Dave Chinner
2019-05-08 14:08 ` Rik van Riel
2019-05-08 21:32 ` Dave Chinner
2019-05-09 14:27 ` Rik van Riel
2019-05-08 16:39 ` Chris Mason
2019-05-08 21:40 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190507130528.1d3d471b@imladris.surriel.com \
--to=riel@surriel.com \
--cc=darrick.wong@oracle.com \
--cc=dchinner@redhat.com \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).