Skip to contentSkip to conversation

f2fs: avoid unneeded initializing when converting inline dentry

PATCH In review Chao Yu 2 participants 3 messages Aug 19, 2015 – Aug 21, 2015 F2FS file system

lore
Share & tools
lore

Chao Yu

author
#0 lore raw

PATCH 2/9 f2fs: avoid unneeded initializing when converting inline dentry

When converting inline dentry, we will zero out target dentry page before duplicating data of inline dentry into target page, it become overhead since inline dentry size is not small.

So this patch tries to remove unneeded initializing in the space of target dentry page.

---
 fs/f2fs/inline.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
fs/f2fs/inline.c +14 -1
index 79d18d5..e4da0d7 100644
@@ -384,17 +384,30 @@ static int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage,
 		goto out;
 
 	f2fs_wait_on_page_writeback(page, DATA);
-	zero_user_segment(page, 0, PAGE_CACHE_SIZE);
+	zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);
 
 	dentry_blk = kmap_atomic(page);
 
 	/* copy data from inline dentry block to new dentry block */
 	memcpy(dentry_blk->dentry_bitmap, inline_dentry->dentry_bitmap,
 					INLINE_DENTRY_BITMAP_SIZE);
+	memset(dentry_blk->dentry_bitmap + INLINE_DENTRY_BITMAP_SIZE, 0,
+			SIZE_OF_DENTRY_BITMAP - INLINE_DENTRY_BITMAP_SIZE);
+	/*
+	 * reserved space size of inline dentry is larger than the one of
+	 * regular dentry, here we just copy with the size of reserved space
+	 * in regular dentry.
+	 */
+	memcpy(dentry_blk->reserved, inline_dentry->reserved, SIZE_OF_RESERVED);
 	memcpy(dentry_blk->dentry, inline_dentry->dentry,
 			sizeof(struct f2fs_dir_entry) * NR_INLINE_DENTRY);
+	memset(dentry_blk->dentry + NR_INLINE_DENTRY, 0,
+			sizeof (struct f2fs_dir_entry) *
+			(NR_DENTRY_IN_BLOCK - NR_INLINE_DENTRY));
 	memcpy(dentry_blk->filename, inline_dentry->filename,
 					NR_INLINE_DENTRY * F2FS_SLOT_LEN);
+	memset(&dentry_blk->filename[NR_INLINE_DENTRY][0], 0,
+		F2FS_SLOT_LEN * (NR_DENTRY_IN_BLOCK - NR_INLINE_DENTRY));
 
 	kunmap_atomic(dentry_blk);
 	SetPageUptodate(page);
Signature · 1 line
2.4.2
maintainer
#1 lore raw

Hi Chao,

Quoted 20 lines · Chao Yu

When converting inline dentry, we will zero out target dentry page before duplicating data of inline dentry into target page, it become overhead since inline dentry size is not small.

So this patch tries to remove unneeded initializing in the space of target dentry page.

---
 fs/f2fs/inline.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
fs/f2fs/inline.c +0 -0
index 79d18d5..e4da0d7 100644
@@ -384,17 +384,30 @@ static int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage,
 		goto out;
 
 	f2fs_wait_on_page_writeback(page, DATA);

fs/f2fs/inline.c static int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage, · line 395

Quoted 10 lines
fs/f2fs/inline.c +3 -1
-	zero_user_segment(page, 0, PAGE_CACHE_SIZE);
+	zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);
 
 	dentry_blk = kmap_atomic(page);
 
 	/* copy data from inline dentry block to new dentry block */
 	memcpy(dentry_blk->dentry_bitmap, inline_dentry->dentry_bitmap,
 					INLINE_DENTRY_BITMAP_SIZE);
+	memset(dentry_blk->dentry_bitmap + INLINE_DENTRY_BITMAP_SIZE, 0,
+			SIZE_OF_DENTRY_BITMAP - INLINE_DENTRY_BITMAP_SIZE);

Setting zeros for bitmap would be enough.
It doesn't need to copy or set zeros for reserved, dentries, and filename slots.

Thanks,

Quoted 20 lines
fs/f2fs/inline.c +11 -0
+	/*
+	 * reserved space size of inline dentry is larger than the one of
+	 * regular dentry, here we just copy with the size of reserved space
+	 * in regular dentry.
+	 */
+	memcpy(dentry_blk->reserved, inline_dentry->reserved, SIZE_OF_RESERVED);
 	memcpy(dentry_blk->dentry, inline_dentry->dentry,
 			sizeof(struct f2fs_dir_entry) * NR_INLINE_DENTRY);
+	memset(dentry_blk->dentry + NR_INLINE_DENTRY, 0,
+			sizeof (struct f2fs_dir_entry) *
+			(NR_DENTRY_IN_BLOCK - NR_INLINE_DENTRY));
 	memcpy(dentry_blk->filename, inline_dentry->filename,
 					NR_INLINE_DENTRY * F2FS_SLOT_LEN);
+	memset(&dentry_blk->filename[NR_INLINE_DENTRY][0], 0,
+		F2FS_SLOT_LEN * (NR_DENTRY_IN_BLOCK - NR_INLINE_DENTRY));
 
 	kunmap_atomic(dentry_blk);
 	SetPageUptodate(page);
Signature · 1 line
2.4.2

------------------------------------------------------------------------------

author
#2 lore raw

Hi Jaegeuk,

Quoted 35 lines

-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Friday, August 21, 2015 1:17 AM
To: Chao Yu
Cc: [email protected]; [email protected]
Subject: Re: [PATCH 2/9] f2fs: avoid unneeded initializing when converting inline dentry

Hi Chao,

Quoted 25 lines · Chao Yu

When converting inline dentry, we will zero out target dentry page before duplicating data of inline dentry into target page, it become overhead since inline dentry size is not small.

So this patch tries to remove unneeded initializing in the space of target dentry page.

---
 fs/f2fs/inline.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)
fs/f2fs/inline.c +1 -1
index 79d18d5..e4da0d7 100644
@@ -384,17 +384,30 @@ static int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage,
 		goto out;
 
 	f2fs_wait_on_page_writeback(page, DATA);
-	zero_user_segment(page, 0, PAGE_CACHE_SIZE);
+	zero_user_segment(page, MAX_INLINE_DATA, PAGE_CACHE_SIZE);
 
 	dentry_blk = kmap_atomic(page);
 
Quoted 8 lines

fs/f2fs/inline.c static int f2fs_convert_inline_dir(struct inode *dir, struct page *ipage, · line 395

Quoted 5 lines
fs/f2fs/inline.c +2 -0
 	/* copy data from inline dentry block to new dentry block */
 	memcpy(dentry_blk->dentry_bitmap, inline_dentry->dentry_bitmap,
 					INLINE_DENTRY_BITMAP_SIZE);
+	memset(dentry_blk->dentry_bitmap + INLINE_DENTRY_BITMAP_SIZE, 0,
+			SIZE_OF_DENTRY_BITMAP - INLINE_DENTRY_BITMAP_SIZE);

Setting zeros for bitmap would be enough.
It doesn't need to copy or set zeros for reserved, dentries, and filename slots.

Oh, you're right, I will fix it. :)

Thanks