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

Commit 7fe9fb29 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sched/walt: Fix stale max_capacity issue during CPU hotplug"

parents 06038262 24f20913

kernel/sched/core.c

+2 −0
Original line number Diff line number Diff line
@@ -6215,6 +6215,7 @@ int sched_cpu_activate(unsigned int cpu) 
	rq_unlock_irqrestore(rq, &rf);



	update_max_interval();

	walt_update_min_max_capacity();



	return 0;

}
@@ -6242,6 +6243,7 @@ int sched_cpu_deactivate(unsigned int cpu) 
		return ret;

	}

	sched_domains_numa_masks_clear(cpu);

	walt_update_min_max_capacity();

	return 0;

}

kernel/sched/sched.h

+6 −1
Original line number Diff line number Diff line
@@ -2665,7 +2665,10 @@ static inline void __update_min_max_capacity(void) 
	int i;

	int max_cap = 0, min_cap = INT_MAX;



	for_each_online_cpu(i) {

	for_each_possible_cpu(i) {

		if (!cpu_active(i))

			continue;



		max_cap = max(max_cap, cpu_capacity(i));

		min_cap = min(min_cap, cpu_capacity(i));

	}
@@ -2950,6 +2953,7 @@ static inline enum sched_boost_policy task_boost_policy(struct task_struct *p) 
}



extern void walt_map_freq_to_load(void);

extern void walt_update_min_max_capacity(void);



static inline bool is_min_capacity_cluster(struct sched_cluster *cluster)

{
@@ -3103,6 +3107,7 @@ static inline unsigned int power_cost(int cpu, u64 demand) 


static inline void note_task_waking(struct task_struct *p, u64 wallclock) { }

static inline void walt_map_freq_to_load(void) { }

static inline void walt_update_min_max_capacity(void) { }

#endif	/* CONFIG_SCHED_WALT */



static inline bool energy_aware(void)

kernel/sched/walt.c

+2 −2
Original line number Diff line number Diff line
@@ -2195,7 +2195,7 @@ static int compute_max_possible_capacity(struct sched_cluster *cluster) 
	return capacity;

}



static void update_min_max_capacity(void)

void walt_update_min_max_capacity(void)

{

	unsigned long flags;
@@ -2366,7 +2366,7 @@ static int cpufreq_notifier_policy(struct notifier_block *nb, 
	if (val != CPUFREQ_NOTIFY)

		return 0;



	update_min_max_capacity();

	walt_update_min_max_capacity();



	max_possible_freq = max(max_possible_freq, policy->cpuinfo.max_freq);

	if (min_max_freq == 1)