Commit ca92e6c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull SMP hotplug update from Thomas Gleixner:
 "This contains a trivial typo fix and an extension to the core code for
  dynamically allocating states in the prepare stage.

  The extension is necessary right now because we need a proper way to
  unbreak LTTNG, which iscurrently non functional due to the removal of
  the notifiers. Surely it's out of tree, but it's widely used by
  distros.

  The simple solution would have been to reserve a state for LTTNG, but
  I'm not fond about unused crap in the kernel and the dynamic range,
  which we admittedly should have done right away, allows us to remove
  quite some of the hardcoded states, i.e. those which have no ordering
  requirements. So doing the right thing now is better than having an
  smaller intermediate solution which needs to be reworked anyway"

* 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  cpu/hotplug: Provide dynamic range for prepare stage
  perf/x86/amd/ibs: Fix typo after cleanup state names in cpu/hotplug
parents 0b75f821 4205e478

arch/x86/events/amd/ibs.c

+1 −1
Original line number Diff line number Diff line
@@ -1010,7 +1010,7 @@ static __init int amd_ibs_init(void) 
	 * all online cpus.

	 */

	cpuhp_setup_state(CPUHP_AP_PERF_X86_AMD_IBS_STARTING,

			  "perf/x86/amd/ibs:STARTING",

			  "perf/x86/amd/ibs:starting",

			  x86_pmu_amd_ibs_starting_cpu,

			  x86_pmu_amd_ibs_dying_cpu);

include/linux/cpuhotplug.h

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ enum cpuhp_state { 
	CPUHP_ZCOMP_PREPARE,

	CPUHP_TIMERS_DEAD,

	CPUHP_MIPS_SOC_PREPARE,

	CPUHP_BP_PREPARE_DYN,

	CPUHP_BP_PREPARE_DYN_END		= CPUHP_BP_PREPARE_DYN + 20,

	CPUHP_BRINGUP_CPU,

	CPUHP_AP_IDLE_DEAD,

	CPUHP_AP_OFFLINE,

kernel/cpu.c

+18 −4
Original line number Diff line number Diff line
@@ -1302,10 +1302,24 @@ static int cpuhp_cb_check(enum cpuhp_state state) 
 */

static int cpuhp_reserve_state(enum cpuhp_state state)

{

	enum cpuhp_state i;

	enum cpuhp_state i, end;

	struct cpuhp_step *step;



	for (i = CPUHP_AP_ONLINE_DYN; i <= CPUHP_AP_ONLINE_DYN_END; i++) {

		if (!cpuhp_ap_states[i].name)

	switch (state) {

	case CPUHP_AP_ONLINE_DYN:

		step = cpuhp_ap_states + CPUHP_AP_ONLINE_DYN;

		end = CPUHP_AP_ONLINE_DYN_END;

		break;

	case CPUHP_BP_PREPARE_DYN:

		step = cpuhp_bp_states + CPUHP_BP_PREPARE_DYN;

		end = CPUHP_BP_PREPARE_DYN_END;

		break;

	default:

		return -EINVAL;

	}



	for (i = state; i <= end; i++, step++) {

		if (!step->name)

			return i;

	}

	WARN(1, "No more dynamic states available for CPU hotplug\n");
@@ -1323,7 +1337,7 @@ static int cpuhp_store_callbacks(enum cpuhp_state state, const char *name, 


	mutex_lock(&cpuhp_state_mutex);



	if (state == CPUHP_AP_ONLINE_DYN) {

	if (state == CPUHP_AP_ONLINE_DYN || state == CPUHP_BP_PREPARE_DYN) {

		ret = cpuhp_reserve_state(state);

		if (ret < 0)

			goto out;

CRA Git | Maintained and supported by SUSTech CRA and CCSE