From: Chandan Rajendra <chandan@linux.vnet.ibm.com>
To: linux-btrfs@vger.kernel.org
Cc: Chandan Rajendra <chandan@linux.vnet.ibm.com>,
jbacik@fb.com, clm@fb.com, bo.li.liu@oracle.com, dsterba@suse.cz,
quwenruo@cn.fujitsu.com, chandan@mykolab.com
Subject: [RFC PATCH V4 12/13] Btrfs: prepare_pages: Retry adding a page to the page cache
Date: Wed, 30 Sep 2015 15:48:28 +0530 [thread overview]
Message-ID: <1443608309-30154-13-git-send-email-chandan@linux.vnet.ibm.com> (raw)
In-Reply-To: <1443608309-30154-1-git-send-email-chandan@linux.vnet.ibm.com>
When reading the page from the disk, we can race with Direct I/O which can get
the page lock (before prepare_uptodate_page() gets it) and can go ahead and
invalidate the page. Hence if the page is not found in the inode's address
space, retry the operation of getting a page.
Signed-off-by: Chandan Rajendra <chandan@linux.vnet.ibm.com>
---
fs/btrfs/file.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 5715e29..76db77c 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1316,6 +1316,7 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages,
int faili;
for (i = 0; i < num_pages; i++) {
+again:
pages[i] = find_or_create_page(inode->i_mapping, index + i,
mask | __GFP_WRITE);
if (!pages[i]) {
@@ -1330,6 +1331,21 @@ static noinline int prepare_pages(struct inode *inode, struct page **pages,
if (i == num_pages - 1)
err = prepare_uptodate_page(pages[i],
pos + write_bytes, false);
+
+ /*
+ * When reading the page from the disk, we can race
+ * with direct i/o which can get the page lock (before
+ * prepare_uptodate_page() gets it) and can go ahead
+ * and invalidate the page. Hence if the page is found
+ * to be not belonging to the inode's address space,
+ * retry the operation of getting a page.
+ */
+ if (unlikely(pages[i]->mapping != inode->i_mapping)) {
+ unlock_page(pages[i]);
+ page_cache_release(pages[i]);
+ goto again;
+ }
+
if (err) {
page_cache_release(pages[i]);
faili = i - 1;
--
2.1.0
next prev parent reply other threads:[~2015-09-30 10:19 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-30 10:18 [RFC PATCH V4 00/13] Btrfs: Pre subpagesize-blocksize cleanups Chandan Rajendra
2015-09-30 10:18 ` [RFC PATCH V4 01/13] Btrfs: __btrfs_buffered_write: Reserve/release extents aligned to block size Chandan Rajendra
2015-10-01 14:31 ` Josef Bacik
2015-09-30 10:18 ` [RFC PATCH V4 02/13] Btrfs: Compute and look up csums based on sectorsized blocks Chandan Rajendra
2015-10-01 14:36 ` Josef Bacik
2015-09-30 10:18 ` [RFC PATCH V4 03/13] Btrfs: Direct I/O read: Work " Chandan Rajendra
2015-09-30 10:18 ` [RFC PATCH V4 04/13] Btrfs: fallocate: Work with " Chandan Rajendra
2015-09-30 10:18 ` [RFC PATCH V4 05/13] Btrfs: btrfs_page_mkwrite: Reserve space in sectorsized units Chandan Rajendra
2015-09-30 10:18 ` [RFC PATCH V4 06/13] Btrfs: Search for all ordered extents that could span across a page Chandan Rajendra
2015-09-30 10:18 ` [RFC PATCH V4 07/13] Btrfs: Use (eb->start, seq) as search key for tree modification log Chandan Rajendra
2015-09-30 10:18 ` [RFC PATCH V4 08/13] Btrfs: btrfs_submit_direct_hook: Handle map_length < bio vector length Chandan Rajendra
2015-09-30 10:18 ` [RFC PATCH V4 09/13] Btrfs: Limit inline extents to root->sectorsize Chandan Rajendra
2015-09-30 10:18 ` [RFC PATCH V4 10/13] Btrfs: Fix block size returned to user space Chandan Rajendra
2015-09-30 10:18 ` [RFC PATCH V4 11/13] Btrfs: Clean pte corresponding to page straddling i_size Chandan Rajendra
2015-09-30 10:18 ` Chandan Rajendra [this message]
2015-09-30 10:18 ` [RFC PATCH V4 13/13] Btrfs: Return valid delalloc range when the page does not have PG_Dirty flag set or has been invalidated Chandan Rajendra
2015-09-30 10:23 ` [RFC PATCH V4 00/13] Btrfs: Pre subpagesize-blocksize cleanups Chandan Rajendra
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=1443608309-30154-13-git-send-email-chandan@linux.vnet.ibm.com \
--to=chandan@linux.vnet.ibm.com \
--cc=bo.li.liu@oracle.com \
--cc=chandan@mykolab.com \
--cc=clm@fb.com \
--cc=dsterba@suse.cz \
--cc=jbacik@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=quwenruo@cn.fujitsu.com \
/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).