From patchwork Wed Jan 31 16:16:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao Xiang X-Patchwork-Id: 10194177 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 9AAEC601A0 for ; Wed, 31 Jan 2018 16:16:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A941D28726 for ; Wed, 31 Jan 2018 16:16:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DE352873B; Wed, 31 Jan 2018 16:16: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 1F91528726 for ; Wed, 31 Jan 2018 16:16:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752731AbeAaQQj convert rfc822-to-8bit (ORCPT ); Wed, 31 Jan 2018 11:16:39 -0500 Received: from szxga03-in.huawei.com ([45.249.212.189]:2095 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752097AbeAaQQh (ORCPT ); Wed, 31 Jan 2018 11:16:37 -0500 Received: from dggemi405-hub.china.huawei.com (unknown [172.30.72.54]) by Forcepoint Email with ESMTP id C36338E66C699; Thu, 1 Feb 2018 00:16:31 +0800 (CST) Received: from DGGEMI505-MBX.china.huawei.com ([169.254.1.231]) by dggemi405-hub.china.huawei.com ([10.3.17.143]) with mapi id 14.03.0361.001; Thu, 1 Feb 2018 00:16:25 +0800 From: "Gaoxiang (OS)" To: Jaegeuk Kim , Chao Yu , "Yuchao (T)" CC: "linux-f2fs-devel@lists.sourceforge.net" , "linux-fsdevel@vger.kernel.org" , heyunlei , Gao Xiang Subject: [f2fs-dev] [PATCH] f2fs: use crc ^ cp_ver instead of crc | cp_ver for recovery Thread-Topic: [f2fs-dev] [PATCH] f2fs: use crc ^ cp_ver instead of crc | cp_ver for recovery Thread-Index: AdOarmiwOc/REYziRwSiWMO34aLLSg== Date: Wed, 31 Jan 2018 16:16:25 +0000 Message-ID: <9047C53C18267742AB12E43B65C7F9F70BCE5C21@dggemi505-mbx.china.huawei.com> Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-imapappendstamp: dggemi307-cas.china.huawei.com (14.03.0336.000) x-originating-ip: [10.151.23.176] MIME-Version: 1.0 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 add a flag CP_CRC_RECOVERY_XOR_FLAG to use XORed crc ^ cp_ver since crc | cp_ver is more likely to get a collision or become 11..1111 | cp_ver. Signed-off-by: Gao Xiang --- fs/f2fs/checkpoint.c | 4 ++-- fs/f2fs/node.h | 16 +++++++++++----- fs/f2fs/segment.c | 3 ++- include/linux/f2fs_fs.h | 1 + 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index 8b0945b..9e7e63b 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c @@ -1157,8 +1157,8 @@ static void update_ckpt_flags(struct f2fs_sb_info *sbi, struct cp_control *cpc) if (is_sbi_flag_set(sbi, SBI_NEED_FSCK)) __set_ckpt_flags(ckpt, CP_FSCK_FLAG); - /* set this flag to activate crc|cp_ver for recovery */ - __set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG); + /* set this flag to activate crc^cp_ver for recovery */ + __set_ckpt_flags(ckpt, CP_CRC_RECOVERY_XOR_FLAG); __clear_ckpt_flags(ckpt, CP_NOCRC_RECOVERY_FLAG); spin_unlock_irqrestore(&sbi->cp_lock, flags); diff --git a/fs/f2fs/node.h b/fs/f2fs/node.h index 081ef0d..7b9489f 100644 --- a/fs/f2fs/node.h +++ b/fs/f2fs/node.h @@ -293,8 +293,11 @@ static inline void fill_node_footer_blkaddr(struct page *page, block_t blkaddr) struct f2fs_node *rn = F2FS_NODE(page); __u64 cp_ver = cur_cp_version(ckpt); - if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG)) - cp_ver |= (cur_cp_crc(ckpt) << 32); + if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_XOR_FLAG)) + cp_ver ^= cur_cp_crc(ckpt) << 32; + /* for backward compatibility */ + else if (unlikely(__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG))) + cp_ver |= cur_cp_crc(ckpt) << 32; rn->footer.cp_ver = cpu_to_le64(cp_ver); rn->footer.next_blkaddr = cpu_to_le32(blkaddr); @@ -307,10 +310,13 @@ static inline bool is_recoverable_dnode(struct page *page) /* Don't care crc part, if fsck.f2fs sets it. */ if (__is_set_ckpt_flags(ckpt, CP_NOCRC_RECOVERY_FLAG)) - return (cp_ver << 32) == (cpver_of_node(page) << 32); + return (__u32)cp_ver == (__u32)cpver_of_node(page); - if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG)) - cp_ver |= (cur_cp_crc(ckpt) << 32); + if (__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_XOR_FLAG)) + cp_ver ^= cur_cp_crc(ckpt) << 32; + /* for backward compatibility */ + else if (unlikely(__is_set_ckpt_flags(ckpt, CP_CRC_RECOVERY_FLAG))) + cp_ver |= cur_cp_crc(ckpt) << 32; return cp_ver == cpver_of_node(page); } diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 205b0d9..64d0c1f 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2316,7 +2316,8 @@ static void allocate_segment_by_default(struct f2fs_sb_info *sbi, if (force) new_curseg(sbi, type, true); - else if (!is_set_ckpt_flags(sbi, CP_CRC_RECOVERY_FLAG) && + else if (!(is_set_ckpt_flags(sbi, CP_CRC_RECOVERY_FLAG) || + is_set_ckpt_flags(sbi, CP_CRC_RECOVERY_XOR_FLAG)) && type == CURSEG_WARM_NODE) new_curseg(sbi, type, false); else if (curseg->alloc_type == LFS && is_next_segment_free(sbi, type)) diff --git a/include/linux/f2fs_fs.h b/include/linux/f2fs_fs.h index f7f0990..07ddf4b 100644 --- a/include/linux/f2fs_fs.h +++ b/include/linux/f2fs_fs.h @@ -117,6 +117,7 @@ struct f2fs_super_block { /* * For checkpoint */ +#define CP_CRC_RECOVERY_XOR_FLAG 0x00000800 #define CP_LARGE_NAT_BITMAP_FLAG 0x00000400 #define CP_NOCRC_RECOVERY_FLAG 0x00000200 #define CP_TRIMMED_FLAG 0x00000100