f2fs crypto: fix incorrect positioning for GCing encrypted data page

For now, flow of GCing an encrypted data page:
1) try to grab meta page in meta inode's mapping with index of old block
address of that data page
2) load data of ciphertext into meta page
3) allocate new block address
4) write the meta page into new block address
5) update block address pointer in direct node page.

Other reader/writer will use f2fs_wait_on_encrypted_page_writeback to
check and wait on GCed encrypted data cached in meta page writebacked
in order to avoid inconsistence among data page cache, meta page cache
and data on-disk when updating.

However, we will use new block address updated in step 5) as an index to
lookup meta page in inner bio buffer. That would be wrong, and we will
never find the GCing meta page, since we use the old block address as
index of that page in step 1).

This patch fixes the issue by adjust the order of step 1) and step 3),
and in step 1) grab page with index generated in step 3).

Signed-off-by: Chao Yu <chao2.yu@samsung.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h
index da8d99d4091e18b429a865c2616372a742d2cfa4..35b34f656eedb12f207aa9628af095cade5761c1 100644 (file)
--- a/fs/f2fs/f2fs.h
+++ b/fs/f2fs/f2fs.h
@@ -1855,6 +1855,8 @@ void write_meta_page(struct f2fs_sb_info *, struct page *);
 void write_node_page(unsigned int, struct f2fs_io_info *);
 void write_data_page(struct dnode_of_data *, struct f2fs_io_info *);
 void rewrite_data_page(struct f2fs_io_info *);
+void __f2fs_replace_block(struct f2fs_sb_info *, struct f2fs_summary *,
+                                       block_t, block_t, bool, bool);
 void f2fs_replace_block(struct f2fs_sb_info *, struct dnode_of_data *,
                                block_t, block_t, unsigned char, bool, bool);
 void allocate_data_block(struct f2fs_sb_info *, struct page *,

diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c
index 4bd0c91d7b5fe23f491c38190cbbe2bb53b6c4e7..d4bf60f128cf4d71cc5de7c5eba3b79e17ed7c8d 100644 (file)
--- a/fs/f2fs/gc.c
+++ b/fs/f2fs/gc.c
@@ -553,6 +553,7 @@ static void move_encrypted_block(struct inode *inode, block_t bidx)
        struct f2fs_summary sum;
        struct node_info ni;
        struct page *page;
+       block_t newaddr;
        int err;
 
        /* do not read out */
@@ -583,12 +584,15 @@ static void move_encrypted_block(struct inode *inode, block_t bidx)
        fio.page = page;
        fio.new_blkaddr = fio.old_blkaddr = dn.data_blkaddr;
 
-       fio.encrypted_page = pagecache_get_page(META_MAPPING(fio.sbi),
-                                       fio.new_blkaddr,
-                                       FGP_LOCK|FGP_CREAT,
-                                       GFP_NOFS);
-       if (!fio.encrypted_page)
-               goto put_out;
+       allocate_data_block(fio.sbi, NULL, fio.old_blkaddr, &newaddr,
+                                                       &sum, CURSEG_COLD_DATA);
+
+       fio.encrypted_page = pagecache_get_page(META_MAPPING(fio.sbi), newaddr,
+                                       FGP_LOCK | FGP_CREAT, GFP_NOFS);
+       if (!fio.encrypted_page) {
+               err = -ENOMEM;
+               goto recover_block;
+       }
 
        err = f2fs_submit_page_bio(&fio);
        if (err)
@@ -597,10 +601,14 @@ static void move_encrypted_block(struct inode *inode, block_t bidx)
        /* write page */
        lock_page(fio.encrypted_page);
 
-       if (unlikely(!PageUptodate(fio.encrypted_page)))
+       if (unlikely(!PageUptodate(fio.encrypted_page))) {
+               err = -EIO;
                goto put_page_out;
-       if (unlikely(fio.encrypted_page->mapping != META_MAPPING(fio.sbi)))
+       }
+       if (unlikely(fio.encrypted_page->mapping != META_MAPPING(fio.sbi))) {
+               err = -EIO;
                goto put_page_out;
+       }
 
        set_page_dirty(fio.encrypted_page);
        f2fs_wait_on_page_writeback(fio.encrypted_page, DATA, true);
@@ -611,9 +619,9 @@ static void move_encrypted_block(struct inode *inode, block_t bidx)
 
        /* allocate block address */
        f2fs_wait_on_page_writeback(dn.node_page, NODE, true);
-       allocate_data_block(fio.sbi, NULL, fio.old_blkaddr, &fio.new_blkaddr,
-                                                       &sum, CURSEG_COLD_DATA);
+
        fio.rw = WRITE_SYNC;
+       fio.new_blkaddr = newaddr;
        f2fs_submit_page_mbio(&fio);
 
        dn.data_blkaddr = fio.new_blkaddr;
@@ -624,6 +632,10 @@ static void move_encrypted_block(struct inode *inode, block_t bidx)
                set_inode_flag(F2FS_I(inode), FI_FIRST_BLOCK_WRITTEN);
 put_page_out:
        f2fs_put_page(fio.encrypted_page, 1);
+recover_block:
+       if (err)
+               __f2fs_replace_block(fio.sbi, &sum, newaddr, fio.old_blkaddr,
+                                                               true, true);
 put_out:
        f2fs_put_dnode(&dn);
 out:

diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c
index d8e13b0d4966ff0ee09e4ea65a451f1529f1c654..639c4ff8650254166191ca1ca6acec1841c04ae4 100644 (file)
--- a/fs/f2fs/segment.c
+++ b/fs/f2fs/segment.c
@@ -1439,8 +1439,7 @@ void rewrite_data_page(struct f2fs_io_info *fio)
        f2fs_submit_page_mbio(fio);
 }
 
-static void __f2fs_replace_block(struct f2fs_sb_info *sbi,
-                               struct f2fs_summary *sum,
+void __f2fs_replace_block(struct f2fs_sb_info *sbi, struct f2fs_summary *sum,
                                block_t old_blkaddr, block_t new_blkaddr,
                                bool recover_curseg, bool recover_newaddr)
 {