Commit 93510cd4 authored by Yu Liao's avatar Yu Liao
Browse files

Revert "cpu/hotplug: fix kabi breakage in enum cpuhp_state" 

hulk inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8OSNK


CVE: NA

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

This reverts commit 48725c8f.

Signed-off-by: default avatarYu Liao <liaoyu15@huawei.com>
parent 20197701

include/linux/cpuhotplug.h

+1 −0
Original line number Diff line number Diff line
@@ -137,6 +137,7 @@ enum cpuhp_state { 
	CPUHP_AP_ARM_CORESIGHT_STARTING,

	CPUHP_AP_ARM64_ISNDEP_STARTING,

	CPUHP_AP_SMPCFD_DYING,

	CPUHP_AP_HRTIMERS_DYING,

	CPUHP_AP_X86_TBOOT_DYING,

	CPUHP_AP_ARM_CACHE_B15_RAC_DYING,

	CPUHP_AP_ONLINE,

include/linux/hrtimer.h

+1 −1
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ int hrtimers_prepare_cpu(unsigned int cpu); 
#ifdef CONFIG_HOTPLUG_CPU

int hrtimers_cpu_dying(unsigned int cpu);

#else

static inline int hrtimers_cpu_dying(unsigned int cpu) { return 0; }

#define hrtimers_cpu_dying	NULL

#endif



#endif

include/linux/smp.h

+0 −1
Original line number Diff line number Diff line
@@ -220,6 +220,5 @@ int smp_call_on_cpu(unsigned int cpu, int (*func)(void *), void *par, 
int smpcfd_prepare_cpu(unsigned int cpu);

int smpcfd_dead_cpu(unsigned int cpu);

int smpcfd_dying_cpu(unsigned int cpu);

int smpcfd_and_hrtimer_dying_cpu(unsigned int cpu);



#endif /* __LINUX_SMP_H */

kernel/cpu.c

+6 −13
Original line number Diff line number Diff line
@@ -1452,23 +1452,16 @@ static struct cpuhp_step cpuhp_hp_states[] = { 
		.startup.single		= NULL,

		.teardown.single	= rcutree_dying_cpu,

	},

	/*

	 * In order to fix the kabi breakage, we had to move the hrtimers:dying

	 * step into smpcfd:dying and create a new function smpcfd_and_hrtimer_dying_cpu().

	 * Please ensure that there are no other steps with teardown handler

	 * between smpcfd:dying and cpu:teardown.

	 */

	[CPUHP_AP_SMPCFD_DYING] = {

		.name			= "smpcfd:dying",

		.startup.single		= NULL,

		.teardown.single	= smpcfd_and_hrtimer_dying_cpu,

		.teardown.single	= smpcfd_dying_cpu,

	},

	[CPUHP_AP_HRTIMERS_DYING] = {

		.name			= "hrtimers:dying",

		.startup.single		= NULL,

		.teardown.single	= hrtimers_cpu_dying,

	},



	/*

	 * Attention: Please do not add steps between smpcfd:dying

	 * and ap:online. Please refer to the above for specific

	 * reasons.

	 */



	/* Entry state on starting. Interrupts enabled from here on. Transient

	 * state for synchronsization */

kernel/smp.c

+0 −8
Original line number Diff line number Diff line
@@ -71,14 +71,6 @@ int smpcfd_dead_cpu(unsigned int cpu) 
	return 0;

}



int smpcfd_and_hrtimer_dying_cpu(unsigned int cpu)

{

	hrtimers_cpu_dying(cpu);

	smpcfd_dying_cpu(cpu);



	return 0;

}



int smpcfd_dying_cpu(unsigned int cpu)

{

	/*