Commit 11d4afd4 authored by Vincent Guittot's avatar Vincent Guittot Committed by Ingo Molnar
Browse files

sched/pelt: Fix warning and clean up IRQ PELT config 



Create a config for enabling irq load tracking in the scheduler.
irq load tracking is useful only when irq or paravirtual time is
accounted but it's only possible with SMP for now.

Also use __maybe_unused to remove the compilation warning in
update_rq_clock_task() that has been introduced by:

  2e62c474 ("sched/fair: Remove #ifdefs from scale_rt_capacity()")

Suggested-by: default avatarIngo Molnar <mingo@redhat.com>
Reported-by: default avatarDou Liyang <douly.fnst@cn.fujitsu.com>
Reported-by: default avatarMiguel Ojeda <miguel.ojeda.sandonis@gmail.com>
Signed-off-by: default avatarVincent Guittot <vincent.guittot@linaro.org>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bp@alien8.de
Cc: dou_liyang@163.com
Fixes: 2e62c474 ("sched/fair: Remove #ifdefs from scale_rt_capacity()")
Link: http://lkml.kernel.org/r/1537867062-27285-1-git-send-email-vincent.guittot@linaro.org


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent b429f71b

init/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -415,6 +415,11 @@ config IRQ_TIME_ACCOUNTING 


	  If in doubt, say N here.



config HAVE_SCHED_AVG_IRQ

	def_bool y

	depends on IRQ_TIME_ACCOUNTING || PARAVIRT_TIME_ACCOUNTING

	depends on SMP



config BSD_PROCESS_ACCT

	bool "BSD Process Accounting"

	depends on MULTIUSER

kernel/sched/core.c

+3 −4
Original line number Diff line number Diff line
@@ -135,9 +135,8 @@ static void update_rq_clock_task(struct rq *rq, s64 delta) 
 * In theory, the compile should just see 0 here, and optimize out the call

 * to sched_rt_avg_update. But I don't trust it...

 */

#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING)

	s64 steal = 0, irq_delta = 0;

#endif

	s64 __maybe_unused steal = 0, irq_delta = 0;



#ifdef CONFIG_IRQ_TIME_ACCOUNTING

	irq_delta = irq_time_read(cpu_of(rq)) - rq->prev_irq_time;
@@ -177,7 +176,7 @@ static void update_rq_clock_task(struct rq *rq, s64 delta) 


	rq->clock_task += delta;



#ifdef HAVE_SCHED_AVG_IRQ

#ifdef CONFIG_HAVE_SCHED_AVG_IRQ

	if ((irq_delta + steal) && sched_feat(NONTASK_CAPACITY))

		update_irq_load_avg(rq, irq_delta + steal);

#endif

kernel/sched/fair.c

+1 −1
Original line number Diff line number Diff line
@@ -7317,7 +7317,7 @@ static inline bool others_have_blocked(struct rq *rq) 
	if (READ_ONCE(rq->avg_dl.util_avg))

		return true;



#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING)

#ifdef CONFIG_HAVE_SCHED_AVG_IRQ

	if (READ_ONCE(rq->avg_irq.util_avg))

		return true;

#endif

kernel/sched/pelt.c

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ int update_dl_rq_load_avg(u64 now, struct rq *rq, int running) 
	return 0;

}



#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING)

#ifdef CONFIG_HAVE_SCHED_AVG_IRQ

/*

 * irq:

 *

kernel/sched/pelt.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ int __update_load_avg_cfs_rq(u64 now, int cpu, struct cfs_rq *cfs_rq); 
int update_rt_rq_load_avg(u64 now, struct rq *rq, int running);

int update_dl_rq_load_avg(u64 now, struct rq *rq, int running);



#if defined(CONFIG_IRQ_TIME_ACCOUNTING) || defined(CONFIG_PARAVIRT_TIME_ACCOUNTING)

#ifdef CONFIG_HAVE_SCHED_AVG_IRQ

int update_irq_load_avg(struct rq *rq, u64 running);

#else

static inline int

CRA Git | Maintained and supported by SUSTech CRA and CCSE