mm, tracing: unify PFN format strings

Some trace event formats print PFNs as hex while others print them as
decimal.  This is rather annoying when attempting to grep through traces
to understand what's going on with a particular page.

 $ git grep -ho 'pfn=[0x%lu]\+' include/trace/events/ | sort | uniq -c
      11 pfn=0x%lx
      12 pfn=%lu
       2 pfn=%lx

Printing as hex is in the majority in the trace events, and all the normal
printks in mm/ also print PFNs as hex, so change all the PFN formats in
the trace events to use 0x%lx.

Link: https://lkml.kernel.org/r/20210602092608.1493-1-vincent.whitchurch@axis.com
Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jesper Dangaard Brouer <hawk@kernel.org>
Cc: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/include/trace/events/cma.h b/include/trace/events/cma.h
index c3d3547..3d708da 100644 (file)
--- a/include/trace/events/cma.h
+++ b/include/trace/events/cma.h
@@ -31,7 +31,7 @@ DECLARE_EVENT_CLASS(cma_alloc_class,
                __entry->align = align;
        ),
 
-       TP_printk("name=%s pfn=%lx page=%p count=%lu align=%u",
+       TP_printk("name=%s pfn=0x%lx page=%p count=%lu align=%u",
                  __get_str(name),
                  __entry->pfn,
                  __entry->page,
@@ -60,7 +60,7 @@ TRACE_EVENT(cma_release,
                __entry->count = count;
        ),
 
-       TP_printk("name=%s pfn=%lx page=%p count=%lu",
+       TP_printk("name=%s pfn=0x%lx page=%p count=%lu",
                  __get_str(name),
                  __entry->pfn,
                  __entry->page,

diff --git a/include/trace/events/filemap.h b/include/trace/events/filemap.h
index 796053e..c47b63d 100644 (file)
--- a/include/trace/events/filemap.h
+++ b/include/trace/events/filemap.h
@@ -36,7 +36,7 @@ DECLARE_EVENT_CLASS(mm_filemap_op_page_cache,
                        __entry->s_dev = page->mapping->host->i_rdev;
        ),
 
-       TP_printk("dev %d:%d ino %lx page=%p pfn=%lu ofs=%lu",
+       TP_printk("dev %d:%d ino %lx page=%p pfn=0x%lx ofs=%lu",
                MAJOR(__entry->s_dev), MINOR(__entry->s_dev),
                __entry->i_ino,
                pfn_to_page(__entry->pfn),

diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
index 829a756..ddc8c94 100644 (file)
--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@@ -173,7 +173,7 @@ TRACE_EVENT(mm_page_free,
                __entry->order          = order;
        ),
 
-       TP_printk("page=%p pfn=%lu order=%d",
+       TP_printk("page=%p pfn=0x%lx order=%d",
                        pfn_to_page(__entry->pfn),
                        __entry->pfn,
                        __entry->order)
@@ -193,7 +193,7 @@ TRACE_EVENT(mm_page_free_batched,
                __entry->pfn            = page_to_pfn(page);
        ),
 
-       TP_printk("page=%p pfn=%lu order=0",
+       TP_printk("page=%p pfn=0x%lx order=0",
                        pfn_to_page(__entry->pfn),
                        __entry->pfn)
 );
@@ -219,7 +219,7 @@ TRACE_EVENT(mm_page_alloc,
                __entry->migratetype    = migratetype;
        ),
 
-       TP_printk("page=%p pfn=%lu order=%d migratetype=%d gfp_flags=%s",
+       TP_printk("page=%p pfn=0x%lx order=%d migratetype=%d gfp_flags=%s",
                __entry->pfn != -1UL ? pfn_to_page(__entry->pfn) : NULL,
                __entry->pfn != -1UL ? __entry->pfn : 0,
                __entry->order,
@@ -245,7 +245,7 @@ DECLARE_EVENT_CLASS(mm_page,
                __entry->migratetype    = migratetype;
        ),
 
-       TP_printk("page=%p pfn=%lu order=%u migratetype=%d percpu_refill=%d",
+       TP_printk("page=%p pfn=0x%lx order=%u migratetype=%d percpu_refill=%d",
                __entry->pfn != -1UL ? pfn_to_page(__entry->pfn) : NULL,
                __entry->pfn != -1UL ? __entry->pfn : 0,
                __entry->order,
@@ -278,7 +278,7 @@ TRACE_EVENT(mm_page_pcpu_drain,
                __entry->migratetype    = migratetype;
        ),
 
-       TP_printk("page=%p pfn=%lu order=%d migratetype=%d",
+       TP_printk("page=%p pfn=0x%lx order=%d migratetype=%d",
                pfn_to_page(__entry->pfn), __entry->pfn,
                __entry->order, __entry->migratetype)
 );
@@ -312,7 +312,7 @@ TRACE_EVENT(mm_page_alloc_extfrag,
                                        get_pageblock_migratetype(page));
        ),
 
-       TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d",
+       TP_printk("page=%p pfn=0x%lx alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d",
                pfn_to_page(__entry->pfn),
                __entry->pfn,
                __entry->alloc_order,

diff --git a/include/trace/events/page_pool.h b/include/trace/events/page_pool.h
index ad0aa7f..ca53450 100644 (file)
--- a/include/trace/events/page_pool.h
+++ b/include/trace/events/page_pool.h
@@ -60,7 +60,7 @@ TRACE_EVENT(page_pool_state_release,
                __entry->pfn            = page_to_pfn(page);
        ),
 
-       TP_printk("page_pool=%p page=%p pfn=%lu release=%u",
+       TP_printk("page_pool=%p page=%p pfn=0x%lx release=%u",
                  __entry->pool, __entry->page, __entry->pfn, __entry->release)
 );
 
@@ -85,7 +85,7 @@ TRACE_EVENT(page_pool_state_hold,
                __entry->pfn    = page_to_pfn(page);
        ),
 
-       TP_printk("page_pool=%p page=%p pfn=%lu hold=%u",
+       TP_printk("page_pool=%p page=%p pfn=0x%lx hold=%u",
                  __entry->pool, __entry->page, __entry->pfn, __entry->hold)
 );
 

diff --git a/include/trace/events/pagemap.h b/include/trace/events/pagemap.h
index e1735fe..1d28431 100644 (file)
--- a/include/trace/events/pagemap.h
+++ b/include/trace/events/pagemap.h
@@ -46,7 +46,7 @@ TRACE_EVENT(mm_lru_insertion,
        ),
 
        /* Flag format is based on page-types.c formatting for pagemap */
-       TP_printk("page=%p pfn=%lu lru=%d flags=%s%s%s%s%s%s",
+       TP_printk("page=%p pfn=0x%lx lru=%d flags=%s%s%s%s%s%s",
                        __entry->page,
                        __entry->pfn,
                        __entry->lru,
@@ -75,7 +75,7 @@ TRACE_EVENT(mm_lru_activate,
        ),
 
        /* Flag format is based on page-types.c formatting for pagemap */
-       TP_printk("page=%p pfn=%lu", __entry->page, __entry->pfn)
+       TP_printk("page=%p pfn=0x%lx", __entry->page, __entry->pfn)
 
 );
 

diff --git a/include/trace/events/vmscan.h b/include/trace/events/vmscan.h
index 2070df6..00d1180 100644 (file)
--- a/include/trace/events/vmscan.h
+++ b/include/trace/events/vmscan.h
@@ -330,7 +330,7 @@ TRACE_EVENT(mm_vmscan_writepage,
                                                page_is_file_lru(page));
        ),
 
-       TP_printk("page=%p pfn=%lu flags=%s",
+       TP_printk("page=%p pfn=0x%lx flags=%s",
                pfn_to_page(__entry->pfn),
                __entry->pfn,
                show_reclaim_flags(__entry->reclaim_flags))