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

Commit d05e871f authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: introduce and spread verify_blkaddr 



This patch introduces verify_blkaddr to check meta/data block address
with valid range to detect bug earlier.

In addition, once we encounter an invalid blkaddr, notice user to run
fsck to fix, and let the kernel panic.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 677f89e0

fs/f2fs/checkpoint.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -120,7 +120,7 @@ struct page *f2fs_get_tmp_page(struct f2fs_sb_info *sbi, pgoff_t index) 
	return __get_meta_page(sbi, index, false);

	return __get_meta_page(sbi, index, false);

}

}





bool f2fs_is_valid_meta_blkaddr(struct f2fs_sb_info *sbi,

bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,

					block_t blkaddr, int type)

					block_t blkaddr, int type)

{

{

	switch (type) {

	switch (type) {
@@ -141,10 +141,16 @@ bool f2fs_is_valid_meta_blkaddr(struct f2fs_sb_info *sbi, 
			return false;

			return false;

		break;

		break;

	case META_POR:

	case META_POR:

	case DATA_GENERIC:

		if (unlikely(blkaddr >= MAX_BLKADDR(sbi) ||

		if (unlikely(blkaddr >= MAX_BLKADDR(sbi) ||

			blkaddr < MAIN_BLKADDR(sbi)))

			blkaddr < MAIN_BLKADDR(sbi)))

			return false;

			return false;

		break;

		break;

	case META_GENERIC:

		if (unlikely(blkaddr < SEG0_BLKADDR(sbi) ||

			blkaddr >= MAIN_BLKADDR(sbi)))

			return false;

		break;

	default:

	default:

		BUG();

		BUG();

	}

	}
@@ -177,7 +183,7 @@ int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, 
	blk_start_plug(&plug);

	blk_start_plug(&plug);

	for (; nrpages-- > 0; blkno++) {

	for (; nrpages-- > 0; blkno++) {





		if (!f2fs_is_valid_meta_blkaddr(sbi, blkno, type))

		if (!f2fs_is_valid_blkaddr(sbi, blkno, type))

			goto out;

			goto out;





		switch (type) {

		switch (type) {

fs/f2fs/data.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -483,7 +483,7 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio) 
		spin_unlock(&io->io_lock);

		spin_unlock(&io->io_lock);

	}

	}





	if (is_valid_blkaddr(fio->old_blkaddr))

	if (__is_valid_data_blkaddr(fio->old_blkaddr))

		verify_block_addr(fio, fio->old_blkaddr);

		verify_block_addr(fio, fio->old_blkaddr);

	verify_block_addr(fio, fio->new_blkaddr);

	verify_block_addr(fio, fio->new_blkaddr);
@@ -1043,7 +1043,7 @@ int f2fs_map_blocks(struct inode *inode, struct f2fs_map_blocks *map, 
next_block:

next_block:

	blkaddr = datablock_addr(dn.inode, dn.node_page, dn.ofs_in_node);

	blkaddr = datablock_addr(dn.inode, dn.node_page, dn.ofs_in_node);





	if (!is_valid_blkaddr(blkaddr)) {

	if (!is_valid_data_blkaddr(sbi, blkaddr)) {

		if (create) {

		if (create) {

			if (unlikely(f2fs_cp_error(sbi))) {

			if (unlikely(f2fs_cp_error(sbi))) {

				err = -EIO;

				err = -EIO;
@@ -1698,7 +1698,7 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 
			f2fs_lookup_extent_cache(inode, page->index, &ei)) {

			f2fs_lookup_extent_cache(inode, page->index, &ei)) {

		fio->old_blkaddr = ei.blk + page->index - ei.fofs;

		fio->old_blkaddr = ei.blk + page->index - ei.fofs;





		if (is_valid_blkaddr(fio->old_blkaddr)) {

		if (is_valid_data_blkaddr(fio->sbi, fio->old_blkaddr)) {

			ipu_force = true;

			ipu_force = true;

			fio->need_lock = LOCK_DONE;

			fio->need_lock = LOCK_DONE;

			goto got_it;

			goto got_it;
@@ -1725,7 +1725,7 @@ int f2fs_do_write_data_page(struct f2fs_io_info *fio) 
	 * If current allocation needs SSR,

	 * If current allocation needs SSR,

	 * it had better in-place writes for updated data.

	 * it had better in-place writes for updated data.

	 */

	 */

	if (ipu_force || (is_valid_blkaddr(fio->old_blkaddr) &&

	if (ipu_force || (is_valid_data_blkaddr(fio->sbi, fio->old_blkaddr) &&

					need_inplace_update(fio))) {

					need_inplace_update(fio))) {

		err = encrypt_one_page(fio);

		err = encrypt_one_page(fio);

		if (err)

		if (err)

fs/f2fs/f2fs.h

+29 −4
Original line number Original line Diff line number Diff line
@@ -196,7 +196,7 @@ struct cp_control { 
};

};





/*

/*

 * For CP/NAT/SIT/SSA readahead

 * indicate meta/data type

 */

 */

enum {

enum {

	META_CP,

	META_CP,
@@ -204,6 +204,8 @@ enum { 
	META_SIT,

	META_SIT,

	META_SSA,

	META_SSA,

	META_POR,

	META_POR,

	DATA_GENERIC,

	META_GENERIC,

};

};





/* for the list of ino */

/* for the list of ino */
@@ -2695,13 +2697,36 @@ static inline void f2fs_update_iostat(struct f2fs_sb_info *sbi, 
	spin_unlock(&sbi->iostat_lock);

	spin_unlock(&sbi->iostat_lock);

}

}





static inline bool is_valid_blkaddr(block_t blkaddr)

bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,

					block_t blkaddr, int type);

void f2fs_msg(struct super_block *sb, const char *level, const char *fmt, ...);

static inline void verify_blkaddr(struct f2fs_sb_info *sbi,

					block_t blkaddr, int type)

{

	if (!f2fs_is_valid_blkaddr(sbi, blkaddr, type)) {

		f2fs_msg(sbi->sb, KERN_ERR,

			"invalid blkaddr: %u, type: %d, run fsck to fix.",

			blkaddr, type);

		f2fs_bug_on(sbi, 1);

	}

}



static inline bool __is_valid_data_blkaddr(block_t blkaddr)

{

{

	if (blkaddr == NEW_ADDR || blkaddr == NULL_ADDR)

	if (blkaddr == NEW_ADDR || blkaddr == NULL_ADDR)

		return false;

		return false;

	return true;

	return true;

}

}





static inline bool is_valid_data_blkaddr(struct f2fs_sb_info *sbi,

						block_t blkaddr)

{

	if (!__is_valid_data_blkaddr(blkaddr))

		return false;

	verify_blkaddr(sbi, blkaddr, DATA_GENERIC);

	return true;

}



/*

/*

 * file.c

 * file.c

 */

 */
@@ -2925,7 +2950,7 @@ void f2fs_stop_checkpoint(struct f2fs_sb_info *sbi, bool end_io); 
struct page *f2fs_grab_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);

struct page *f2fs_grab_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);

struct page *f2fs_get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);

struct page *f2fs_get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index);

struct page *f2fs_get_tmp_page(struct f2fs_sb_info *sbi, pgoff_t index);

struct page *f2fs_get_tmp_page(struct f2fs_sb_info *sbi, pgoff_t index);

bool f2fs_is_valid_meta_blkaddr(struct f2fs_sb_info *sbi,

bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi,

					block_t blkaddr, int type);

					block_t blkaddr, int type);

int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages,

int f2fs_ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages,

			int type, bool sync);

			int type, bool sync);

fs/f2fs/file.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -352,13 +352,13 @@ static pgoff_t __get_first_dirty_index(struct address_space *mapping, 
	return pgofs;

	return pgofs;

}

}





static bool __found_offset(block_t blkaddr, pgoff_t dirty, pgoff_t pgofs,

static bool __found_offset(struct f2fs_sb_info *sbi, block_t blkaddr,

							int whence)

				pgoff_t dirty, pgoff_t pgofs, int whence)

{

{

	switch (whence) {

	switch (whence) {

	case SEEK_DATA:

	case SEEK_DATA:

		if ((blkaddr == NEW_ADDR && dirty == pgofs) ||

		if ((blkaddr == NEW_ADDR && dirty == pgofs) ||

			is_valid_blkaddr(blkaddr))

			is_valid_data_blkaddr(sbi, blkaddr))

			return true;

			return true;

		break;

		break;

	case SEEK_HOLE:

	case SEEK_HOLE:
@@ -422,7 +422,8 @@ static loff_t f2fs_seek_block(struct file *file, loff_t offset, int whence) 
			blkaddr = datablock_addr(dn.inode,

			blkaddr = datablock_addr(dn.inode,

					dn.node_page, dn.ofs_in_node);

					dn.node_page, dn.ofs_in_node);





			if (__found_offset(blkaddr, dirty, pgofs, whence)) {

			if (__found_offset(F2FS_I_SB(inode), blkaddr, dirty,

							pgofs, whence)) {

				f2fs_put_dnode(&dn);

				f2fs_put_dnode(&dn);

				goto found;

				goto found;

			}

			}

fs/f2fs/inode.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -68,11 +68,12 @@ static void __get_inode_rdev(struct inode *inode, struct f2fs_inode *ri) 
	}

	}

}

}





static bool __written_first_block(struct f2fs_inode *ri)

static bool __written_first_block(struct f2fs_sb_info *sbi,

					struct f2fs_inode *ri)

{

{

	block_t addr = le32_to_cpu(ri->i_addr[offset_in_addr(ri)]);

	block_t addr = le32_to_cpu(ri->i_addr[offset_in_addr(ri)]);





	if (is_valid_blkaddr(addr))

	if (is_valid_data_blkaddr(sbi, addr))

		return true;

		return true;

	return false;

	return false;

}

}
@@ -282,7 +283,7 @@ static int do_read_inode(struct inode *inode) 
	/* get rdev by using inline_info */

	/* get rdev by using inline_info */

	__get_inode_rdev(inode, ri);

	__get_inode_rdev(inode, ri);





	if (__written_first_block(ri))

	if (__written_first_block(sbi, ri))

		set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);

		set_inode_flag(inode, FI_FIRST_BLOCK_WRITTEN);





	if (!f2fs_need_inode_block_update(sbi, inode->i_ino))

	if (!f2fs_need_inode_block_update(sbi, inode->i_ino))