f2fs: split sbi->write_mutex for DATA/NODE/META to avoid unnecessary race
Subsystems (2)
PATCH 1/1 f2fs: split sbi->write_mutex for DATA/NODE/META to avoid unnecessary race
All DATA/NODE/META bio buffers in superblock is protected by 'sbi->write_mutex', but each bio buffer area is independent, So we should split write_mutex to three for DATA/NODE/META.
--- fs/f2fs/f2fs.h | 2 +- fs/f2fs/segment.c | 8 ++++---- fs/f2fs/super.c | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-)
fs/f2fs/f2fs.h +1 -1
@@ -362,7 +362,7 @@ struct f2fs_sb_info {struct f2fs_sm_info *sm_info;/* segment manager */ struct bio *bio[NR_PAGE_TYPE ];/* bios to merge */ sector_t last_block_in_bio[NR_PAGE_TYPE ];/* last block number */ -struct mutex write_mutex;/* mutex for writing IOs */ +struct mutex write_mutex[NR_PAGE_TYPE ];/* mutex for writing IOs */ /* for checkpoint */ struct f2fs_checkpoint *ckpt;/* raw checkpoint pointer */
fs/f2fs/segment.c +0 -0
@@ -661,9 +661,9 @@ void f2fs_submit_bio(struct f2fs_sb_info *sbi, enum
page_type type, bool sync)
if (!sbi->bio[btype])
return;
- mutex_lock(&sbi->write_mutex);
+ mutex_lock(&sbi->write_mutex[type]);
do_submit_bio(sbi, type, sync);
- mutex_unlock(&sbi->write_mutex);
+ mutex_unlock(&sbi->write_mutex[type]);
}
static void submit_write_page(struct f2fs_sb_info *sbi, struct page *page,
@@ -674,7 +674,7 @@ static void submit_write_page(struct f2fs_sb_info *sbi, struct page *page,
verify_block_addr(sbi, blk_addr);
- mutex_lock(&sbi->write_mutex);
+ mutex_lock(&sbi->write_mutex[type]);
inc_page_count(sbi, F2FS_WRITEBACK);
@@ -709,7 +709,7 @@ retry:
sbi->last_block_in_bio[type] = blk_addr;
- mutex_unlock(&sbi->write_mutex);
+ mutex_unlock(&sbi->write_mutex[type]);
trace_f2fs_submit_write_page(page, blk_addr, type);
}
fs/f2fs/super.c +0 -0
@@ -874,7 +874,9 @@ static int f2fs_fill_super(struct super_block *sb, void
*data, int silent)
mutex_init(&sbi->node_write);
sbi->por_doing = false;
spin_lock_init(&sbi->stat_lock);
- mutex_init(&sbi->write_mutex);
+ mutex_init(&sbi->write_mutex[DATA]);
+ mutex_init(&sbi->write_mutex[NODE]);
+ mutex_init(&sbi->write_mutex[META]);
init_rwsem(&sbi->cp_rwsem);
init_waitqueue_head(&sbi->cp_wait);
init_sb_info(sbi);
Signature · 1 line
1.7.9.5
Hi,
2013-11-19 (화), 09:43 +0800, Chao Yu:
Quoted 3 lines
All DATA/NODE/META bio buffers in superblock is protected by '
sbi->write_mutex', but each bio buffer area is independent, So we should splitwrite_mutexto three for DATA/NODE/META.
Agreed, one comment below though.
Anyway I'll send v2.
Thanks, :)
Quoted 26 lines
Signed-off-by Chao Yu <[email protected]>--- fs/f2fs/f2fs.h | 2 +- fs/f2fs/segment.c | 8 ++++---- fs/f2fs/super.c | 4 +++- 3 files changed, 8 insertions(+), 6 deletions(-)fs/f2fs/f2fs.h +1
-1@@ -362,7 +362,7 @@ struct f2fs_sb_info {struct f2fs_sm_info *sm_info;/* segment manager */ struct bio *bio[NR_PAGE_TYPE ];/* bios to merge */ sector_t last_block_in_bio[NR_PAGE_TYPE ];/* last block number */ -struct mutex write_mutex;/* mutex for writing IOs */ +struct mutex write_mutex[NR_PAGE_TYPE ];/* mutex for writing IOs */ /* for checkpoint */ struct f2fs_checkpoint *ckpt;/* raw checkpoint pointer */ fs/f2fs/segment.c +0
-0
fs/f2fs/segment.c void f2fs_submit_bio(struct f2fs_sb_info *sbi, enum · line 665
Quoted 6 lines
fs/f2fs/segment.c +1
-1@@ -661,9 +661,9 @@ void f2fs_submit_bio(struct f2fs_sb_info *sbi, enum page_type type, bool sync)if (!sbi->bio[btype])return ; -mutex_lock (&sbi->write_mutex); +mutex_lock (&sbi->write_mutex[type]);
btype instead of type.
Quoted 41 lines
fs/f2fs/segment.c +1
-1do_submit_bio (sbi, type, sync); -mutex_unlock (&sbi->write_mutex); +mutex_unlock (&sbi->write_mutex[type]); }static void submit_write_page(struct
f2fs_sb_info*sbi, struct page *page,fs/f2fs/segment.c +2
-2@@ -674,7 +674,7 @@ static void submit_write_page(struct f2fs_sb_info *sbi,struct page *page,verify_block_addr (sbi ,blk_addr ); -mutex_lock (&sbi->write_mutex); +mutex_lock (&sbi->write_mutex[type]);inc_page_count (sbi,F2FS_WRITEBACK );@@ -709,7 +709,7 @@ retry: sbi->last_block_in_bio[type] = blk_addr; -mutex_unlock (&sbi->write_mutex); +mutex_unlock (&sbi->write_mutex[type]);trace_f2fs_submit_write_page (page, blk_addr, type); }fs/f2fs/super.c +3
-1@@ -874,7 +874,9 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)mutex_init (&sbi->node_write); sbi->por_doing = false;spin_lock_init (&sbi->stat_lock); -mutex_init (&sbi->write_mutex); +mutex_init (&sbi->write_mutex[DATA ]); +mutex_init (&sbi->write_mutex[NODE ]); +mutex_init (&sbi->write_mutex[META ]);init_rwsem (&sbi->cp_rwsem);init_waitqueue_head (&sbi->cp_wait);
init_sb_info(sbi);
Signature · 7 lines
Jaegeuk Kim Samsung -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi,
I think we don't need to make two patches for this. How about this?
Quoted 1 line
From
71c27f78e72d680edcd7b1c0917842343044653cMon Sep 17 00:00:00 2001
From: Jaegeuk Kim <[email protected]>
Date: Mon, 18 Nov 2013 17:16:17 +0900
Subject: [PATCH] f2fs: use sbi->write_mutex for write bios
This patch removes an unnecessary semaphore (i.e., sbi->bio_sem). There is no reason to use the semaphore when f2fs submits read and write IOs.
Instead, let's use a write mutex and cover the sbi->bio[] by the lock.
Change log from v1:
o split write_mutex suggested by Chao Yu
Chao described,
"All DATA/NODE/META bio buffers in superblock is protected by 'sbi->write_mutex', but each bio buffer area is independent, So we should split write_mutex to three for DATA/NODE/META."
--- fs/f2fs/data.c | 4 ---- fs/f2fs/f2fs.h | 2 +- fs/f2fs/segment.c | 13 +++++++++---- fs/f2fs/super.c | 6 +++++- 4 files changed, 15 insertions(+), 10 deletions(-)
fs/f2fs/data.c +0 -0
@@ -383,8 +383,6 @@ int f2fs_readpage(struct f2fs_sb_info *sbi, struct
page *page,
trace_f2fs_readpage(page, blk_addr, type);
- down_read(&sbi->bio_sem);
-
/* Allocate a new bio */
bio = f2fs_bio_alloc(bdev, 1);
@@ -394,13 +392,11 @@ int f2fs_readpage(struct f2fs_sb_info *sbi, struct page *page,
if (bio_add_page(bio, page, PAGE_CACHE_SIZE, 0) < PAGE_CACHE_SIZE) {
bio_put(bio);
- up_read(&sbi->bio_sem);
f2fs_put_page(page, 1);
return -EFAULT;
}
submit_bio(type, bio);
- up_read(&sbi->bio_sem);
return 0;
}
fs/f2fs/f2fs.h +1 -1
@@ -374,7 +374,7 @@ struct f2fs_sb_info {struct f2fs_sm_info *sm_info;/* segment manager */ struct bio *bio[NR_PAGE_TYPE ];/* bios to merge */ sector_t last_block_in_bio[NR_PAGE_TYPE ];/* last block number */ -struct rw_semaphore bio_sem;/* IO semaphore */ +struct mutex write_mutex[NR_PAGE_TYPE ];/* mutex for writing IOs */ /* for checkpoint */ struct f2fs_checkpoint *ckpt;/* raw checkpoint pointer */
fs/f2fs/segment.c +0 -0
@@ -871,9 +871,14 @@ static void do_submit_bio(struct f2fs_sb_info *sbi, void f2fs_submit_bio(struct f2fs_sb_info *sbi, enum page_type type,
bool sync)
{
- down_write(&sbi->bio_sem);
+ enum page_type btype = PAGE_TYPE_OF_BIO(type);
+
+ if (!sbi->bio[btype])
+ return;
+
+ mutex_lock(&sbi->write_mutex[btype]);
do_submit_bio(sbi, type, sync);
- up_write(&sbi->bio_sem);
+ mutex_unlock(&sbi->write_mutex[btype]);
}
static void submit_write_page(struct f2fs_sb_info *sbi, struct page
*page,
@@ -884,7 +889,7 @@ static void submit_write_page(struct f2fs_sb_info *sbi, struct page *page,
verify_block_addr(sbi, blk_addr);
- down_write(&sbi->bio_sem);
+ mutex_lock(&sbi->write_mutex[type]);
inc_page_count(sbi, F2FS_WRITEBACK);
@@ -919,7 +924,7 @@ retry:
sbi->last_block_in_bio[type] = blk_addr;
- up_write(&sbi->bio_sem);
+ mutex_unlock(&sbi->write_mutex[type]);
trace_f2fs_submit_write_page(page, blk_addr, type);
}
fs/f2fs/super.c +0 -0
@@ -820,6 +820,7 @@ static int f2fs_fill_super(struct super_block *sb,
void *data, int silent)
struct buffer_head *raw_super_buf;
struct inode *root;
long err = -EINVAL;
+ int i;
/* allocate memory for f2fs-specific super block info */ sbi = kzalloc(sizeof(struct f2fs_sb_info), GFP_KERNEL);
@@ -876,7 +877,10 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)
mutex_init(&sbi->node_write);
sbi->por_doing = false; spin_lock_init(&sbi->stat_lock);
- init_rwsem(&sbi->bio_sem);
+
+ for (i = 0; i < NR_PAGE_TYPE; i++)
+ mutex_init(&sbi->write_mutex[i]);
+
init_rwsem(&sbi->cp_rwsem); init_waitqueue_head(&sbi->cp_wait); init_sb_info(sbi);
Signature · 15 lines
1.8.4.474.g128a96c -- 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
Hi
Quoted 9 lines
-----Original Message-----
From: Jaegeuk Kim [mailto:[email protected]]
Sent: Tuesday, November 19, 2013 11:36 AM
To: Chao Yu
Cc: [email protected]; [email protected]; [email protected]
Subject: Re: [f2fs-dev] [PATCH] f2fs: splitsbi->write_mutexfor DATA/NODE/META to avoid unnecessary race
Quoted 4 lines
Hi,
I think we don't need to make two patches for this. How about this?
This could be reasonable,
And I will refer to this patch.
Quoted 146 lines
From
71c27f78e72d680edcd7b1c0917842343044653cMon Sep 17 00:00:00 2001
From: Jaegeuk Kim <[email protected]>
Date: Mon, 18 Nov 2013 17:16:17 +0900
Subject: [PATCH] f2fs: usesbi->write_mutexfor write biosThis patch removes an unnecessary semaphore (i.e.,
sbi->bio_sem). There is no reason to use the semaphore when f2fs submits read and write IOs.
Instead, let's use a write mutex and cover the sbi->bio[] by the lock.Change log from v1:
o splitwrite_mutexsuggested by Chao YuChao described,
"All DATA/NODE/META bio buffers in superblock is protected by 'sbi->write_mutex', but each bio buffer area is independent, So we should splitwrite_mutexto three for DATA/NODE/META."Signed-off-by Chao Yu <[email protected]>Signed-off-by Jaegeuk Kim <[email protected]>--- fs/f2fs/data.c | 4 ---- fs/f2fs/f2fs.h | 2 +- fs/f2fs/segment.c | 13 +++++++++---- fs/f2fs/super.c | 6 +++++- 4 files changed, 15 insertions(+), 10 deletions(-)fs/f2fs/data.c +0
-4@@ -383,8 +383,6 @@ int f2fs_readpage(struct f2fs_sb_info *sbi, structpage *page,trace_f2fs_readpage (page ,blk_addr ,type ); -down_read (&sbi->bio_sem); -/* Allocate a new bio */ bio =f2fs_bio_alloc (bdev,1 );@@ -394,13 +392,11 @@ int f2fs_readpage(struct f2fs_sb_info *sbi, struct page *page, if (bio_add_page(bio, page, PAGE_CACHE_SIZE, 0) < PAGE_CACHE_SIZE) {bio_put (bio); -up_read (&sbi->bio_sem);f2fs_put_page (page,1 );return -EFAULT ; }submit_bio (type, bio); -up_read (&sbi->bio_sem);return 0 ; }fs/f2fs/f2fs.h +1
-1@@ -374,7 +374,7 @@ struct f2fs_sb_info {struct f2fs_sm_info *sm_info;/* segment manager */ struct bio *bio[NR_PAGE_TYPE ];/* bios to merge */ sector_t last_block_in_bio[NR_PAGE_TYPE ];/* last block number */ -struct rw_semaphore bio_sem;/* IO semaphore */ +struct mutex write_mutex[NR_PAGE_TYPE ];/* mutex for writing IOs */ /* for checkpoint */ struct f2fs_checkpoint *ckpt;/* raw checkpoint pointer */ fs/f2fs/segment.c +7
-2@@ -871,9 +871,14 @@ static void do_submit_bio(struct f2fs_sb_info *sbi,void f2fs_submit_bio (struct f2fs_sb_info *sbi,enum page_type type,bool sync) { -down_write (&sbi->bio_sem); +enum page_type btype =PAGE_TYPE_OF_BIO (type); + +if (!sbi->bio[btype]) +return ; + +mutex_lock (&sbi->write_mutex[btype]);do_submit_bio (sbi, type, sync); -up_write (&sbi->bio_sem); +mutex_unlock (&sbi->write_mutex[btype]); }static void submit_write_page(struct
f2fs_sb_info*sbi, struct page
*page,fs/f2fs/segment.c +2
-2@@ -884,7 +889,7 @@ static void submit_write_page(struct f2fs_sb_info *sbi, struct page *page,verify_block_addr (sbi, blk_addr); -down_write (&sbi->bio_sem); +mutex_lock (&sbi->write_mutex[type]);inc_page_count (sbi,F2FS_WRITEBACK );@@ -919,7 +924,7 @@ retry: sbi->last_block_in_bio[type] = blk_addr; -up_write (&sbi->bio_sem); +mutex_unlock (&sbi->write_mutex[type]);trace_f2fs_submit_write_page (page, blk_addr, type); }fs/f2fs/super.c +1
-0@@ -820,6 +820,7 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent)struct buffer_head *raw_super_buf;struct inode *root;long err = -EINVAL ; +int i;/* allocate memory for f2fs-specific super block info */ fs/f2fs/super.c +4
-1sbi =kzalloc (sizeof (struct f2fs_sb_info ),GFP_KERNEL );@@ -876,7 +877,10 @@ static int f2fs_fill_super(struct super_block *sb, void *data, int silent) mutex_init(&sbi->node_write); sbi->por_doing = false;spin_lock_init (&sbi->stat_lock); -init_rwsem (&sbi->bio_sem); + +for (i =0 ; i <NR_PAGE_TYPE ; i++) +mutex_init (&sbi->write_mutex[i]); +init_rwsem (&sbi->cp_rwsem);init_waitqueue_head (&sbi->cp_wait);
init_sb_info(sbi);
--
1.8.4.474.g128a96c--
Jaegeuk Kim
Samsung