From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754385AbcBVKis (ORCPT ); Mon, 22 Feb 2016 05:38:48 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:47729 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751208AbcBVKir (ORCPT ); Mon, 22 Feb 2016 05:38:47 -0500 X-AuditID: cbfee61b-f793c6d00000236c-27-56cae5351587 From: Chao Yu To: Jaegeuk Kim Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] f2fs crypto: fix incorrect positioning for GCing encrypted data page Date: Mon, 22 Feb 2016 18:38:05 +0800 Message-id: <004b01d16d5d$34e95cb0$9ebc1610$@samsung.com> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: AdFtXQgujiND/3AeT6us0HFJLJfShQ== Content-language: zh-cn X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrDLMWRmVeSWpSXmKPExsVy+t9jQV2zp6fCDKbvYbV4sn4Ws8WlRe4W l3fNYXNg9ti0qpPNY/eCz0wenzfJBTBHcdmkpOZklqUW6dslcGUcntjMVNAnVrHx/C6mBsa/ gl2MnBwSAiYSTyY+ZISwxSQu3FvP1sXIxSEkMItRomPqVUYI5xWjxMTlEFVsAioSyzv+M4HY IkD2oUWX2UFsZgEPicaO76wgtrBAtMS33QvZQGwWAVWJ1t9/wGp4BSwlHi07zQJhC0r8mHyP BaJXS2L9zuNMELa8xOY1b5khLlKQ2HH2NSPELj2JZx/PMkLUiEtsPHKLZQIj0JkIo2YhGTUL yahZSFoWMLKsYpRILUguKE5KzzXKSy3XK07MLS7NS9dLzs/dxAgO42fSOxgP73I/xCjAwajE w6vBdCpMiDWxrLgy9xCjBAezkghv2wOgEG9KYmVValF+fFFpTmrxIUZpDhYlcd7H/9eFCQmk J5akZqemFqQWwWSZODilGhjn+mmEieesuXXi9rnu1MuTfB8eSHqzahFLXeK1zGVNXd6up6+s VZne3/c/9FyvadCuaLOqjS9aFh5xiVbPFK9T5lwXeulgX7ru3bX7fYPurYhwP2+q+UX/wKeg Iy/al4UWrb0/afIF8eddlsf3ijZ7duUeuV13cs679R4TOMWeNK/e1cLWrRenxFKckWioxVxU nAgA2l2JQF8CAAA= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For now, flow of GCing an encrypted data page will be: 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 --- fs/f2fs/gc.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 4af3d80..428159b 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -549,6 +549,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 */ @@ -579,12 +580,13 @@ 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); + 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) - goto put_out; + goto invalid_block; err = f2fs_submit_page_bio(&fio); if (err) @@ -607,9 +609,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; @@ -620,6 +622,8 @@ 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); +invalid_block: + invalidate_blocks(fio.sbi, newaddr); put_out: f2fs_put_dnode(&dn); out: -- 2.7.0