Skip to contentSkip to conversation

printk for 4.11

GIT PULL Petr Mladek 2 participants 2 messages Feb 22, 2017 – Feb 23, 2017

lore
Share & tools
lore
#0 lore raw

Linus,

please pull from

git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git for-linus

to receive printk queue for 4.11 merge window:

==========

- Add Petr Mladek, Sergey Senozhatsky as printk maintainers, and Steven Rostedt as the printk reviewer. This idea came up after the discussion about printk issues at Kernel Summit. It was formulated and discussed at lkml[1].

- Extend a lock-less NMI per-cpu buffers idea to handle recursive printk() calls by Sergey Senozhatsky[2]. It is the first step in sanitizing printk as discussed at Kernel Summit.

The change allows to see messages that would normally get ignored or would cause a deadlock.

Also it allows to enable lockdep in printk(). This already paid off. The testing in linux-next helped to discover two old problems that were hidden before[3][4].

- Remove unused parameter by Sergey Senozhatsky. Clean up after a past change.

[1] http://lkml.kernel.org/r/[email protected]
[2] http://lkml.kernel.org/r/[email protected]
[3] http://lkml.kernel.org/r/[email protected]
[4] http://lkml.kernel.org/r/[email protected]

-------------------------------------------------

Petr Mladek (1):
MAINTAINERS: Add printk maintainers

Sergey Senozhatsky (9):
printk: use vprintk_func in vprintk()
printk: rename nmi.c and exported api
printk: introduce per-cpu safe_print seq buffer
printk: always use deferred printk when flush printk_safe lines
printk: report lost messages in printk safe/nmi contexts
printk: use printk_safe buffers in printk
printk: remove zap_locks() function
printk: convert the rest to printk-safe
printk: drop call_console_drivers() unused param

 MAINTAINERS                 |   8 +
 include/linux/printk.h      |  21 ++-
 init/Kconfig                |  16 +-
 init/main.c                 |   2 +-
 kernel/kexec_core.c         |   2 +-
 kernel/panic.c              |   4 +-
 kernel/printk/Makefile      |   2 +-
 kernel/printk/internal.h    |  79 +++++----
 kernel/printk/nmi.c         | 291 ---------------------------------
 kernel/printk/printk.c      | 232 ++++++++++++--------------
 kernel/printk/printk_safe.c | 385 ++++++++++++++++++++++++++++++++++++++++++++
 lib/nmi_backtrace.c         |   2 +-
 12 files changed, 568 insertions(+), 476 deletions(-)
 delete mode 100644 kernel/printk/nmi.c
 create mode 100644 kernel/printk/printk_safe.c

Best Regards,
Petr Mladek

#1 lore raw
Quoted 3 lines · Petr Mladek
 12 files changed, 568 insertions(+), 476 deletions(-)
 delete mode 100644 kernel/printk/nmi.c
 create mode 100644 kernel/printk/printk_safe.c

Hmm. Please use -M when generating diffstats, because what I got is:

   11 files changed, 347 insertions(+), 255 deletions(-)

rename kernel/printk/{nmi.c => printk_safe.c} (53%)

which is more descriptive of what actually is going on.

The default pull-request script uses -M, so I don't know why you didn't have that already.

Linus