From: Chris Mason <clm@fb.com>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Peter Zijlstra <peterz@infradead.org>, Dave Jones <dsj@fb.com>,
LKML <linux-kernel@vger.kernel.org>,
Jon Christopherson <jon@jons.org>
Subject: [PATCH] lock_page() doesn't lock if __wait_on_bit_lock returns -EINTR
Date: Sat, 12 Dec 2015 11:23:42 -0500 [thread overview]
Message-ID: <20151212162342.GF11257@ret.masoncoding.com> (raw)
We have two reports of frequent crashes in btrfs where asserts in
clear_page_dirty_for_io() were triggering on missing page locks.
The crashes were much easier to trigger when processes were catching
ctrl-c's, and after much debugging it really looked like lock_page was a
noop.
This recent commit looks pretty suspect to me, and I confirmed that we
were exiting __wait_on_bit_lock() with -EINTR when it was called with
TASK_UNINTERRUPTIBLE
commit 68985633bccb6066bf1803e316fbc6c1f5b796d6
Author: Peter Zijlstra <peterz@infradead.org>
Date: Tue Dec 1 14:04:04 2015 +0100
sched/wait: Fix signal handling in bit wait helpers
The patch below is mostly untested, and probably not the right solution.
Dave's trinity run doesn't explode immediately anymore, and I wanted to
get this out for discussion. A quick look on the list doesn't show
anyone else has tracked this down, sorry if it's a dup.
Reported-by: Dave Jones <dsj@fb.com>,
Reported-by: Jon Christopherson <jon@jons.org>
Signed-off-by: Chris Mason <clm@fb.com>
diff --git a/kernel/sched/wait.c b/kernel/sched/wait.c
index f10bd87..12f69df 100644
--- a/kernel/sched/wait.c
+++ b/kernel/sched/wait.c
@@ -434,6 +434,8 @@ __wait_on_bit_lock(wait_queue_head_t *wq, struct wait_bit_queue *q,
ret = action(&q->key);
if (!ret)
continue;
+ if (ret == -EINTR && mode == TASK_UNINTERRUPTIBLE)
+ continue;
abort_exclusive_wait(wq, &q->wait, mode, &q->key);
return ret;
} while (test_and_set_bit(q->key.bit_nr, q->key.flags));
next reply other threads:[~2015-12-12 16:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-12 16:23 Chris Mason [this message]
2015-12-12 18:33 ` [PATCH] lock_page() doesn't lock if __wait_on_bit_lock returns -EINTR Linus Torvalds
2015-12-12 19:41 ` Linus Torvalds
2015-12-13 0:07 ` Chris Mason
2015-12-14 18:33 ` Dave Jones
2015-12-14 20:01 ` Chris Mason
2015-12-14 23:59 ` Chris Mason
2015-12-13 9:50 ` Peter Zijlstra
2015-12-13 15:55 ` Chris Mason
2015-12-13 20:51 ` Linus Torvalds
2015-12-13 21:12 ` Peter Zijlstra
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=20151212162342.GF11257@ret.masoncoding.com \
--to=clm@fb.com \
--cc=dsj@fb.com \
--cc=jon@jons.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=torvalds@linux-foundation.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.