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

Commit bb4bf9d3 authored by Mohan Srinivasan's avatar Mohan Srinivasan Committed by Runmin Wang
Browse files

ANDROID: fs: FS tracepoints to track IO. 



Adds tracepoints in ext4/f2fs/mpage to track readpages/buffered
write()s. This allows us to track files that are being read/written
to PIDs.

Change-Id: I26bd36f933108927d6903da04d8cb42fd9c3ef3d
Signed-off-by: default avatarMohan Srinivasan <srmohan@google.com>
Git-commit: 32cbbe59
Git-repo: https://android.googlesource.com/kernel/common/


[runminw@codeaurora.org: resolve trivial merge conflicts]
Signed-off-by: default avatarRunmin Wang <runminw@codeaurora.org>
parent 0293b8a7

fs/ext4/inline.c

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "ext4.h"

#include "xattr.h"

#include "truncate.h"

#include <trace/events/android_fs.h>



#define EXT4_XATTR_SYSTEM_DATA	"data"

#define EXT4_MIN_INLINE_DATA_SIZE	((sizeof(__le32) * EXT4_N_BLOCKS))
@@ -502,6 +503,9 @@ int ext4_readpage_inline(struct inode *inode, struct page *page) 
		return -EAGAIN;

	}



	trace_android_fs_dataread_start(inode, page_offset(page), PAGE_SIZE,

					current->pid, current->comm);



	/*

	 * Current inline data can only exist in the 1st page,

	 * So for all the other pages, just set them uptodate.
@@ -513,6 +517,8 @@ int ext4_readpage_inline(struct inode *inode, struct page *page) 
		SetPageUptodate(page);

	}



	trace_android_fs_dataread_end(inode, page_offset(page), PAGE_SIZE);



	up_read(&EXT4_I(inode)->xattr_sem);



	unlock_page(page);

fs/ext4/inode.c

+27 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include "ext4_ice.h"



#include <trace/events/ext4.h>

#include <trace/events/android_fs.h>



#define MPAGE_DA_EXTENT_TAIL 0x01
@@ -1018,6 +1019,8 @@ static int ext4_write_begin(struct file *file, struct address_space *mapping, 
	pgoff_t index;

	unsigned from, to;



	trace_android_fs_datawrite_start(inode, pos, len,

					 current->pid, current->comm);

	trace_ext4_write_begin(inode, pos, len, flags);

	/*

	 * Reserve one block more for addition to orphan list in case
@@ -1154,6 +1157,7 @@ static int ext4_write_end(struct file *file, 
	int ret = 0, ret2;

	int i_size_changed = 0;



	trace_android_fs_datawrite_end(inode, pos, len);

	trace_ext4_write_end(inode, pos, len, copied);

	if (ext4_test_inode_state(inode, EXT4_STATE_ORDERED_MODE)) {

		ret = ext4_jbd2_file_inode(handle, inode);
@@ -1267,6 +1271,7 @@ static int ext4_journalled_write_end(struct file *file, 
	unsigned from, to;

	int size_changed = 0;



	trace_android_fs_datawrite_end(inode, pos, len);

	trace_ext4_journalled_write_end(inode, pos, len, copied);

	from = pos & (PAGE_CACHE_SIZE - 1);

	to = from + len;
@@ -2742,6 +2747,8 @@ static int ext4_da_write_begin(struct file *file, struct address_space *mapping, 
					len, flags, pagep, fsdata);

	}

	*fsdata = (void *)0;

	trace_android_fs_datawrite_start(inode, pos, len,

					 current->pid, current->comm);

	trace_ext4_da_write_begin(inode, pos, len, flags);



	if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) {
@@ -2860,6 +2867,7 @@ static int ext4_da_write_end(struct file *file, 
		return ext4_write_end(file, mapping, pos,

				      len, copied, page, fsdata);



	trace_android_fs_datawrite_end(inode, pos, len);

	trace_ext4_da_write_end(inode, pos, len, copied);

	start = pos & (PAGE_CACHE_SIZE - 1);

	end = start + copied - 1;
@@ -3352,12 +3360,31 @@ static ssize_t ext4_direct_IO(struct kiocb *iocb, struct iov_iter *iter, 
	if (ext4_has_inline_data(inode))

		return 0;



	if (trace_android_fs_dataread_start_enabled() &&

	    (iov_iter_rw(iter) == READ))

		trace_android_fs_dataread_start(inode, offset, count,

						current->pid,

						current->comm);

	if (trace_android_fs_datawrite_start_enabled() &&

	    (iov_iter_rw(iter) == WRITE))

		trace_android_fs_datawrite_start(inode, offset, count,

						 current->pid,

						 current->comm);



	trace_ext4_direct_IO_enter(inode, offset, count, iov_iter_rw(iter));

	if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))

		ret = ext4_ext_direct_IO(iocb, iter, offset);

	else

		ret = ext4_ind_direct_IO(iocb, iter, offset);

	trace_ext4_direct_IO_exit(inode, offset, count, iov_iter_rw(iter), ret);



	if (trace_android_fs_dataread_start_enabled() &&

	    (iov_iter_rw(iter) == READ))

		trace_android_fs_dataread_end(inode, offset, count);

	if (trace_android_fs_datawrite_start_enabled() &&

	    (iov_iter_rw(iter) == WRITE))

		trace_android_fs_datawrite_end(inode, offset, count);



	return ret;

}

fs/ext4/readpage.c

+37 −4
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 


#include "ext4.h"

#include "ext4_ice.h"

#include <trace/events/android_fs.h>



/*

 * Call ext4_decrypt on every single page, reusing the encryption
@@ -92,6 +93,17 @@ static inline bool ext4_bio_encrypted(struct bio *bio) 
#endif

}



static void

ext4_trace_read_completion(struct bio *bio)

{

	struct page *first_page = bio->bi_io_vec[0].bv_page;



	if (first_page != NULL)

		trace_android_fs_dataread_end(first_page->mapping->host,

					      page_offset(first_page),

					      bio->bi_iter.bi_size);

}



/*

 * I/O completion handler for multipage BIOs.

 *
@@ -109,6 +121,9 @@ static void mpage_end_io(struct bio *bio) 
	struct bio_vec *bv;

	int i;



	if (trace_android_fs_dataread_start_enabled())

		ext4_trace_read_completion(bio);



	if (ext4_bio_encrypted(bio)) {

		struct ext4_crypto_ctx *ctx = bio->bi_private;
@@ -136,6 +151,24 @@ static void mpage_end_io(struct bio *bio) 
	bio_put(bio);

}



static void

ext4_submit_bio_read(struct bio *bio)

{

	if (trace_android_fs_dataread_start_enabled()) {

		struct page *first_page = bio->bi_io_vec[0].bv_page;



		if (first_page != NULL) {

			trace_android_fs_dataread_start(

				first_page->mapping->host,

				page_offset(first_page),

				bio->bi_iter.bi_size,

				current->pid,

				current->comm);

		}

	}

	submit_bio(READ, bio);

}



int ext4_mpage_readpages(struct address_space *mapping,

			 struct list_head *pages, struct page *page,

			 unsigned nr_pages)
@@ -277,7 +310,7 @@ int ext4_mpage_readpages(struct address_space *mapping, 
		 */

		if (bio && (last_block_in_bio != blocks[0] - 1)) {

		submit_and_realloc:

			submit_bio(READ, bio);

			ext4_submit_bio_read(bio);

			bio = NULL;

		}

		if (bio == NULL) {
@@ -309,14 +342,14 @@ int ext4_mpage_readpages(struct address_space *mapping, 
		if (((map.m_flags & EXT4_MAP_BOUNDARY) &&

		     (relative_block == map.m_len)) ||

		    (first_hole != blocks_per_page)) {

			submit_bio(READ, bio);

			ext4_submit_bio_read(bio);

			bio = NULL;

		} else

			last_block_in_bio = blocks[blocks_per_page - 1];

		goto next_page;

	confused:

		if (bio) {

			submit_bio(READ, bio);

			ext4_submit_bio_read(bio);

			bio = NULL;

		}

		if (!PageUptodate(page))
@@ -329,6 +362,6 @@ int ext4_mpage_readpages(struct address_space *mapping, 
	}

	BUG_ON(pages && !list_empty(pages));

	if (bio)

		submit_bio(READ, bio);

		ext4_submit_bio_read(bio);

	return 0;

}

fs/f2fs/data.c

+21 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "segment.h"

#include "trace.h"

#include <trace/events/f2fs.h>

#include <trace/events/android_fs.h>



static void f2fs_read_end_io(struct bio *bio)

{
@@ -1405,6 +1406,8 @@ static int f2fs_write_begin(struct file *file, struct address_space *mapping, 
	struct dnode_of_data dn;

	int err = 0;



	trace_android_fs_datawrite_start(inode, pos, len,

					 current->pid, current->comm);

	trace_f2fs_write_begin(inode, pos, len, flags);



	f2fs_balance_fs(sbi);
@@ -1533,6 +1536,7 @@ static int f2fs_write_end(struct file *file, 
{

	struct inode *inode = page->mapping->host;



	trace_android_fs_datawrite_end(inode, pos, len);

	trace_f2fs_write_end(inode, pos, len, copied);



	set_page_dirty(page);
@@ -1586,6 +1590,16 @@ static ssize_t f2fs_direct_IO(struct kiocb *iocb, struct iov_iter *iter, 


	trace_f2fs_direct_IO_enter(inode, offset, count, iov_iter_rw(iter));



	if (trace_android_fs_dataread_start_enabled() &&

	    (iov_iter_rw(iter) == READ))

		trace_android_fs_dataread_start(inode, offset,

						count, current->pid,

						current->comm);

	if (trace_android_fs_datawrite_start_enabled() &&

	    (iov_iter_rw(iter) == WRITE))

		trace_android_fs_datawrite_start(inode, offset, count,

						 current->pid, current->comm);



	if (iov_iter_rw(iter) == WRITE) {

		__allocate_data_blocks(inode, offset, count);

		if (unlikely(f2fs_cp_error(F2FS_I_SB(inode)))) {
@@ -1599,6 +1613,13 @@ out: 
	if (err < 0 && iov_iter_rw(iter) == WRITE)

		f2fs_write_failed(mapping, offset + count);



	if (trace_android_fs_dataread_start_enabled() &&

	    (iov_iter_rw(iter) == READ))

		trace_android_fs_dataread_end(inode, offset, count);

	if (trace_android_fs_datawrite_start_enabled() &&

	    (iov_iter_rw(iter) == WRITE))

		trace_android_fs_datawrite_end(inode, offset, count);



	trace_f2fs_direct_IO_exit(inode, offset, count, iov_iter_rw(iter), err);



	return err;

fs/f2fs/inline.c

+11 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#include "f2fs.h"

#include "node.h"

#include <trace/events/android_fs.h>



bool f2fs_may_inline_data(struct inode *inode)

{
@@ -84,14 +85,22 @@ int f2fs_read_inline_data(struct inode *inode, struct page *page) 
{

	struct page *ipage;



	trace_android_fs_dataread_start(inode, page_offset(page),

					PAGE_SIZE, current->pid,

					current->comm);



	ipage = get_node_page(F2FS_I_SB(inode), inode->i_ino);

	if (IS_ERR(ipage)) {

		trace_android_fs_dataread_end(inode, page_offset(page),

					      PAGE_SIZE);

		unlock_page(page);

		return PTR_ERR(ipage);

	}



	if (!f2fs_has_inline_data(inode)) {

		f2fs_put_page(ipage, 1);

		trace_android_fs_dataread_end(inode, page_offset(page),

					      PAGE_SIZE);

		return -EAGAIN;

	}
@@ -102,6 +111,8 @@ int f2fs_read_inline_data(struct inode *inode, struct page *page) 


	SetPageUptodate(page);

	f2fs_put_page(ipage, 1);

	trace_android_fs_dataread_end(inode, page_offset(page),

				      PAGE_SIZE);

	unlock_page(page);

	return 0;

}