From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751351AbdCQKrP (ORCPT ); Fri, 17 Mar 2017 06:47:15 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]:4425 "EHLO dggrg03-dlp.huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751097AbdCQKrN (ORCPT ); Fri, 17 Mar 2017 06:47:13 -0400 From: Chao Yu To: CC: , , , Chao Yu Subject: [PATCH] f2fs: protect free nid operation with cp_rwsem Date: Fri, 17 Mar 2017 18:46:23 +0800 Message-ID: <20170317104623.90116-1-yuchao0@huawei.com> X-Mailer: git-send-email 2.8.2.295.g3f1c1d0 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.120.216.130] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020203.58CBBE8C.0209,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 6ccfc6548882f33a7409a6ac161f356c Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org - f2fs_balance_fs_bg - build_free_nids - __build_free_nids - scan_nat_page - add_free_nid - f2fs_create - f2fs_new_inode - alloc_nid - remove_free_nid This patch uses cp_rwsem to protect free nid allocation/initialization to avoid reusing allocated nid in above scenario. Signed-off-by: Chao Yu --- fs/f2fs/inode.c | 2 ++ fs/f2fs/segment.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/fs/f2fs/inode.c b/fs/f2fs/inode.c index 2520fa72b23f..f941410f994a 100644 --- a/fs/f2fs/inode.c +++ b/fs/f2fs/inode.c @@ -423,7 +423,9 @@ void f2fs_evict_inode(struct inode *inode) add_ino_entry(sbi, inode->i_ino, UPDATE_INO); } if (is_inode_flag_set(inode, FI_FREE_NID)) { + f2fs_lock_op(sbi); alloc_nid_failed(sbi, inode->i_ino); + f2fs_unlock_op(sbi); clear_inode_flag(inode, FI_FREE_NID); } f2fs_bug_on(sbi, err && diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 0bf024f62330..f85e1f443c99 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -426,8 +426,11 @@ void f2fs_balance_fs_bg(struct f2fs_sb_info *sbi) if (!available_free_memory(sbi, FREE_NIDS)) try_to_free_nids(sbi, MAX_FREE_NIDS); - else + else { + f2fs_lock_op(sbi); build_free_nids(sbi, false, false); + f2fs_unlock_op(sbi); + } if (!is_idle(sbi)) return; -- 2.8.2.295.g3f1c1d0