| From 7fb430562eb217bb8cbd4bd65eca039d0c08d590 Mon Sep 17 00:00:00 2001 |
| From: Matteo Croce <mcroce@redhat.com> |
| Date: Mon, 18 Mar 2019 02:32:36 +0100 |
| Subject: [PATCH] percpu: stop printing kernel addresses |
| |
| commit 00206a69ee32f03e6f40837684dcbe475ea02266 upstream. |
| |
| Since commit ad67b74d2469d9b8 ("printk: hash addresses printed with %p"), |
| at boot "____ptrval____" is printed instead of actual addresses: |
| |
| percpu: Embedded 38 pages/cpu @(____ptrval____) s124376 r0 d31272 u524288 |
| |
| Instead of changing the print to "%px", and leaking kernel addresses, |
| just remove the print completely, cfr. e.g. commit 071929dbdd865f77 |
| ("arm64: Stop printing the virtual memory layout"). |
| |
| Signed-off-by: Matteo Croce <mcroce@redhat.com> |
| Signed-off-by: Dennis Zhou <dennis@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/mm/percpu.c b/mm/percpu.c |
| index 074732f3c209..69b0b29fdfde 100644 |
| --- a/mm/percpu.c |
| +++ b/mm/percpu.c |
| @@ -2516,8 +2516,8 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size, |
| ai->groups[group].base_offset = areas[group] - base; |
| } |
| |
| - pr_info("Embedded %zu pages/cpu @%p s%zu r%zu d%zu u%zu\n", |
| - PFN_DOWN(size_sum), base, ai->static_size, ai->reserved_size, |
| + pr_info("Embedded %zu pages/cpu s%zu r%zu d%zu u%zu\n", |
| + PFN_DOWN(size_sum), ai->static_size, ai->reserved_size, |
| ai->dyn_size, ai->unit_size); |
| |
| rc = pcpu_setup_first_chunk(ai, base); |
| @@ -2638,8 +2638,8 @@ int __init pcpu_page_first_chunk(size_t reserved_size, |
| } |
| |
| /* we're ready, commit */ |
| - pr_info("%d %s pages/cpu @%p s%zu r%zu d%zu\n", |
| - unit_pages, psize_str, vm.addr, ai->static_size, |
| + pr_info("%d %s pages/cpu s%zu r%zu d%zu\n", |
| + unit_pages, psize_str, ai->static_size, |
| ai->reserved_size, ai->dyn_size); |
| |
| rc = pcpu_setup_first_chunk(ai, vm.addr); |
| -- |
| 2.17.1 |
| |