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

Commit be99eece authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sched: Fix integer overflow in sched_update_nr_prod()"

parents 5210b0f1 25ce9aa4

kernel/sched/sched_avg.c

+10 −9
Original line number Diff line number Diff line 
/* Copyright (c) 2012, 2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012, 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -60,17 +60,17 @@ void sched_get_nr_running_avg(int *avg, int *iowait_avg, int *big_avg) 


		spin_lock_irqsave(&per_cpu(nr_lock, cpu), flags);

		curr_time = sched_clock();

		diff = curr_time - per_cpu(last_time, cpu);

		BUG_ON((s64)diff < 0);



		tmp_avg += per_cpu(nr_prod_sum, cpu);

		tmp_avg += per_cpu(nr, cpu) *

			(curr_time - per_cpu(last_time, cpu));

		tmp_avg += per_cpu(nr, cpu) * diff;



		tmp_big_avg += per_cpu(nr_big_prod_sum, cpu);

		tmp_big_avg += nr_eligible_big_tasks(cpu) *

			(curr_time - per_cpu(last_time, cpu));

		tmp_big_avg += nr_eligible_big_tasks(cpu) * diff;



		tmp_iowait += per_cpu(iowait_prod_sum, cpu);

		tmp_iowait +=  nr_iowait_cpu(cpu) *

			(curr_time - per_cpu(last_time, cpu));

		tmp_iowait +=  nr_iowait_cpu(cpu) * diff;



		per_cpu(last_time, cpu) = curr_time;
@@ -107,14 +107,15 @@ EXPORT_SYMBOL(sched_get_nr_running_avg); 
 */

void sched_update_nr_prod(int cpu, long delta, bool inc)

{

	int diff;

	s64 curr_time;

	u64 diff;

	u64 curr_time;

	unsigned long flags, nr_running;



	spin_lock_irqsave(&per_cpu(nr_lock, cpu), flags);

	nr_running = per_cpu(nr, cpu);

	curr_time = sched_clock();

	diff = curr_time - per_cpu(last_time, cpu);

	BUG_ON((s64)diff < 0);

	per_cpu(last_time, cpu) = curr_time;

	per_cpu(nr, cpu) = nr_running + (inc ? delta : -delta);