Commit 992a1a3b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'smp-core-2020-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull core SMP updates from Thomas Gleixner:
 "CPU (hotplug) updates:

   - Support for locked CSD objects in smp_call_function_single_async()
     which allows to simplify callsites in the scheduler core and MIPS

   - Treewide consolidation of CPU hotplug functions which ensures the
     consistency between the sysfs interface and kernel state. The low
     level functions cpu_up/down() are now confined to the core code and
     not longer accessible from random code"

* tag 'smp-core-2020-03-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (22 commits)
  cpu/hotplug: Ignore pm_wakeup_pending() for disable_nonboot_cpus()
  cpu/hotplug: Hide cpu_up/down()
  cpu/hotplug: Move bringup of secondary CPUs out of smp_init()
  torture: Replace cpu_up/down() with add/remove_cpu()
  firmware: psci: Replace cpu_up/down() with add/remove_cpu()
  xen/cpuhotplug: Replace cpu_up/down() with device_online/offline()
  parisc: Replace cpu_up/down() with add/remove_cpu()
  sparc: Replace cpu_up/down() with add/remove_cpu()
  powerpc: Replace cpu_up/down() with add/remove_cpu()
  x86/smp: Replace cpu_up/down() with add/remove_cpu()
  arm64: hibernate: Use bringup_hibernate_cpu()
  cpu/hotplug: Provide bringup_hibernate_cpu()
  arm64: Use reboot_cpu instead of hardconding it to 0
  arm64: Don't use disable_nonboot_cpus()
  ARM: Use reboot_cpu instead of hardcoding it to 0
  ARM: Don't use disable_nonboot_cpus()
  ia64: Replace cpu_down() with smp_shutdown_nonboot_cpus()
  cpu/hotplug: Create a new function to shutdown nonboot cpus
  cpu/hotplug: Add new {add,remove}_cpu() functions
  sched/core: Remove rq.hrtick_csd_pending
  ...
parents 2d385336 e98eac6f

arch/arm/kernel/reboot.c

+2 −2
Original line number Diff line number Diff line
@@ -88,11 +88,11 @@ void soft_restart(unsigned long addr) 
 * to execute e.g. a RAM-based pin loop is not sufficient. This allows the

 * kexec'd kernel to use any and all RAM as it sees fit, without having to

 * avoid any code or data used by any SW CPU pin loop. The CPU hotplug

 * functionality embodied in disable_nonboot_cpus() to achieve this.

 * functionality embodied in smp_shutdown_nonboot_cpus() to achieve this.

 */

void machine_shutdown(void)

{

	disable_nonboot_cpus();

	smp_shutdown_nonboot_cpus(reboot_cpu);

}



/*

arch/arm64/kernel/hibernate.c

+5 −8
Original line number Diff line number Diff line
@@ -166,15 +166,12 @@ int arch_hibernation_header_restore(void *addr) 
		sleep_cpu = -EINVAL;

		return -EINVAL;

	}

	if (!cpu_online(sleep_cpu)) {

		pr_info("Hibernated on a CPU that is offline! Bringing CPU up.\n");

		ret = cpu_up(sleep_cpu);



	ret = bringup_hibernate_cpu(sleep_cpu);

	if (ret) {

			pr_err("Failed to bring hibernate-CPU up!\n");

		sleep_cpu = -EINVAL;

		return ret;

	}

	}



	resume_hdr = *hdr;

arch/arm64/kernel/process.c

+2 −2
Original line number Diff line number Diff line
@@ -141,11 +141,11 @@ void arch_cpu_idle_dead(void) 
 * to execute e.g. a RAM-based pin loop is not sufficient. This allows the

 * kexec'd kernel to use any and all RAM as it sees fit, without having to

 * avoid any code or data used by any SW CPU pin loop. The CPU hotplug

 * functionality embodied in disable_nonboot_cpus() to achieve this.

 * functionality embodied in smpt_shutdown_nonboot_cpus() to achieve this.

 */

void machine_shutdown(void)

{

	disable_nonboot_cpus();

	smp_shutdown_nonboot_cpus(reboot_cpu);

}



/*

arch/ia64/kernel/process.c

+1 −7
Original line number Diff line number Diff line
@@ -646,14 +646,8 @@ cpu_halt (void) 


void machine_shutdown(void)

{

#ifdef CONFIG_HOTPLUG_CPU

	int cpu;

	smp_shutdown_nonboot_cpus(reboot_cpu);



	for_each_online_cpu(cpu) {

		if (cpu != smp_processor_id())

			cpu_down(cpu);

	}

#endif

#ifdef CONFIG_KEXEC

	kexec_disable_iosapic();

#endif

arch/mips/kernel/smp.c

+1 −8
Original line number Diff line number Diff line
@@ -696,29 +696,22 @@ EXPORT_SYMBOL(flush_tlb_one); 


#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST



static DEFINE_PER_CPU(atomic_t, tick_broadcast_count);

static DEFINE_PER_CPU(call_single_data_t, tick_broadcast_csd);



void tick_broadcast(const struct cpumask *mask)

{

	atomic_t *count;

	call_single_data_t *csd;

	int cpu;



	for_each_cpu(cpu, mask) {

		count = &per_cpu(tick_broadcast_count, cpu);

		csd = &per_cpu(tick_broadcast_csd, cpu);



		if (atomic_inc_return(count) == 1)

		smp_call_function_single_async(cpu, csd);

	}

}



static void tick_broadcast_callee(void *info)

{

	int cpu = smp_processor_id();

	tick_receive_broadcast();

	atomic_set(&per_cpu(tick_broadcast_count, cpu), 0);

}



static int __init tick_broadcast_init(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE