Commit 62047e0f authored by Liu Shixin's avatar Liu Shixin Committed by Andrew Morton

mm/kmemleak: fix print format of pointer in pr_debug()

With 0x%p, the pointer will be hashed and print (____ptrval____) instead. 
And with 0x%pa, the pointer can be successfully printed but with duplicate
prefixes, which looks like:

 kmemleak: kmemleak_free(0x(____ptrval____))
 kmemleak: kmemleak_free_percpu(0x(____ptrval____))
 kmemleak: kmemleak_free_part_phys(0x0x0000000a1af86000)

Use 0x%px instead of 0x%p or 0x%pa to print the pointer. Then the print
will be like:

 kmemleak: kmemleak_free(0xffff9111c145b020)
 kmemleak: kmemleak_free_percpu(0x00000000000333b0)
 kmemleak: kmemleak_free_part_phys(0x0000000a1af80000)

Link: https://lkml.kernel.org/r/20231018102952.3339837-4-liushixin2@huawei.comSigned-off-by: default avatarLiu Shixin <liushixin2@huawei.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Cc: Kefeng Wang <wangkefeng.wang@huawei.com>
Cc: Patrick Wang <patrick.wang.shcn@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 80203f1c
...@@ -975,7 +975,7 @@ static void object_no_scan(unsigned long ptr) ...@@ -975,7 +975,7 @@ static void object_no_scan(unsigned long ptr)
void __ref kmemleak_alloc(const void *ptr, size_t size, int min_count, void __ref kmemleak_alloc(const void *ptr, size_t size, int min_count,
gfp_t gfp) gfp_t gfp)
{ {
pr_debug("%s(0x%p, %zu, %d)\n", __func__, ptr, size, min_count); pr_debug("%s(0x%px, %zu, %d)\n", __func__, ptr, size, min_count);
if (kmemleak_enabled && ptr && !IS_ERR(ptr)) if (kmemleak_enabled && ptr && !IS_ERR(ptr))
create_object((unsigned long)ptr, size, min_count, gfp); create_object((unsigned long)ptr, size, min_count, gfp);
...@@ -996,7 +996,7 @@ void __ref kmemleak_alloc_percpu(const void __percpu *ptr, size_t size, ...@@ -996,7 +996,7 @@ void __ref kmemleak_alloc_percpu(const void __percpu *ptr, size_t size,
{ {
unsigned int cpu; unsigned int cpu;
pr_debug("%s(0x%p, %zu)\n", __func__, ptr, size); pr_debug("%s(0x%px, %zu)\n", __func__, ptr, size);
/* /*
* Percpu allocations are only scanned and not reported as leaks * Percpu allocations are only scanned and not reported as leaks
...@@ -1020,7 +1020,7 @@ EXPORT_SYMBOL_GPL(kmemleak_alloc_percpu); ...@@ -1020,7 +1020,7 @@ EXPORT_SYMBOL_GPL(kmemleak_alloc_percpu);
*/ */
void __ref kmemleak_vmalloc(const struct vm_struct *area, size_t size, gfp_t gfp) void __ref kmemleak_vmalloc(const struct vm_struct *area, size_t size, gfp_t gfp)
{ {
pr_debug("%s(0x%p, %zu)\n", __func__, area, size); pr_debug("%s(0x%px, %zu)\n", __func__, area, size);
/* /*
* A min_count = 2 is needed because vm_struct contains a reference to * A min_count = 2 is needed because vm_struct contains a reference to
...@@ -1043,7 +1043,7 @@ EXPORT_SYMBOL_GPL(kmemleak_vmalloc); ...@@ -1043,7 +1043,7 @@ EXPORT_SYMBOL_GPL(kmemleak_vmalloc);
*/ */
void __ref kmemleak_free(const void *ptr) void __ref kmemleak_free(const void *ptr)
{ {
pr_debug("%s(0x%p)\n", __func__, ptr); pr_debug("%s(0x%px)\n", __func__, ptr);
if (kmemleak_free_enabled && ptr && !IS_ERR(ptr)) if (kmemleak_free_enabled && ptr && !IS_ERR(ptr))
delete_object_full((unsigned long)ptr); delete_object_full((unsigned long)ptr);
...@@ -1061,7 +1061,7 @@ EXPORT_SYMBOL_GPL(kmemleak_free); ...@@ -1061,7 +1061,7 @@ EXPORT_SYMBOL_GPL(kmemleak_free);
*/ */
void __ref kmemleak_free_part(const void *ptr, size_t size) void __ref kmemleak_free_part(const void *ptr, size_t size)
{ {
pr_debug("%s(0x%p)\n", __func__, ptr); pr_debug("%s(0x%px)\n", __func__, ptr);
if (kmemleak_enabled && ptr && !IS_ERR(ptr)) if (kmemleak_enabled && ptr && !IS_ERR(ptr))
delete_object_part((unsigned long)ptr, size, false); delete_object_part((unsigned long)ptr, size, false);
...@@ -1079,7 +1079,7 @@ void __ref kmemleak_free_percpu(const void __percpu *ptr) ...@@ -1079,7 +1079,7 @@ void __ref kmemleak_free_percpu(const void __percpu *ptr)
{ {
unsigned int cpu; unsigned int cpu;
pr_debug("%s(0x%p)\n", __func__, ptr); pr_debug("%s(0x%px)\n", __func__, ptr);
if (kmemleak_free_enabled && ptr && !IS_ERR(ptr)) if (kmemleak_free_enabled && ptr && !IS_ERR(ptr))
for_each_possible_cpu(cpu) for_each_possible_cpu(cpu)
...@@ -1100,7 +1100,7 @@ void __ref kmemleak_update_trace(const void *ptr) ...@@ -1100,7 +1100,7 @@ void __ref kmemleak_update_trace(const void *ptr)
struct kmemleak_object *object; struct kmemleak_object *object;
unsigned long flags; unsigned long flags;
pr_debug("%s(0x%p)\n", __func__, ptr); pr_debug("%s(0x%px)\n", __func__, ptr);
if (!kmemleak_enabled || IS_ERR_OR_NULL(ptr)) if (!kmemleak_enabled || IS_ERR_OR_NULL(ptr))
return; return;
...@@ -1131,7 +1131,7 @@ EXPORT_SYMBOL(kmemleak_update_trace); ...@@ -1131,7 +1131,7 @@ EXPORT_SYMBOL(kmemleak_update_trace);
*/ */
void __ref kmemleak_not_leak(const void *ptr) void __ref kmemleak_not_leak(const void *ptr)
{ {
pr_debug("%s(0x%p)\n", __func__, ptr); pr_debug("%s(0x%px)\n", __func__, ptr);
if (kmemleak_enabled && ptr && !IS_ERR(ptr)) if (kmemleak_enabled && ptr && !IS_ERR(ptr))
make_gray_object((unsigned long)ptr); make_gray_object((unsigned long)ptr);
...@@ -1149,7 +1149,7 @@ EXPORT_SYMBOL(kmemleak_not_leak); ...@@ -1149,7 +1149,7 @@ EXPORT_SYMBOL(kmemleak_not_leak);
*/ */
void __ref kmemleak_ignore(const void *ptr) void __ref kmemleak_ignore(const void *ptr)
{ {
pr_debug("%s(0x%p)\n", __func__, ptr); pr_debug("%s(0x%px)\n", __func__, ptr);
if (kmemleak_enabled && ptr && !IS_ERR(ptr)) if (kmemleak_enabled && ptr && !IS_ERR(ptr))
make_black_object((unsigned long)ptr, false); make_black_object((unsigned long)ptr, false);
...@@ -1169,7 +1169,7 @@ EXPORT_SYMBOL(kmemleak_ignore); ...@@ -1169,7 +1169,7 @@ EXPORT_SYMBOL(kmemleak_ignore);
*/ */
void __ref kmemleak_scan_area(const void *ptr, size_t size, gfp_t gfp) void __ref kmemleak_scan_area(const void *ptr, size_t size, gfp_t gfp)
{ {
pr_debug("%s(0x%p)\n", __func__, ptr); pr_debug("%s(0x%px)\n", __func__, ptr);
if (kmemleak_enabled && ptr && size && !IS_ERR(ptr)) if (kmemleak_enabled && ptr && size && !IS_ERR(ptr))
add_scan_area((unsigned long)ptr, size, gfp); add_scan_area((unsigned long)ptr, size, gfp);
...@@ -1187,7 +1187,7 @@ EXPORT_SYMBOL(kmemleak_scan_area); ...@@ -1187,7 +1187,7 @@ EXPORT_SYMBOL(kmemleak_scan_area);
*/ */
void __ref kmemleak_no_scan(const void *ptr) void __ref kmemleak_no_scan(const void *ptr)
{ {
pr_debug("%s(0x%p)\n", __func__, ptr); pr_debug("%s(0x%px)\n", __func__, ptr);
if (kmemleak_enabled && ptr && !IS_ERR(ptr)) if (kmemleak_enabled && ptr && !IS_ERR(ptr))
object_no_scan((unsigned long)ptr); object_no_scan((unsigned long)ptr);
...@@ -1203,7 +1203,7 @@ EXPORT_SYMBOL(kmemleak_no_scan); ...@@ -1203,7 +1203,7 @@ EXPORT_SYMBOL(kmemleak_no_scan);
*/ */
void __ref kmemleak_alloc_phys(phys_addr_t phys, size_t size, gfp_t gfp) void __ref kmemleak_alloc_phys(phys_addr_t phys, size_t size, gfp_t gfp)
{ {
pr_debug("%s(0x%pa, %zu)\n", __func__, &phys, size); pr_debug("%s(0x%px, %zu)\n", __func__, &phys, size);
if (kmemleak_enabled) if (kmemleak_enabled)
/* /*
...@@ -1223,7 +1223,7 @@ EXPORT_SYMBOL(kmemleak_alloc_phys); ...@@ -1223,7 +1223,7 @@ EXPORT_SYMBOL(kmemleak_alloc_phys);
*/ */
void __ref kmemleak_free_part_phys(phys_addr_t phys, size_t size) void __ref kmemleak_free_part_phys(phys_addr_t phys, size_t size)
{ {
pr_debug("%s(0x%pa)\n", __func__, &phys); pr_debug("%s(0x%px)\n", __func__, &phys);
if (kmemleak_enabled) if (kmemleak_enabled)
delete_object_part((unsigned long)phys, size, true); delete_object_part((unsigned long)phys, size, true);
...@@ -1237,7 +1237,7 @@ EXPORT_SYMBOL(kmemleak_free_part_phys); ...@@ -1237,7 +1237,7 @@ EXPORT_SYMBOL(kmemleak_free_part_phys);
*/ */
void __ref kmemleak_ignore_phys(phys_addr_t phys) void __ref kmemleak_ignore_phys(phys_addr_t phys)
{ {
pr_debug("%s(0x%pa)\n", __func__, &phys); pr_debug("%s(0x%px)\n", __func__, &phys);
if (kmemleak_enabled) if (kmemleak_enabled)
make_black_object((unsigned long)phys, true); make_black_object((unsigned long)phys, true);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment