From patchwork Sat Feb 3 02:47:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunlong Song X-Patchwork-Id: 10198285 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 77E2F60594 for ; Sat, 3 Feb 2018 02:48:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 646CC28EBF for ; Sat, 3 Feb 2018 02:48:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 594E028ED3; Sat, 3 Feb 2018 02:48:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2D4C28EC1 for ; Sat, 3 Feb 2018 02:48:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752520AbeBCCs2 (ORCPT ); Fri, 2 Feb 2018 21:48:28 -0500 Received: from szxga06-in.huawei.com ([45.249.212.32]:41338 "EHLO huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1752513AbeBCCs1 (ORCPT ); Fri, 2 Feb 2018 21:48:27 -0500 Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 99FF9C08176F8; Sat, 3 Feb 2018 10:48:14 +0800 (CST) Received: from huawei.com (10.107.193.250) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.361.1; Sat, 3 Feb 2018 10:48:08 +0800 From: Yunlong Song To: , , , , CC: , , , , , , Subject: [PATCH 2/2] f2fs: add GC_WRITTEN_PAGE to gc atomic file Date: Sat, 3 Feb 2018 10:47:48 +0800 Message-ID: <1517626068-49739-2-git-send-email-yunlong.song@huawei.com> X-Mailer: git-send-email 1.8.5.2 In-Reply-To: <1517626068-49739-1-git-send-email-yunlong.song@huawei.com> References: <1517626068-49739-1-git-send-email-yunlong.song@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.250] X-CFilter-Loop: Reflected Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch enables to gc atomic file by adding GC_WRITTEN_PAGE to identify the gced pages of atomic file, which can avoid register_inmem_page in set_page_dirty, so the gced pages will not mix with the inmem pages. Signed-off-by: Yunlong Song --- fs/f2fs/data.c | 7 ++++++- fs/f2fs/gc.c | 25 ++++++++++++++++++------- fs/f2fs/segment.h | 3 +++ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index edafcb6..5e1fc5d 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c @@ -120,6 +120,10 @@ static void f2fs_write_end_io(struct bio *bio) dec_page_count(sbi, type); clear_cold_data(page); + if (IS_GC_WRITTEN_PAGE(page)) { + set_page_private(page, 0); + ClearPagePrivate(page); + } end_page_writeback(page); } if (!get_pages(sbi, F2FS_WB_CP_DATA) && @@ -2418,7 +2422,8 @@ static int f2fs_set_data_page_dirty(struct page *page) if (!PageUptodate(page)) SetPageUptodate(page); - if (f2fs_is_atomic_file(inode) && !f2fs_is_commit_atomic_write(inode)) { + if (f2fs_is_atomic_file(inode) && !f2fs_is_commit_atomic_write(inode) + && !IS_GC_WRITTEN_PAGE(page)) { if (!IS_ATOMIC_WRITTEN_PAGE(page)) { register_inmem_page(inode, page); return 1; diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index 84ab3ff..9d54ddb 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c @@ -622,10 +622,6 @@ static void move_data_block(struct inode *inode, block_t bidx, if (!check_valid_map(F2FS_I_SB(inode), segno, off)) goto out; - if (f2fs_is_atomic_file(inode) && - !f2fs_is_commit_atomic_write(inode)) - goto out; - if (f2fs_is_pinned_file(inode)) { f2fs_pin_file_control(inode, true); goto out; @@ -680,6 +676,12 @@ static void move_data_block(struct inode *inode, block_t bidx, goto put_page_out; } + if (f2fs_is_atomic_file(inode) && + !f2fs_is_commit_atomic_write(inode) && + !IS_GC_WRITTEN_PAGE(fio.encrypted_page)) { + set_page_private(fio.encrypted_page, (unsigned long)GC_WRITTEN_PAGE); + SetPagePrivate(fio.encrypted_page); + } set_page_dirty(fio.encrypted_page); f2fs_wait_on_page_writeback(fio.encrypted_page, DATA, true); if (clear_page_dirty_for_io(fio.encrypted_page)) @@ -730,9 +732,6 @@ static void move_data_page(struct inode *inode, block_t bidx, int gc_type, if (!check_valid_map(F2FS_I_SB(inode), segno, off)) goto out; - if (f2fs_is_atomic_file(inode) && - !f2fs_is_commit_atomic_write(inode)) - goto out; if (f2fs_is_pinned_file(inode)) { if (gc_type == FG_GC) f2fs_pin_file_control(inode, true); @@ -742,6 +741,12 @@ static void move_data_page(struct inode *inode, block_t bidx, int gc_type, if (gc_type == BG_GC) { if (PageWriteback(page)) goto out; + if (f2fs_is_atomic_file(inode) && + !f2fs_is_commit_atomic_write(inode) && + !IS_GC_WRITTEN_PAGE(page)) { + set_page_private(page, (unsigned long)GC_WRITTEN_PAGE); + SetPagePrivate(page); + } set_page_dirty(page); set_cold_data(page); } else { @@ -762,6 +767,12 @@ static void move_data_page(struct inode *inode, block_t bidx, int gc_type, int err; retry: + if (f2fs_is_atomic_file(inode) && + !f2fs_is_commit_atomic_write(inode) && + !IS_GC_WRITTEN_PAGE(page)) { + set_page_private(page, (unsigned long)GC_WRITTEN_PAGE); + SetPagePrivate(page); + } set_page_dirty(page); f2fs_wait_on_page_writeback(page, DATA, true); if (clear_page_dirty_for_io(page)) { diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index f11c4bc..f0a6432 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -203,11 +203,14 @@ struct segment_allocation { */ #define ATOMIC_WRITTEN_PAGE ((unsigned long)-1) #define DUMMY_WRITTEN_PAGE ((unsigned long)-2) +#define GC_WRITTEN_PAGE ((unsigned long)-3) #define IS_ATOMIC_WRITTEN_PAGE(page) \ (page_private(page) == (unsigned long)ATOMIC_WRITTEN_PAGE) #define IS_DUMMY_WRITTEN_PAGE(page) \ (page_private(page) == (unsigned long)DUMMY_WRITTEN_PAGE) +#define IS_GC_WRITTEN_PAGE(page) \ + (page_private(page) == (unsigned long)GC_WRITTEN_PAGE) struct inmem_pages { struct list_head list;