Unverified Commit 4c116feb authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14398 printk: Skip log flush in NMI context when logbuf_lock is held 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiaomeng Zhang <zhangxiaomeng13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/CKCJDLNJ2K3PQIBU2ZVXRVHYETQ2MPGP/ 
 
https://gitee.com/openeuler/kernel/issues/IB963V 
 
Link:https://gitee.com/openeuler/kernel/pulls/14398

 

Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Reviewed-by: default avatarYuan Can <yuancan@huawei.com>
Signed-off-by: default avatarYuan Can <yuancan@huawei.com>
parents b68a556b b6b57706

kernel/printk/printk_safe.c

+4 −0
Original line number Diff line number Diff line
@@ -256,6 +256,10 @@ void printk_safe_flush(void) 
{

	int cpu;



	if (raw_spin_is_locked(&logbuf_lock) &&

	    (this_cpu_read(printk_context) & PRINTK_SAFE_CONTEXT_MASK))

		return;



	for_each_possible_cpu(cpu) {

#ifdef CONFIG_PRINTK_NMI

		__printk_safe_flush(&per_cpu(nmi_print_seq, cpu).work);