Commit 358ab24d authored by Jie Liu's avatar Jie Liu
Browse files

Revert "sched: Add per_cpu cluster domain info and cpus_share_lowest_cache API" 

kunpeng inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8E8NN


CVE: NA

----------------------------------------------------------------------

This reverts commit 53ad6bf7.
Signed-off-by: default avatarJie Liu <liujie375@h-partners.com>
parent cc70cbc1

include/linux/sched/sd_flags.h

+0 −7
Original line number Diff line number Diff line
@@ -109,13 +109,6 @@ SD_FLAG(SD_ASYM_CPUCAPACITY_FULL, SDF_SHARED_PARENT | SDF_NEEDS_GROUPS) 
 */

SD_FLAG(SD_SHARE_CPUCAPACITY, SDF_SHARED_CHILD | SDF_NEEDS_GROUPS)



/*

 * Domain members share CPU cluster (LLC tags or L2 cache)

 *

 * NEEDS_GROUPS: Clusters are shared between groups.

 */

SD_FLAG(SD_CLUSTER, SDF_NEEDS_GROUPS)



/*

 * Domain members share CPU package resources (i.e. caches)

 *

include/linux/sched/topology.h

+1 −7
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static inline int cpu_smt_flags(void) 
#ifdef CONFIG_SCHED_CLUSTER

static inline int cpu_cluster_flags(void)

{

	return SD_CLUSTER | SD_SHARE_PKG_RESOURCES;

	return SD_SHARE_PKG_RESOURCES;

}

#endif
@@ -189,7 +189,6 @@ cpumask_var_t *alloc_sched_domains(unsigned int ndoms); 
void free_sched_domains(cpumask_var_t doms[], unsigned int ndoms);



bool cpus_share_cache(int this_cpu, int that_cpu);

bool cpus_share_lowest_cache(int this_cpu, int that_cpu);



typedef const struct cpumask *(*sched_domain_mask_f)(int cpu);

typedef int (*sched_domain_flags_f)(void);
@@ -244,11 +243,6 @@ static inline bool cpus_share_cache(int this_cpu, int that_cpu) 
	return true;

}



static inline bool cpus_share_lowest_cache(int this_cpu, int that_cpu)

{

	return true;

}



#endif	/* !CONFIG_SMP */



#ifndef arch_scale_cpu_capacity

kernel/sched/core.c

+0 −12
Original line number Diff line number Diff line
@@ -3021,18 +3021,6 @@ bool cpus_share_cache(int this_cpu, int that_cpu) 
	return per_cpu(sd_llc_id, this_cpu) == per_cpu(sd_llc_id, that_cpu);

}



/*

 * Whether CPUs are share lowest cache, which means LLC on non-cluster

 * machines and LLC tag or L2 on machines with clusters.

 */

bool cpus_share_lowest_cache(int this_cpu, int that_cpu)

{

	if (this_cpu == that_cpu)

		return true;



	return per_cpu(sd_lowest_cache_id, this_cpu) == per_cpu(sd_lowest_cache_id, that_cpu);

}



static inline bool ttwu_queue_cond(int cpu)

{

	/*

kernel/sched/sched.h

+0 −2
Original line number Diff line number Diff line
@@ -1844,9 +1844,7 @@ static inline struct sched_domain *lowest_flag_domain(int cpu, int flag) 
DECLARE_PER_CPU(struct sched_domain __rcu *, sd_llc);

DECLARE_PER_CPU(int, sd_llc_size);

DECLARE_PER_CPU(int, sd_llc_id);

DECLARE_PER_CPU(int, sd_lowest_cache_id);

DECLARE_PER_CPU(struct sched_domain_shared __rcu *, sd_llc_shared);

DECLARE_PER_CPU(struct sched_domain __rcu *, sd_cluster);

DECLARE_PER_CPU(struct sched_domain __rcu *, sd_numa);

DECLARE_PER_CPU(struct sched_domain __rcu *, sd_asym_packing);

DECLARE_PER_CPU(struct sched_domain __rcu *, sd_asym_cpucapacity);

kernel/sched/topology.c

+0 −15
Original line number Diff line number Diff line
@@ -647,8 +647,6 @@ static void destroy_sched_domains(struct sched_domain *sd) 
DEFINE_PER_CPU(struct sched_domain __rcu *, sd_llc);

DEFINE_PER_CPU(int, sd_llc_size);

DEFINE_PER_CPU(int, sd_llc_id);

DEFINE_PER_CPU(int, sd_lowest_cache_id);

DEFINE_PER_CPU(struct sched_domain __rcu *, sd_cluster);

DEFINE_PER_CPU(struct sched_domain_shared __rcu *, sd_llc_shared);

DEFINE_PER_CPU(struct sched_domain __rcu *, sd_numa);

DEFINE_PER_CPU(struct sched_domain __rcu *, sd_asym_packing);
@@ -684,18 +682,6 @@ static void update_top_cache_domain(int cpu) 
	per_cpu(sd_llc_id, cpu) = id;

	rcu_assign_pointer(per_cpu(sd_llc_shared, cpu), sds);



	sd = lowest_flag_domain(cpu, SD_CLUSTER);

	if (sd)

		id = cpumask_first(sched_domain_span(sd));

	rcu_assign_pointer(per_cpu(sd_cluster, cpu), sd);



	/*

	 * This assignment should be placed after the sd_llc_id as

	 * we want this id equals to cluster id on cluster machines

	 * but equals to LLC id on non-Cluster machines.

	 */

	per_cpu(sd_lowest_cache_id, cpu) = id;



	sd = lowest_flag_domain(cpu, SD_NUMA);

	rcu_assign_pointer(per_cpu(sd_numa, cpu), sd);
@@ -1530,7 +1516,6 @@ int __read_mostly node_reclaim_distance = RECLAIM_DISTANCE; 
 */

#define TOPOLOGY_SD_FLAGS		\

	(SD_SHARE_CPUCAPACITY	|	\

	 SD_CLUSTER		|	\

	 SD_SHARE_PKG_RESOURCES |	\

	 SD_NUMA		|	\

	 SD_ASYM_PACKING)