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

Commit adf5ebf2 authored by Abhijeet Dharmapurikar's avatar Abhijeet Dharmapurikar
Browse files

sched/walt: drop preferred_cluster from rtg 



Drop preferred_cluster since it is not used anymore.

Change-Id: I6195632be7cdbe0d929803b1895e01b9eb0bb26d
Signed-off-by: default avatarAbhijeet Dharmapurikar <adharmap@codeaurora.org>
parent 422b033f

include/trace/events/walt.h

+7 −11
Original line number Original line Diff line number Diff line
@@ -364,23 +364,19 @@ TRACE_EVENT(sched_set_preferred_cluster, 




	TP_STRUCT__entry(

	TP_STRUCT__entry(

		__field(int,		id)

		__field(int,		id)

		__field(u64,		demand)

		__field(u64,		total_demand)

		__field(int,		cluster_first_cpu)

		__field(bool,		skip_min)

		__array(char,		comm, TASK_COMM_LEN)

		__field(pid_t,		pid)

		__field(unsigned int,	task_demand)

	),

	),





	TP_fast_assign(

	TP_fast_assign(

		__entry->id			= grp->id;

		__entry->id			= grp->id;

		__entry->demand			= total_demand;

		__entry->total_demand		= total_demand;

		__entry->cluster_first_cpu	= grp->preferred_cluster ?

		__entry->skip_min		= grp->skip_min;

			cluster_first_cpu(grp->preferred_cluster) : -1;

	),

	),





	TP_printk("group_id %d total_demand %llu preferred_cluster_first_cpu %d",

	TP_printk("group_id %d total_demand %llu skip_min %d",

			__entry->id, __entry->demand,

			__entry->id, __entry->total_demand,

			__entry->cluster_first_cpu)

			__entry->skip_min)

);

);





TRACE_EVENT(sched_migration_update_sum,

TRACE_EVENT(sched_migration_update_sum,

kernel/sched/sched.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -2739,7 +2739,6 @@ struct related_thread_group { 
	raw_spinlock_t lock;

	raw_spinlock_t lock;

	struct list_head tasks;

	struct list_head tasks;

	struct list_head list;

	struct list_head list;

	struct sched_cluster *preferred_cluster;

	bool skip_min;

	bool skip_min;

	struct rcu_head rcu;

	struct rcu_head rcu;

	u64 last_update;

	u64 last_update;

kernel/sched/walt.c

+3 −12
Original line number Original line Diff line number Diff line
@@ -2508,21 +2508,18 @@ void update_best_cluster(struct related_thread_group *grp, 
				   u64 demand, bool boost)

				   u64 demand, bool boost)

{

{

	if (boost) {

	if (boost) {

		grp->preferred_cluster = sched_cluster[1];

		grp->skip_min = true;

		grp->skip_min = true;

		return;

		return;

	}

	}





	if (grp->preferred_cluster == sched_cluster[0]) {

	if (!grp->skip_min) {

		if (demand >= sched_group_upmigrate) {

		if (demand >= sched_group_upmigrate) {

			grp->preferred_cluster = sched_cluster[1];

			grp->skip_min = true;

			grp->skip_min = true;

		}

		}

		return;

		return;

	}

	}

	if (demand < sched_group_downmigrate) {

	if (demand < sched_group_downmigrate) {

		if (!sysctl_sched_coloc_downmigrate_ns) {

		if (!sysctl_sched_coloc_downmigrate_ns) {

			grp->preferred_cluster = sched_cluster[0];

			grp->skip_min = false;

			grp->skip_min = false;

			return;

			return;

		}

		}
@@ -2532,7 +2529,6 @@ void update_best_cluster(struct related_thread_group *grp, 
		}

		}

		if (grp->last_update - grp->downmigrate_ts >

		if (grp->last_update - grp->downmigrate_ts >

				sysctl_sched_coloc_downmigrate_ns) {

				sysctl_sched_coloc_downmigrate_ns) {

			grp->preferred_cluster = sched_cluster[0];

			grp->downmigrate_ts = 0;

			grp->downmigrate_ts = 0;

			grp->skip_min = false;

			grp->skip_min = false;

		}

		}
@@ -2549,7 +2545,7 @@ int preferred_cluster(struct sched_cluster *cluster, struct task_struct *p) 




	grp = task_related_thread_group(p);

	grp = task_related_thread_group(p);

	if (grp)

	if (grp)

		rc = ((grp->preferred_cluster == cluster) ||

		rc = (sched_cluster[(int)grp->skip_min] == cluster ||

		      cpumask_subset(&cluster->cpus, &asym_cap_sibling_cpus));

		      cpumask_subset(&cluster->cpus, &asym_cap_sibling_cpus));





	rcu_read_unlock();

	rcu_read_unlock();
@@ -2567,7 +2563,6 @@ static void _set_preferred_cluster(struct related_thread_group *grp) 
		return;

		return;





	if (!hmp_capable()) {

	if (!hmp_capable()) {

		grp->preferred_cluster = sched_cluster[0];

		grp->skip_min = false;

		grp->skip_min = false;

		return;

		return;

	}

	}
@@ -3062,11 +3057,7 @@ static bool is_rtgb_active(void) 
		return false;

		return false;





	grp = lookup_related_thread_group(DEFAULT_CGROUP_COLOC_ID);

	grp = lookup_related_thread_group(DEFAULT_CGROUP_COLOC_ID);

	if (!grp || !grp->preferred_cluster ||

	return grp && grp->skip_min;

			is_min_capacity_cluster(grp->preferred_cluster))

		return false;



	return true;

}

}





/*

/*