f2fs: support get_page error injection

This patch adds to support get_page error injection to simulate
out-of-memory test scenario.

Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c
index 7fd09837820ada2cd8654c8e6565899af2cbf041..acb531788c436329e4fbcb42cc29f962db60573e 100644 (file)
--- a/fs/f2fs/data.c
+++ b/fs/f2fs/data.c
@@ -1965,7 +1965,7 @@ repeat:
         * Do not use grab_cache_page_write_begin() to avoid deadlock due to
         * wait_for_stable_page. Will wait that below with our IO control.
         */
-       page = pagecache_get_page(mapping, index,
+       page = f2fs_pagecache_get_page(mapping, index,
                                FGP_LOCK | FGP_WRITE | FGP_CREAT, GFP_NOFS);
        if (!page) {
                err = -ENOMEM;

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index 5ed40fbd1a367e93f7db1207c1314dc552e9c128..7ef3193db43860cecca9e149d6ab7346b526c59d 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -46,6 +46,7 @@
 enum {
        FAULT_KMALLOC,
        FAULT_PAGE_ALLOC,
+       FAULT_PAGE_GET,
        FAULT_ALLOC_NID,
        FAULT_ORPHAN,
        FAULT_BLOCK,
@@ -1835,6 +1836,19 @@ static inline struct page *f2fs_grab_cache_page(struct address_space *mapping,
        return grab_cache_page_write_begin(mapping, index, AOP_FLAG_NOFS);
 }
 
+static inline struct page *f2fs_pagecache_get_page(
+                               struct address_space *mapping, pgoff_t index,
+                               int fgp_flags, gfp_t gfp_mask)
+{
+#ifdef CONFIG_F2FS_FAULT_INJECTION
+       if (time_to_inject(F2FS_M_SB(mapping), FAULT_PAGE_GET)) {
+               f2fs_show_injection_info(FAULT_PAGE_GET);
+               return NULL;
+       }
+#endif
+       return pagecache_get_page(mapping, index, fgp_flags, gfp_mask);
+}
+
 static inline void f2fs_copy_page(struct page *src, struct page *dst)
 {
        char *src_kaddr = kmap(src);

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 197ebf45e4e44577fd3eaf22ac46dcb16f8ba0b0..c7b1d704846ae7cbed19f0259f4f3af8e5eb21c4 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -650,8 +650,8 @@ static void move_data_block(struct inode *inode, block_t bidx,
        allocate_data_block(fio.sbi, NULL, fio.old_blkaddr, &newaddr,
                                        &sum, CURSEG_COLD_DATA, NULL, false);
 
-       fio.encrypted_page = pagecache_get_page(META_MAPPING(fio.sbi), newaddr,
-                                       FGP_LOCK | FGP_CREAT, GFP_NOFS);
+       fio.encrypted_page = f2fs_pagecache_get_page(META_MAPPING(fio.sbi),
+                               newaddr, FGP_LOCK | FGP_CREAT, GFP_NOFS);
        if (!fio.encrypted_page) {
                err = -ENOMEM;
                goto recover_block;

diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index f44d837052459f5d1992be0178411cd4a5e0c51d..819671febd6d77195bab37c6a763c30781dd3eea 100644 (file)
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1218,7 +1218,8 @@ static void flush_inline_data(struct f2fs_sb_info *sbi, nid_t ino)
        if (!inode)
                return;
 
-       page = pagecache_get_page(inode->i_mapping, 0, FGP_LOCK|FGP_NOWAIT, 0);
+       page = f2fs_pagecache_get_page(inode->i_mapping, 0,
+                                       FGP_LOCK|FGP_NOWAIT, 0);
        if (!page)
                goto iput_out;
 

diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index dab1fedf7148dee7b83e517131409b6446414fa5..4a5af8398f0cf3df92a785ee39d9d6b5df1a9ec4 100644 (file)
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -44,6 +44,7 @@ static struct kmem_cache *f2fs_inode_cachep;
 char *fault_name[FAULT_MAX] = {
        [FAULT_KMALLOC]         = "kmalloc",
        [FAULT_PAGE_ALLOC]      = "page alloc",
+       [FAULT_PAGE_GET]        = "page get",
        [FAULT_ALLOC_NID]       = "alloc nid",
        [FAULT_ORPHAN]          = "orphan",
        [FAULT_BLOCK]           = "no more block",