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

!10514 powerpc: Avoid nmi_enter/nmi_exit in real mode interrupt. 

Merge Pull Request from: @ci-robot 
 
PR sync from: Jinjie Ruan <ruanjinjie@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LQ4VX2WVYWAKTSDT4HINLEQEVJ3EDHOV/ 
 
https://gitee.com/src-openeuler/kernel/issues/IAGPSI 
 
Link:https://gitee.com/openeuler/kernel/pulls/10514

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents bfe6971a 247ff920

arch/powerpc/include/asm/percpu.h

+10 −0
Original line number Diff line number Diff line
@@ -15,6 +15,16 @@ 
#endif /* CONFIG_SMP */

#endif /* __powerpc64__ */



#if defined(CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK) && defined(CONFIG_SMP)

#include <linux/jump_label.h>

DECLARE_STATIC_KEY_FALSE(__percpu_first_chunk_is_paged);



#define percpu_first_chunk_is_paged	\

		(static_key_enabled(&__percpu_first_chunk_is_paged.key))

#else

#define percpu_first_chunk_is_paged	false

#endif /* CONFIG_PPC64 && CONFIG_SMP */



#include <asm-generic/percpu.h>



#include <asm/paca.h>

arch/powerpc/kernel/mce.c

+11 −3
Original line number Diff line number Diff line
@@ -594,8 +594,15 @@ long notrace machine_check_early(struct pt_regs *regs) 
	u8 ftrace_enabled = this_cpu_get_ftrace_enabled();



	this_cpu_set_ftrace_enabled(0);

	/* Do not use nmi_enter/exit for pseries hpte guest */

	if (radix_enabled() || !firmware_has_feature(FW_FEATURE_LPAR))

	/*

	 * Do not use nmi_enter/exit for pseries hpte guest.

	 *

	 * Likewise, do not use it in real mode if percpu first chunk is not

	 * embedded. With CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK enabled there

	 * are chances where percpu allocation can come from vmalloc area.

	 */

	if ((radix_enabled() || !firmware_has_feature(FW_FEATURE_LPAR)) &&

	    !percpu_first_chunk_is_paged)

		nmi_enter();



	hv_nmi_check_nonrecoverable(regs);
@@ -606,7 +613,8 @@ long notrace machine_check_early(struct pt_regs *regs) 
	if (ppc_md.machine_check_early)

		handled = ppc_md.machine_check_early(regs);



	if (radix_enabled() || !firmware_has_feature(FW_FEATURE_LPAR))

	if ((radix_enabled() || !firmware_has_feature(FW_FEATURE_LPAR)) &&

	    !percpu_first_chunk_is_paged)

		nmi_exit();



	this_cpu_set_ftrace_enabled(ftrace_enabled);

arch/powerpc/kernel/setup_64.c

+2 −0
Original line number Diff line number Diff line
@@ -827,6 +827,7 @@ static int pcpu_cpu_distance(unsigned int from, unsigned int to) 


unsigned long __per_cpu_offset[NR_CPUS] __read_mostly;

EXPORT_SYMBOL(__per_cpu_offset);

DEFINE_STATIC_KEY_FALSE(__percpu_first_chunk_is_paged);



static void __init pcpu_populate_pte(unsigned long addr)

{
@@ -906,6 +907,7 @@ void __init setup_per_cpu_areas(void) 
	if (rc < 0)

		panic("cannot initialize percpu area (err=%d)", rc);



	static_key_enable(&__percpu_first_chunk_is_paged.key);

	delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start;

	for_each_possible_cpu(cpu) {

                __per_cpu_offset[cpu] = delta + pcpu_unit_offsets[cpu];