diff options
author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2016-08-25 18:17:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-26 20:39:35 -0400 |
commit | 11bd969fdefea3ac0cb9791224f1e09784e21e58 (patch) | |
tree | 0acb5b64edc970860174c068698448b94f3122c8 /mm | |
parent | d0e5845561c238619de9f5b77e0d763f4c331ca5 (diff) |
mm: silently skip readahead for DAX inodes
For DAX inodes we need to be careful to never have page cache pages in
the mapping->page_tree. This radix tree should be composed only of DAX
exceptional entries and zero pages.
ltp's readahead02 test was triggering a warning because we were trying
to insert a DAX exceptional entry but found that a page cache page had
already been inserted into the tree. This page was being inserted into
the radix tree in response to a readahead(2) call.
Readahead doesn't make sense for DAX inodes, but we don't want it to
report a failure either. Instead, we just return success and don't do
any work.
Link: http://lkml.kernel.org/r/20160824221429.21158-1-ross.zwisler@linux.intel.com
Signed-off-by: Ross Zwisler <ross.zwisler@linux.intel.com>
Reported-by: Jeff Moyer <jmoyer@redhat.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Jan Kara <jack@suse.com>
Cc: <stable@vger.kernel.org> [4.5+]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r-- | mm/readahead.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mm/readahead.c b/mm/readahead.c index 65ec288dc057..c8a955b1297e 100644 --- a/mm/readahead.c +++ b/mm/readahead.c | |||
@@ -8,6 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/kernel.h> | 10 | #include <linux/kernel.h> |
11 | #include <linux/dax.h> | ||
11 | #include <linux/gfp.h> | 12 | #include <linux/gfp.h> |
12 | #include <linux/export.h> | 13 | #include <linux/export.h> |
13 | #include <linux/blkdev.h> | 14 | #include <linux/blkdev.h> |
@@ -544,6 +545,14 @@ do_readahead(struct address_space *mapping, struct file *filp, | |||
544 | if (!mapping || !mapping->a_ops) | 545 | if (!mapping || !mapping->a_ops) |
545 | return -EINVAL; | 546 | return -EINVAL; |
546 | 547 | ||
548 | /* | ||
549 | * Readahead doesn't make sense for DAX inodes, but we don't want it | ||
550 | * to report a failure either. Instead, we just return success and | ||
551 | * don't do any work. | ||
552 | */ | ||
553 | if (dax_mapping(mapping)) | ||
554 | return 0; | ||
555 | |||
547 | return force_page_cache_readahead(mapping, filp, index, nr); | 556 | return force_page_cache_readahead(mapping, filp, index, nr); |
548 | } | 557 | } |
549 | 558 | ||