Unverified Commit 880d5ed6 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!11222 nfs: pass explicit offset/count to trace events 

Merge Pull Request from: @ci-robot 
 
PR sync from: Zizhi Wo <wozizhi@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/Q7RLJRLBV4XEVV2ML2AYYRZ2ULUOEKLD/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAKQ2A 
 
Link:https://gitee.com/openeuler/kernel/pulls/11222

 

Reviewed-by: default avatarZhang Peng <zhangpeng362@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents fdb298b7 37523773

fs/nfs/file.c

+3 −2
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static void nfs_invalidate_folio(struct folio *folio, size_t offset, 
	/* Cancel any unstarted writes on this page */

	nfs_wb_folio_cancel(inode, folio);

	folio_wait_fscache(folio);

	trace_nfs_invalidate_folio(inode, folio);

	trace_nfs_invalidate_folio(inode, folio_pos(folio) + offset, length);

}



/*
@@ -502,7 +502,8 @@ static int nfs_launder_folio(struct folio *folio) 


	folio_wait_fscache(folio);

	ret = nfs_wb_folio(inode, folio);

	trace_nfs_launder_folio_done(inode, folio, ret);

	trace_nfs_launder_folio_done(inode, folio_pos(folio),

			folio_size(folio), ret);

	return ret;

}

fs/nfs/nfstrace.h

+20 −16
Original line number Diff line number Diff line
@@ -933,10 +933,11 @@ TRACE_EVENT(nfs_sillyrename_unlink, 
DECLARE_EVENT_CLASS(nfs_folio_event,

		TP_PROTO(

			const struct inode *inode,

			struct folio *folio

			loff_t offset,

			size_t count

		),



		TP_ARGS(inode, folio),

		TP_ARGS(inode, offset, count),



		TP_STRUCT__entry(

			__field(dev_t, dev)
@@ -944,7 +945,7 @@ DECLARE_EVENT_CLASS(nfs_folio_event, 
			__field(u64, fileid)

			__field(u64, version)

			__field(loff_t, offset)

			__field(u32, count)

			__field(size_t, count)

		),



		TP_fast_assign(
@@ -954,13 +955,13 @@ DECLARE_EVENT_CLASS(nfs_folio_event, 
			__entry->fileid = nfsi->fileid;

			__entry->fhandle = nfs_fhandle_hash(&nfsi->fh);

			__entry->version = inode_peek_iversion_raw(inode);

			__entry->offset = folio_file_pos(folio);

			__entry->count = nfs_folio_length(folio);

			__entry->offset = offset,

			__entry->count = count;

		),



		TP_printk(

			"fileid=%02x:%02x:%llu fhandle=0x%08x version=%llu "

			"offset=%lld count=%u",

			"offset=%lld count=%zu",

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->fileid,

			__entry->fhandle, __entry->version,
@@ -972,18 +973,20 @@ DECLARE_EVENT_CLASS(nfs_folio_event, 
	DEFINE_EVENT(nfs_folio_event, name, \

			TP_PROTO( \

				const struct inode *inode, \

				struct folio *folio \

				loff_t offset, \

				size_t count \

			), \

			TP_ARGS(inode, folio))

			TP_ARGS(inode, offset, count))



DECLARE_EVENT_CLASS(nfs_folio_event_done,

		TP_PROTO(

			const struct inode *inode,

			struct folio *folio,

			loff_t offset,

			size_t count,

			int ret

		),



		TP_ARGS(inode, folio, ret),

		TP_ARGS(inode, offset, count, ret),



		TP_STRUCT__entry(

			__field(dev_t, dev)
@@ -992,7 +995,7 @@ DECLARE_EVENT_CLASS(nfs_folio_event_done, 
			__field(u64, fileid)

			__field(u64, version)

			__field(loff_t, offset)

			__field(u32, count)

			__field(size_t, count)

		),



		TP_fast_assign(
@@ -1002,14 +1005,14 @@ DECLARE_EVENT_CLASS(nfs_folio_event_done, 
			__entry->fileid = nfsi->fileid;

			__entry->fhandle = nfs_fhandle_hash(&nfsi->fh);

			__entry->version = inode_peek_iversion_raw(inode);

			__entry->offset = folio_file_pos(folio);

			__entry->count = nfs_folio_length(folio);

			__entry->offset = offset,

			__entry->count = count,

			__entry->ret = ret;

		),



		TP_printk(

			"fileid=%02x:%02x:%llu fhandle=0x%08x version=%llu "

			"offset=%lld count=%u ret=%d",

			"offset=%lld count=%zu ret=%d",

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->fileid,

			__entry->fhandle, __entry->version,
@@ -1021,10 +1024,11 @@ DECLARE_EVENT_CLASS(nfs_folio_event_done, 
	DEFINE_EVENT(nfs_folio_event_done, name, \

			TP_PROTO( \

				const struct inode *inode, \

				struct folio *folio, \

				loff_t offset, \

				size_t count, \

				int ret \

			), \

			TP_ARGS(inode, folio, ret))

			TP_ARGS(inode, offset, count, ret))



DEFINE_NFS_FOLIO_EVENT(nfs_aop_readpage);

DEFINE_NFS_FOLIO_EVENT_DONE(nfs_aop_readpage_done);

fs/nfs/read.c

+5 −3
Original line number Diff line number Diff line
@@ -332,13 +332,15 @@ int nfs_read_add_folio(struct nfs_pageio_descriptor *pgio, 
int nfs_read_folio(struct file *file, struct folio *folio)

{

	struct inode *inode = file_inode(file);

	loff_t pos = folio_pos(folio);

	size_t len = folio_size(folio);

	struct nfs_pageio_descriptor pgio;

	struct nfs_open_context *ctx;

	int ret;



	trace_nfs_aop_readpage(inode, folio);

	trace_nfs_aop_readpage(inode, pos, len);

	nfs_inc_stats(inode, NFSIOS_VFSREADPAGE);

	task_io_account_read(folio_size(folio));

	task_io_account_read(len);



	/*

	 * Try to flush any pending writes to the file..
@@ -381,7 +383,7 @@ int nfs_read_folio(struct file *file, struct folio *folio) 
out_put:

	put_nfs_open_context(ctx);

out:

	trace_nfs_aop_readpage_done(inode, folio, ret);

	trace_nfs_aop_readpage_done(inode, pos, len, ret);

	return ret;

out_unlock:

	folio_unlock(folio);

fs/nfs/write.c

+5 −5
Original line number Diff line number Diff line
@@ -2088,17 +2088,17 @@ int nfs_wb_folio_cancel(struct inode *inode, struct folio *folio) 
 */

int nfs_wb_folio(struct inode *inode, struct folio *folio)

{

	loff_t range_start = folio_file_pos(folio);

	loff_t range_end = range_start + (loff_t)folio_size(folio) - 1;

	loff_t range_start = folio_pos(folio);

	size_t len = folio_size(folio);

	struct writeback_control wbc = {

		.sync_mode = WB_SYNC_ALL,

		.nr_to_write = 0,

		.range_start = range_start,

		.range_end = range_end,

		.range_end = range_start + len - 1,

	};

	int ret;



	trace_nfs_writeback_folio(inode, folio);

	trace_nfs_writeback_folio(inode, range_start, len);



	for (;;) {

		folio_wait_writeback(folio);
@@ -2116,7 +2116,7 @@ int nfs_wb_folio(struct inode *inode, struct folio *folio) 
			goto out_error;

	}

out_error:

	trace_nfs_writeback_folio_done(inode, folio, ret);

	trace_nfs_writeback_folio_done(inode, range_start, len, ret);

	return ret;

}