# \[PATCH 00/18\] Convert default pr\_fmt from empty to KBUILD\_MODNAME - Subsystems: EFIFB FRAMEBUFFER DRIVER, FRAMEBUFFER LAYER, ATA OVER ETHERNET (AOE) DRIVER, AUDIT SUBSYSTEM, BITMAP API, BLOCK LAYER, CPU HOTPLUG, DRIVER CORE, KOBJECTS, DEBUGFS AND SYSFS, FILESYSTEMS (VFS and infrastructure), GENERIC STRING LIBRARY, HARDWARE RANDOM NUMBER GENERATOR CORE, HPET: x86, HUNG TASK DETECTOR, KDUMP, KEYS-ENCRYPTED, KEYS/KEYRINGS, KPROBES, LIBRARY CODE, NETFILTER, NETWORKING DRIVERS, NETWORKING \[GENERAL\], NETWORKING \[IPv4/IPv6\], NETWORKING \[SOCKETS\], PER-CPU MEMORY ALLOCATOR, PERFORMANCE EVENTS SUBSYSTEM, PRINTK, PROC FILESYSTEM, PTP HARDWARE CLOCK SUPPORT, RANDOM NUMBER DRIVER, READ-COPY UPDATE (RCU), RELAY, RHASHTABLE, SECURE COMPUTING, SECURITY SUBSYSTEM, SELINUX SECURITY MODULE, SLEEPABLE READ-COPY UPDATE (SRCU), TASKSTATS STATISTICS INTERFACE, THE REST, TORTURE-TEST MODULES, TRACING, UBSAN, UPROBES, WORKQUEUE, X86 ARCHITECTURE (32-BIT AND 64-BIT), X86 MM - Maintainers: Peter Jones, Helge Deller, "Justin Sanders", Paul Moore, Eric Paris, Yury Norov, Jens Axboe, Thomas Gleixner, Peter Zijlstra, Greg Kroah-Hartman, "Rafael J. Wysocki", Danilo Krummrich, Johan Hovold, Alexander Viro, Christian Brauner, Kees Cook, Olivia Mackall, Herbert Xu, Andrew Morton, Lance Yang, Baoquan He, Mike Rapoport, Pasha Tatashin, Pratyush Yadav, Mimi Zohar, David Howells, Jarkko Sakkinen, Naveen N Rao, "David S. Miller", Masami Hiramatsu, Pablo Neira Ayuso, Florian Westphal, Andrew Lunn, Eric Dumazet, Jakub Kicinski, Paolo Abeni, David Ahern, Ido Schimmel, Kuniyuki Iwashima, Willem de Bruijn, Dennis Zhou, Tejun Heo, Christoph Lameter, Ingo Molnar, Arnaldo Carvalho de Melo, Namhyung Kim, Petr Mladek, John Ogness, Richard Cochran, "Theodore Ts'o", Jason A. Donenfeld, "Paul E. McKenney", Frederic Weisbecker, Neeraj Upadhyay, Joel Fernandes, Josh Triplett, Boqun Feng, Uladzislau Rezki, Jason Xing, Thomas Graf, James Morris, "Serge E. Hallyn", Stephen Smalley, Lai Jiangshan, Onur Özkan, Balbir Singh, Linus Torvalds, Davidlohr Bueso, Steven Rostedt, Oleg Nesterov, Borislav Petkov, Dave Hansen, Andy Lutomirski - Series: 18 patches touching 82 files, +580/-532 - Status: PENDING · 2 of 18 landed - Pending, 2 of 18 landed. - List: linux-fbdev - 2 messages, 1 author - Page: https://ratatoskr.run/linux-fbdev/2018/05/5282214/t ## \[PATCH 00/18\] Convert default pr\_fmt from empty to KBUILD\_MODNAME - From: Joe Perches \ - Date: 2018-05-10 15:46:07 - Message: https://ratatoskr.run/linux-fbdev/2018/05/5282214.md ```text pr_ logging uses allow a prefix to be specified with a specific #define pr_fmt The default of pr_fmt in printk.h is #define pr_fmt(fmt) fmt so no prefixing of logging output is generically done. There are several output logging uses like dump_stack() that are unprefixed and should remain unprefixed. This patch series attempts to convert the default #define of pr_fmt to KBUILD_MODNAME ": " fmt and as well update the various bits of the kernel that should _not_ be prefixed by adding #define pr_fmt(fmt) fmt to those compilation units that do not want output message prefixing. There are about 1200 uses of #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt that could be removed if the default is changed. A script that does this removal (and removes any blank lines that follow) for the linux-kernel tree is included below: $ git grep -P --name-only "define\s+pr_fmt\b" | \ grep -v include/linux/printk.h | \ xargs perl -i -e 'local $/; while (<>) {s/(\n)*[ \t]*#[ \t]*define[ \t]+pr_fmt[ \t]*\([ \t]*(\w+)[ \t]*\)[ \t]*KBUILD_MODNAME[ \t]*\": \"[ \t]*\2[ \t]*\n\s*/\1\n/; s/^\n//; print;}' This script should be run after this patch series is applied. The above script output diff is currently: 1198 files changed, 70 insertions(+), 2241 deletions(-) Joe Perches (18): kernel: Use pr_fmt lib: Use pr_fmt printk: Convert pr_fmt from blank define to KBUILD_MODNAME x86: Remove pr_fmt duplicate logging prefixes x86/mtrr: Rename main.c to mtrr.c and remove duplicate prefixes net: Remove pr_fmt duplicate logging prefixes blk-mq: Remove pr_fmt duplicate logging prefixes random: Remove pr_fmt duplicate logging prefixes ptp: Remove pr_fmt duplicate logging prefixes efifb: Remove pr_fmt duplicate logging prefixes proc: Remove pr_fmt duplicate logging prefixes uprobes: Remove pr_fmt duplicate logging prefixes printk: Remove pr_fmt duplicate logging prefixes lib/mpi: Remove pr_fmt duplicate logging prefixes security: Remove pr_fmt duplicate logging prefixes aoe: Remove pr_fmt duplicate logging prefixes security: encrypted-keys: Remove pr_fmt duplicate logging prefixes rcu: Use pr_fmt to prefix "rcu: " to logging output arch/x86/events/amd/ibs.c | 2 +- arch/x86/kernel/cpu/mtrr/Makefile | 2 +- arch/x86/kernel/cpu/mtrr/{main.c => mtrr.c} | 33 ++++++------- arch/x86/kernel/e820.c | 32 ++++++------ arch/x86/kernel/hpet.c | 5 +- arch/x86/kernel/uprobes.c | 4 +- arch/x86/mm/numa.c | 22 ++++----- block/blk-mq.c | 9 ++-- drivers/block/aoe/aoeblk.c | 29 ++++++----- drivers/block/aoe/aoechr.c | 11 ++--- drivers/block/aoe/aoecmd.c | 34 ++++++------- drivers/block/aoe/aoedev.c | 19 +++----- drivers/block/aoe/aoemain.c | 6 +-- drivers/block/aoe/aoenet.c | 19 +++----- drivers/char/hw_random/via-rng.c | 10 ++-- drivers/char/random.c | 16 +++--- drivers/ptp/ptp_clock.c | 4 +- drivers/video/fbdev/efifb.c | 48 +++++++++--------- fs/proc/root.c | 6 +-- include/linux/printk.h | 2 +- kernel/acct.c | 2 + kernel/async.c | 14 +++--- kernel/audit_tree.c | 2 +- kernel/backtracetest.c | 8 +-- kernel/crash_core.c | 29 ++++++----- kernel/events/uprobes.c | 3 +- kernel/exit.c | 2 + kernel/hung_task.c | 13 +++-- kernel/kprobes.c | 20 +++++--- kernel/module.c | 59 +++++++++++------------ kernel/panic.c | 3 ++ kernel/params.c | 13 +++-- kernel/pid.c | 2 + kernel/printk/printk.c | 2 +- kernel/profile.c | 2 + kernel/range.c | 2 +- kernel/rcu/rcu_segcblist.c | 2 + kernel/rcu/rcuperf.c | 10 ++-- kernel/rcu/rcutorture.c | 46 +++++++++--------- kernel/rcu/srcutiny.c | 2 + kernel/rcu/srcutree.c | 5 +- kernel/rcu/tiny.c | 3 ++ kernel/rcu/tree.c | 8 +-- kernel/rcu/tree_plugin.h | 67 +++++++++++++++----------- kernel/rcu/update.c | 19 +++++--- kernel/relay.c | 5 +- kernel/seccomp.c | 4 +- kernel/signal.c | 10 ++-- kernel/smpboot.c | 5 +- kernel/taskstats.c | 4 +- kernel/torture.c | 6 ++- kernel/tracepoint.c | 3 ++ kernel/workqueue.c | 2 + lib/cpu_rmap.c | 15 +++--- lib/crc32test.c | 2 + lib/earlycpio.c | 5 +- lib/find_bit_benchmark.c | 2 + lib/kobject.c | 36 +++++++------- lib/kobject_uevent.c | 27 +++++------ lib/mpi/mpicoder.c | 10 ++-- lib/nmi_backtrace.c | 3 ++ lib/percpu_ida.c | 4 +- lib/percpu_test.c | 2 + lib/random32.c | 10 ++-- lib/stmp_device.c | 2 + lib/string.c | 2 + lib/swiotlb.c | 4 +- lib/test_debug_virtual.c | 2 + lib/test_rhashtable.c | 44 +++++++++-------- lib/test_sort.c | 2 + lib/ubsan.c | 61 ++++++++++++----------- net/ipv4/ipconfig.c | 59 ++++++++++------------- net/ipv4/ipmr.c | 2 +- net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 9 ++-- net/ipv6/ip6mr.c | 2 +- net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 6 +-- net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 4 +- net/netfilter/nf_conntrack_helper.c | 11 ++--- net/netfilter/nf_conntrack_standalone.c | 2 +- net/socket.c | 2 +- security/keys/encrypted-keys/encrypted.c | 63 +++++++++++------------- security/selinux/selinuxfs.c | 29 ++++++----- 82 files changed, 580 insertions(+), 532 deletions(-) rename arch/x86/kernel/cpu/mtrr/{main.c => mtrr.c} (96%) -- 2.15.0 ``` ## \[PATCH 10/18\] efifb: Remove pr\_fmt duplicate logging prefixes - From: Joe Perches \ - Date: 2018-05-10 15:46:35 - Message: https://ratatoskr.run/linux-fbdev/2018/05/5282218.md ```text Converting pr_fmt from a simple define to use KBUILD_MODNAME added some duplicate logging prefixes to existing uses. Remove them. Signed-off-by: Joe Perches --- drivers/video/fbdev/efifb.c | 48 ++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 25 deletions(-) diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c index 46a4484e3da7..3a11174f194b 100644 --- a/drivers/video/fbdev/efifb.c +++ b/drivers/video/fbdev/efifb.c @@ -250,13 +250,13 @@ static int efifb_probe(struct platform_device *dev) } else { /* We cannot make this fatal. Sometimes this comes from magic spaces our resource handlers simply don't know about */ - pr_warn("efifb: cannot reserve video memory at 0x%lx\n", + pr_warn("cannot reserve video memory at 0x%lx\n", efifb_fix.smem_start); } info = framebuffer_alloc(sizeof(u32) * 16, &dev->dev); if (!info) { - pr_err("efifb: cannot allocate framebuffer\n"); + pr_err("cannot allocate framebuffer\n"); err = -ENOMEM; goto err_release_mem; } @@ -277,23 +277,23 @@ static int efifb_probe(struct platform_device *dev) else info->screen_base = ioremap_wc(efifb_fix.smem_start, efifb_fix.smem_len); if (!info->screen_base) { - pr_err("efifb: abort, cannot ioremap video memory 0x%x @ 0x%lx\n", - efifb_fix.smem_len, efifb_fix.smem_start); + pr_err("abort, cannot ioremap video memory 0x%x @ 0x%lx\n", + efifb_fix.smem_len, efifb_fix.smem_start); err = -EIO; goto err_release_fb; } - pr_info("efifb: framebuffer at 0x%lx, using %dk, total %dk\n", - efifb_fix.smem_start, size_remap/1024, size_total/1024); - pr_info("efifb: mode is %dx%dx%d, linelength=%d, pages=%d\n", - efifb_defined.xres, efifb_defined.yres, - efifb_defined.bits_per_pixel, efifb_fix.line_length, - screen_info.pages); + pr_info("framebuffer at 0x%lx, using %dk, total %dk\n", + efifb_fix.smem_start, size_remap/1024, size_total/1024); + pr_info("mode is %dx%dx%d, linelength=%d, pages=%d\n", + efifb_defined.xres, efifb_defined.yres, + efifb_defined.bits_per_pixel, efifb_fix.line_length, + screen_info.pages); efifb_defined.xres_virtual = efifb_defined.xres; efifb_defined.yres_virtual = efifb_fix.smem_len / efifb_fix.line_length; - pr_info("efifb: scrolling: redraw\n"); + pr_info("scrolling: redraw\n"); efifb_defined.yres_virtual = efifb_defined.yres; /* some dummy values for timing to make fbset happy */ @@ -311,17 +311,15 @@ static int efifb_probe(struct platform_device *dev) efifb_defined.transp.offset = screen_info.rsvd_pos; efifb_defined.transp.length = screen_info.rsvd_size; - pr_info("efifb: %s: " - "size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n", - "Truecolor", - screen_info.rsvd_size, - screen_info.red_size, - screen_info.green_size, - screen_info.blue_size, - screen_info.rsvd_pos, - screen_info.red_pos, - screen_info.green_pos, - screen_info.blue_pos); + pr_info("Truecolor: size=%d:%d:%d:%d, shift=%d:%d:%d:%d\n", + screen_info.rsvd_size, + screen_info.red_size, + screen_info.green_size, + screen_info.blue_size, + screen_info.rsvd_pos, + screen_info.red_pos, + screen_info.green_pos, + screen_info.blue_pos); efifb_fix.ypanstep = 0; efifb_fix.ywrapstep = 0; @@ -350,17 +348,17 @@ static int efifb_probe(struct platform_device *dev) err = sysfs_create_groups(&dev->dev.kobj, efifb_groups); if (err) { - pr_err("efifb: cannot add sysfs attrs\n"); + pr_err("cannot add sysfs attrs\n"); goto err_unmap; } err = fb_alloc_cmap(&info->cmap, 256, 0); if (err < 0) { - pr_err("efifb: cannot allocate colormap\n"); + pr_err("cannot allocate colormap\n"); goto err_groups; } err = register_framebuffer(info); if (err < 0) { - pr_err("efifb: cannot register framebuffer\n"); + pr_err("cannot register framebuffer\n"); goto err_fb_dealoc; } fb_info(info, "%s frame buffer device\n", info->fix.id); -- 2.15.0 ```