Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d35daff authored by Satya Durga Srinivasu Prabhala's avatar Satya Durga Srinivasu Prabhala
Browse files

Revert "core_ctl: Add a kernel parameter to disable core_ctl" 



Now that the support to enable/disable core control from sysfs
node available, kernel parameter isn't needed anymore.
So, revert 'commit 1aeb977e ("core_ctl: Add a kernel
parameter to disable core_ctl")' to drop kernel parameter
support and follow up patches need core control to populate
cluster stats to enable/disable core control.

Change-Id: Ifbe59c288bd405a376c14e9dfda49a6042674068
Signed-off-by: default avatarSatya Durga Srinivasu Prabhala <satyap@codeaurora.org>
parent 84f2004d

Documentation/admin-guide/kernel-parameters.txt

+0 −6
Original line number Diff line number Diff line
@@ -648,12 +648,6 @@ 
			seconds. Defaults to 10*60 = 10mins. A value of 0

			disables the blank timer.



	core_ctl_disable_cpumask= [SMP]

			Exempt the CPUs from being managed by core_ctl.

			core_ctl operates on a cluster basis. So all the

			CPUs in a given cluster must be specified to disable

			core_ctl for that cluster.



	coredump_filter=

			[KNL] Change the default value for

			/proc/<pid>/coredump_filter.

kernel/sched/core_ctl.c

+0 −42
Original line number Diff line number Diff line
@@ -969,42 +969,6 @@ static int core_ctl_isolation_dead_cpu(unsigned int cpu) 


/* ============================ init code ============================== */



static cpumask_var_t core_ctl_disable_cpumask;

static bool core_ctl_disable_cpumask_present;



static int __init core_ctl_disable_setup(char *str)

{

	if (!*str)

		return -EINVAL;



	alloc_bootmem_cpumask_var(&core_ctl_disable_cpumask);



	if (cpulist_parse(str, core_ctl_disable_cpumask) < 0) {

		free_bootmem_cpumask_var(core_ctl_disable_cpumask);

		return -EINVAL;

	}



	core_ctl_disable_cpumask_present = true;

	pr_info("disable_cpumask=%*pbl\n",

			cpumask_pr_args(core_ctl_disable_cpumask));



	return 0;

}

early_param("core_ctl_disable_cpumask", core_ctl_disable_setup);



static bool should_skip(const struct cpumask *mask)

{

	if (!core_ctl_disable_cpumask_present)

		return false;



	/*

	 * We operate on a cluster basis. Disable the core_ctl for

	 * a cluster, if all of it's cpus are specified in

	 * core_ctl_disable_cpumask

	 */

	return cpumask_subset(mask, core_ctl_disable_cpumask);

}



static struct cluster_data *find_cluster_by_first_cpu(unsigned int first_cpu)

{

	unsigned int i;
@@ -1026,9 +990,6 @@ static int cluster_init(const struct cpumask *mask) 
	unsigned int cpu;

	struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };



	if (should_skip(mask))

		return 0;



	if (find_cluster_by_first_cpu(first_cpu))

		return 0;
@@ -1093,9 +1054,6 @@ static int __init core_ctl_init(void) 
	unsigned int cpu;

	struct cpumask cpus = *cpu_possible_mask;



	if (should_skip(cpu_possible_mask))

		return 0;



	cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,

			"core_ctl/isolation:online",

			core_ctl_isolation_online_cpu, NULL);