gfs2: Disable page faults during lockless buffered reads

During lockless buffered reads, filemap_read() holds page cache page
references while trying to copy data to the user-space buffer.  The
calling process isn't holding the inode glock, but the page references
it holds prevent those pages from being removed from the page cache, and
that prevents the underlying inode glock from being moved to another
node.  Thus, we can end up in the same kinds of distributed deadlock
situations as with normal (non-lockless) buffered reads.

Fix that by disabling page faults during lockless reads as well.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 0c8cf10281dabc9e2f81cbb248caf242e5cb4a24..44132e4c878909106b736189e69ab66e1a7b0bd2 100644 (file)
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -957,14 +957,16 @@ static ssize_t gfs2_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
                        return ret;
                iocb->ki_flags &= ~IOCB_DIRECT;
        }
+       pagefault_disable();
        iocb->ki_flags |= IOCB_NOIO;
        ret = generic_file_read_iter(iocb, to);
        iocb->ki_flags &= ~IOCB_NOIO;
+       pagefault_enable();
        if (ret >= 0) {
                if (!iov_iter_count(to))
                        return ret;
                written = ret;
-       } else {
+       } else if (ret != -EFAULT) {
                if (ret != -EAGAIN)
                        return ret;
                if (iocb->ki_flags & IOCB_NOWAIT)