linux-kernel - [PATCH 2/3] f2fs: fix get stale meta pages when build free nids

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1425870055-27694-2-git-send-email-wanpeng.li@linux.intel.com>
Date:	Mon,  9 Mar 2015 11:00:54 +0800
From:	Wanpeng Li <wanpeng.li@...ux.intel.com>
To:	Jaegeuk Kim <jaegeuk@...nel.org>
Cc:	Changman Lee <cm224.lee@...sung.com>,
	Chao Yu <chao2.yu@...sung.com>,
	linux-f2fs-devel@...ts.sourceforge.net,
	linux-fsdevel@...r.kernel.org, linux-kernel@...r.kernel.org,
	Wanpeng Li <wanpeng.li@...ux.intel.com>
Subject: [PATCH 2/3] f2fs: fix get stale meta pages when build free nids

The blocks of nat pages to be scanned will be readahead when build free 
nids. The start blkno will be adjusted to 0 when the intended range over 
max_nids, then function ra_meta_pages readahead the right blkno, however, 
function get_current_nat_page which is called in build_free_nids still 
get the meta pages w/ stale blkno, this patch fix it by adjusting the nid 
and the blkno which will be readahead in avdance in order to readahead and 
get the right meta pages.

Signed-off-by: Wanpeng Li <wanpeng.li@...ux.intel.com>
---
 fs/f2fs/checkpoint.c | 3 ---
 fs/f2fs/node.c       | 9 ++++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c
index 53bc328..aedb441 100644
--- a/fs/f2fs/checkpoint.c
+++ b/fs/f2fs/checkpoint.c
@@ -129,9 +129,6 @@ int ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, int type
 
 		switch (type) {
 		case META_NAT:
-			if (unlikely(blkno >=
-					NAT_BLOCK_OFFSET(NM_I(sbi)->max_nid)))
-				blkno = 0;
 			/* get nat block addr */
 			fio.blk_addr = current_nat_addr(sbi,
 					blkno * NAT_ENTRY_PER_BLOCK);
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c
index 1a7e925..8751375 100644
--- a/fs/f2fs/node.c
+++ b/fs/f2fs/node.c
@@ -1509,13 +1509,20 @@ static void build_free_nids(struct f2fs_sb_info *sbi)
 	struct f2fs_summary_block *sum = curseg->sum_blk;
 	int i = 0;
 	nid_t nid = nm_i->next_scan_nid;
+	block_t blkno = NAT_BLOCK_OFFSET(nid);
 
 	/* Enough entries */
 	if (nm_i->fcnt > NAT_ENTRY_PER_BLOCK)
 		return;
 
+	if (unlikely(blkno >=
+			NAT_BLOCK_OFFSET(NM_I(sbi)->max_nid))) {
+		blkno = 0;
+		nid = 0;
+	}
+
 	/* readahead nat pages to be scanned */
-	ra_meta_pages(sbi, NAT_BLOCK_OFFSET(nid), FREE_NID_PAGES, META_NAT);
+	ra_meta_pages(sbi, blkno, FREE_NID_PAGES, META_NAT);
 
 	while (1) {
 		struct page *page = get_current_nat_page(sbi, nid);
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/