mm/page_owner/cma: show pfn in cma/page_owner with hex format

cma: display pfn as well as pfn_to_page(pfn)

page_owner: display pfn in hex rather than decimal

Link: https://lkml.kernel.org/r/20230613092533.15449-1-quic_yingangl@quicinc.com
Signed-off-by: Kassey Li <quic_yingangl@quicinc.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/mm/cma.c b/mm/cma.c
index 6268d6620254fe52a36344d46c8c73256a7016f3..a4cfe995e11e786e2791615a5c86cdbf49758d51 100644 (file)
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -483,8 +483,8 @@ struct page *cma_alloc(struct cma *cma, unsigned long count,
                if (ret != -EBUSY)
                        break;
 
-               pr_debug("%s(): memory range at %p is busy, retrying\n",
-                        __func__, pfn_to_page(pfn));
+               pr_debug("%s(): memory range at pfn 0x%lx %p is busy, retrying\n",
+                        __func__, pfn, pfn_to_page(pfn));
 
                trace_cma_alloc_busy_retry(cma->name, pfn, pfn_to_page(pfn),
                                           count, align);

diff --git a/mm/page_owner.c b/mm/page_owner.c
index 31169b3e7f0672d93d97f443e03c239c354600c0..c93baef0148f1846c8b37428bd9558f9fece1dd4 100644 (file)
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
@@ -418,7 +418,7 @@ print_page_owner(char __user *buf, size_t count, unsigned long pfn,
        pageblock_mt = get_pageblock_migratetype(page);
        page_mt  = gfp_migratetype(page_owner->gfp_mask);
        ret += scnprintf(kbuf + ret, count - ret,
-                       "PFN %lu type %s Block %lu type %s Flags %pGp\n",
+                       "PFN 0x%lx type %s Block %lu type %s Flags %pGp\n",
                        pfn,
                        migratetype_names[page_mt],
                        pfn >> pageblock_order,