Merge "sched/core_ctl: Drop core rotate code" (2bec10a0) · Commits · e / devices / android_kernel_xiaomi_nabu

init/Kconfig

+0 −10

Original line number	Diff line number	Diff line
		@@ -900,16 +900,6 @@ config SCHED_CORE_CTL

		If unsure, say N here.

		config SCHED_CORE_ROTATE
		bool "Scheduler core rotation"
		depends on SMP
		help
		This options enables the core rotation functionality in
		the scheduler. Scheduler with core rotation aims to utilize
		CPUs evenly.

		If unsure, say N here.

		config CHECKPOINT_RESTORE
		bool "Checkpoint/restore support" if EXPERT
		select PROC_CHILDREN

kernel/sched/core_ctl.c

+0 −67

Original line number	Diff line number	Diff line
		@@ -40,10 +40,6 @@ struct cluster_data {
		unsigned int num_cpus;
		unsigned int nr_isolated_cpus;
		unsigned int nr_not_preferred_cpus;
		#ifdef CONFIG_SCHED_CORE_ROTATE
		unsigned long set_max;
		unsigned long set_cur;
		#endif
		cpumask_t cpu_mask;
		unsigned int need_cpus;
		unsigned int task_thres;
		@@ -717,58 +713,6 @@ static void move_cpu_lru(struct cpu_data *cpu_data)
		spin_unlock_irqrestore(&state_lock, flags);
		}

		#ifdef CONFIG_SCHED_CORE_ROTATE
		static void cpuset_next(struct cluster_data *cluster)
		{
		int cpus_needed = cluster->num_cpus - cluster->min_cpus;

		cluster->set_cur++;
		cluster->set_cur = min(cluster->set_cur, cluster->set_max);

		/*
		* This loop generates bit sets from 0 to pow(num_cpus, 2) - 1.
		* We start loop from set_cur to set_cur - 1 and break when weight of
		* set_cur equals to cpus_needed.
		*/

		while (1) {
		if (bitmap_weight(&cluster->set_cur, BITS_PER_LONG) ==
		cpus_needed) {
		break;
		}
		cluster->set_cur++;
		cluster->set_cur = min(cluster->set_cur, cluster->set_max);
		if (cluster->set_cur == cluster->set_max)
		/* roll over */
		cluster->set_cur = 0;
		};

		pr_debug("first_cpu=%d cpus_needed=%d set_cur=0x%lx\n",
		cluster->first_cpu, cpus_needed, cluster->set_cur);
		}

		static bool should_we_isolate(int cpu, struct cluster_data *cluster)
		{
		/* cpu should be part of cluster */
		return !!(cluster->set_cur & (1 << (cpu - cluster->first_cpu)));
		}

		static void core_ctl_resume(void)
		{
		unsigned int i = 0;
		struct cluster_data *cluster;

		/* move to next isolation cpu set */
		for_each_cluster(cluster, i)
		cpuset_next(cluster);
		}

		static struct syscore_ops core_ctl_syscore_ops = {
		.resume = core_ctl_resume,
		};

		#else

		static void cpuset_next(struct cluster_data *cluster) { }

		static bool should_we_isolate(int cpu, struct cluster_data *cluster)
		@@ -776,8 +720,6 @@ static bool should_we_isolate(int cpu, struct cluster_data *cluster)
		return true;
		}

		#endif

		static void try_to_isolate(struct cluster_data *cluster, unsigned int need)
		{
		struct cpu_data c, tmp;
		@@ -1116,11 +1058,6 @@ static int cluster_init(const struct cpumask *mask)
		cluster->offline_delay_ms = 100;
		cluster->task_thres = UINT_MAX;
		cluster->nrrun = cluster->num_cpus;
		#ifdef CONFIG_SCHED_CORE_ROTATE
		cluster->set_max = cluster->num_cpus * cluster->num_cpus;
		/* by default mark all cpus as eligible */
		cluster->set_cur = cluster->set_max - 1;
		#endif
		cluster->enable = true;
		cluster->nr_not_preferred_cpus = 0;
		INIT_LIST_HEAD(&cluster->lru);
		@@ -1158,10 +1095,6 @@ static int __init core_ctl_init(void)
		if (should_skip(cpu_possible_mask))
		return 0;

		#ifdef CONFIG_SCHED_CORE_ROTATE
		register_syscore_ops(&core_ctl_syscore_ops);
		#endif

		cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
		"core_ctl/isolation:online",
		core_ctl_isolation_online_cpu, NULL);