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

!8153 cpu/hotplug: Don't offline the last non-isolated CPU 

Merge Pull Request from: @ci-robot 
 
PR sync from: liwei <liwei728@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/D33FRDDWRB6NR4Z26FZYAQG4SOLUGXP6/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9RFL2 
 
Link:https://gitee.com/openeuler/kernel/pulls/8153

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 46770813 a158905c

kernel/cpu.c

+7 −4
Original line number Diff line number Diff line
@@ -1142,12 +1142,15 @@ static int cpu_down_maps_locked(unsigned int cpu, enum cpuhp_state target) 
	/*

	 * Ensure that the control task does not run on the to be offlined

	 * CPU to prevent a deadlock against cfs_b->period_timer.

	 * Also keep at least one housekeeping cpu onlined to avoid generating

	 * an empty sched_domain span.

	 */

	cpu = cpumask_any_but(cpu_online_mask, cpu);

	if (cpu >= nr_cpu_ids)

		return -EBUSY;

	for_each_cpu_and(cpu, cpu_online_mask, housekeeping_cpumask(HK_FLAG_DOMAIN)) {

		if (cpu != work.cpu)

			return work_on_cpu(cpu, __cpu_down_maps_locked, &work);

	}

	return -EBUSY;

}



static int cpu_down(unsigned int cpu, enum cpuhp_state target)

{