Commit 96edcc81 authored by Tetsuo Handa's avatar Tetsuo Handa Committed by sanglipeng
Browse files

printk: declare printk_deferred_{enter,safe}() in include/linux/printk.h 

stable inclusion
from stable-v5.10.180
commit 32232bcd4e5300e678718d5c29da4dfa07ade01e
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8DDFN

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=32232bcd4e5300e678718d5c29da4dfa07ade01e



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

commit 85e3e7fb upstream.

[This patch implements subset of original commit 85e3e7fb ("printk:
remove NMI tracking") where commit 1007843a ("mm/page_alloc: fix
potential deadlock on zonelist_update_seq seqlock") depends on, for
commit 3d36424b ("mm/page_alloc: fix race condition between
build_all_zonelists and page allocation") was backported to stable.]

All NMI contexts are handled the same as the safe context: store the
message and defer printing. There is no need to have special NMI
context tracking for this. Using in_nmi() is enough.

There are several parts of the kernel that are manually calling into
the printk NMI context tracking in order to cause general printk
deferred printing:

    arch/arm/kernel/smp.c
    arch/powerpc/kexec/crash.c
    kernel/trace/trace.c

For arm/kernel/smp.c and powerpc/kexec/crash.c, provide a new
function pair printk_deferred_enter/exit that explicitly achieves the
same objective.

For ftrace, remove the printk context manipulation completely. It was
added in commit 03fc7f9c ("printk/nmi: Prevent deadlock when
accessing the main log buffer in NMI"). The purpose was to enforce
storing messages directly into the ring buffer even in NMI context.
It really should have only modified the behavior in NMI context.
There is no need for a special behavior any longer. All messages are
always stored directly now. The console deferring is handled
transparently in vprintk().

Signed-off-by: default avatarJohn Ogness <john.ogness@linutronix.de>
[pmladek@suse.com: Remove special handling in ftrace.c completely.
Signed-off-by: default avatarPetr Mladek <pmladek@suse.com>
Link: https://lore.kernel.org/r/20210715193359.25946-5-john.ogness@linutronix.de


[penguin-kernel: Copy only printk_deferred_{enter,safe}() definition ]
Signed-off-by: default avatarTetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 45a79e28

include/linux/printk.h

+19 −0
Original line number Original line Diff line number Diff line
@@ -672,4 +672,23 @@ static inline void print_hex_dump_debug(const char *prefix_str, int prefix_type, 
#define print_hex_dump_bytes(prefix_str, prefix_type, buf, len)	\

#define print_hex_dump_bytes(prefix_str, prefix_type, buf, len)	\

	print_hex_dump_debug(prefix_str, prefix_type, 16, 1, buf, len, true)

	print_hex_dump_debug(prefix_str, prefix_type, 16, 1, buf, len, true)





#ifdef CONFIG_PRINTK

extern void __printk_safe_enter(void);

extern void __printk_safe_exit(void);

/*

 * The printk_deferred_enter/exit macros are available only as a hack for

 * some code paths that need to defer all printk console printing. Interrupts

 * must be disabled for the deferred duration.

 */

#define printk_deferred_enter __printk_safe_enter

#define printk_deferred_exit __printk_safe_exit

#else

static inline void printk_deferred_enter(void)

{

}

static inline void printk_deferred_exit(void)

{

}

#endif



#endif
 
#endif