Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce44f2ad authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: support aligned pinned file



This patch supports 2MB-aligned pinned file, which can guarantee no GC at all
by allocating fully valid 2MB segment.

Check free segments by has_not_enough_free_secs() with large budget.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 52963b54
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -888,6 +888,7 @@ enum {
	CURSEG_WARM_NODE,	/* direct node blocks of normal files */
	CURSEG_COLD_NODE,	/* indirect node blocks */
	NO_CHECK_TYPE,
	CURSEG_COLD_DATA_PINNED,/* cold data for pinned file */
};

struct flush_cmd {
@@ -1299,6 +1300,7 @@ struct f2fs_sb_info {

	/* threshold for gc trials on pinned files */
	u64 gc_pin_file_threshold;
	struct rw_semaphore pin_sem;

	/* maximum # of trials to find a victim segment for SSR and GC */
	unsigned int max_victim_search;
@@ -3115,7 +3117,7 @@ void f2fs_release_discard_addrs(struct f2fs_sb_info *sbi);
int f2fs_npages_for_summary_flush(struct f2fs_sb_info *sbi, bool for_ra);
void allocate_segment_for_resize(struct f2fs_sb_info *sbi, int type,
					unsigned int start, unsigned int end);
void f2fs_allocate_new_segments(struct f2fs_sb_info *sbi);
void f2fs_allocate_new_segments(struct f2fs_sb_info *sbi, int type);
int f2fs_trim_fs(struct f2fs_sb_info *sbi, struct fstrim_range *range);
bool f2fs_exist_trim_candidates(struct f2fs_sb_info *sbi,
					struct cp_control *cpc);
+37 −5
Original line number Diff line number Diff line
@@ -1541,12 +1541,44 @@ static int expand_inode_data(struct inode *inode, loff_t offset,
	if (off_end)
		map.m_len++;

	if (f2fs_is_pinned_file(inode))
		map.m_seg_type = CURSEG_COLD_DATA;
	if (!map.m_len)
		return 0;

	if (f2fs_is_pinned_file(inode)) {
		block_t len = (map.m_len >> sbi->log_blocks_per_seg) <<
					sbi->log_blocks_per_seg;
		block_t done = 0;

		if (map.m_len % sbi->blocks_per_seg)
			len += sbi->blocks_per_seg;

		map.m_len = sbi->blocks_per_seg;
next_alloc:
		if (has_not_enough_free_secs(sbi, 0,
			GET_SEC_FROM_SEG(sbi, overprovision_segments(sbi)))) {
			mutex_lock(&sbi->gc_mutex);
			err = f2fs_gc(sbi, true, false, NULL_SEGNO);
			if (err && err != -ENODATA && err != -EAGAIN)
				goto out_err;
		}

		down_write(&sbi->pin_sem);
		map.m_seg_type = CURSEG_COLD_DATA_PINNED;
		f2fs_allocate_new_segments(sbi, CURSEG_COLD_DATA);
		err = f2fs_map_blocks(inode, &map, 1, F2FS_GET_BLOCK_PRE_DIO);
		up_write(&sbi->pin_sem);

		done += map.m_len;
		len -= map.m_len;
		map.m_lblk += map.m_len;
		if (!err && len)
			goto next_alloc;

	err = f2fs_map_blocks(inode, &map, 1, (f2fs_is_pinned_file(inode) ?
						F2FS_GET_BLOCK_PRE_DIO :
						F2FS_GET_BLOCK_PRE_AIO));
		map.m_len = done;
	} else {
		err = f2fs_map_blocks(inode, &map, 1, F2FS_GET_BLOCK_PRE_AIO);
	}
out_err:
	if (err) {
		pgoff_t last_off;

+1 −1
Original line number Diff line number Diff line
@@ -711,7 +711,7 @@ static int recover_data(struct f2fs_sb_info *sbi, struct list_head *inode_list,
		f2fs_put_page(page, 1);
	}
	if (!err)
		f2fs_allocate_new_segments(sbi);
		f2fs_allocate_new_segments(sbi, NO_CHECK_TYPE);
	return err;
}

+27 −4
Original line number Diff line number Diff line
@@ -2690,7 +2690,7 @@ void allocate_segment_for_resize(struct f2fs_sb_info *sbi, int type,
	up_read(&SM_I(sbi)->curseg_lock);
}

void f2fs_allocate_new_segments(struct f2fs_sb_info *sbi)
void f2fs_allocate_new_segments(struct f2fs_sb_info *sbi, int type)
{
	struct curseg_info *curseg;
	unsigned int old_segno;
@@ -2699,11 +2699,18 @@ void f2fs_allocate_new_segments(struct f2fs_sb_info *sbi)
	down_write(&SIT_I(sbi)->sentry_lock);

	for (i = CURSEG_HOT_DATA; i <= CURSEG_COLD_DATA; i++) {
		if (type != NO_CHECK_TYPE && i != type)
			continue;

		curseg = CURSEG_I(sbi, i);
		if (type == NO_CHECK_TYPE || curseg->next_blkoff ||
				get_valid_blocks(sbi, curseg->segno, false) ||
				get_ckpt_valid_blocks(sbi, curseg->segno)) {
			old_segno = curseg->segno;
			SIT_I(sbi)->s_ops->allocate_segment(sbi, i, true);
			locate_dirty_segment(sbi, old_segno);
		}
	}

	up_write(&SIT_I(sbi)->sentry_lock);
}
@@ -3068,6 +3075,19 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
{
	struct sit_info *sit_i = SIT_I(sbi);
	struct curseg_info *curseg = CURSEG_I(sbi, type);
	bool put_pin_sem = false;

	if (type == CURSEG_COLD_DATA) {
		/* GC during CURSEG_COLD_DATA_PINNED allocation */
		if (down_read_trylock(&sbi->pin_sem)) {
			put_pin_sem = true;
		} else {
			type = CURSEG_WARM_DATA;
			curseg = CURSEG_I(sbi, type);
		}
	} else if (type == CURSEG_COLD_DATA_PINNED) {
		type = CURSEG_COLD_DATA;
	}

	down_read(&SM_I(sbi)->curseg_lock);

@@ -3133,6 +3153,9 @@ void f2fs_allocate_data_block(struct f2fs_sb_info *sbi, struct page *page,
	mutex_unlock(&curseg->curseg_mutex);

	up_read(&SM_I(sbi)->curseg_lock);

	if (put_pin_sem)
		up_read(&sbi->pin_sem);
}

static void update_device_state(struct f2fs_io_info *fio)
+2 −0
Original line number Diff line number Diff line
@@ -313,6 +313,8 @@ struct sit_entry_set {
 */
static inline struct curseg_info *CURSEG_I(struct f2fs_sb_info *sbi, int type)
{
	if (type == CURSEG_COLD_DATA_PINNED)
		type = CURSEG_COLD_DATA;
	return (struct curseg_info *)(SM_I(sbi)->curseg_array + type);
}

Loading