diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 412d22b13a7c..923ca2b2f953 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -447,3 +447,6 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_swapmem_gather_add_bypass); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_swapmem_gather_finish); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_oom_swapmem_gather_init); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_oom_swapmem_gather_finish); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_do_read_fault); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_filemap_read); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_filemap_map_pages); diff --git a/include/trace/hooks/mm.h b/include/trace/hooks/mm.h index 194f5536c149..df7430211a09 100644 --- a/include/trace/hooks/mm.h +++ b/include/trace/hooks/mm.h @@ -261,6 +261,16 @@ DECLARE_HOOK(android_vh_oom_swapmem_gather_init, DECLARE_HOOK(android_vh_oom_swapmem_gather_finish, TP_PROTO(struct mm_struct *mm), TP_ARGS(mm)); +DECLARE_HOOK(android_vh_do_read_fault, + TP_PROTO(struct vm_fault *vmf, unsigned long fault_around_bytes), + TP_ARGS(vmf, fault_around_bytes)); +DECLARE_HOOK(android_vh_filemap_read, + TP_PROTO(struct file *file, loff_t pos, size_t size), + TP_ARGS(file, pos, size)); +DECLARE_HOOK(android_vh_filemap_map_pages, + TP_PROTO(struct file *file, pgoff_t first_pgoff, + pgoff_t last_pgoff, vm_fault_t ret), + TP_ARGS(file, first_pgoff, last_pgoff, ret)); #endif /* _TRACE_HOOK_MM_H */ /* This part must be outside protection */ diff --git a/mm/filemap.c b/mm/filemap.c index 373165ba8a1f..5edd973dbe5f 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2736,6 +2736,7 @@ ssize_t filemap_read(struct kiocb *iocb, struct iov_iter *iter, iov_iter_truncate(iter, inode->i_sb->s_maxbytes); folio_batch_init(&fbatch); + trace_android_vh_filemap_read(filp, iocb->ki_pos, iov_iter_count(iter)); do { cond_resched(); @@ -3438,11 +3439,13 @@ vm_fault_t filemap_map_pages(struct vm_fault *vmf, struct page *page; unsigned int mmap_miss = READ_ONCE(file->f_ra.mmap_miss); vm_fault_t ret = 0; + pgoff_t first_pgoff = 0; rcu_read_lock(); folio = first_map_page(mapping, &xas, end_pgoff); if (!folio) goto out; + first_pgoff = xas.xa_index; if (filemap_map_pmd(vmf, &folio->page)) { ret = VM_FAULT_NOPAGE; @@ -3498,6 +3501,8 @@ unlock: out: rcu_read_unlock(); WRITE_ONCE(file->f_ra.mmap_miss, mmap_miss); + trace_android_vh_filemap_map_pages(file, first_pgoff, last_pgoff, ret); + return ret; } EXPORT_SYMBOL(filemap_map_pages); diff --git a/mm/memory.c b/mm/memory.c index 4c54877c04a0..90c90066b59a 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4690,6 +4690,8 @@ static vm_fault_t do_read_fault(struct vm_fault *vmf) ret = do_fault_around(vmf); if (ret) return ret; + } else { + trace_android_vh_do_read_fault(vmf, fault_around_bytes); } ret = vmf_can_call_fault(vmf);