diff options
Diffstat (limited to 'fs/f2fs/segment.c')
| -rw-r--r-- | fs/f2fs/segment.c | 846 | 
1 files changed, 567 insertions, 279 deletions
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 09af9c7b0f5..d04613df710 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -13,13 +13,165 @@  #include <linux/bio.h>  #include <linux/blkdev.h>  #include <linux/prefetch.h> +#include <linux/kthread.h>  #include <linux/vmalloc.h> +#include <linux/swap.h>  #include "f2fs.h"  #include "segment.h"  #include "node.h"  #include <trace/events/f2fs.h> +#define __reverse_ffz(x) __reverse_ffs(~(x)) + +static struct kmem_cache *discard_entry_slab; + +/* + * __reverse_ffs is copied from include/asm-generic/bitops/__ffs.h since + * MSB and LSB are reversed in a byte by f2fs_set_bit. + */ +static inline unsigned long __reverse_ffs(unsigned long word) +{ +	int num = 0; + +#if BITS_PER_LONG == 64 +	if ((word & 0xffffffff) == 0) { +		num += 32; +		word >>= 32; +	} +#endif +	if ((word & 0xffff) == 0) { +		num += 16; +		word >>= 16; +	} +	if ((word & 0xff) == 0) { +		num += 8; +		word >>= 8; +	} +	if ((word & 0xf0) == 0) +		num += 4; +	else +		word >>= 4; +	if ((word & 0xc) == 0) +		num += 2; +	else +		word >>= 2; +	if ((word & 0x2) == 0) +		num += 1; +	return num; +} + +/* + * __find_rev_next(_zero)_bit is copied from lib/find_next_bit.c becasue + * f2fs_set_bit makes MSB and LSB reversed in a byte. + * Example: + *                             LSB <--> MSB + *   f2fs_set_bit(0, bitmap) => 0000 0001 + *   f2fs_set_bit(7, bitmap) => 1000 0000 + */ +static unsigned long __find_rev_next_bit(const unsigned long *addr, +			unsigned long size, unsigned long offset) +{ +	const unsigned long *p = addr + BIT_WORD(offset); +	unsigned long result = offset & ~(BITS_PER_LONG - 1); +	unsigned long tmp; +	unsigned long mask, submask; +	unsigned long quot, rest; + +	if (offset >= size) +		return size; + +	size -= result; +	offset %= BITS_PER_LONG; +	if (!offset) +		goto aligned; + +	tmp = *(p++); +	quot = (offset >> 3) << 3; +	rest = offset & 0x7; +	mask = ~0UL << quot; +	submask = (unsigned char)(0xff << rest) >> rest; +	submask <<= quot; +	mask &= submask; +	tmp &= mask; +	if (size < BITS_PER_LONG) +		goto found_first; +	if (tmp) +		goto found_middle; + +	size -= BITS_PER_LONG; +	result += BITS_PER_LONG; +aligned: +	while (size & ~(BITS_PER_LONG-1)) { +		tmp = *(p++); +		if (tmp) +			goto found_middle; +		result += BITS_PER_LONG; +		size -= BITS_PER_LONG; +	} +	if (!size) +		return result; +	tmp = *p; +found_first: +	tmp &= (~0UL >> (BITS_PER_LONG - size)); +	if (tmp == 0UL)		/* Are any bits set? */ +		return result + size;   /* Nope. */ +found_middle: +	return result + __reverse_ffs(tmp); +} + +static unsigned long __find_rev_next_zero_bit(const unsigned long *addr, +			unsigned long size, unsigned long offset) +{ +	const unsigned long *p = addr + BIT_WORD(offset); +	unsigned long result = offset & ~(BITS_PER_LONG - 1); +	unsigned long tmp; +	unsigned long mask, submask; +	unsigned long quot, rest; + +	if (offset >= size) +		return size; + +	size -= result; +	offset %= BITS_PER_LONG; +	if (!offset) +		goto aligned; + +	tmp = *(p++); +	quot = (offset >> 3) << 3; +	rest = offset & 0x7; +	mask = ~(~0UL << quot); +	submask = (unsigned char)~((unsigned char)(0xff << rest) >> rest); +	submask <<= quot; +	mask += submask; +	tmp |= mask; +	if (size < BITS_PER_LONG) +		goto found_first; +	if (~tmp) +		goto found_middle; + +	size -= BITS_PER_LONG; +	result += BITS_PER_LONG; +aligned: +	while (size & ~(BITS_PER_LONG - 1)) { +		tmp = *(p++); +		if (~tmp) +			goto found_middle; +		result += BITS_PER_LONG; +		size -= BITS_PER_LONG; +	} +	if (!size) +		return result; +	tmp = *p; + +found_first: +	tmp |= ~0UL << size; +	if (tmp == ~0UL)        /* Are any bits zero? */ +		return result + size;   /* Nope. */ +found_middle: +	return result + __reverse_ffz(tmp); +} +  /*   * This function balances dirty node and dentry pages.   * In addition, it controls garbage collection. @@ -36,6 +188,114 @@ void f2fs_balance_fs(struct f2fs_sb_info *sbi)  	}  } +void f2fs_balance_fs_bg(struct f2fs_sb_info *sbi) +{ +	/* check the # of cached NAT entries and prefree segments */ +	if (try_to_free_nats(sbi, NAT_ENTRY_PER_BLOCK) || +				excess_prefree_segs(sbi)) +		f2fs_sync_fs(sbi->sb, true); +} + +static int issue_flush_thread(void *data) +{ +	struct f2fs_sb_info *sbi = data; +	struct flush_cmd_control *fcc = SM_I(sbi)->cmd_control_info; +	wait_queue_head_t *q = &fcc->flush_wait_queue; +repeat: +	if (kthread_should_stop()) +		return 0; + +	spin_lock(&fcc->issue_lock); +	if (fcc->issue_list) { +		fcc->dispatch_list = fcc->issue_list; +		fcc->issue_list = fcc->issue_tail = NULL; +	} +	spin_unlock(&fcc->issue_lock); + +	if (fcc->dispatch_list) { +		struct bio *bio = bio_alloc(GFP_NOIO, 0); +		struct flush_cmd *cmd, *next; +		int ret; + +		bio->bi_bdev = sbi->sb->s_bdev; +		ret = submit_bio_wait(WRITE_FLUSH, bio); + +		for (cmd = fcc->dispatch_list; cmd; cmd = next) { +			cmd->ret = ret; +			next = cmd->next; +			complete(&cmd->wait); +		} +		bio_put(bio); +		fcc->dispatch_list = NULL; +	} + +	wait_event_interruptible(*q, +			kthread_should_stop() || fcc->issue_list); +	goto repeat; +} + +int f2fs_issue_flush(struct f2fs_sb_info *sbi) +{ +	struct flush_cmd_control *fcc = SM_I(sbi)->cmd_control_info; +	struct flush_cmd cmd; + +	if (!test_opt(sbi, FLUSH_MERGE)) +		return blkdev_issue_flush(sbi->sb->s_bdev, GFP_KERNEL, NULL); + +	init_completion(&cmd.wait); +	cmd.next = NULL; + +	spin_lock(&fcc->issue_lock); +	if (fcc->issue_list) +		fcc->issue_tail->next = &cmd; +	else +		fcc->issue_list = &cmd; +	fcc->issue_tail = &cmd; +	spin_unlock(&fcc->issue_lock); + +	if (!fcc->dispatch_list) +		wake_up(&fcc->flush_wait_queue); + +	wait_for_completion(&cmd.wait); + +	return cmd.ret; +} + +int create_flush_cmd_control(struct f2fs_sb_info *sbi) +{ +	dev_t dev = sbi->sb->s_bdev->bd_dev; +	struct flush_cmd_control *fcc; +	int err = 0; + +	fcc = kzalloc(sizeof(struct flush_cmd_control), GFP_KERNEL); +	if (!fcc) +		return -ENOMEM; +	spin_lock_init(&fcc->issue_lock); +	init_waitqueue_head(&fcc->flush_wait_queue); +	sbi->sm_info->cmd_control_info = fcc; +	fcc->f2fs_issue_flush = kthread_run(issue_flush_thread, sbi, +				"f2fs_flush-%u:%u", MAJOR(dev), MINOR(dev)); +	if (IS_ERR(fcc->f2fs_issue_flush)) { +		err = PTR_ERR(fcc->f2fs_issue_flush); +		kfree(fcc); +		sbi->sm_info->cmd_control_info = NULL; +		return err; +	} + +	return err; +} + +void destroy_flush_cmd_control(struct f2fs_sb_info *sbi) +{ +	struct flush_cmd_control *fcc = +				sbi->sm_info->cmd_control_info; + +	if (fcc && fcc->f2fs_issue_flush) +		kthread_stop(fcc->f2fs_issue_flush); +	kfree(fcc); +	sbi->sm_info->cmd_control_info = NULL; +} +  static void __locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno,  		enum dirty_type dirty_type)  { @@ -50,20 +310,10 @@ static void __locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno,  	if (dirty_type == DIRTY) {  		struct seg_entry *sentry = get_seg_entry(sbi, segno); -		enum dirty_type t = DIRTY_HOT_DATA; +		enum dirty_type t = sentry->type; -		dirty_type = sentry->type; - -		if (!test_and_set_bit(segno, dirty_i->dirty_segmap[dirty_type])) -			dirty_i->nr_dirty[dirty_type]++; - -		/* Only one bitmap should be set */ -		for (; t <= DIRTY_COLD_NODE; t++) { -			if (t == dirty_type) -				continue; -			if (test_and_clear_bit(segno, dirty_i->dirty_segmap[t])) -				dirty_i->nr_dirty[t]--; -		} +		if (!test_and_set_bit(segno, dirty_i->dirty_segmap[t])) +			dirty_i->nr_dirty[t]++;  	}  } @@ -76,12 +326,11 @@ static void __remove_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno,  		dirty_i->nr_dirty[dirty_type]--;  	if (dirty_type == DIRTY) { -		enum dirty_type t = DIRTY_HOT_DATA; +		struct seg_entry *sentry = get_seg_entry(sbi, segno); +		enum dirty_type t = sentry->type; -		/* clear all the bitmaps */ -		for (; t <= DIRTY_COLD_NODE; t++) -			if (test_and_clear_bit(segno, dirty_i->dirty_segmap[t])) -				dirty_i->nr_dirty[t]--; +		if (test_and_clear_bit(segno, dirty_i->dirty_segmap[t])) +			dirty_i->nr_dirty[t]--;  		if (get_valid_blocks(sbi, segno, sbi->segs_per_sec) == 0)  			clear_bit(GET_SECNO(sbi, segno), @@ -119,6 +368,69 @@ static void locate_dirty_segment(struct f2fs_sb_info *sbi, unsigned int segno)  	mutex_unlock(&dirty_i->seglist_lock);  } +static int f2fs_issue_discard(struct f2fs_sb_info *sbi, +				block_t blkstart, block_t blklen) +{ +	sector_t start = SECTOR_FROM_BLOCK(sbi, blkstart); +	sector_t len = SECTOR_FROM_BLOCK(sbi, blklen); +	trace_f2fs_issue_discard(sbi->sb, blkstart, blklen); +	return blkdev_issue_discard(sbi->sb->s_bdev, start, len, GFP_NOFS, 0); +} + +void discard_next_dnode(struct f2fs_sb_info *sbi) +{ +	struct curseg_info *curseg = CURSEG_I(sbi, CURSEG_WARM_NODE); +	block_t blkaddr = NEXT_FREE_BLKADDR(sbi, curseg); + +	if (f2fs_issue_discard(sbi, blkaddr, 1)) { +		struct page *page = grab_meta_page(sbi, blkaddr); +		/* zero-filled page */ +		set_page_dirty(page); +		f2fs_put_page(page, 1); +	} +} + +static void add_discard_addrs(struct f2fs_sb_info *sbi, +			unsigned int segno, struct seg_entry *se) +{ +	struct list_head *head = &SM_I(sbi)->discard_list; +	struct discard_entry *new; +	int entries = SIT_VBLOCK_MAP_SIZE / sizeof(unsigned long); +	int max_blocks = sbi->blocks_per_seg; +	unsigned long *cur_map = (unsigned long *)se->cur_valid_map; +	unsigned long *ckpt_map = (unsigned long *)se->ckpt_valid_map; +	unsigned long dmap[entries]; +	unsigned int start = 0, end = -1; +	int i; + +	if (!test_opt(sbi, DISCARD)) +		return; + +	/* zero block will be discarded through the prefree list */ +	if (!se->valid_blocks || se->valid_blocks == max_blocks) +		return; + +	/* SIT_VBLOCK_MAP_SIZE should be multiple of sizeof(unsigned long) */ +	for (i = 0; i < entries; i++) +		dmap[i] = (cur_map[i] ^ ckpt_map[i]) & ckpt_map[i]; + +	while (SM_I(sbi)->nr_discards <= SM_I(sbi)->max_discards) { +		start = __find_rev_next_bit(dmap, max_blocks, end + 1); +		if (start >= max_blocks) +			break; + +		end = __find_rev_next_zero_bit(dmap, max_blocks, start + 1); + +		new = f2fs_kmem_cache_alloc(discard_entry_slab, GFP_NOFS); +		INIT_LIST_HEAD(&new->list); +		new->blkaddr = START_BLOCK(sbi, segno) + start; +		new->len = end - start; + +		list_add_tail(&new->list, head); +		SM_I(sbi)->nr_discards += end - start; +	} +} +  /*   * Should call clear_prefree_segments after checkpoint is done.   */ @@ -141,30 +453,42 @@ static void set_prefree_as_free_segments(struct f2fs_sb_info *sbi)  void clear_prefree_segments(struct f2fs_sb_info *sbi)  { +	struct list_head *head = &(SM_I(sbi)->discard_list); +	struct discard_entry *entry, *this;  	struct dirty_seglist_info *dirty_i = DIRTY_I(sbi); -	unsigned int segno = -1; +	unsigned long *prefree_map = dirty_i->dirty_segmap[PRE];  	unsigned int total_segs = TOTAL_SEGS(sbi); +	unsigned int start = 0, end = -1;  	mutex_lock(&dirty_i->seglist_lock); +  	while (1) { -		segno = find_next_bit(dirty_i->dirty_segmap[PRE], total_segs, -				segno + 1); -		if (segno >= total_segs) +		int i; +		start = find_next_bit(prefree_map, total_segs, end + 1); +		if (start >= total_segs)  			break; +		end = find_next_zero_bit(prefree_map, total_segs, start + 1); + +		for (i = start; i < end; i++) +			clear_bit(i, prefree_map); + +		dirty_i->nr_dirty[PRE] -= end - start; -		if (test_and_clear_bit(segno, dirty_i->dirty_segmap[PRE])) -			dirty_i->nr_dirty[PRE]--; - -		/* Let's use trim */ -		if (test_opt(sbi, DISCARD)) -			blkdev_issue_discard(sbi->sb->s_bdev, -					START_BLOCK(sbi, segno) << -					sbi->log_sectors_per_block, -					1 << (sbi->log_sectors_per_block + -						sbi->log_blocks_per_seg), -					GFP_NOFS, 0); +		if (!test_opt(sbi, DISCARD)) +			continue; + +		f2fs_issue_discard(sbi, START_BLOCK(sbi, start), +				(end - start) << sbi->log_blocks_per_seg);  	}  	mutex_unlock(&dirty_i->seglist_lock); + +	/* send small discards */ +	list_for_each_entry_safe(entry, this, head, list) { +		f2fs_issue_discard(sbi, entry->blkaddr, entry->len); +		list_del(&entry->list); +		SM_I(sbi)->nr_discards -= entry->len; +		kmem_cache_free(discard_entry_slab, entry); +	}  }  static void __mark_sit_entry_dirty(struct f2fs_sb_info *sbi, unsigned int segno) @@ -193,9 +517,9 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)  	se = get_seg_entry(sbi, segno);  	new_vblocks = se->valid_blocks + del; -	offset = GET_SEGOFF_FROM_SEG0(sbi, blkaddr) & (sbi->blocks_per_seg - 1); +	offset = GET_BLKOFF_FROM_SEG0(sbi, blkaddr); -	BUG_ON((new_vblocks >> (sizeof(unsigned short) << 3) || +	f2fs_bug_on((new_vblocks >> (sizeof(unsigned short) << 3) ||  				(new_vblocks > sbi->blocks_per_seg)));  	se->valid_blocks = new_vblocks; @@ -222,12 +546,14 @@ static void update_sit_entry(struct f2fs_sb_info *sbi, block_t blkaddr, int del)  		get_sec_entry(sbi, segno)->valid_blocks += del;  } -static void refresh_sit_entry(struct f2fs_sb_info *sbi, -			block_t old_blkaddr, block_t new_blkaddr) +void refresh_sit_entry(struct f2fs_sb_info *sbi, block_t old, block_t new)  { -	update_sit_entry(sbi, new_blkaddr, 1); -	if (GET_SEGNO(sbi, old_blkaddr) != NULL_SEGNO) -		update_sit_entry(sbi, old_blkaddr, -1); +	update_sit_entry(sbi, new, 1); +	if (GET_SEGNO(sbi, old) != NULL_SEGNO) +		update_sit_entry(sbi, old, -1); + +	locate_dirty_segment(sbi, GET_SEGNO(sbi, old)); +	locate_dirty_segment(sbi, GET_SEGNO(sbi, new));  }  void invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr) @@ -235,7 +561,7 @@ void invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr)  	unsigned int segno = GET_SEGNO(sbi, addr);  	struct sit_info *sit_i = SIT_I(sbi); -	BUG_ON(addr == NULL_ADDR); +	f2fs_bug_on(addr == NULL_ADDR);  	if (addr == NEW_ADDR)  		return; @@ -267,9 +593,8 @@ static void __add_sum_entry(struct f2fs_sb_info *sbi, int type,   */  int npages_for_summary_flush(struct f2fs_sb_info *sbi)  { -	int total_size_bytes = 0;  	int valid_sum_count = 0; -	int i, sum_space; +	int i, sum_in_page;  	for (i = CURSEG_HOT_DATA; i <= CURSEG_COLD_DATA; i++) {  		if (sbi->ckpt->alloc_type[i] == SSR) @@ -278,13 +603,12 @@ int npages_for_summary_flush(struct f2fs_sb_info *sbi)  			valid_sum_count += curseg_blkoff(sbi, i);  	} -	total_size_bytes = valid_sum_count * (SUMMARY_SIZE + 1) -			+ sizeof(struct nat_journal) + 2 -			+ sizeof(struct sit_journal) + 2; -	sum_space = PAGE_CACHE_SIZE - SUM_FOOTER_SIZE; -	if (total_size_bytes < sum_space) +	sum_in_page = (PAGE_CACHE_SIZE - 2 * SUM_JOURNAL_SIZE - +			SUM_FOOTER_SIZE) / SUMMARY_SIZE; +	if (valid_sum_count <= sum_in_page)  		return 1; -	else if (total_size_bytes < 2 * sum_space) +	else if ((valid_sum_count - sum_in_page) <= +		(PAGE_CACHE_SIZE - SUM_FOOTER_SIZE) / SUMMARY_SIZE)  		return 2;  	return 3;  } @@ -350,7 +674,7 @@ find_other_zone:  		if (dir == ALLOC_RIGHT) {  			secno = find_next_zero_bit(free_i->free_secmap,  							TOTAL_SECS(sbi), 0); -			BUG_ON(secno >= TOTAL_SECS(sbi)); +			f2fs_bug_on(secno >= TOTAL_SECS(sbi));  		} else {  			go_left = 1;  			left_start = hint - 1; @@ -366,7 +690,7 @@ find_other_zone:  		}  		left_start = find_next_zero_bit(free_i->free_secmap,  							TOTAL_SECS(sbi), 0); -		BUG_ON(left_start >= TOTAL_SECS(sbi)); +		f2fs_bug_on(left_start >= TOTAL_SECS(sbi));  		break;  	}  	secno = left_start; @@ -405,7 +729,7 @@ skip_left:  	}  got_it:  	/* set it as dirty segment in free segmap */ -	BUG_ON(test_bit(segno, free_i->free_segmap)); +	f2fs_bug_on(test_bit(segno, free_i->free_segmap));  	__set_inuse(sbi, segno);  	*newseg = segno;  	write_unlock(&free_i->segmap_lock); @@ -458,13 +782,18 @@ static void __next_free_blkoff(struct f2fs_sb_info *sbi,  			struct curseg_info *seg, block_t start)  {  	struct seg_entry *se = get_seg_entry(sbi, seg->segno); -	block_t ofs; -	for (ofs = start; ofs < sbi->blocks_per_seg; ofs++) { -		if (!f2fs_test_bit(ofs, se->ckpt_valid_map) -			&& !f2fs_test_bit(ofs, se->cur_valid_map)) -			break; -	} -	seg->next_blkoff = ofs; +	int entries = SIT_VBLOCK_MAP_SIZE / sizeof(unsigned long); +	unsigned long target_map[entries]; +	unsigned long *ckpt_map = (unsigned long *)se->ckpt_valid_map; +	unsigned long *cur_map = (unsigned long *)se->cur_valid_map; +	int i, pos; + +	for (i = 0; i < entries; i++) +		target_map[i] = ckpt_map[i] | cur_map[i]; + +	pos = __find_rev_next_zero_bit(target_map, sbi->blocks_per_seg, start); + +	seg->next_blkoff = pos;  }  /* @@ -550,9 +879,8 @@ static void allocate_segment_by_default(struct f2fs_sb_info *sbi,  		change_curseg(sbi, type, true);  	else  		new_curseg(sbi, type, false); -#ifdef CONFIG_F2FS_STAT_FS -	sbi->segment_count[curseg->alloc_type]++; -#endif + +	stat_inc_seg_type(sbi, curseg);  }  void allocate_new_segments(struct f2fs_sb_info *sbi) @@ -573,141 +901,6 @@ static const struct segment_allocation default_salloc_ops = {  	.allocate_segment = allocate_segment_by_default,  }; -static void f2fs_end_io_write(struct bio *bio, int err) -{ -	const int uptodate = test_bit(BIO_UPTODATE, &bio->bi_flags); -	struct bio_vec *bvec = bio->bi_io_vec + bio->bi_vcnt - 1; -	struct bio_private *p = bio->bi_private; - -	do { -		struct page *page = bvec->bv_page; - -		if (--bvec >= bio->bi_io_vec) -			prefetchw(&bvec->bv_page->flags); -		if (!uptodate) { -			SetPageError(page); -			if (page->mapping) -				set_bit(AS_EIO, &page->mapping->flags); -			set_ckpt_flags(p->sbi->ckpt, CP_ERROR_FLAG); -			p->sbi->sb->s_flags |= MS_RDONLY; -		} -		end_page_writeback(page); -		dec_page_count(p->sbi, F2FS_WRITEBACK); -	} while (bvec >= bio->bi_io_vec); - -	if (p->is_sync) -		complete(p->wait); -	kfree(p); -	bio_put(bio); -} - -struct bio *f2fs_bio_alloc(struct block_device *bdev, int npages) -{ -	struct bio *bio; - -	/* No failure on bio allocation */ -	bio = bio_alloc(GFP_NOIO, npages); -	bio->bi_bdev = bdev; -	bio->bi_private = NULL; - -	return bio; -} - -static void do_submit_bio(struct f2fs_sb_info *sbi, -				enum page_type type, bool sync) -{ -	int rw = sync ? WRITE_SYNC : WRITE; -	enum page_type btype = type > META ? META : type; - -	if (type >= META_FLUSH) -		rw = WRITE_FLUSH_FUA; - -	if (btype == META) -		rw |= REQ_META; - -	if (sbi->bio[btype]) { -		struct bio_private *p = sbi->bio[btype]->bi_private; -		p->sbi = sbi; -		sbi->bio[btype]->bi_end_io = f2fs_end_io_write; - -		trace_f2fs_do_submit_bio(sbi->sb, btype, sync, sbi->bio[btype]); - -		if (type == META_FLUSH) { -			DECLARE_COMPLETION_ONSTACK(wait); -			p->is_sync = true; -			p->wait = &wait; -			submit_bio(rw, sbi->bio[btype]); -			wait_for_completion(&wait); -		} else { -			p->is_sync = false; -			submit_bio(rw, sbi->bio[btype]); -		} -		sbi->bio[btype] = NULL; -	} -} - -void f2fs_submit_bio(struct f2fs_sb_info *sbi, enum page_type type, bool sync) -{ -	down_write(&sbi->bio_sem); -	do_submit_bio(sbi, type, sync); -	up_write(&sbi->bio_sem); -} - -static void submit_write_page(struct f2fs_sb_info *sbi, struct page *page, -				block_t blk_addr, enum page_type type) -{ -	struct block_device *bdev = sbi->sb->s_bdev; - -	verify_block_addr(sbi, blk_addr); - -	down_write(&sbi->bio_sem); - -	inc_page_count(sbi, F2FS_WRITEBACK); - -	if (sbi->bio[type] && sbi->last_block_in_bio[type] != blk_addr - 1) -		do_submit_bio(sbi, type, false); -alloc_new: -	if (sbi->bio[type] == NULL) { -		struct bio_private *priv; -retry: -		priv = kmalloc(sizeof(struct bio_private), GFP_NOFS); -		if (!priv) { -			cond_resched(); -			goto retry; -		} - -		sbi->bio[type] = f2fs_bio_alloc(bdev, max_hw_blocks(sbi)); -		sbi->bio[type]->bi_sector = SECTOR_FROM_BLOCK(sbi, blk_addr); -		sbi->bio[type]->bi_private = priv; -		/* -		 * The end_io will be assigned at the sumbission phase. -		 * Until then, let bio_add_page() merge consecutive IOs as much -		 * as possible. -		 */ -	} - -	if (bio_add_page(sbi->bio[type], page, PAGE_CACHE_SIZE, 0) < -							PAGE_CACHE_SIZE) { -		do_submit_bio(sbi, type, false); -		goto alloc_new; -	} - -	sbi->last_block_in_bio[type] = blk_addr; - -	up_write(&sbi->bio_sem); -	trace_f2fs_submit_write_page(page, blk_addr, type); -} - -void f2fs_wait_on_page_writeback(struct page *page, -				enum page_type type, bool sync) -{ -	struct f2fs_sb_info *sbi = F2FS_SB(page->mapping->host->i_sb); -	if (PageWriteback(page)) { -		f2fs_submit_bio(sbi, type, sync); -		wait_on_page_writeback(page); -	} -} -  static bool __has_curseg_space(struct f2fs_sb_info *sbi, int type)  {  	struct curseg_info *curseg = CURSEG_I(sbi, type); @@ -771,20 +964,18 @@ static int __get_segment_type(struct page *page, enum page_type p_type)  		return __get_segment_type_4(page, p_type);  	}  	/* NR_CURSEG_TYPE(6) logs by default */ -	BUG_ON(sbi->active_logs != NR_CURSEG_TYPE); +	f2fs_bug_on(sbi->active_logs != NR_CURSEG_TYPE);  	return __get_segment_type_6(page, p_type);  } -static void do_write_page(struct f2fs_sb_info *sbi, struct page *page, -			block_t old_blkaddr, block_t *new_blkaddr, -			struct f2fs_summary *sum, enum page_type p_type) +void allocate_data_block(struct f2fs_sb_info *sbi, struct page *page, +		block_t old_blkaddr, block_t *new_blkaddr, +		struct f2fs_summary *sum, int type)  {  	struct sit_info *sit_i = SIT_I(sbi);  	struct curseg_info *curseg;  	unsigned int old_cursegno; -	int type; -	type = __get_segment_type(page, p_type);  	curseg = CURSEG_I(sbi, type);  	mutex_lock(&curseg->curseg_mutex); @@ -801,66 +992,78 @@ static void do_write_page(struct f2fs_sb_info *sbi, struct page *page,  	mutex_lock(&sit_i->sentry_lock);  	__refresh_next_blkoff(sbi, curseg); -#ifdef CONFIG_F2FS_STAT_FS -	sbi->block_count[curseg->alloc_type]++; -#endif +	stat_inc_block_count(sbi, curseg); + +	if (!__has_curseg_space(sbi, type)) +		sit_i->s_ops->allocate_segment(sbi, type, false);  	/*  	 * SIT information should be updated before segment allocation,  	 * since SSR needs latest valid block information.  	 */  	refresh_sit_entry(sbi, old_blkaddr, *new_blkaddr); - -	if (!__has_curseg_space(sbi, type)) -		sit_i->s_ops->allocate_segment(sbi, type, false); -  	locate_dirty_segment(sbi, old_cursegno); -	locate_dirty_segment(sbi, GET_SEGNO(sbi, old_blkaddr)); +  	mutex_unlock(&sit_i->sentry_lock); -	if (p_type == NODE) +	if (page && IS_NODESEG(type))  		fill_node_footer_blkaddr(page, NEXT_FREE_BLKADDR(sbi, curseg)); -	/* writeout dirty page into bdev */ -	submit_write_page(sbi, page, *new_blkaddr, p_type); -  	mutex_unlock(&curseg->curseg_mutex);  } +static void do_write_page(struct f2fs_sb_info *sbi, struct page *page, +			block_t old_blkaddr, block_t *new_blkaddr, +			struct f2fs_summary *sum, struct f2fs_io_info *fio) +{ +	int type = __get_segment_type(page, fio->type); + +	allocate_data_block(sbi, page, old_blkaddr, new_blkaddr, sum, type); + +	/* writeout dirty page into bdev */ +	f2fs_submit_page_mbio(sbi, page, *new_blkaddr, fio); +} +  void write_meta_page(struct f2fs_sb_info *sbi, struct page *page)  { +	struct f2fs_io_info fio = { +		.type = META, +		.rw = WRITE_SYNC | REQ_META | REQ_PRIO +	}; +  	set_page_writeback(page); -	submit_write_page(sbi, page, page->index, META); +	f2fs_submit_page_mbio(sbi, page, page->index, &fio);  }  void write_node_page(struct f2fs_sb_info *sbi, struct page *page, +		struct f2fs_io_info *fio,  		unsigned int nid, block_t old_blkaddr, block_t *new_blkaddr)  {  	struct f2fs_summary sum;  	set_summary(&sum, nid, 0, 0); -	do_write_page(sbi, page, old_blkaddr, new_blkaddr, &sum, NODE); +	do_write_page(sbi, page, old_blkaddr, new_blkaddr, &sum, fio);  } -void write_data_page(struct inode *inode, struct page *page, -		struct dnode_of_data *dn, block_t old_blkaddr, -		block_t *new_blkaddr) +void write_data_page(struct page *page, struct dnode_of_data *dn, +		block_t *new_blkaddr, struct f2fs_io_info *fio)  { -	struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); +	struct f2fs_sb_info *sbi = F2FS_SB(dn->inode->i_sb);  	struct f2fs_summary sum;  	struct node_info ni; -	BUG_ON(old_blkaddr == NULL_ADDR); +	f2fs_bug_on(dn->data_blkaddr == NULL_ADDR);  	get_node_info(sbi, dn->nid, &ni);  	set_summary(&sum, dn->nid, dn->ofs_in_node, ni.version); -	do_write_page(sbi, page, old_blkaddr, -			new_blkaddr, &sum, DATA); +	do_write_page(sbi, page, dn->data_blkaddr, new_blkaddr, &sum, fio);  } -void rewrite_data_page(struct f2fs_sb_info *sbi, struct page *page, -					block_t old_blk_addr) +void rewrite_data_page(struct page *page, block_t old_blkaddr, +					struct f2fs_io_info *fio)  { -	submit_write_page(sbi, page, old_blk_addr, DATA); +	struct inode *inode = page->mapping->host; +	struct f2fs_sb_info *sbi = F2FS_SB(inode->i_sb); +	f2fs_submit_page_mbio(sbi, page, old_blkaddr, fio);  }  void recover_data_page(struct f2fs_sb_info *sbi, @@ -896,14 +1099,11 @@ void recover_data_page(struct f2fs_sb_info *sbi,  		change_curseg(sbi, type, true);  	} -	curseg->next_blkoff = GET_SEGOFF_FROM_SEG0(sbi, new_blkaddr) & -					(sbi->blocks_per_seg - 1); +	curseg->next_blkoff = GET_BLKOFF_FROM_SEG0(sbi, new_blkaddr);  	__add_sum_entry(sbi, type, sum);  	refresh_sit_entry(sbi, old_blkaddr, new_blkaddr); -  	locate_dirty_segment(sbi, old_cursegno); -	locate_dirty_segment(sbi, GET_SEGNO(sbi, old_blkaddr));  	mutex_unlock(&sit_i->sentry_lock);  	mutex_unlock(&curseg->curseg_mutex); @@ -919,6 +1119,10 @@ void rewrite_node_page(struct f2fs_sb_info *sbi,  	unsigned int segno, old_cursegno;  	block_t next_blkaddr = next_blkaddr_of_node(page);  	unsigned int next_segno = GET_SEGNO(sbi, next_blkaddr); +	struct f2fs_io_info fio = { +		.type = NODE, +		.rw = WRITE_SYNC, +	};  	curseg = CURSEG_I(sbi, type); @@ -933,8 +1137,7 @@ void rewrite_node_page(struct f2fs_sb_info *sbi,  		curseg->next_segno = segno;  		change_curseg(sbi, type, true);  	} -	curseg->next_blkoff = GET_SEGOFF_FROM_SEG0(sbi, new_blkaddr) & -					(sbi->blocks_per_seg - 1); +	curseg->next_blkoff = GET_BLKOFF_FROM_SEG0(sbi, new_blkaddr);  	__add_sum_entry(sbi, type, sum);  	/* change the current log to the next block addr in advance */ @@ -942,22 +1145,54 @@ void rewrite_node_page(struct f2fs_sb_info *sbi,  		curseg->next_segno = next_segno;  		change_curseg(sbi, type, true);  	} -	curseg->next_blkoff = GET_SEGOFF_FROM_SEG0(sbi, next_blkaddr) & -					(sbi->blocks_per_seg - 1); +	curseg->next_blkoff = GET_BLKOFF_FROM_SEG0(sbi, next_blkaddr);  	/* rewrite node page */  	set_page_writeback(page); -	submit_write_page(sbi, page, new_blkaddr, NODE); -	f2fs_submit_bio(sbi, NODE, true); +	f2fs_submit_page_mbio(sbi, page, new_blkaddr, &fio); +	f2fs_submit_merged_bio(sbi, NODE, WRITE);  	refresh_sit_entry(sbi, old_blkaddr, new_blkaddr); -  	locate_dirty_segment(sbi, old_cursegno); -	locate_dirty_segment(sbi, GET_SEGNO(sbi, old_blkaddr));  	mutex_unlock(&sit_i->sentry_lock);  	mutex_unlock(&curseg->curseg_mutex);  } +static inline bool is_merged_page(struct f2fs_sb_info *sbi, +					struct page *page, enum page_type type) +{ +	enum page_type btype = PAGE_TYPE_OF_BIO(type); +	struct f2fs_bio_info *io = &sbi->write_io[btype]; +	struct bio_vec *bvec; +	int i; + +	down_read(&io->io_rwsem); +	if (!io->bio) +		goto out; + +	bio_for_each_segment_all(bvec, io->bio, i) { +		if (page == bvec->bv_page) { +			up_read(&io->io_rwsem); +			return true; +		} +	} + +out: +	up_read(&io->io_rwsem); +	return false; +} + +void f2fs_wait_on_page_writeback(struct page *page, +				enum page_type type) +{ +	struct f2fs_sb_info *sbi = F2FS_SB(page->mapping->host->i_sb); +	if (PageWriteback(page)) { +		if (is_merged_page(sbi, page, type)) +			f2fs_submit_merged_bio(sbi, type, WRITE); +		wait_on_page_writeback(page); +	} +} +  static int read_compacted_summaries(struct f2fs_sb_info *sbi)  {  	struct f2fs_checkpoint *ckpt = F2FS_CKPT(sbi); @@ -1062,9 +1297,12 @@ static int read_normal_summaries(struct f2fs_sb_info *sbi, int type)  				ns->ofs_in_node = 0;  			}  		} else { -			if (restore_node_summary(sbi, segno, sum)) { +			int err; + +			err = restore_node_summary(sbi, segno, sum); +			if (err) {  				f2fs_put_page(new, 1); -				return -EINVAL; +				return err;  			}  		}  	} @@ -1085,6 +1323,7 @@ static int read_normal_summaries(struct f2fs_sb_info *sbi, int type)  static int restore_curseg_summaries(struct f2fs_sb_info *sbi)  {  	int type = CURSEG_HOT_DATA; +	int err;  	if (is_set_ckpt_flags(F2FS_CKPT(sbi), CP_COMPACT_SUM_FLAG)) {  		/* restore for compacted data summary */ @@ -1093,9 +1332,12 @@ static int restore_curseg_summaries(struct f2fs_sb_info *sbi)  		type = CURSEG_HOT_NODE;  	} -	for (; type <= CURSEG_COLD_NODE; type++) -		if (read_normal_summaries(sbi, type)) -			return -EINVAL; +	for (; type <= CURSEG_COLD_NODE; type++) { +		err = read_normal_summaries(sbi, type); +		if (err) +			return err; +	} +  	return 0;  } @@ -1122,8 +1364,6 @@ static void write_compacted_summaries(struct f2fs_sb_info *sbi, block_t blkaddr)  						SUM_JOURNAL_SIZE);  	written_size += SUM_JOURNAL_SIZE; -	set_page_dirty(page); -  	/* Step 3: write summary entries */  	for (i = CURSEG_HOT_DATA; i <= CURSEG_COLD_DATA; i++) {  		unsigned short blkoff; @@ -1142,18 +1382,20 @@ static void write_compacted_summaries(struct f2fs_sb_info *sbi, block_t blkaddr)  			summary = (struct f2fs_summary *)(kaddr + written_size);  			*summary = seg_i->sum_blk->entries[j];  			written_size += SUMMARY_SIZE; -			set_page_dirty(page);  			if (written_size + SUMMARY_SIZE <= PAGE_CACHE_SIZE -  							SUM_FOOTER_SIZE)  				continue; +			set_page_dirty(page);  			f2fs_put_page(page, 1);  			page = NULL;  		}  	} -	if (page) +	if (page) { +		set_page_dirty(page);  		f2fs_put_page(page, 1); +	}  }  static void write_normal_summaries(struct f2fs_sb_info *sbi, @@ -1239,7 +1481,7 @@ static struct page *get_next_sit_page(struct f2fs_sb_info *sbi,  	/* get current sit block page without lock */  	src_page = get_meta_page(sbi, src_off);  	dst_page = grab_meta_page(sbi, dst_off); -	BUG_ON(PageDirty(src_page)); +	f2fs_bug_on(PageDirty(src_page));  	src_addr = page_address(src_page);  	dst_addr = page_address(dst_page); @@ -1271,9 +1513,9 @@ static bool flush_sits_in_journal(struct f2fs_sb_info *sbi)  			__mark_sit_entry_dirty(sbi, segno);  		}  		update_sits_in_cursum(sum, -sits_in_cursum(sum)); -		return 1; +		return true;  	} -	return 0; +	return false;  }  /* @@ -1308,6 +1550,10 @@ void flush_sit_entries(struct f2fs_sb_info *sbi)  		sit_offset = SIT_ENTRY_OFFSET(sit_i, segno); +		/* add discard candidates */ +		if (SM_I(sbi)->nr_discards < SM_I(sbi)->max_discards) +			add_discard_addrs(sbi, segno, se); +  		if (flushed)  			goto to_sit_page; @@ -1479,36 +1725,48 @@ 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; +	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)); -	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; +	do { +		readed = ra_meta_pages(sbi, start_blk, nrpages, META_SIT); + +		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) @@ -1628,8 +1886,6 @@ int build_segment_manager(struct f2fs_sb_info *sbi)  	/* init sm info */  	sbi->sm_info = sm_info; -	INIT_LIST_HEAD(&sm_info->wblist_head); -	spin_lock_init(&sm_info->wblist_lock);  	sm_info->seg0_blkaddr = le32_to_cpu(raw_super->segment0_blkaddr);  	sm_info->main_blkaddr = le32_to_cpu(raw_super->main_blkaddr);  	sm_info->segment_count = le32_to_cpu(raw_super->segment_count); @@ -1637,6 +1893,20 @@ int build_segment_manager(struct f2fs_sb_info *sbi)  	sm_info->ovp_segments = le32_to_cpu(ckpt->overprov_segment_count);  	sm_info->main_segments = le32_to_cpu(raw_super->segment_count_main);  	sm_info->ssa_blkaddr = le32_to_cpu(raw_super->ssa_blkaddr); +	sm_info->rec_prefree_segments = sm_info->main_segments * +					DEF_RECLAIM_PREFREE_SEGMENTS / 100; +	sm_info->ipu_policy = F2FS_IPU_DISABLE; +	sm_info->min_ipu_util = DEF_MIN_IPU_UTIL; + +	INIT_LIST_HEAD(&sm_info->discard_list); +	sm_info->nr_discards = 0; +	sm_info->max_discards = 0; + +	if (test_opt(sbi, FLUSH_MERGE) && !f2fs_readonly(sbi->sb)) { +		err = create_flush_cmd_control(sbi); +		if (err) +			return err; +	}  	err = build_sit_info(sbi);  	if (err) @@ -1744,6 +2014,10 @@ static void destroy_sit_info(struct f2fs_sb_info *sbi)  void destroy_segment_manager(struct f2fs_sb_info *sbi)  {  	struct f2fs_sm_info *sm_info = SM_I(sbi); + +	if (!sm_info) +		return; +	destroy_flush_cmd_control(sbi);  	destroy_dirty_segmap(sbi);  	destroy_curseg(sbi);  	destroy_free_segmap(sbi); @@ -1751,3 +2025,17 @@ void destroy_segment_manager(struct f2fs_sb_info *sbi)  	sbi->sm_info = NULL;  	kfree(sm_info);  } + +int __init create_segment_manager_caches(void) +{ +	discard_entry_slab = f2fs_kmem_cache_create("discard_entry", +			sizeof(struct discard_entry)); +	if (!discard_entry_slab) +		return -ENOMEM; +	return 0; +} + +void destroy_segment_manager_caches(void) +{ +	kmem_cache_destroy(discard_entry_slab); +}  | 
