* [PATCH v2] Some printk cleanup in mm
@ 2014-03-27 17:54 ` Mitchel Humpherys
0 siblings, 0 replies; 18+ messages in thread
From: Mitchel Humpherys @ 2014-03-27 17:54 UTC (permalink / raw)
To: Christoph Lameter, Pekka Enberg, Matt Mackall, Joe Perches,
linux-mm
Cc: linux-kernel, Mitchel Humpherys
This series cleans up some printks in the mm code that were missing
log levels.
Changelog:
- v2: Suggestions by Joe Perches (pr_fmt, pr_cont, pr_err, __func__,
missing \n)
Mitchel Humpherys (1):
mm: convert some level-less printks to pr_*
mm/bounce.c | 7 +++++--
mm/mempolicy.c | 5 ++++-
mm/mmap.c | 21 ++++++++++++---------
mm/nommu.c | 5 ++++-
mm/slub.c | 9 ++++++---
mm/vmscan.c | 5 ++++-
6 files changed, 35 insertions(+), 17 deletions(-)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
^ permalink raw reply [flat|nested] 18+ messages in thread* [PATCH v2] Some printk cleanup in mm @ 2014-03-27 17:54 ` Mitchel Humpherys 0 siblings, 0 replies; 18+ messages in thread From: Mitchel Humpherys @ 2014-03-27 17:54 UTC (permalink / raw) To: Christoph Lameter, Pekka Enberg, Matt Mackall, Joe Perches, linux-mm Cc: linux-kernel, Mitchel Humpherys This series cleans up some printks in the mm code that were missing log levels. Changelog: - v2: Suggestions by Joe Perches (pr_fmt, pr_cont, pr_err, __func__, missing \n) Mitchel Humpherys (1): mm: convert some level-less printks to pr_* mm/bounce.c | 7 +++++-- mm/mempolicy.c | 5 ++++- mm/mmap.c | 21 ++++++++++++--------- mm/nommu.c | 5 ++++- mm/slub.c | 9 ++++++--- mm/vmscan.c | 5 ++++- 6 files changed, 35 insertions(+), 17 deletions(-) -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v2] mm: convert some level-less printks to pr_* 2014-03-27 17:54 ` Mitchel Humpherys @ 2014-03-27 17:54 ` Mitchel Humpherys -1 siblings, 0 replies; 18+ messages in thread From: Mitchel Humpherys @ 2014-03-27 17:54 UTC (permalink / raw) To: Christoph Lameter, Pekka Enberg, Matt Mackall, Joe Perches, linux-mm Cc: linux-kernel, Mitchel Humpherys printk is meant to be used with an associated log level. There are some instances of printk scattered around the mm code where the log level is missing. Add a log level and adhere to suggestions by scripts/checkpatch.pl by moving to the pr_* macros. Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org> --- mm/bounce.c | 7 +++++-- mm/mempolicy.c | 5 ++++- mm/mmap.c | 21 ++++++++++++--------- mm/nommu.c | 5 ++++- mm/slub.c | 9 ++++++--- mm/vmscan.c | 5 ++++- 6 files changed, 35 insertions(+), 17 deletions(-) diff --git a/mm/bounce.c b/mm/bounce.c index 523918b8c6..d35850895b 100644 --- a/mm/bounce.c +++ b/mm/bounce.c @@ -3,6 +3,8 @@ * - Split from highmem.c */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/mm.h> #include <linux/export.h> #include <linux/swap.h> @@ -15,6 +17,7 @@ #include <linux/hash.h> #include <linux/highmem.h> #include <linux/bootmem.h> +#include <linux/printk.h> #include <asm/tlbflush.h> #include <trace/events/block.h> @@ -34,7 +37,7 @@ static __init int init_emergency_pool(void) page_pool = mempool_create_page_pool(POOL_SIZE, 0); BUG_ON(!page_pool); - printk("bounce pool size: %d pages\n", POOL_SIZE); + pr_info("bounce pool size: %d pages\n", POOL_SIZE); return 0; } @@ -86,7 +89,7 @@ int init_emergency_isa_pool(void) mempool_free_pages, (void *) 0); BUG_ON(!isa_page_pool); - printk("isa bounce pool size: %d pages\n", ISA_POOL_SIZE); + pr_info("isa bounce pool size: %d pages\n", ISA_POOL_SIZE); return 0; } diff --git a/mm/mempolicy.c b/mm/mempolicy.c index ae3c8f3595..aec6220485 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -65,6 +65,8 @@ kernel is not always grateful with that. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/mempolicy.h> #include <linux/mm.h> #include <linux/highmem.h> @@ -91,6 +93,7 @@ #include <linux/ctype.h> #include <linux/mm_inline.h> #include <linux/mmu_notifier.h> +#include <linux/printk.h> #include <asm/tlbflush.h> #include <asm/uaccess.h> @@ -2751,7 +2754,7 @@ void __init numa_policy_init(void) node_set(prefer, interleave_nodes); if (do_set_mempolicy(MPOL_INTERLEAVE, 0, &interleave_nodes)) - printk("numa_policy_init: interleaving failed\n"); + pr_err("%s: interleaving failed\n", __func__); check_numabalancing_enable(); } diff --git a/mm/mmap.c b/mm/mmap.c index 20ff0c3327..c7023516da 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -6,6 +6,8 @@ * Address space accounting code <alan@lxorguk.ukuu.org.uk> */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/kernel.h> #include <linux/slab.h> #include <linux/backing-dev.h> @@ -36,6 +38,7 @@ #include <linux/sched/sysctl.h> #include <linux/notifier.h> #include <linux/memory.h> +#include <linux/printk.h> #include <asm/uaccess.h> #include <asm/cacheflush.h> @@ -360,20 +363,20 @@ static int browse_rb(struct rb_root *root) struct vm_area_struct *vma; vma = rb_entry(nd, struct vm_area_struct, vm_rb); if (vma->vm_start < prev) { - printk("vm_start %lx prev %lx\n", vma->vm_start, prev); + pr_info("vm_start %lx prev %lx\n", vma->vm_start, prev); bug = 1; } if (vma->vm_start < pend) { - printk("vm_start %lx pend %lx\n", vma->vm_start, pend); + pr_info("vm_start %lx pend %lx\n", vma->vm_start, pend); bug = 1; } if (vma->vm_start > vma->vm_end) { - printk("vm_end %lx < vm_start %lx\n", + pr_info("vm_end %lx < vm_start %lx\n", vma->vm_end, vma->vm_start); bug = 1; } if (vma->rb_subtree_gap != vma_compute_subtree_gap(vma)) { - printk("free gap %lx, correct %lx\n", + pr_info("free gap %lx, correct %lx\n", vma->rb_subtree_gap, vma_compute_subtree_gap(vma)); bug = 1; @@ -387,7 +390,7 @@ static int browse_rb(struct rb_root *root) for (nd = pn; nd; nd = rb_prev(nd)) j++; if (i != j) { - printk("backwards %d, forwards %d\n", j, i); + pr_info("backwards %d, forwards %d\n", j, i); bug = 1; } return bug ? -1 : i; @@ -422,17 +425,17 @@ void validate_mm(struct mm_struct *mm) i++; } if (i != mm->map_count) { - printk("map_count %d vm_next %d\n", mm->map_count, i); + pr_info("map_count %d vm_next %d\n", mm->map_count, i); bug = 1; } if (highest_address != mm->highest_vm_end) { - printk("mm->highest_vm_end %lx, found %lx\n", + pr_info("mm->highest_vm_end %lx, found %lx\n", mm->highest_vm_end, highest_address); bug = 1; } i = browse_rb(&mm->mm_rb); if (i != mm->map_count) { - printk("map_count %d rb %d\n", mm->map_count, i); + pr_info("map_count %d rb %d\n", mm->map_count, i); bug = 1; } BUG_ON(bug); @@ -3237,7 +3240,7 @@ static struct notifier_block reserve_mem_nb = { static int __meminit init_reserve_notifier(void) { if (register_hotmemory_notifier(&reserve_mem_nb)) - printk("Failed registering memory add/remove notifier for admin reserve"); + pr_err("Failed registering memory add/remove notifier for admin reserve\n"); return 0; } diff --git a/mm/nommu.c b/mm/nommu.c index 8740213b16..1ff42f87dd 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -13,6 +13,8 @@ * Copyright (c) 2007-2010 Paul Mundt <lethal@linux-sh.org> */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/export.h> #include <linux/mm.h> #include <linux/mman.h> @@ -30,6 +32,7 @@ #include <linux/syscalls.h> #include <linux/audit.h> #include <linux/sched/sysctl.h> +#include <linux/printk.h> #include <asm/uaccess.h> #include <asm/tlb.h> @@ -1241,7 +1244,7 @@ error_free: return ret; enomem: - printk("Allocation of length %lu from process %d (%s) failed\n", + pr_err("Allocation of length %lu from process %d (%s) failed\n", len, current->pid, current->comm); show_free_areas(0); return -ENOMEM; diff --git a/mm/slub.c b/mm/slub.c index 25f14ad8f8..9f109e6756 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -9,6 +9,8 @@ * (C) 2011 Linux Foundation, Christoph Lameter */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/mm.h> #include <linux/swap.h> /* struct reclaim_state */ #include <linux/module.h> @@ -33,6 +35,7 @@ #include <linux/stacktrace.h> #include <linux/prefetch.h> #include <linux/memcontrol.h> +#include <linux/printk.h> #include <trace/events/kmem.h> @@ -1774,15 +1777,15 @@ static inline void note_cmpxchg_failure(const char *n, #ifdef CONFIG_PREEMPT if (tid_to_cpu(tid) != tid_to_cpu(actual_tid)) - printk("due to cpu change %d -> %d\n", + pr_cont("due to cpu change %d -> %d\n", tid_to_cpu(tid), tid_to_cpu(actual_tid)); else #endif if (tid_to_event(tid) != tid_to_event(actual_tid)) - printk("due to cpu running other code. Event %ld->%ld\n", + pr_cont("due to cpu running other code. Event %ld->%ld\n", tid_to_event(tid), tid_to_event(actual_tid)); else - printk("for unknown reason: actual=%lx was=%lx target=%lx\n", + pr_cont("for unknown reason: actual=%lx was=%lx target=%lx\n", actual_tid, tid, next_tid(tid)); #endif stat(s, CMPXCHG_DOUBLE_CPU_FAIL); diff --git a/mm/vmscan.c b/mm/vmscan.c index a9c74b4096..394dd2b644 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -11,6 +11,8 @@ * Multiqueue VM started 5.8.00, Rik van Riel. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/mm.h> #include <linux/module.h> #include <linux/gfp.h> @@ -43,6 +45,7 @@ #include <linux/sysctl.h> #include <linux/oom.h> #include <linux/prefetch.h> +#include <linux/printk.h> #include <asm/tlbflush.h> #include <asm/div64.h> @@ -477,7 +480,7 @@ static pageout_t pageout(struct page *page, struct address_space *mapping, if (page_has_private(page)) { if (try_to_free_buffers(page)) { ClearPageDirty(page); - printk("%s: orphaned page\n", __func__); + pr_info("%s: orphaned page\n", __func__); return PAGE_CLEAN; } } -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v2] mm: convert some level-less printks to pr_* @ 2014-03-27 17:54 ` Mitchel Humpherys 0 siblings, 0 replies; 18+ messages in thread From: Mitchel Humpherys @ 2014-03-27 17:54 UTC (permalink / raw) To: Christoph Lameter, Pekka Enberg, Matt Mackall, Joe Perches, linux-mm Cc: linux-kernel, Mitchel Humpherys printk is meant to be used with an associated log level. There are some instances of printk scattered around the mm code where the log level is missing. Add a log level and adhere to suggestions by scripts/checkpatch.pl by moving to the pr_* macros. Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org> --- mm/bounce.c | 7 +++++-- mm/mempolicy.c | 5 ++++- mm/mmap.c | 21 ++++++++++++--------- mm/nommu.c | 5 ++++- mm/slub.c | 9 ++++++--- mm/vmscan.c | 5 ++++- 6 files changed, 35 insertions(+), 17 deletions(-) diff --git a/mm/bounce.c b/mm/bounce.c index 523918b8c6..d35850895b 100644 --- a/mm/bounce.c +++ b/mm/bounce.c @@ -3,6 +3,8 @@ * - Split from highmem.c */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/mm.h> #include <linux/export.h> #include <linux/swap.h> @@ -15,6 +17,7 @@ #include <linux/hash.h> #include <linux/highmem.h> #include <linux/bootmem.h> +#include <linux/printk.h> #include <asm/tlbflush.h> #include <trace/events/block.h> @@ -34,7 +37,7 @@ static __init int init_emergency_pool(void) page_pool = mempool_create_page_pool(POOL_SIZE, 0); BUG_ON(!page_pool); - printk("bounce pool size: %d pages\n", POOL_SIZE); + pr_info("bounce pool size: %d pages\n", POOL_SIZE); return 0; } @@ -86,7 +89,7 @@ int init_emergency_isa_pool(void) mempool_free_pages, (void *) 0); BUG_ON(!isa_page_pool); - printk("isa bounce pool size: %d pages\n", ISA_POOL_SIZE); + pr_info("isa bounce pool size: %d pages\n", ISA_POOL_SIZE); return 0; } diff --git a/mm/mempolicy.c b/mm/mempolicy.c index ae3c8f3595..aec6220485 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -65,6 +65,8 @@ kernel is not always grateful with that. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/mempolicy.h> #include <linux/mm.h> #include <linux/highmem.h> @@ -91,6 +93,7 @@ #include <linux/ctype.h> #include <linux/mm_inline.h> #include <linux/mmu_notifier.h> +#include <linux/printk.h> #include <asm/tlbflush.h> #include <asm/uaccess.h> @@ -2751,7 +2754,7 @@ void __init numa_policy_init(void) node_set(prefer, interleave_nodes); if (do_set_mempolicy(MPOL_INTERLEAVE, 0, &interleave_nodes)) - printk("numa_policy_init: interleaving failed\n"); + pr_err("%s: interleaving failed\n", __func__); check_numabalancing_enable(); } diff --git a/mm/mmap.c b/mm/mmap.c index 20ff0c3327..c7023516da 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -6,6 +6,8 @@ * Address space accounting code <alan@lxorguk.ukuu.org.uk> */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/kernel.h> #include <linux/slab.h> #include <linux/backing-dev.h> @@ -36,6 +38,7 @@ #include <linux/sched/sysctl.h> #include <linux/notifier.h> #include <linux/memory.h> +#include <linux/printk.h> #include <asm/uaccess.h> #include <asm/cacheflush.h> @@ -360,20 +363,20 @@ static int browse_rb(struct rb_root *root) struct vm_area_struct *vma; vma = rb_entry(nd, struct vm_area_struct, vm_rb); if (vma->vm_start < prev) { - printk("vm_start %lx prev %lx\n", vma->vm_start, prev); + pr_info("vm_start %lx prev %lx\n", vma->vm_start, prev); bug = 1; } if (vma->vm_start < pend) { - printk("vm_start %lx pend %lx\n", vma->vm_start, pend); + pr_info("vm_start %lx pend %lx\n", vma->vm_start, pend); bug = 1; } if (vma->vm_start > vma->vm_end) { - printk("vm_end %lx < vm_start %lx\n", + pr_info("vm_end %lx < vm_start %lx\n", vma->vm_end, vma->vm_start); bug = 1; } if (vma->rb_subtree_gap != vma_compute_subtree_gap(vma)) { - printk("free gap %lx, correct %lx\n", + pr_info("free gap %lx, correct %lx\n", vma->rb_subtree_gap, vma_compute_subtree_gap(vma)); bug = 1; @@ -387,7 +390,7 @@ static int browse_rb(struct rb_root *root) for (nd = pn; nd; nd = rb_prev(nd)) j++; if (i != j) { - printk("backwards %d, forwards %d\n", j, i); + pr_info("backwards %d, forwards %d\n", j, i); bug = 1; } return bug ? -1 : i; @@ -422,17 +425,17 @@ void validate_mm(struct mm_struct *mm) i++; } if (i != mm->map_count) { - printk("map_count %d vm_next %d\n", mm->map_count, i); + pr_info("map_count %d vm_next %d\n", mm->map_count, i); bug = 1; } if (highest_address != mm->highest_vm_end) { - printk("mm->highest_vm_end %lx, found %lx\n", + pr_info("mm->highest_vm_end %lx, found %lx\n", mm->highest_vm_end, highest_address); bug = 1; } i = browse_rb(&mm->mm_rb); if (i != mm->map_count) { - printk("map_count %d rb %d\n", mm->map_count, i); + pr_info("map_count %d rb %d\n", mm->map_count, i); bug = 1; } BUG_ON(bug); @@ -3237,7 +3240,7 @@ static struct notifier_block reserve_mem_nb = { static int __meminit init_reserve_notifier(void) { if (register_hotmemory_notifier(&reserve_mem_nb)) - printk("Failed registering memory add/remove notifier for admin reserve"); + pr_err("Failed registering memory add/remove notifier for admin reserve\n"); return 0; } diff --git a/mm/nommu.c b/mm/nommu.c index 8740213b16..1ff42f87dd 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -13,6 +13,8 @@ * Copyright (c) 2007-2010 Paul Mundt <lethal@linux-sh.org> */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/export.h> #include <linux/mm.h> #include <linux/mman.h> @@ -30,6 +32,7 @@ #include <linux/syscalls.h> #include <linux/audit.h> #include <linux/sched/sysctl.h> +#include <linux/printk.h> #include <asm/uaccess.h> #include <asm/tlb.h> @@ -1241,7 +1244,7 @@ error_free: return ret; enomem: - printk("Allocation of length %lu from process %d (%s) failed\n", + pr_err("Allocation of length %lu from process %d (%s) failed\n", len, current->pid, current->comm); show_free_areas(0); return -ENOMEM; diff --git a/mm/slub.c b/mm/slub.c index 25f14ad8f8..9f109e6756 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -9,6 +9,8 @@ * (C) 2011 Linux Foundation, Christoph Lameter */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/mm.h> #include <linux/swap.h> /* struct reclaim_state */ #include <linux/module.h> @@ -33,6 +35,7 @@ #include <linux/stacktrace.h> #include <linux/prefetch.h> #include <linux/memcontrol.h> +#include <linux/printk.h> #include <trace/events/kmem.h> @@ -1774,15 +1777,15 @@ static inline void note_cmpxchg_failure(const char *n, #ifdef CONFIG_PREEMPT if (tid_to_cpu(tid) != tid_to_cpu(actual_tid)) - printk("due to cpu change %d -> %d\n", + pr_cont("due to cpu change %d -> %d\n", tid_to_cpu(tid), tid_to_cpu(actual_tid)); else #endif if (tid_to_event(tid) != tid_to_event(actual_tid)) - printk("due to cpu running other code. Event %ld->%ld\n", + pr_cont("due to cpu running other code. Event %ld->%ld\n", tid_to_event(tid), tid_to_event(actual_tid)); else - printk("for unknown reason: actual=%lx was=%lx target=%lx\n", + pr_cont("for unknown reason: actual=%lx was=%lx target=%lx\n", actual_tid, tid, next_tid(tid)); #endif stat(s, CMPXCHG_DOUBLE_CPU_FAIL); diff --git a/mm/vmscan.c b/mm/vmscan.c index a9c74b4096..394dd2b644 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -11,6 +11,8 @@ * Multiqueue VM started 5.8.00, Rik van Riel. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/mm.h> #include <linux/module.h> #include <linux/gfp.h> @@ -43,6 +45,7 @@ #include <linux/sysctl.h> #include <linux/oom.h> #include <linux/prefetch.h> +#include <linux/printk.h> #include <asm/tlbflush.h> #include <asm/div64.h> @@ -477,7 +480,7 @@ static pageout_t pageout(struct page *page, struct address_space *mapping, if (page_has_private(page)) { if (try_to_free_buffers(page)) { ClearPageDirty(page); - printk("%s: orphaned page\n", __func__); + pr_info("%s: orphaned page\n", __func__); return PAGE_CLEAN; } } -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Re: [PATCH v2] mm: convert some level-less printks to pr_* 2014-03-27 17:54 ` Mitchel Humpherys @ 2014-03-31 18:35 ` Christoph Lameter -1 siblings, 0 replies; 18+ messages in thread From: Christoph Lameter @ 2014-03-31 18:35 UTC (permalink / raw) To: Mitchel Humpherys Cc: Pekka Enberg, Matt Mackall, Joe Perches, linux-mm, linux-kernel On Thu, 27 Mar 2014, Mitchel Humpherys wrote: > diff --git a/mm/slub.c b/mm/slub.c > index 25f14ad8f8..9f109e6756 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -9,6 +9,8 @@ > * (C) 2011 Linux Foundation, Christoph Lameter > */ > > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt This is implicitly used by some macros? If so then please define this elsewhere. I do not see any use in slub.c of this one. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2] mm: convert some level-less printks to pr_* @ 2014-03-31 18:35 ` Christoph Lameter 0 siblings, 0 replies; 18+ messages in thread From: Christoph Lameter @ 2014-03-31 18:35 UTC (permalink / raw) To: Mitchel Humpherys Cc: Pekka Enberg, Matt Mackall, Joe Perches, linux-mm, linux-kernel On Thu, 27 Mar 2014, Mitchel Humpherys wrote: > diff --git a/mm/slub.c b/mm/slub.c > index 25f14ad8f8..9f109e6756 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -9,6 +9,8 @@ > * (C) 2011 Linux Foundation, Christoph Lameter > */ > > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt This is implicitly used by some macros? If so then please define this elsewhere. I do not see any use in slub.c of this one. ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2] mm: convert some level-less printks to pr_* 2014-03-31 18:35 ` Christoph Lameter @ 2014-03-31 18:44 ` Joe Perches -1 siblings, 0 replies; 18+ messages in thread From: Joe Perches @ 2014-03-31 18:44 UTC (permalink / raw) To: Christoph Lameter Cc: Mitchel Humpherys, Pekka Enberg, Matt Mackall, linux-mm, linux-kernel On Mon, 2014-03-31 at 13:35 -0500, Christoph Lameter wrote: > On Thu, 27 Mar 2014, Mitchel Humpherys wrote: > > > diff --git a/mm/slub.c b/mm/slub.c [] > > @@ -9,6 +9,8 @@ > > * (C) 2011 Linux Foundation, Christoph Lameter > > */ > > > > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > This is implicitly used by some macros? If so then please define this > elsewhere. I do not see any use in slub.c of this one. Hi Christoph All the pr_<level> macros use it. from include/linux/printk.h: #ifndef pr_fmt #define pr_fmt(fmt) fmt #endif #define pr_emerg(fmt, ...) \ printk(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__) etc... -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2] mm: convert some level-less printks to pr_* @ 2014-03-31 18:44 ` Joe Perches 0 siblings, 0 replies; 18+ messages in thread From: Joe Perches @ 2014-03-31 18:44 UTC (permalink / raw) To: Christoph Lameter Cc: Mitchel Humpherys, Pekka Enberg, Matt Mackall, linux-mm, linux-kernel On Mon, 2014-03-31 at 13:35 -0500, Christoph Lameter wrote: > On Thu, 27 Mar 2014, Mitchel Humpherys wrote: > > > diff --git a/mm/slub.c b/mm/slub.c [] > > @@ -9,6 +9,8 @@ > > * (C) 2011 Linux Foundation, Christoph Lameter > > */ > > > > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > This is implicitly used by some macros? If so then please define this > elsewhere. I do not see any use in slub.c of this one. Hi Christoph All the pr_<level> macros use it. from include/linux/printk.h: #ifndef pr_fmt #define pr_fmt(fmt) fmt #endif #define pr_emerg(fmt, ...) \ printk(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__) etc... ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2] mm: convert some level-less printks to pr_* 2014-03-31 18:44 ` Joe Perches @ 2014-04-03 16:33 ` Christoph Lameter -1 siblings, 0 replies; 18+ messages in thread From: Christoph Lameter @ 2014-04-03 16:33 UTC (permalink / raw) To: Joe Perches Cc: Mitchel Humpherys, Pekka Enberg, Matt Mackall, linux-mm, linux-kernel On Mon, 31 Mar 2014, Joe Perches wrote: > On Mon, 2014-03-31 at 13:35 -0500, Christoph Lameter wrote: > > On Thu, 27 Mar 2014, Mitchel Humpherys wrote: > > > > > diff --git a/mm/slub.c b/mm/slub.c > [] > > > @@ -9,6 +9,8 @@ > > > * (C) 2011 Linux Foundation, Christoph Lameter > > > */ > > > > > > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > > > This is implicitly used by some macros? If so then please define this > > elsewhere. I do not see any use in slub.c of this one. > > Hi Christoph > > All the pr_<level> macros use it. > > from include/linux/printk.h: Ok then why do you add the definition to slub.c? -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2] mm: convert some level-less printks to pr_* @ 2014-04-03 16:33 ` Christoph Lameter 0 siblings, 0 replies; 18+ messages in thread From: Christoph Lameter @ 2014-04-03 16:33 UTC (permalink / raw) To: Joe Perches Cc: Mitchel Humpherys, Pekka Enberg, Matt Mackall, linux-mm, linux-kernel On Mon, 31 Mar 2014, Joe Perches wrote: > On Mon, 2014-03-31 at 13:35 -0500, Christoph Lameter wrote: > > On Thu, 27 Mar 2014, Mitchel Humpherys wrote: > > > > > diff --git a/mm/slub.c b/mm/slub.c > [] > > > @@ -9,6 +9,8 @@ > > > * (C) 2011 Linux Foundation, Christoph Lameter > > > */ > > > > > > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt > > > > This is implicitly used by some macros? If so then please define this > > elsewhere. I do not see any use in slub.c of this one. > > Hi Christoph > > All the pr_<level> macros use it. > > from include/linux/printk.h: Ok then why do you add the definition to slub.c? ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2] mm: convert some level-less printks to pr_* 2014-04-03 16:33 ` Christoph Lameter @ 2014-04-03 16:57 ` Mitchel Humpherys -1 siblings, 0 replies; 18+ messages in thread From: Mitchel Humpherys @ 2014-04-03 16:57 UTC (permalink / raw) To: Christoph Lameter Cc: Joe Perches, Pekka Enberg, Matt Mackall, linux-mm, linux-kernel On Thu, Apr 03 2014 at 09:33:15 AM, Christoph Lameter <cl@linux.com> wrote: > On Mon, 31 Mar 2014, Joe Perches wrote: > >> On Mon, 2014-03-31 at 13:35 -0500, Christoph Lameter wrote: >> > On Thu, 27 Mar 2014, Mitchel Humpherys wrote: >> > >> > > diff --git a/mm/slub.c b/mm/slub.c >> [] >> > > @@ -9,6 +9,8 @@ >> > > * (C) 2011 Linux Foundation, Christoph Lameter >> > > */ >> > > >> > > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt >> > >> > This is implicitly used by some macros? If so then please define this >> > elsewhere. I do not see any use in slub.c of this one. >> >> Hi Christoph >> >> All the pr_<level> macros use it. >> >> from include/linux/printk.h: > > Ok then why do you add the definition to slub.c? Ah that was an oversight on my part after changing to pr_cont. I'll send a v3 that removes the pr_fmt. Or I could send a v3 that leaves the pr_fmt but changes the printk that the pr_cont's are continuing (at the top of note_cmpxchg_failure) to pr_info, but that wouldn't be consistent with the rest of the file, which is using hand-tagged printk's. I don't know if it's worthwhile to convert all of the hand-tagged printk's to the pr_ macros, but if so I can do that in a separate patch. -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2] mm: convert some level-less printks to pr_* @ 2014-04-03 16:57 ` Mitchel Humpherys 0 siblings, 0 replies; 18+ messages in thread From: Mitchel Humpherys @ 2014-04-03 16:57 UTC (permalink / raw) To: Christoph Lameter Cc: Joe Perches, Pekka Enberg, Matt Mackall, linux-mm, linux-kernel On Thu, Apr 03 2014 at 09:33:15 AM, Christoph Lameter <cl@linux.com> wrote: > On Mon, 31 Mar 2014, Joe Perches wrote: > >> On Mon, 2014-03-31 at 13:35 -0500, Christoph Lameter wrote: >> > On Thu, 27 Mar 2014, Mitchel Humpherys wrote: >> > >> > > diff --git a/mm/slub.c b/mm/slub.c >> [] >> > > @@ -9,6 +9,8 @@ >> > > * (C) 2011 Linux Foundation, Christoph Lameter >> > > */ >> > > >> > > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt >> > >> > This is implicitly used by some macros? If so then please define this >> > elsewhere. I do not see any use in slub.c of this one. >> >> Hi Christoph >> >> All the pr_<level> macros use it. >> >> from include/linux/printk.h: > > Ok then why do you add the definition to slub.c? Ah that was an oversight on my part after changing to pr_cont. I'll send a v3 that removes the pr_fmt. Or I could send a v3 that leaves the pr_fmt but changes the printk that the pr_cont's are continuing (at the top of note_cmpxchg_failure) to pr_info, but that wouldn't be consistent with the rest of the file, which is using hand-tagged printk's. I don't know if it's worthwhile to convert all of the hand-tagged printk's to the pr_ macros, but if so I can do that in a separate patch. -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2] mm: convert some level-less printks to pr_* 2014-03-27 17:54 ` Mitchel Humpherys @ 2014-04-14 22:55 ` Andrew Morton -1 siblings, 0 replies; 18+ messages in thread From: Andrew Morton @ 2014-04-14 22:55 UTC (permalink / raw) To: Mitchel Humpherys Cc: Christoph Lameter, Pekka Enberg, Matt Mackall, Joe Perches, linux-mm, linux-kernel On Thu, 27 Mar 2014 10:54:19 -0700 Mitchel Humpherys <mitchelh@codeaurora.org> wrote: > printk is meant to be used with an associated log level. There are some > instances of printk scattered around the mm code where the log level is > missing. Add a log level and adhere to suggestions by > scripts/checkpatch.pl by moving to the pr_* macros. > hm, this is a functional change. > --- a/mm/bounce.c > +++ b/mm/bounce.c > @@ -3,6 +3,8 @@ > * - Split from highmem.c > */ > > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Because of this. > #include <linux/mm.h> > #include <linux/export.h> > #include <linux/swap.h> > @@ -15,6 +17,7 @@ > #include <linux/hash.h> > #include <linux/highmem.h> > #include <linux/bootmem.h> > +#include <linux/printk.h> > #include <asm/tlbflush.h> > > #include <trace/events/block.h> > @@ -34,7 +37,7 @@ static __init int init_emergency_pool(void) > > page_pool = mempool_create_page_pool(POOL_SIZE, 0); > BUG_ON(!page_pool); > - printk("bounce pool size: %d pages\n", POOL_SIZE); > + pr_info("bounce pool size: %d pages\n", POOL_SIZE); This used to print "bounce pool size: N pages" but will now print "bounce: bounce pool size: N pages". It isn't necessarily a *bad* change but perhaps a little more thought could be put into it. In this example it would be better remove the redundancy by using pr_info("pool size: %d pages\n"...); And all of this should be described and justified in the changelog, please. -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2] mm: convert some level-less printks to pr_* @ 2014-04-14 22:55 ` Andrew Morton 0 siblings, 0 replies; 18+ messages in thread From: Andrew Morton @ 2014-04-14 22:55 UTC (permalink / raw) To: Mitchel Humpherys Cc: Christoph Lameter, Pekka Enberg, Matt Mackall, Joe Perches, linux-mm, linux-kernel On Thu, 27 Mar 2014 10:54:19 -0700 Mitchel Humpherys <mitchelh@codeaurora.org> wrote: > printk is meant to be used with an associated log level. There are some > instances of printk scattered around the mm code where the log level is > missing. Add a log level and adhere to suggestions by > scripts/checkpatch.pl by moving to the pr_* macros. > hm, this is a functional change. > --- a/mm/bounce.c > +++ b/mm/bounce.c > @@ -3,6 +3,8 @@ > * - Split from highmem.c > */ > > +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt Because of this. > #include <linux/mm.h> > #include <linux/export.h> > #include <linux/swap.h> > @@ -15,6 +17,7 @@ > #include <linux/hash.h> > #include <linux/highmem.h> > #include <linux/bootmem.h> > +#include <linux/printk.h> > #include <asm/tlbflush.h> > > #include <trace/events/block.h> > @@ -34,7 +37,7 @@ static __init int init_emergency_pool(void) > > page_pool = mempool_create_page_pool(POOL_SIZE, 0); > BUG_ON(!page_pool); > - printk("bounce pool size: %d pages\n", POOL_SIZE); > + pr_info("bounce pool size: %d pages\n", POOL_SIZE); This used to print "bounce pool size: N pages" but will now print "bounce: bounce pool size: N pages". It isn't necessarily a *bad* change but perhaps a little more thought could be put into it. In this example it would be better remove the redundancy by using pr_info("pool size: %d pages\n"...); And all of this should be described and justified in the changelog, please. ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2] mm: convert some level-less printks to pr_* 2014-04-14 22:55 ` Andrew Morton @ 2014-04-15 23:58 ` Mitchel Humpherys -1 siblings, 0 replies; 18+ messages in thread From: Mitchel Humpherys @ 2014-04-15 23:58 UTC (permalink / raw) To: Andrew Morton Cc: Christoph Lameter, Pekka Enberg, Matt Mackall, Joe Perches, linux-mm, linux-kernel On Mon, Apr 14 2014 at 03:55:26 PM, Andrew Morton <akpm@linux-foundation.org> wrote: > On Thu, 27 Mar 2014 10:54:19 -0700 Mitchel Humpherys <mitchelh@codeaurora.org> wrote: >> #include <linux/mm.h> >> #include <linux/export.h> >> #include <linux/swap.h> >> @@ -15,6 +17,7 @@ >> #include <linux/hash.h> >> #include <linux/highmem.h> >> #include <linux/bootmem.h> >> +#include <linux/printk.h> >> #include <asm/tlbflush.h> >> >> #include <trace/events/block.h> >> @@ -34,7 +37,7 @@ static __init int init_emergency_pool(void) >> >> page_pool = mempool_create_page_pool(POOL_SIZE, 0); >> BUG_ON(!page_pool); >> - printk("bounce pool size: %d pages\n", POOL_SIZE); >> + pr_info("bounce pool size: %d pages\n", POOL_SIZE); > > This used to print "bounce pool size: N pages" but will now print > "bounce: bounce pool size: N pages". > > It isn't necessarily a *bad* change but perhaps a little more thought > could be put into it. In this example it would be better remove the > redundancy by using > > pr_info("pool size: %d pages\n"...); Yes I noticed this in my boot-test... I'll change it to remove the redundancy. The others all seem okay. > > And all of this should be described and justified in the changelog, > please. Will send a v3 shortly. Thanks for your comments. -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2] mm: convert some level-less printks to pr_* @ 2014-04-15 23:58 ` Mitchel Humpherys 0 siblings, 0 replies; 18+ messages in thread From: Mitchel Humpherys @ 2014-04-15 23:58 UTC (permalink / raw) To: Andrew Morton Cc: Christoph Lameter, Pekka Enberg, Matt Mackall, Joe Perches, linux-mm, linux-kernel On Mon, Apr 14 2014 at 03:55:26 PM, Andrew Morton <akpm@linux-foundation.org> wrote: > On Thu, 27 Mar 2014 10:54:19 -0700 Mitchel Humpherys <mitchelh@codeaurora.org> wrote: >> #include <linux/mm.h> >> #include <linux/export.h> >> #include <linux/swap.h> >> @@ -15,6 +17,7 @@ >> #include <linux/hash.h> >> #include <linux/highmem.h> >> #include <linux/bootmem.h> >> +#include <linux/printk.h> >> #include <asm/tlbflush.h> >> >> #include <trace/events/block.h> >> @@ -34,7 +37,7 @@ static __init int init_emergency_pool(void) >> >> page_pool = mempool_create_page_pool(POOL_SIZE, 0); >> BUG_ON(!page_pool); >> - printk("bounce pool size: %d pages\n", POOL_SIZE); >> + pr_info("bounce pool size: %d pages\n", POOL_SIZE); > > This used to print "bounce pool size: N pages" but will now print > "bounce: bounce pool size: N pages". > > It isn't necessarily a *bad* change but perhaps a little more thought > could be put into it. In this example it would be better remove the > redundancy by using > > pr_info("pool size: %d pages\n"...); Yes I noticed this in my boot-test... I'll change it to remove the redundancy. The others all seem okay. > > And all of this should be described and justified in the changelog, > please. Will send a v3 shortly. Thanks for your comments. -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2] mm: convert some level-less printks to pr_* 2014-04-15 23:58 ` Mitchel Humpherys @ 2014-04-16 0:05 ` Mitchel Humpherys -1 siblings, 0 replies; 18+ messages in thread From: Mitchel Humpherys @ 2014-04-16 0:05 UTC (permalink / raw) To: Andrew Morton Cc: Christoph Lameter, Pekka Enberg, Matt Mackall, Joe Perches, linux-mm, linux-kernel On Tue, Apr 15 2014 at 04:58:21 PM, Mitchel Humpherys <mitchelh@codeaurora.org> wrote: > On Mon, Apr 14 2014 at 03:55:26 PM, Andrew Morton <akpm@linux-foundation.org> wrote: >> And all of this should be described and justified in the changelog, >> please. > > Will send a v3 shortly. Thanks for your comments. Make that a v4, I actually already sent a v3. You'd think I could get a printk change right on v1 :). We'll get there. -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a> ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v2] mm: convert some level-less printks to pr_* @ 2014-04-16 0:05 ` Mitchel Humpherys 0 siblings, 0 replies; 18+ messages in thread From: Mitchel Humpherys @ 2014-04-16 0:05 UTC (permalink / raw) To: Andrew Morton Cc: Christoph Lameter, Pekka Enberg, Matt Mackall, Joe Perches, linux-mm, linux-kernel On Tue, Apr 15 2014 at 04:58:21 PM, Mitchel Humpherys <mitchelh@codeaurora.org> wrote: > On Mon, Apr 14 2014 at 03:55:26 PM, Andrew Morton <akpm@linux-foundation.org> wrote: >> And all of this should be described and justified in the changelog, >> please. > > Will send a v3 shortly. Thanks for your comments. Make that a v4, I actually already sent a v3. You'd think I could get a printk change right on v1 :). We'll get there. -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, hosted by The Linux Foundation ^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2014-04-16 0:05 UTC | newest] Thread overview: 18+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-03-27 17:54 [PATCH v2] Some printk cleanup in mm Mitchel Humpherys 2014-03-27 17:54 ` Mitchel Humpherys 2014-03-27 17:54 ` [PATCH v2] mm: convert some level-less printks to pr_* Mitchel Humpherys 2014-03-27 17:54 ` Mitchel Humpherys 2014-03-31 18:35 ` Christoph Lameter 2014-03-31 18:35 ` Christoph Lameter 2014-03-31 18:44 ` Joe Perches 2014-03-31 18:44 ` Joe Perches 2014-04-03 16:33 ` Christoph Lameter 2014-04-03 16:33 ` Christoph Lameter 2014-04-03 16:57 ` Mitchel Humpherys 2014-04-03 16:57 ` Mitchel Humpherys 2014-04-14 22:55 ` Andrew Morton 2014-04-14 22:55 ` Andrew Morton 2014-04-15 23:58 ` Mitchel Humpherys 2014-04-15 23:58 ` Mitchel Humpherys 2014-04-16 0:05 ` Mitchel Humpherys 2014-04-16 0:05 ` Mitchel Humpherys
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.