niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

f2fs: add tracepoint for f2fs_vm_page_mkwrite()

Browse source 
This patch adds to support tracepoint for f2fs_vm_page_mkwrite(),
meanwhile it prints more details for trace_f2fs_filemap_fault().

Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
This commit is contained in:
Chao Yu 2023-12-10 17:20:40 +08:00 • committed by Jaegeuk Kim
parent 4e4f1eb994
commit 87f3afd366
2 changed files with 41 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
fs/f2fs/file.c
View file

@ -46,7 +46,7 @@ static vm_fault_t f2fs_filemap_fault(struct vm_fault *vmf)
f2fs_update_iostat(F2FS_I_SB(inode), inode, f2fs_update_iostat(F2FS_I_SB(inode), inode,
APP_MAPPED_READ_IO, F2FS_BLKSIZE); APP_MAPPED_READ_IO, F2FS_BLKSIZE);
trace_f2fs_filemap_fault(inode, vmf->pgoff, (unsigned long)ret); trace_f2fs_filemap_fault(inode, vmf->pgoff, vmf->vma->vm_flags, ret);
return ret; return ret;
} }
@ -59,26 +59,29 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)
struct dnode_of_data dn; struct dnode_of_data dn;
bool need_alloc = true; bool need_alloc = true;
int err = 0; int err = 0;
vm_fault_t ret;
if (unlikely(IS_IMMUTABLE(inode))) if (unlikely(IS_IMMUTABLE(inode)))
return VM_FAULT_SIGBUS; return VM_FAULT_SIGBUS;
if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) if (is_inode_flag_set(inode, FI_COMPRESS_RELEASED)) {
return VM_FAULT_SIGBUS; err = -EIO;
goto out;
}
if (unlikely(f2fs_cp_error(sbi))) { if (unlikely(f2fs_cp_error(sbi))) {
err = -EIO; err = -EIO;
goto err; goto out;
} }
if (!f2fs_is_checkpoint_ready(sbi)) { if (!f2fs_is_checkpoint_ready(sbi)) {
err = -ENOSPC; err = -ENOSPC;
goto err; goto out;
} }
err = f2fs_convert_inline_inode(inode); err = f2fs_convert_inline_inode(inode);
if (err) if (err)
goto err; goto out;
#ifdef CONFIG_F2FS_FS_COMPRESSION #ifdef CONFIG_F2FS_FS_COMPRESSION
if (f2fs_compressed_file(inode)) { if (f2fs_compressed_file(inode)) {
@ -86,7 +89,7 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)
if (ret < 0) { if (ret < 0) {
err = ret; err = ret;
goto err; goto out;
} else if (ret) { } else if (ret) {
need_alloc = false; need_alloc = false;
} }
@ -153,13 +156,15 @@ static vm_fault_t f2fs_vm_page_mkwrite(struct vm_fault *vmf)
f2fs_update_iostat(sbi, inode, APP_MAPPED_IO, F2FS_BLKSIZE); f2fs_update_iostat(sbi, inode, APP_MAPPED_IO, F2FS_BLKSIZE);
f2fs_update_time(sbi, REQ_TIME); f2fs_update_time(sbi, REQ_TIME);
trace_f2fs_vm_page_mkwrite(page, DATA);
out_sem: out_sem:
filemap_invalidate_unlock_shared(inode->i_mapping); filemap_invalidate_unlock_shared(inode->i_mapping);
sb_end_pagefault(inode->i_sb); sb_end_pagefault(inode->i_sb);
err: out:
return vmf_fs_error(err); ret = vmf_fs_error(err);
trace_f2fs_vm_page_mkwrite(inode, page->index, vmf->vma->vm_flags, ret);
return ret;
} }
static const struct vm_operations_struct f2fs_file_vm_ops = { static const struct vm_operations_struct f2fs_file_vm_ops = {

39
include/trace/events/f2fs.h
View file

@ -1369,13 +1369,6 @@ DEFINE_EVENT(f2fs__page, f2fs_set_page_dirty,
TP_ARGS(page, type) TP_ARGS(page, type)
); );
DEFINE_EVENT(f2fs__page, f2fs_vm_page_mkwrite,
TP_PROTO(struct page *page, int type),
TP_ARGS(page, type)
);
TRACE_EVENT(f2fs_replace_atomic_write_block, TRACE_EVENT(f2fs_replace_atomic_write_block,
TP_PROTO(struct inode *inode, struct inode *cow_inode, pgoff_t index, TP_PROTO(struct inode *inode, struct inode *cow_inode, pgoff_t index,
@ -1413,30 +1406,50 @@ TRACE_EVENT(f2fs_replace_atomic_write_block,
__entry->recovery) __entry->recovery)
); );
TRACE_EVENT(f2fs_filemap_fault, DECLARE_EVENT_CLASS(f2fs_mmap,
TP_PROTO(struct inode *inode, pgoff_t index, unsigned long ret), TP_PROTO(struct inode *inode, pgoff_t index,
vm_flags_t flags, vm_fault_t ret),
TP_ARGS(inode, index, ret), TP_ARGS(inode, index, flags, ret),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(dev_t, dev) __field(dev_t, dev)
__field(ino_t, ino) __field(ino_t, ino)
__field(pgoff_t, index) __field(pgoff_t, index)
__field(unsigned long, ret) __field(vm_flags_t, flags)
__field(vm_fault_t, ret)
), ),
TP_fast_assign( TP_fast_assign(
__entry->dev = inode->i_sb->s_dev; __entry->dev = inode->i_sb->s_dev;
__entry->ino = inode->i_ino; __entry->ino = inode->i_ino;
__entry->index = index; __entry->index = index;
__entry->flags = flags;
__entry->ret = ret; __entry->ret = ret;
), ),
TP_printk("dev = (%d,%d), ino = %lu, index = %lu, ret = %lx", TP_printk("dev = (%d,%d), ino = %lu, index = %lu, flags: %s, ret: %s",
show_dev_ino(__entry), show_dev_ino(__entry),
(unsigned long)__entry->index, (unsigned long)__entry->index,
__entry->ret) __print_flags(__entry->flags, "|", FAULT_FLAG_TRACE),
__print_flags(__entry->ret, "|", VM_FAULT_RESULT_TRACE))
);
DEFINE_EVENT(f2fs_mmap, f2fs_filemap_fault,
TP_PROTO(struct inode *inode, pgoff_t index,
vm_flags_t flags, vm_fault_t ret),
TP_ARGS(inode, index, flags, ret)
);
DEFINE_EVENT(f2fs_mmap, f2fs_vm_page_mkwrite,
TP_PROTO(struct inode *inode, pgoff_t index,
vm_flags_t flags, vm_fault_t ret),
TP_ARGS(inode, index, flags, ret)
); );
TRACE_EVENT(f2fs_writepages, TRACE_EVENT(f2fs_writepages,