Unverified Commit 59e6ce82 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!15699 Push 2 self-developed patches to OLK-5.10 

Merge Pull Request from: @ci-robot 
 
PR sync from: Xiaomeng Zhang <zhangxiaomeng13@huawei.com>
https://mailweb.openeuler.org/archives/list/kernel@openeuler.org/message/MMSTDQWS73DPWXFOHDQK7HRHTXW5YSAA/ 
*** BLURB HERE ***

Xiaomeng Zhang (2):
  x86: reboot: Initialize the printk locks to avoid deadlock
  printk: Skip log flush in NMI context when logbuf_lock is held

 
https://gitee.com/openeuler/kernel/issues/IB5G5N
https://gitee.com/openeuler/kernel/issues/IB963V 
 
Link:https://gitee.com/openeuler/kernel/pulls/15699

 

Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Reviewed-by: default avatarYe Weihua <yeweihua4@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents 00d4899f 6651ea5c

arch/x86/kernel/reboot.c

+1 −0
Original line number Diff line number Diff line
@@ -924,6 +924,7 @@ void nmi_shootdown_cpus(nmi_shootdown_cb callback) 
		mdelay(1);

		msecs--;

	}

	zap_locks();



	/*

	 * Leave the nmi callback set, shootdown is a one-time thing.  Clearing

kernel/printk/printk_safe.c

+4 −0
Original line number Diff line number Diff line
@@ -246,6 +246,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);