The patch titled
Subject: memblock: neaten logging
has been removed from the -mm tree. Its filename was
memblock-neaten-logging.patch
This patch was dropped because it was nacked
------------------------------------------------------
From: Joe Perches <joe@xxxxxxxxxxx>
Subject: memblock: neaten logging
Use more typical kernel logging styles.
o Add and use #define pr_fmt KBUILD_MODNAME ": " fmt
o Neaten memblock_dbg to use %s: %pS: to output __func__ and caller
o Convert existing uses of pr_<level> and memblock_dbg appropriately
Logging output is now always prefixed with 'memblock: '
Debugging output is now prefixed with 'memblock: ', function and caller
Link: https://lkml.kernel.org/r/623750dd31aa3fe5e45c416be98ab37707e2c45d.camel@xxxxxxxxxxx
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Cc: Mike Rapoport <rppt@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memblock.c | 59 +++++++++++++++++++++---------------------------
1 file changed, 26 insertions(+), 33 deletions(-)
--- a/mm/memblock.c~memblock-neaten-logging
+++ a/mm/memblock.c
@@ -6,6 +6,8 @@
* Copyright (C) 2001 Peter Bergner.
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include <linux/kernel.h>
#include <linux/slab.h>
#include <linux/init.h>
@@ -146,10 +148,12 @@ static __refdata struct memblock_type *m
i++, rgn = &memblock_type->regions[i])
#define memblock_dbg(fmt, ...) \
- do { \
- if (memblock_debug) \
- pr_info(fmt, ##__VA_ARGS__); \
- } while (0)
+do { \
+ if (memblock_debug) \
+ pr_info("%s: %pS: " fmt, \
+ __func__, __builtin_return_address(0), \
+ ##__VA_ARGS__); \
+} while (0)
static int memblock_debug __initdata_memblock;
static bool system_has_some_mirror __initdata_memblock = false;
@@ -447,14 +451,14 @@ static int __init_memblock memblock_doub
new_array = addr ? __va(addr) : NULL;
}
if (!addr) {
- pr_err("memblock: Failed to double %s array from %ld to %ld entries !\n",
+ pr_err("Failed to double %s array from %ld to %ld entries !\n",
type->name, type->max, type->max * 2);
return -1;
}
new_end = addr + new_size - 1;
- memblock_dbg("memblock: %s is doubled to %ld at [%pa-%pa]",
- type->name, type->max * 2, &addr, &new_end);
+ memblock_dbg("%s is doubled to %ld at [%pa-%pa]\n",
+ type->name, type->max * 2, &addr, &new_end);
/*
* Found space, we now need to move the array over before we add the
@@ -667,8 +671,7 @@ int __init_memblock memblock_add_node(ph
{
phys_addr_t end = base + size - 1;
- memblock_dbg("%s: [%pa-%pa] nid=%d %pS\n", __func__,
- &base, &end, nid, (void *)_RET_IP_);
+ memblock_dbg("[%pa-%pa] nid=%d\n", &base, &end, nid);
return memblock_add_range(&memblock.memory, base, size, nid, 0);
}
@@ -688,8 +691,7 @@ int __init_memblock memblock_add(phys_ad
{
phys_addr_t end = base + size - 1;
- memblock_dbg("%s: [%pa-%pa] %pS\n", __func__,
- &base, &end, (void *)_RET_IP_);
+ memblock_dbg("[%pa-%pa]\n", &base, &end);
return memblock_add_range(&memblock.memory, base, size, MAX_NUMNODES, 0);
}
@@ -789,8 +791,7 @@ int __init_memblock memblock_remove(phys
{
phys_addr_t end = base + size - 1;
- memblock_dbg("%s: [%pa-%pa] %pS\n", __func__,
- &base, &end, (void *)_RET_IP_);
+ memblock_dbg("[%pa-%pa]\n", &base, &end);
return memblock_remove_range(&memblock.memory, base, size);
}
@@ -821,8 +822,7 @@ int __init_memblock memblock_phys_free(p
{
phys_addr_t end = base + size - 1;
- memblock_dbg("%s: [%pa-%pa] %pS\n", __func__,
- &base, &end, (void *)_RET_IP_);
+ memblock_dbg("[%pa-%pa]\n", &base, &end);
kmemleak_free_part_phys(base, size);
return memblock_remove_range(&memblock.reserved, base, size);
@@ -832,8 +832,7 @@ int __init_memblock memblock_reserve(phy
{
phys_addr_t end = base + size - 1;
- memblock_dbg("%s: [%pa-%pa] %pS\n", __func__,
- &base, &end, (void *)_RET_IP_);
+ memblock_dbg("[%pa-%pa]\n", &base, &end);
return memblock_add_range(&memblock.reserved, base, size, MAX_NUMNODES, 0);
}
@@ -843,8 +842,7 @@ int __init_memblock memblock_physmem_add
{
phys_addr_t end = base + size - 1;
- memblock_dbg("%s: [%pa-%pa] %pS\n", __func__,
- &base, &end, (void *)_RET_IP_);
+ memblock_dbg("[%pa-%pa]\n", &base, &end);
return memblock_add_range(&physmem, base, size, MAX_NUMNODES, 0);
}
@@ -1409,9 +1407,8 @@ phys_addr_t __init memblock_phys_alloc_r
phys_addr_t start,
phys_addr_t end)
{
- memblock_dbg("%s: %llu bytes align=0x%llx from=%pa max_addr=%pa %pS\n",
- __func__, (u64)size, (u64)align, &start, &end,
- (void *)_RET_IP_);
+ memblock_dbg("%llu bytes align=0x%llx from=%pa max_addr=%pa\n",
+ (u64)size, (u64)align, &start, &end);
return memblock_alloc_range_nid(size, align, start, end, NUMA_NO_NODE,
false);
}
@@ -1510,9 +1507,8 @@ void * __init memblock_alloc_exact_nid_r
phys_addr_t min_addr, phys_addr_t max_addr,
int nid)
{
- memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pS\n",
- __func__, (u64)size, (u64)align, nid, &min_addr,
- &max_addr, (void *)_RET_IP_);
+ memblock_dbg("%llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa\n",
+ (u64)size, (u64)align, nid, &min_addr, &max_addr);
return memblock_alloc_internal(size, align, min_addr, max_addr, nid,
true);
@@ -1542,9 +1538,8 @@ void * __init memblock_alloc_try_nid_raw
phys_addr_t min_addr, phys_addr_t max_addr,
int nid)
{
- memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pS\n",
- __func__, (u64)size, (u64)align, nid, &min_addr,
- &max_addr, (void *)_RET_IP_);
+ memblock_dbg("%llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa\n",
+ (u64)size, (u64)align, nid, &min_addr, &max_addr);
return memblock_alloc_internal(size, align, min_addr, max_addr, nid,
false);
@@ -1574,9 +1569,8 @@ void * __init memblock_alloc_try_nid(
{
void *ptr;
- memblock_dbg("%s: %llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa %pS\n",
- __func__, (u64)size, (u64)align, nid, &min_addr,
- &max_addr, (void *)_RET_IP_);
+ memblock_dbg("%llu bytes align=0x%llx nid=%d from=%pa max_addr=%pa\n",
+ (u64)size, (u64)align, nid, &min_addr, &max_addr);
ptr = memblock_alloc_internal(size, align,
min_addr, max_addr, nid, false);
if (ptr)
@@ -1599,8 +1593,7 @@ void __init memblock_free_late(phys_addr
phys_addr_t cursor, end;
end = base + size - 1;
- memblock_dbg("%s: [%pa-%pa] %pS\n",
- __func__, &base, &end, (void *)_RET_IP_);
+ memblock_dbg("[%pa-%pa]\n", &base, &end);
kmemleak_free_part_phys(base, size);
cursor = PFN_UP(base);
end = PFN_DOWN(base + size);
_
Patches currently in -mm which might be from joe@xxxxxxxxxxx are
