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

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

f2fs: trace old block address for CoWed page 



This patch enables to trace old block address of CoWed page for better
debugging.

f2fs_submit_page_mbio: dev = (1,0), ino = 1, page_index = 0x1d4f0, oldaddr = 0xfe8ab, newaddr = 0xfee90 rw = WRITE_SYNC, type = NODE
f2fs_submit_page_mbio: dev = (1,0), ino = 1, page_index = 0x1d4f8, oldaddr = 0xfe8b0, newaddr = 0xfee91 rw = WRITE_SYNC, type = NODE
f2fs_submit_page_mbio: dev = (1,0), ino = 1, page_index = 0x1d4fa, oldaddr = 0xfe8ae, newaddr = 0xfee92 rw = WRITE_SYNC, type = NODE

f2fs_submit_page_mbio: dev = (1,0), ino = 134824, page_index = 0x96, oldaddr = 0xf049b, newaddr = 0x2bbe rw = WRITE, type = DATA
f2fs_submit_page_mbio: dev = (1,0), ino = 134824, page_index = 0x97, oldaddr = 0xf049c, newaddr = 0x2bbf rw = WRITE, type = DATA
f2fs_submit_page_mbio: dev = (1,0), ino = 134824, page_index = 0x98, oldaddr = 0xf049d, newaddr = 0x2bc0 rw = WRITE, type = DATA

f2fs_submit_page_mbio: dev = (1,0), ino = 135260, page_index = 0x47, oldaddr = 0xffffffff, newaddr = 0xf2631 rw = WRITE, type = DATA
f2fs_submit_page_mbio: dev = (1,0), ino = 135260, page_index = 0x48, oldaddr = 0xffffffff, newaddr = 0xf2632 rw = WRITE, type = DATA
f2fs_submit_page_mbio: dev = (1,0), ino = 135260, page_index = 0x49, oldaddr = 0xffffffff, newaddr = 0xf2633 rw = WRITE, type = DATA

Signed-off-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 9a4cbc9e

fs/f2fs/checkpoint.c

+7 −5
Original line number Diff line number Diff line
@@ -56,7 +56,8 @@ static struct page *__get_meta_page(struct f2fs_sb_info *sbi, pgoff_t index, 
		.sbi = sbi,

		.type = META,

		.rw = READ_SYNC | REQ_META | REQ_PRIO,

		.blk_addr = index,

		.old_blkaddr = index,

		.new_blkaddr = index,

		.encrypted_page = NULL,

	};
@@ -168,24 +169,24 @@ int ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, 
					NAT_BLOCK_OFFSET(NM_I(sbi)->max_nid)))

				blkno = 0;

			/* get nat block addr */

			fio.blk_addr = current_nat_addr(sbi,

			fio.new_blkaddr = current_nat_addr(sbi,

					blkno * NAT_ENTRY_PER_BLOCK);

			break;

		case META_SIT:

			/* get sit block addr */

			fio.blk_addr = current_sit_addr(sbi,

			fio.new_blkaddr = current_sit_addr(sbi,

					blkno * SIT_ENTRY_PER_BLOCK);

			break;

		case META_SSA:

		case META_CP:

		case META_POR:

			fio.blk_addr = blkno;

			fio.new_blkaddr = blkno;

			break;

		default:

			BUG();

		}



		page = grab_cache_page(META_MAPPING(sbi), fio.blk_addr);

		page = grab_cache_page(META_MAPPING(sbi), fio.new_blkaddr);

		if (!page)

			continue;

		if (PageUptodate(page)) {
@@ -194,6 +195,7 @@ int ra_meta_pages(struct f2fs_sb_info *sbi, block_t start, int nrpages, 
		}



		fio.page = page;

		fio.old_blkaddr = fio.new_blkaddr;

		f2fs_submit_page_mbio(&fio);

		f2fs_put_page(page, 0);

	}

fs/f2fs/data.c

+14 −11
Original line number Diff line number Diff line
@@ -219,7 +219,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio) 
	f2fs_trace_ios(fio, 0);



	/* Allocate a new bio */

	bio = __bio_alloc(fio->sbi, fio->blk_addr, 1, is_read_io(fio->rw));

	bio = __bio_alloc(fio->sbi, fio->new_blkaddr, 1, is_read_io(fio->rw));



	if (bio_add_page(bio, page, PAGE_CACHE_SIZE, 0) < PAGE_CACHE_SIZE) {

		bio_put(bio);
@@ -240,21 +240,24 @@ void f2fs_submit_page_mbio(struct f2fs_io_info *fio) 


	io = is_read ? &sbi->read_io : &sbi->write_io[btype];



	verify_block_addr(sbi, fio->blk_addr);

	if (fio->old_blkaddr != NEW_ADDR)

		verify_block_addr(sbi, fio->old_blkaddr);

	verify_block_addr(sbi, fio->new_blkaddr);



	down_write(&io->io_rwsem);



	if (!is_read)

		inc_page_count(sbi, F2FS_WRITEBACK);



	if (io->bio && (io->last_block_in_bio != fio->blk_addr - 1 ||

	if (io->bio && (io->last_block_in_bio != fio->new_blkaddr - 1 ||

						io->fio.rw != fio->rw))

		__submit_merged_bio(io);

alloc_new:

	if (io->bio == NULL) {

		int bio_blocks = MAX_BIO_BLOCKS(sbi);



		io->bio = __bio_alloc(sbi, fio->blk_addr, bio_blocks, is_read);

		io->bio = __bio_alloc(sbi, fio->new_blkaddr,

						bio_blocks, is_read);

		io->fio = *fio;

	}
@@ -266,7 +269,7 @@ void f2fs_submit_page_mbio(struct f2fs_io_info *fio) 
		goto alloc_new;

	}



	io->last_block_in_bio = fio->blk_addr;

	io->last_block_in_bio = fio->new_blkaddr;

	f2fs_trace_ios(fio, 0);



	up_write(&io->io_rwsem);
@@ -400,7 +403,7 @@ struct page *get_read_data_page(struct inode *inode, pgoff_t index, 
		return page;

	}



	fio.blk_addr = dn.data_blkaddr;

	fio.new_blkaddr = fio.old_blkaddr = dn.data_blkaddr;

	fio.page = page;

	err = f2fs_submit_page_bio(&fio);

	if (err)
@@ -1071,11 +1074,10 @@ int do_write_data_page(struct f2fs_io_info *fio) 
	if (err)

		return err;



	fio->blk_addr = dn.data_blkaddr;

	fio->old_blkaddr = dn.data_blkaddr;



	/* This page is already truncated */

	if (fio->blk_addr == NULL_ADDR) {

	if (fio->old_blkaddr == NULL_ADDR) {

		ClearPageUptodate(page);

		goto out_writepage;

	}
@@ -1084,7 +1086,7 @@ int do_write_data_page(struct f2fs_io_info *fio) 


		/* wait for GCed encrypted page writeback */

		f2fs_wait_on_encrypted_page_writeback(F2FS_I_SB(inode),

							fio->blk_addr);

							fio->old_blkaddr);



		fio->encrypted_page = f2fs_encrypt(inode, fio->page);

		if (IS_ERR(fio->encrypted_page)) {
@@ -1099,7 +1101,7 @@ int do_write_data_page(struct f2fs_io_info *fio) 
	 * If current allocation needs SSR,

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

	 */

	if (unlikely(fio->blk_addr != NEW_ADDR &&

	if (unlikely(fio->old_blkaddr != NEW_ADDR &&

			!is_cold_data(page) &&

			!IS_ATOMIC_WRITTEN_PAGE(page) &&

			need_inplace_update(inode))) {
@@ -1573,7 +1575,8 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, 
			.sbi = sbi,

			.type = DATA,

			.rw = READ_SYNC,

			.blk_addr = blkaddr,

			.old_blkaddr = blkaddr,

			.new_blkaddr = blkaddr,

			.page = page,

			.encrypted_page = NULL,

		};

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -695,7 +695,7 @@ struct f2fs_io_info { 
	struct f2fs_sb_info *sbi;	/* f2fs_sb_info pointer */

	enum page_type type;	/* contains DATA/NODE/META/META_FLUSH */

	int rw;			/* contains R/RS/W/WS with REQ_META/REQ_PRIO */

	block_t blk_addr;	/* block address to be written */

	block_t new_blkaddr;	/* new block address to be written */

	block_t old_blkaddr;	/* old block address before Cow */

	struct page *page;	/* page to be written */

	struct page *encrypted_page;	/* encrypted page */

fs/f2fs/gc.c

+5 −5
Original line number Diff line number Diff line
@@ -581,10 +581,10 @@ static void move_encrypted_block(struct inode *inode, block_t bidx) 


	/* read page */

	fio.page = page;

	fio.blk_addr = dn.data_blkaddr;

	fio.new_blkaddr = fio.old_blkaddr = dn.data_blkaddr;



	fio.encrypted_page = pagecache_get_page(META_MAPPING(fio.sbi),

					fio.blk_addr,

					fio.new_blkaddr,

					FGP_LOCK|FGP_CREAT,

					GFP_NOFS);

	if (!fio.encrypted_page)
@@ -611,12 +611,12 @@ static void move_encrypted_block(struct inode *inode, block_t bidx) 


	/* allocate block address */

	f2fs_wait_on_page_writeback(dn.node_page, NODE, true);

	allocate_data_block(fio.sbi, NULL, fio.blk_addr,

					&fio.blk_addr, &sum, CURSEG_COLD_DATA);

	allocate_data_block(fio.sbi, NULL, fio.old_blkaddr, &fio.new_blkaddr,

							&sum, CURSEG_COLD_DATA);

	fio.rw = WRITE_SYNC;

	f2fs_submit_page_mbio(&fio);



	dn.data_blkaddr = fio.blk_addr;

	dn.data_blkaddr = fio.new_blkaddr;

	set_data_blkaddr(&dn);

	f2fs_update_extent_cache(&dn);

	set_inode_flag(F2FS_I(inode), FI_APPEND_WRITE);

fs/f2fs/inline.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page) 


	/* write data page to try to make data consistent */

	set_page_writeback(page);

	fio.blk_addr = dn->data_blkaddr;

	fio.old_blkaddr = dn->data_blkaddr;

	write_data_page(dn, &fio);

	set_data_blkaddr(dn);

	f2fs_update_extent_cache(dn);