Convert default pr_fmt from empty to KBUILD_MODNAME
Get series with b4
b4 am [email protected]Versions newest first
- v1 Latest18 patches 45 repliesIn review
Patches in v1 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/18 | kernel: Use pr_fmtkernel/ kernel/ kernel/ +19 more | +122 | 6 replies | |
| 2/18 | lib: Use pr_fmtlib/ lib/ lib/ +14 more | +122 | 0 replies | |
| 3/18 | printk: Convert pr_fmt from blank define to KBUILD_MODNAMEinclude/ | +1 | 18 replies | |
| 4/18 | x86: Remove pr_fmt duplicate logging prefixesarch/ arch/ arch/ +2 more | +33 | 4 replies | |
| 5/18 | x86/mtrr: Rename main.c to mtrr.c and remove duplicate prefixesarch/ arch/ | +17 | 0 replies | |
| 6/18 | net: Remove pr_fmt duplicate logging prefixesnet/ net/ net/ +6 more | +43 | 0 replies | |
| 7/18 | blk-mq: Remove pr_fmt duplicate logging prefixesblock/ | +4 | 0 replies | |
| 8/18 | random: Remove pr_fmt duplicate logging prefixesdrivers/ drivers/ | +12 | 0 replies | |
| 9/18 | ptp: Remove pr_fmt duplicate logging prefixesdrivers/ | +2 | 1 reply | |
| 10/18 | efifb: Remove pr_fmt duplicate logging prefixesdrivers/ | +23 | 0 replies | |
| 11/18 | proc: Remove pr_fmt duplicate logging prefixesfs/ | +3 | 0 replies | |
| 12/18 | uprobes: Remove pr_fmt duplicate logging prefixeskernel/ | +1 | 0 replies | |
| 13/18 | printk: Remove pr_fmt duplicate logging prefixeskernel/ | +1 | 2 replies | |
| 14/18 | lib/mpi: Remove pr_fmt duplicate logging prefixeslib/ | +5 | 0 replies | |
| 15/18 | security: Remove pr_fmt duplicate logging prefixessecurity/ | +14 | 1 reply | |
| 16/18 | aoe: Remove pr_fmt duplicate logging prefixesdrivers/ drivers/ drivers/ +3 more | +53 | 0 replies | |
| 17/18 | security: encrypted-keys: Remove pr_fmt duplicate logging prefixessecurity/ | +28 | 1 reply | |
| 18/18 | rcu: Use pr_fmt to prefix "rcu: " to logging outputkernel/ kernel/ kernel/ +6 more | +96 | 16 replies |
Reviews trailers per patch
6 of 18 patches have a Reviewed-by or Acked-by.
| Patch | Paul Moore | Steven Rostedt (VMware) | James Morris | Kees Cook | Richard Cochran | Sergey Senozhatsky | Jessica Yu | Masami Hiramatsu | Paul E. McKenney | Petr Mladek |
|---|---|---|---|---|---|---|---|---|---|---|
| 1/18 | A-b A-b | R-b | A-b | A-b | A-b | |||||
| 2/18 | ||||||||||
| 3/18 | A-b | A-b | A-b | |||||||
| 4/18 | ||||||||||
| 5/18 | ||||||||||
| 6/18 | ||||||||||
| 7/18 | ||||||||||
| 8/18 | ||||||||||
| 9/18 | A-b | |||||||||
| 10/18 | ||||||||||
| 11/18 | ||||||||||
| 12/18 | ||||||||||
| 13/18 | A-b | A-b | ||||||||
| 14/18 | ||||||||||
| 15/18 | A-b | |||||||||
| 16/18 | ||||||||||
| 17/18 | R-b | |||||||||
| 18/18 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 10 reviewers.
Cover letter [PATCH 00/18] Convert default pr_fmt from empty to KBUILD_MODNAME
pr_<level> 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%)Signature · 1 line
2.15.0