readahead-add-trace-points-v2

Move tracepoint from do_page_cache_ra() to page_cache_ra_unbounded() as
that is a more standard function.

Link: https://lkml.kernel.org/r/20250909145849.5090-2-jack@suse.cz
Signed-off-by: Jan Kara <jack@suse.cz>
Cc: Pankaj Raghav <kernel@pankajraghav.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/include/trace/events/readahead.h b/include/trace/events/readahead.h
index 992a6ce5c15437abb93e79d06c913c2e052f5fd2..0997ac5eceab1ac2de3b84b9d9d59cc338b9dd2b 100644 (file)
--- a/include/trace/events/readahead.h
+++ b/include/trace/events/readahead.h
@@ -11,7 +11,7 @@
 #include <linux/fs.h>
 #include <linux/pagemap.h>
 
-TRACE_EVENT(do_page_cache_ra,
+TRACE_EVENT(page_cache_ra_unbounded,
        TP_PROTO(struct inode *inode, pgoff_t index, unsigned long nr_to_read,
                 unsigned long lookahead_size),
 

diff --git a/mm/readahead.c b/mm/readahead.c
index 210395fe104474ceb5a8806ad742719eaaeb687b..3a4b5d58eeb6fe266fbfc4dd1c6033e016915ead 100644 (file)
--- a/mm/readahead.c
+++ b/mm/readahead.c
@@ -228,6 +228,8 @@ void page_cache_ra_unbounded(struct readahead_control *ractl,
         */
        unsigned int nofs = memalloc_nofs_save();
 
+       trace_page_cache_ra_unbounded(mapping->host, index, nr_to_read,
+                                     lookahead_size);
        filemap_invalidate_lock_shared(mapping);
        index = mapping_align_index(mapping, index);
 
@@ -317,7 +319,6 @@ static void do_page_cache_ra(struct readahead_control *ractl,
        loff_t isize = i_size_read(inode);
        pgoff_t end_index;      /* The last page we want to read */
 
-       trace_do_page_cache_ra(inode, index, nr_to_read, lookahead_size);
        if (isize == 0)
                return;