* [PATCH v2 4/5] f2fs: add tracepoint for f2fs_filemap_fault() @ 2019-04-15 7:22 Chao Yu 2019-04-24 9:14 ` Jaegeuk Kim 0 siblings, 1 reply; 3+ messages in thread From: Chao Yu @ 2019-04-15 7:22 UTC (permalink / raw) To: jaegeuk; +Cc: linux-f2fs-devel, linux-kernel, chao, Chao Yu This patch adds tracepoint for f2fs_filemap_fault(). Signed-off-by: Chao Yu <yuchao0@huawei.com> --- v2: - fix wrong type of @ret parameter fs/f2fs/file.c | 2 ++ include/trace/events/f2fs.h | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 30d49467578e..578486e03427 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -39,6 +39,8 @@ static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf) ret = filemap_fault(vmf); up_read(&F2FS_I(inode)->i_mmap_sem); + trace_f2fs_filemap_fault(inode, vmf->pgoff, ret); + return ret; } diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h index a3916b4dd57e..cfa0dcdd1462 100644 --- a/include/trace/events/f2fs.h +++ b/include/trace/events/f2fs.h @@ -1253,6 +1253,32 @@ DEFINE_EVENT(f2fs__page, f2fs_commit_inmem_page, TP_ARGS(page, type) ); +TRACE_EVENT(f2fs_filemap_fault, + + TP_PROTO(struct inode *inode, pgoff_t index, enum vm_fault_reason ret), + + TP_ARGS(inode, index, ret), + + TP_STRUCT__entry( + __field(dev_t, dev) + __field(ino_t, ino) + __field(pgoff_t, index) + __field(enum vm_fault_reason, ret) + ), + + TP_fast_assign( + __entry->dev = inode->i_sb->s_dev; + __entry->ino = inode->i_ino; + __entry->index = index; + __entry->ret = ret; + ), + + TP_printk("dev = (%d,%d), ino = %lu, index = %lu, ret = %u", + show_dev_ino(__entry), + (unsigned long)__entry->index, + ret) +); + TRACE_EVENT(f2fs_writepages, TP_PROTO(struct inode *inode, struct writeback_control *wbc, int type), -- 2.18.0.rc1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 4/5] f2fs: add tracepoint for f2fs_filemap_fault() 2019-04-15 7:22 [PATCH v2 4/5] f2fs: add tracepoint for f2fs_filemap_fault() Chao Yu @ 2019-04-24 9:14 ` Jaegeuk Kim 2019-04-24 12:45 ` Chao Yu 0 siblings, 1 reply; 3+ messages in thread From: Jaegeuk Kim @ 2019-04-24 9:14 UTC (permalink / raw) To: Chao Yu; +Cc: linux-f2fs-devel, linux-kernel, chao On 04/15, Chao Yu wrote: > This patch adds tracepoint for f2fs_filemap_fault(). > > Signed-off-by: Chao Yu <yuchao0@huawei.com> > --- > v2: > - fix wrong type of @ret parameter > fs/f2fs/file.c | 2 ++ > include/trace/events/f2fs.h | 26 ++++++++++++++++++++++++++ > 2 files changed, 28 insertions(+) > > diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c > index 30d49467578e..578486e03427 100644 > --- a/fs/f2fs/file.c > +++ b/fs/f2fs/file.c > @@ -39,6 +39,8 @@ static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf) > ret = filemap_fault(vmf); > up_read(&F2FS_I(inode)->i_mmap_sem); > > + trace_f2fs_filemap_fault(inode, vmf->pgoff, ret); In order to avoid wrong casting warning, how about this? --- include/trace/events/f2fs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h index abe763cc1d0b..c29dea7ac0fe 100644 --- a/include/trace/events/f2fs.h +++ b/include/trace/events/f2fs.h @@ -1286,7 +1286,7 @@ DEFINE_EVENT(f2fs__page, f2fs_commit_inmem_page, TRACE_EVENT(f2fs_filemap_fault, - TP_PROTO(struct inode *inode, pgoff_t index, enum vm_fault_reason ret), + TP_PROTO(struct inode *inode, pgoff_t index, vm_fault_t ret), TP_ARGS(inode, index, ret), @@ -1294,7 +1294,7 @@ TRACE_EVENT(f2fs_filemap_fault, __field(dev_t, dev) __field(ino_t, ino) __field(pgoff_t, index) - __field(enum vm_fault_reason, ret) + __field(vm_fault_t, ret) ), TP_fast_assign( @@ -1304,10 +1304,10 @@ TRACE_EVENT(f2fs_filemap_fault, __entry->ret = ret; ), - TP_printk("dev = (%d,%d), ino = %lu, index = %lu, ret = %u", + TP_printk("dev = (%d,%d), ino = %lu, index = %lu, ret = %lx", show_dev_ino(__entry), (unsigned long)__entry->index, - ret) + (unsigned long)__entry->ret) ); TRACE_EVENT(f2fs_writepages, -- 2.19.0.605.g01d371f741-goog ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 4/5] f2fs: add tracepoint for f2fs_filemap_fault() 2019-04-24 9:14 ` Jaegeuk Kim @ 2019-04-24 12:45 ` Chao Yu 0 siblings, 0 replies; 3+ messages in thread From: Chao Yu @ 2019-04-24 12:45 UTC (permalink / raw) To: Jaegeuk Kim, Chao Yu; +Cc: linux-f2fs-devel, linux-kernel On 2019-4-24 17:14, Jaegeuk Kim wrote: > On 04/15, Chao Yu wrote: >> This patch adds tracepoint for f2fs_filemap_fault(). >> >> Signed-off-by: Chao Yu <yuchao0@huawei.com> >> --- >> v2: >> - fix wrong type of @ret parameter >> fs/f2fs/file.c | 2 ++ >> include/trace/events/f2fs.h | 26 ++++++++++++++++++++++++++ >> 2 files changed, 28 insertions(+) >> >> diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c >> index 30d49467578e..578486e03427 100644 >> --- a/fs/f2fs/file.c >> +++ b/fs/f2fs/file.c >> @@ -39,6 +39,8 @@ static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf) >> ret = filemap_fault(vmf); >> up_read(&F2FS_I(inode)->i_mmap_sem); >> >> + trace_f2fs_filemap_fault(inode, vmf->pgoff, ret); > > In order to avoid wrong casting warning, how about this? Confirmed, I used wrong type in v2, thanks for fixing this. Thanks, > > --- > include/trace/events/f2fs.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h > index abe763cc1d0b..c29dea7ac0fe 100644 > --- a/include/trace/events/f2fs.h > +++ b/include/trace/events/f2fs.h > @@ -1286,7 +1286,7 @@ DEFINE_EVENT(f2fs__page, f2fs_commit_inmem_page, > > TRACE_EVENT(f2fs_filemap_fault, > > - TP_PROTO(struct inode *inode, pgoff_t index, enum vm_fault_reason ret), > + TP_PROTO(struct inode *inode, pgoff_t index, vm_fault_t ret), > > TP_ARGS(inode, index, ret), > > @@ -1294,7 +1294,7 @@ TRACE_EVENT(f2fs_filemap_fault, > __field(dev_t, dev) > __field(ino_t, ino) > __field(pgoff_t, index) > - __field(enum vm_fault_reason, ret) > + __field(vm_fault_t, ret) > ), > > TP_fast_assign( > @@ -1304,10 +1304,10 @@ TRACE_EVENT(f2fs_filemap_fault, > __entry->ret = ret; > ), > > - TP_printk("dev = (%d,%d), ino = %lu, index = %lu, ret = %u", > + TP_printk("dev = (%d,%d), ino = %lu, index = %lu, ret = %lx", > show_dev_ino(__entry), > (unsigned long)__entry->index, > - ret) > + (unsigned long)__entry->ret) > ); > > TRACE_EVENT(f2fs_writepages, > ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-04-24 12:45 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2019-04-15 7:22 [PATCH v2 4/5] f2fs: add tracepoint for f2fs_filemap_fault() Chao Yu 2019-04-24 9:14 ` Jaegeuk Kim 2019-04-24 12:45 ` Chao Yu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).