Unverified Commit 9db5c334 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!3372 Cluster scheduler support 

Merge Pull Request from: @aubrey-intel 
 
The cluster scheduler support in this context is about enhancing the Linux kernel's scheduler for systems where sets of CPU cores share an L2 cache or other mid-level caches/resources.

On x86_64 side a testing with Intel's Jacobsville platform showed up to a 25% improvement with the load being better balanced between L2 clusters. Also, not all workloads will benefit from this cluster scheduler work.

On the ARM side there were Stream memory benchmark improvements up to 19%, PBZIP2 performance by up to 8%, PIXZ performance up to a few percent, and also a number of SPECrate wins, but not a universal win either. 
 
Link:https://gitee.com/openeuler/kernel/pulls/3372

 

Reviewed-by: default avatarJason Zeng <jason.zeng@intel.com>
Reviewed-by: default avatarAichun Shi <aichun.shi@intel.com>
Reviewed-by: default avatarWeilong Chen <chenweilong@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents a551aedc 5ce7f450

arch/x86/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -1010,6 +1010,17 @@ config NR_CPUS 
	  This is purely to save memory: each supported CPU adds about 8KB

	  to the kernel image.



config SCHED_CLUSTER

	bool "Cluster scheduler support"

	depends on SMP

	default y

	help

	  Cluster scheduler support improves the CPU scheduler's decision

	  making when dealing with machines that have clusters of CPUs.

	  Cluster usually means a couple of CPUs which are placed closely

	  by sharing mid-level caches, last-level cache tags or internal

	  busses.



config SCHED_SMT

	def_bool y if SMP

arch/x86/configs/openeuler_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ CONFIG_NR_CPUS_RANGE_BEGIN=8192 
CONFIG_NR_CPUS_RANGE_END=8192

CONFIG_NR_CPUS_DEFAULT=8192

CONFIG_NR_CPUS=8192

CONFIG_SCHED_CLUSTER=y

CONFIG_SCHED_SMT=y

CONFIG_SCHED_MC=y

CONFIG_SCHED_MC_PRIO=y

arch/x86/include/asm/smp.h

+8 −0
Original line number Diff line number Diff line
@@ -16,7 +16,9 @@ DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_core_map); 
DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_die_map);

/* cpus sharing the last level cache: */

DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_llc_shared_map);

DECLARE_PER_CPU_READ_MOSTLY(cpumask_var_t, cpu_l2c_shared_map);

DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_llc_id);

DECLARE_PER_CPU_READ_MOSTLY(u16, cpu_l2c_id);

DECLARE_PER_CPU_READ_MOSTLY(int, cpu_number);



static inline struct cpumask *cpu_llc_shared_mask(int cpu)
@@ -24,6 +26,11 @@ static inline struct cpumask *cpu_llc_shared_mask(int cpu) 
	return per_cpu(cpu_llc_shared_map, cpu);

}



static inline struct cpumask *cpu_l2c_shared_mask(int cpu)

{

	return per_cpu(cpu_l2c_shared_map, cpu);

}



DECLARE_EARLY_PER_CPU_READ_MOSTLY(u16, x86_cpu_to_apicid);

DECLARE_EARLY_PER_CPU_READ_MOSTLY(u32, x86_cpu_to_acpiid);

DECLARE_EARLY_PER_CPU_READ_MOSTLY(u16, x86_bios_cpu_apicid);
@@ -119,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/include/asm/topology.h

+3 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ static inline void setup_node_to_cpumask_map(void) { } 
#include <asm-generic/topology.h>



extern const struct cpumask *cpu_coregroup_mask(int cpu);

extern const struct cpumask *cpu_clustergroup_mask(int cpu);



#define topology_logical_package_id(cpu)	(cpu_data(cpu).logical_proc_id)

#define topology_physical_package_id(cpu)	(cpu_data(cpu).phys_proc_id)
@@ -113,7 +114,9 @@ extern const struct cpumask *cpu_coregroup_mask(int cpu); 
extern unsigned int __max_die_per_package;



#ifdef CONFIG_SMP

#define topology_cluster_id(cpu)		(per_cpu(cpu_l2c_id, cpu))

#define topology_die_cpumask(cpu)		(per_cpu(cpu_die_map, cpu))

#define topology_cluster_cpumask(cpu)		(cpu_clustergroup_mask(cpu))

#define topology_core_cpumask(cpu)		(per_cpu(cpu_core_map, cpu))

#define topology_sibling_cpumask(cpu)		(per_cpu(cpu_sibling_map, cpu))

arch/x86/kernel/cpu/cacheinfo.c

+1 −0
Original line number Diff line number Diff line
@@ -865,6 +865,7 @@ void init_intel_cacheinfo(struct cpuinfo_x86 *c) 
		l2 = new_l2;

#ifdef CONFIG_SMP

		per_cpu(cpu_llc_id, cpu) = l2_id;

		per_cpu(cpu_l2c_id, cpu) = l2_id;

#endif

	}