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

Merge tag 'sched_urgent_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull scheduler fixes from Borislav Petkov:

 - Avoid touching ~100 config files in order to be able to select the
   preemption model

 - clear cluster CPU masks too, on the CPU unplug path

 - prevent use-after-free in cfs

 - Prevent a race condition when updating CPU cache domains

 - Factor out common shared part of smp_prepare_cpus() into a common
   helper which can be called by both baremetal and Xen, in order to fix
   a booting of Xen PV guests

* tag 'sched_urgent_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  preempt: Restore preemption model selection configs
  arch_topology: Fix missing clear cluster_cpumask in remove_cpu_topology()
  sched/fair: Prevent dead task groups from regaining cfs_rq's
  sched/core: Mitigate race cpus_share_cache()/update_top_cache_domain()
  x86/smp: Factor out parts of native_smp_prepare_cpus()
parents f7018be2 a8b76910

arch/x86/include/asm/smp.h

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ static inline void arch_send_call_function_ipi_mask(const struct cpumask *mask) 


void cpu_disable_common(void);

void native_smp_prepare_boot_cpu(void);

void smp_prepare_cpus_common(void);

void native_smp_prepare_cpus(unsigned int max_cpus);

void calculate_max_logical_packages(void);

void native_smp_cpus_done(unsigned int max_cpus);

arch/x86/kernel/smpboot.c

+12 −6
Original line number Diff line number Diff line
@@ -1350,12 +1350,7 @@ static void __init smp_get_logical_apicid(void) 
		cpu0_logical_apicid = GET_APIC_LOGICAL_ID(apic_read(APIC_LDR));

}



/*

 * Prepare for SMP bootup.

 * @max_cpus: configured maximum number of CPUs, It is a legacy parameter

 *            for common interface support.

 */

void __init native_smp_prepare_cpus(unsigned int max_cpus)

void __init smp_prepare_cpus_common(void)

{

	unsigned int i;
@@ -1386,6 +1381,17 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) 
	set_sched_topology(x86_topology);



	set_cpu_sibling_map(0);

}



/*

 * Prepare for SMP bootup.

 * @max_cpus: configured maximum number of CPUs, It is a legacy parameter

 *            for common interface support.

 */

void __init native_smp_prepare_cpus(unsigned int max_cpus)

{

	smp_prepare_cpus_common();



	init_freq_invariance(false, false);

	smp_sanity_check();

arch/x86/xen/smp_pv.c

+2 −10
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ static void __init xen_pv_smp_prepare_boot_cpu(void) 
static void __init xen_pv_smp_prepare_cpus(unsigned int max_cpus)

{

	unsigned cpu;

	unsigned int i;



	if (skip_ioapic_setup) {

		char *m = (max_cpus == 0) ?
@@ -238,16 +237,9 @@ static void __init xen_pv_smp_prepare_cpus(unsigned int max_cpus) 
	}

	xen_init_lock_cpu(0);



	smp_store_boot_cpu_info();

	cpu_data(0).x86_max_cores = 1;

	smp_prepare_cpus_common();



	for_each_possible_cpu(i) {

		zalloc_cpumask_var(&per_cpu(cpu_sibling_map, i), GFP_KERNEL);

		zalloc_cpumask_var(&per_cpu(cpu_core_map, i), GFP_KERNEL);

		zalloc_cpumask_var(&per_cpu(cpu_die_map, i), GFP_KERNEL);

		zalloc_cpumask_var(&per_cpu(cpu_llc_shared_map, i), GFP_KERNEL);

	}

	set_cpu_sibling_map(0);

	cpu_data(0).x86_max_cores = 1;



	speculative_store_bypass_ht_init();

drivers/base/arch_topology.c

+2 −0
Original line number Diff line number Diff line
@@ -677,6 +677,8 @@ void remove_cpu_topology(unsigned int cpu) 
		cpumask_clear_cpu(cpu, topology_core_cpumask(sibling));

	for_each_cpu(sibling, topology_sibling_cpumask(cpu))

		cpumask_clear_cpu(cpu, topology_sibling_cpumask(sibling));

	for_each_cpu(sibling, topology_cluster_cpumask(cpu))

		cpumask_clear_cpu(cpu, topology_cluster_cpumask(sibling));

	for_each_cpu(sibling, topology_llc_cpumask(cpu))

		cpumask_clear_cpu(cpu, topology_llc_cpumask(sibling));

include/linux/kernel.h

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
struct completion;

struct user;



#ifdef CONFIG_PREEMPT_VOLUNTARY

#ifdef CONFIG_PREEMPT_VOLUNTARY_BUILD



extern int __cond_resched(void);

# define might_resched() __cond_resched()