Skip to contentSkip to conversation

f2fs: read contiguous sit entry pages by merging for mount performance

PATCH In review Chao Yu 2 participants 6 messages Nov 22, 2013 – Nov 25, 2013

Subsystems (2)
lore
Share & tools
lore

Chao Yu

author
#0 lore raw

PATCH v3 2/2 f2fs: read contiguous sit entry pages by merging for mount performance

Previously we read sit entries page one by one, this method lost the chance of reading contiguous page together. So we read pages as contiguous as possible for better mount performance.

change log:
o merge judgements/use 'Continue' or 'Break' instead of 'Goto' as Gu Zheng suggested.
o add mark_page_accessed() before release page to delay VM reclaiming.
o remove '*order' for simplification of function as Jaegeuk Kim suggested.

---
 fs/f2fs/segment.c |  103 +++++++++++++++++++++++++++++++++++++++--------------
 fs/f2fs/segment.h |    2 ++
 2 files changed, 78 insertions(+), 27 deletions(-)
fs/f2fs/segment.c +76 -27
index 8149eba..998e7d3 100644
@@ -14,6 +14,7 @@
 #include <linux/blkdev.h>
 #include <linux/prefetch.h>
 #include <linux/vmalloc.h>
+#include <linux/swap.h>
 
 #include "f2fs.h"
 #include "segment.h"
@@ -1488,41 +1489,89 @@ static int build_curseg(struct f2fs_sb_info *sbi)
 	return restore_curseg_summaries(sbi);
 }
 
+static int ra_sit_pages(struct f2fs_sb_info *sbi, int start, int nrpages)
+{
+	struct address_space *mapping = sbi->meta_inode->i_mapping;
+	struct page *page;
+	block_t blk_addr, prev_blk_addr = 0;
+	int sit_blk_cnt = SIT_BLK_CNT(sbi);
+	int blkno = start;
+
+	for (; blkno < start + nrpages && blkno < sit_blk_cnt; blkno++) {
+
+		blk_addr = current_sit_addr(sbi, start * SIT_ENTRY_PER_BLOCK);
+
+		if (blkno != start && prev_blk_addr + 1 != blk_addr)
+			break;
+		prev_blk_addr = blk_addr;
+repeat:
+		page = grab_cache_page(mapping, blk_addr);
+		if (!page) {
+			cond_resched();
+			goto repeat;
+		}
+		if (PageUptodate(page)) {
+			mark_page_accessed(page);
+			f2fs_put_page(page, 1);
+			continue;
+		}
+
+		submit_read_page(sbi, page, blk_addr, READ_SYNC);
+
+		mark_page_accessed(page);
+		f2fs_put_page(page, 0);
+	}
+
+	f2fs_submit_read_bio(sbi, READ_SYNC);
+	return blkno - start;
+}
+
 static void build_sit_entries(struct f2fs_sb_info *sbi)
 {
 	struct sit_info *sit_i = SIT_I(sbi);
 	struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_COLD_DATA);
 	struct f2fs_summary_block *sum = curseg->sum_blk;
-	unsigned int start;
-
-	for (start = 0; start < TOTAL_SEGS(sbi); start++) {
-		struct seg_entry *se = &sit_i->sentries[start];
-		struct f2fs_sit_block *sit_blk;
-		struct f2fs_sit_entry sit;
-		struct page *page;
-		int i;
-
-		mutex_lock(&curseg->curseg_mutex);
-		for (i = 0; i < sits_in_cursum(sum); i++) {
-			if (le32_to_cpu(segno_in_journal(sum, i)) == start) {
-				sit = sit_in_journal(sum, i);
-				mutex_unlock(&curseg->curseg_mutex);
-				goto got_it;
+	int sit_blk_cnt = SIT_BLK_CNT(sbi);
+	unsigned int i, start, end;
+	unsigned int readed, start_blk = 0;
+	int nrpages = MAX_BIO_BLOCKS(max_hw_blocks(sbi));
+	
+	do {
+		readed = ra_sit_pages(sbi, start_blk, nrpages);
+
+		start = start_blk * sit_i->sents_per_block;
+		end = (start_blk + readed) * sit_i->sents_per_block;
+
+		for (; start < end && start < TOTAL_SEGS(sbi); start++) {
+			struct seg_entry *se = &sit_i->sentries[start];
+			struct f2fs_sit_block *sit_blk;
+			struct f2fs_sit_entry sit;
+			struct page *page;
+
+			mutex_lock(&curseg->curseg_mutex);
+			for (i = 0; i < sits_in_cursum(sum); i++) {
+				if (le32_to_cpu(segno_in_journal(sum, i)) == start) {
+					sit = sit_in_journal(sum, i);
+					mutex_unlock(&curseg->curseg_mutex);
+					goto got_it;
+				}
 			}
-		}
-		mutex_unlock(&curseg->curseg_mutex);
-		page = get_current_sit_page(sbi, start);
-		sit_blk = (struct f2fs_sit_block *)page_address(page);
-		sit = sit_blk->entries[SIT_ENTRY_OFFSET(sit_i, start)];
-		f2fs_put_page(page, 1);
+			mutex_unlock(&curseg->curseg_mutex);
+
+			page = get_current_sit_page(sbi, start);
+			sit_blk = (struct f2fs_sit_block *)page_address(page);
+			sit = sit_blk->entries[SIT_ENTRY_OFFSET(sit_i, start)];
+			f2fs_put_page(page, 1);
 got_it:
-		check_block_count(sbi, start, &sit);
-		seg_info_from_raw_sit(se, &sit);
-		if (sbi->segs_per_sec > 1) {
-			struct sec_entry *e = get_sec_entry(sbi, start);
-			e->valid_blocks += se->valid_blocks;
+			check_block_count(sbi, start, &sit);
+			seg_info_from_raw_sit(se, &sit);
+			if (sbi->segs_per_sec > 1) {
+				struct sec_entry *e = get_sec_entry(sbi, start);
+				e->valid_blocks += se->valid_blocks;
+			}
 		}
-	}
+		start_blk += readed;
+	} while (start_blk < sit_blk_cnt);
 }
 
 static void init_free_segmap(struct f2fs_sb_info *sbi)
fs/f2fs/segment.h +2 -0
index 269f690..ad5b9f1 100644
@@ -83,6 +83,8 @@
 	(segno / SIT_ENTRY_PER_BLOCK)
 #define	START_SEGNO(sit_i, segno)		\
 	(SIT_BLOCK_OFFSET(sit_i, segno) * SIT_ENTRY_PER_BLOCK)
+#define SIT_BLK_CNT(sbi)			\
+	((TOTAL_SEGS(sbi) + SIT_ENTRY_PER_BLOCK - 1) / SIT_ENTRY_PER_BLOCK)
 #define f2fs_bitmap_size(nr)			\
 	(BITS_TO_LONGS(nr) * sizeof(unsigned long))
 #define TOTAL_SEGS(sbi)	(SM_I(sbi)->main_segments)
Signature · 1 line
1.7.9.5
#1 lore raw

Hi,

Just one niptick.

2013-11-22 (금), 09:09 +0800, Chao Yu:

Quoted 29 lines

Previously we read sit entries page one by one, this method lost the chance of reading contiguous page together. So we read pages as contiguous as possible for better mount performance.

change log:
o merge judgements/use 'Continue' or 'Break' instead of 'Goto' as Gu Zheng suggested.
o add mark_page_accessed() before release page to delay VM reclaiming.
o remove '*order' for simplification of function as Jaegeuk Kim suggested.

---
 fs/f2fs/segment.c |  103 +++++++++++++++++++++++++++++++++++++++--------------
 fs/f2fs/segment.h |    2 ++
 2 files changed, 78 insertions(+), 27 deletions(-)
fs/f2fs/segment.c +1 -0
index 8149eba..998e7d3 100644
@@ -14,6 +14,7 @@
 #include <linux/blkdev.h>
 #include <linux/prefetch.h>
 #include <linux/vmalloc.h>
+#include <linux/swap.h>
 
 #include "f2fs.h"
 #include "segment.h"

fs/f2fs/segment.c static int build_curseg(struct f2fs_sb_info *sbi) · line 1497

Quoted 9 lines
fs/f2fs/segment.c +6 -0
@@ -1488,41 +1489,89 @@ static int build_curseg(struct f2fs_sb_info *sbi)
 	return restore_curseg_summaries(sbi);
 }
 
+static int ra_sit_pages(struct f2fs_sb_info *sbi, int start, int nrpages)
+{
+	struct address_space *mapping = sbi->meta_inode->i_mapping;
+	struct page *page;
+	block_t blk_addr, prev_blk_addr = 0;
+	int sit_blk_cnt = SIT_BLK_CNT(sbi);

Can we remove SIT_BLK_CNT by replacing with sit_i->sit_blocks?

Signature · 14 lines
Jaegeuk Kim
Samsung


------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation.
Intel(R) Software Adrenaline delivers strategic insight and game-changing 
conversations that shape the rapidly evolving mobile landscape. Sign up now. 
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
Linux-f2fs-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
author
#2 lore raw

Hi,

Quoted 44 lines

-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Friday, November 22, 2013 5:11 PM
To: Chao Yu
Cc: [email protected]; [email protected]; [email protected]; 谭姝
Subject: Re: [f2fs-dev] [PATCH V3 2/2] f2fs: read contiguous sit entry pages by merging for mount performance

Hi,

Just one niptick.

2013-11-22 (금), 09:09 +0800, Chao Yu:

Quoted 32 lines

Previously we read sit entries page one by one, this method lost the chance of reading contiguous page together. So we read pages as contiguous as possible for better mount performance.

change log:
o merge judgements/use 'Continue' or 'Break' instead of 'Goto' as Gu Zheng suggested.
o add mark_page_accessed() before release page to delay VM reclaiming.
o remove '*order' for simplification of function as Jaegeuk Kim suggested.

---
 fs/f2fs/segment.c |  103 +++++++++++++++++++++++++++++++++++++++--------------
 fs/f2fs/segment.h |    2 ++
 2 files changed, 78 insertions(+), 27 deletions(-)
fs/f2fs/segment.c +1 -0
index 8149eba..998e7d3 100644
@@ -14,6 +14,7 @@
 #include <linux/blkdev.h>
 #include <linux/prefetch.h>
 #include <linux/vmalloc.h>
+#include <linux/swap.h>
 
 #include "f2fs.h"
 #include "segment.h"
@@ -1488,41 +1489,89 @@ static int build_curseg(struct f2fs_sb_info *sbi)
 	return restore_curseg_summaries(sbi);
 }
 
Quoted 8 lines

fs/f2fs/segment.c static int build_curseg(struct f2fs_sb_info *sbi) · line 1497

Quoted 6 lines
fs/f2fs/segment.c +6 -0
+static int ra_sit_pages(struct f2fs_sb_info *sbi, int start, int nrpages)
+{
+	struct address_space *mapping = sbi->meta_inode->i_mapping;
+	struct page *page;
+	block_t blk_addr, prev_blk_addr = 0;
+	int sit_blk_cnt = SIT_BLK_CNT(sbi);

Can we remove SIT_BLK_CNT by replacing with sit_i->sit_blocks?

Because sit_i->sit_blocks is a multiple of segment size(i.e. 512/1024), but we may use part of sit_blocks, not all of them. So it's waste to read all of them.
What's your opinion?

Regards,
Yu

Quoted 4 lines

--
Jaegeuk Kim
Samsung

------------------------------------------------------------------------------
Shape the Mobile Experience: Free Subscription
Software experts and developers: Be at the forefront of tech innovation. Intel(R) Software Adrenaline delivers strategic insight and game-changing conversations that shape the rapidly evolving mobile landscape. Sign up now.
http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktrk
_______________________________________________
Linux-f2fs-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel

#3 lore raw

Hi,

2013-11-23 (토), 10:53 +0800, Chao Yu:

Quoted 55 lines

Hi,

Quoted 44 lines

-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Friday, November 22, 2013 5:11 PM
To: Chao Yu
Cc: [email protected]; [email protected]; [email protected]; 谭姝
Subject: Re: [f2fs-dev] [PATCH V3 2/2] f2fs: read contiguous sit entry pages by merging for mount performance

Hi,

Just one niptick.

2013-11-22 (금), 09:09 +0800, Chao Yu:

Quoted 32 lines

Previously we read sit entries page one by one, this method lost the chance of reading contiguous page together. So we read pages as contiguous as possible for better mount performance.

change log:
o merge judgements/use 'Continue' or 'Break' instead of 'Goto' as Gu Zheng suggested.
o add mark_page_accessed() before release page to delay VM reclaiming.
o remove '*order' for simplification of function as Jaegeuk Kim suggested.

---
 fs/f2fs/segment.c |  103 +++++++++++++++++++++++++++++++++++++++--------------
 fs/f2fs/segment.h |    2 ++
 2 files changed, 78 insertions(+), 27 deletions(-)
fs/f2fs/segment.c +1 -0
index 8149eba..998e7d3 100644
@@ -14,6 +14,7 @@
 #include <linux/blkdev.h>
 #include <linux/prefetch.h>
 #include <linux/vmalloc.h>
+#include <linux/swap.h>
 
 #include "f2fs.h"
 #include "segment.h"
@@ -1488,41 +1489,89 @@ static int build_curseg(struct f2fs_sb_info *sbi)
 	return restore_curseg_summaries(sbi);
 }
 
Quoted 8 lines

fs/f2fs/segment.c static int build_curseg(struct f2fs_sb_info *sbi) · line 1497

Quoted 6 lines
fs/f2fs/segment.c +6 -0
+static int ra_sit_pages(struct f2fs_sb_info *sbi, int start, int nrpages)
+{
+	struct address_space *mapping = sbi->meta_inode->i_mapping;
+	struct page *page;
+	block_t blk_addr, prev_blk_addr = 0;
+	int sit_blk_cnt = SIT_BLK_CNT(sbi);

Can we remove SIT_BLK_CNT by replacing with sit_i->sit_blocks?

Quoted 4 lines

Because sit_i->sit_blocks is a multiple of segment size(i.e. 512/1024), but we may use part of sit_blocks, not all of them. So it's waste to read all of them.
What's your opinion?

Got it.
It's right and we can avoid that.
Thanks, :)

Signature · 2 lines
Jaegeuk Kim
Samsung
#4 lore raw
In reply to Chao Yu

Hi,

2013-11-22 (금), 09:09 +0800, Chao Yu:

Quoted 33 lines

Previously we read sit entries page one by one, this method lost the chance of reading contiguous page together. So we read pages as contiguous as possible for better mount performance.

change log:
o merge judgements/use 'Continue' or 'Break' instead of 'Goto' as Gu Zheng suggested.
o add mark_page_accessed() before release page to delay VM reclaiming.
o remove '*order' for simplification of function as Jaegeuk Kim suggested.

---
 fs/f2fs/segment.c |  103 +++++++++++++++++++++++++++++++++++++++--------------
 fs/f2fs/segment.h |    2 ++
 2 files changed, 78 insertions(+), 27 deletions(-)
fs/f2fs/segment.c +2 -0
index 8149eba..998e7d3 100644
@@ -14,6 +14,7 @@
 #include <linux/blkdev.h>
 #include <linux/prefetch.h>
 #include <linux/vmalloc.h>
+#include <linux/swap.h>
 
 #include "f2fs.h"
 #include "segment.h"
@@ -1488,41 +1489,89 @@ static int build_curseg(struct f2fs_sb_info *sbi)
 	return restore_curseg_summaries(sbi);
 }
 
+static int ra_sit_pages(struct f2fs_sb_info *sbi, int start, int nrpages)

fs/f2fs/segment.c static int build_curseg(struct f2fs_sb_info *sbi) · line 1502

Quoted 10 lines
fs/f2fs/segment.c +10 -0
+{
+	struct address_space *mapping = sbi->meta_inode->i_mapping;
+	struct page *page;
+	block_t blk_addr, prev_blk_addr = 0;
+	int sit_blk_cnt = SIT_BLK_CNT(sbi);
+	int blkno = start;
+
+	for (; blkno < start + nrpages && blkno < sit_blk_cnt; blkno++) {
+
+		blk_addr = current_sit_addr(sbi, start * SIT_ENTRY_PER_BLOCK);

Should be:

	blk_addr = current_sit_addr(sbi, blkno * SIT_ENTRY_PER_BLOCK);
	                                -------

I'll fix this and merge the patch though.
Thanks,

Signature · 2 lines
Jaegeuk Kim
Samsung
author
#5 lore raw

Hi,

Quoted 55 lines

-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Sunday, November 24, 2013 12:26 PM
To: Chao Yu
Cc: [email protected]; [email protected]; [email protected]; 谭姝
Subject: Re: [f2fs-dev] [PATCH V3 2/2] f2fs: read contiguous sit entry pages by merging for mount performance

Hi,

2013-11-22 (금), 09:09 +0800, Chao Yu:

Quoted 33 lines

Previously we read sit entries page one by one, this method lost the chance of reading contiguous page together. So we read pages as contiguous as possible for better mount performance.

change log:
o merge judgements/use 'Continue' or 'Break' instead of 'Goto' as Gu Zheng suggested.
o add mark_page_accessed() before release page to delay VM reclaiming.
o remove '*order' for simplification of function as Jaegeuk Kim suggested.

---
 fs/f2fs/segment.c |  103 +++++++++++++++++++++++++++++++++++++++--------------
 fs/f2fs/segment.h |    2 ++
 2 files changed, 78 insertions(+), 27 deletions(-)
fs/f2fs/segment.c +2 -0
index 8149eba..998e7d3 100644
@@ -14,6 +14,7 @@
 #include <linux/blkdev.h>
 #include <linux/prefetch.h>
 #include <linux/vmalloc.h>
+#include <linux/swap.h>
 
 #include "f2fs.h"
 #include "segment.h"
@@ -1488,41 +1489,89 @@ static int build_curseg(struct f2fs_sb_info *sbi)
 	return restore_curseg_summaries(sbi);
 }
 
+static int ra_sit_pages(struct f2fs_sb_info *sbi, int start, int nrpages)

fs/f2fs/segment.c static int build_curseg(struct f2fs_sb_info *sbi) · line 1502

Quoted 10 lines
fs/f2fs/segment.c +10 -0
+{
+	struct address_space *mapping = sbi->meta_inode->i_mapping;
+	struct page *page;
+	block_t blk_addr, prev_blk_addr = 0;
+	int sit_blk_cnt = SIT_BLK_CNT(sbi);
+	int blkno = start;
+
+	for (; blkno < start + nrpages && blkno < sit_blk_cnt; blkno++) {
+
+		blk_addr = current_sit_addr(sbi, start * SIT_ENTRY_PER_BLOCK);

Should be:

Quoted 4 lines
	blk_addr = current_sit_addr(sbi, blkno * SIT_ENTRY_PER_BLOCK);
	                                -------

I'll fix this and merge the patch though.
Thanks,

Oh, It's my mistake, sorry for that.
Thanks for your review! :)

Quoted 4 lines

--
Jaegeuk Kim
Samsung