From: Omar Sandoval <osandov@osandov.com>
To: Alexander Viro <viro@zeniv.linux.org.uk>,
Andrew Morton <akpm@linux-foundation.org>,
Trond Myklebust <trond.myklebust@primarydata.com>,
Christoph Hellwig <hch@infradead.org>,
David Sterba <dsterba@suse.cz>,
linux-fsdevel@vger.kernel.org, linux-mm@kvack.org,
linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Omar Sandoval <osandov@osandov.com>
Subject: [PATCH 2/8] swap: lock i_mutex for swap_writepage direct_IO
Date: Sun, 14 Dec 2014 21:26:56 -0800 [thread overview]
Message-ID: <a59510f4552a5d3557958cdb0ce1b23b3abfc75b.1418618044.git.osandov@osandov.com> (raw)
In-Reply-To: <cover.1418618044.git.osandov@osandov.com>
In-Reply-To: <cover.1418618044.git.osandov@osandov.com>
The generic write code locks i_mutex for a direct_IO. Swap-over-NFS
doesn't grab the mutex because nfs_direct_IO doesn't expect i_mutex to
be held, but most direct_IO implementations do.
Signed-off-by: Omar Sandoval <osandov@osandov.com>
---
mm/page_io.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/mm/page_io.c b/mm/page_io.c
index 955db8b..1630ac0 100644
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@ -263,6 +263,7 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
if (sis->flags & SWP_FILE) {
struct kiocb kiocb;
struct file *swap_file = sis->swap_file;
+ struct inode *inode = file_inode(swap_file);
struct address_space *mapping = swap_file->f_mapping;
struct bio_vec bv = {
.bv_page = page,
@@ -283,9 +284,11 @@ int __swap_writepage(struct page *page, struct writeback_control *wbc,
set_page_writeback(page);
unlock_page(page);
+ mutex_lock(&inode->i_mutex);
ret = mapping->a_ops->direct_IO(ITER_BVEC | WRITE,
&kiocb, &from,
kiocb.ki_pos);
+ mutex_unlock(&inode->i_mutex);
if (ret == PAGE_SIZE) {
count_vm_event(PSWPOUT);
ret = 0;
--
2.1.3
next prev parent reply other threads:[~2014-12-15 5:27 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-15 5:26 [PATCH 0/8] clean up and generalize swap-over-NFS Omar Sandoval
2014-12-15 5:26 ` [PATCH 1/8] nfs: follow direct I/O write locking convention Omar Sandoval
2014-12-15 12:49 ` Trond Myklebust
2014-12-15 15:42 ` Omar Sandoval
2014-12-15 5:26 ` Omar Sandoval [this message]
2014-12-15 16:27 ` [PATCH 2/8] swap: lock i_mutex for swap_writepage direct_IO Jan Kara
2014-12-15 16:56 ` Christoph Hellwig
2014-12-15 22:11 ` Omar Sandoval
2014-12-16 8:35 ` Christoph Hellwig
2014-12-16 8:56 ` Omar Sandoval
2014-12-17 8:06 ` Christoph Hellwig
2014-12-17 8:20 ` Al Viro
2014-12-17 8:24 ` Christoph Hellwig
2014-12-17 14:58 ` Omar Sandoval
2014-12-17 18:52 ` Christoph Hellwig
2014-12-17 22:03 ` Al Viro
2014-12-19 6:24 ` Omar Sandoval
2014-12-19 6:28 ` Al Viro
2014-12-20 6:51 ` Al Viro
2014-12-22 7:26 ` Omar Sandoval
2014-12-23 9:37 ` Christoph Hellwig
2014-12-15 5:26 ` [PATCH 3/8] swap: don't add ITER_BVEC flag to direct_IO rw Omar Sandoval
2014-12-15 6:16 ` Al Viro
2014-12-15 15:57 ` Omar Sandoval
2014-12-15 5:26 ` [PATCH 4/8] iov_iter: add iov_iter_bvec and convert callers Omar Sandoval
2014-12-15 5:26 ` [PATCH 5/8] direct-io: don't dirty ITER_BVEC pages on read Omar Sandoval
2014-12-15 5:27 ` [PATCH 6/8] nfs: don't dirty ITER_BVEC pages read through direct I/O Omar Sandoval
2014-12-15 6:17 ` Al Viro
2014-12-15 5:27 ` [PATCH 7/8] swap: use direct I/O for SWP_FILE swap_readpage Omar Sandoval
2014-12-15 5:27 ` [PATCH 8/8] vfs: update swap_{,de}activate documentation Omar Sandoval
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=a59510f4552a5d3557958cdb0ce1b23b3abfc75b.1418618044.git.osandov@osandov.com \
--to=osandov@osandov.com \
--cc=akpm@linux-foundation.org \
--cc=dsterba@suse.cz \
--cc=hch@infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
--cc=viro@zeniv.linux.org.uk \
/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).