Skip to content

Commit 43eef7c

Browse files
vingu-linaroPeter Zijlstra
authored andcommitted
sched/fair: Remove unused cfs_rq.idle_nr_running
cfs_rq.idle_nr_running field is not used anywhere so we can remove the useless associated computation. Last user went in commit 5e963f2 ("sched/fair: Commit to EEVDF"). Signed-off-by: Vincent Guittot <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Dietmar Eggemann <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 31898e7 commit 43eef7c

File tree

3 files changed

+1
-16
lines changed

3 files changed

+1
-16
lines changed

kernel/sched/debug.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -846,8 +846,6 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
846846
SEQ_printf(m, " .%-30s: %d\n", "nr_running", cfs_rq->nr_running);
847847
SEQ_printf(m, " .%-30s: %d\n", "h_nr_runnable", cfs_rq->h_nr_runnable);
848848
SEQ_printf(m, " .%-30s: %d\n", "h_nr_queued", cfs_rq->h_nr_queued);
849-
SEQ_printf(m, " .%-30s: %d\n", "idle_nr_running",
850-
cfs_rq->idle_nr_running);
851849
SEQ_printf(m, " .%-30s: %d\n", "h_nr_idle", cfs_rq->h_nr_idle);
852850
SEQ_printf(m, " .%-30s: %ld\n", "load", cfs_rq->load.weight);
853851
#ifdef CONFIG_SMP

kernel/sched/fair.c

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3674,8 +3674,6 @@ account_entity_enqueue(struct cfs_rq *cfs_rq, struct sched_entity *se)
36743674
}
36753675
#endif
36763676
cfs_rq->nr_running++;
3677-
if (se_is_idle(se))
3678-
cfs_rq->idle_nr_running++;
36793677
}
36803678

36813679
static void
@@ -3689,8 +3687,6 @@ account_entity_dequeue(struct cfs_rq *cfs_rq, struct sched_entity *se)
36893687
}
36903688
#endif
36913689
cfs_rq->nr_running--;
3692-
if (se_is_idle(se))
3693-
cfs_rq->idle_nr_running--;
36943690
}
36953691

36963692
/*
@@ -13507,7 +13503,7 @@ int sched_group_set_idle(struct task_group *tg, long idle)
1350713503
for_each_possible_cpu(i) {
1350813504
struct rq *rq = cpu_rq(i);
1350913505
struct sched_entity *se = tg->se[i];
13510-
struct cfs_rq *parent_cfs_rq, *grp_cfs_rq = tg->cfs_rq[i];
13506+
struct cfs_rq *grp_cfs_rq = tg->cfs_rq[i];
1351113507
bool was_idle = cfs_rq_is_idle(grp_cfs_rq);
1351213508
long idle_task_delta;
1351313509
struct rq_flags rf;
@@ -13518,14 +13514,6 @@ int sched_group_set_idle(struct task_group *tg, long idle)
1351813514
if (WARN_ON_ONCE(was_idle == cfs_rq_is_idle(grp_cfs_rq)))
1351913515
goto next_cpu;
1352013516

13521-
if (se->on_rq) {
13522-
parent_cfs_rq = cfs_rq_of(se);
13523-
if (cfs_rq_is_idle(grp_cfs_rq))
13524-
parent_cfs_rq->idle_nr_running++;
13525-
else
13526-
parent_cfs_rq->idle_nr_running--;
13527-
}
13528-
1352913517
idle_task_delta = grp_cfs_rq->h_nr_queued -
1353013518
grp_cfs_rq->h_nr_idle;
1353113519
if (!cfs_rq_is_idle(grp_cfs_rq))

kernel/sched/sched.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -648,7 +648,6 @@ struct cfs_rq {
648648
unsigned int nr_running;
649649
unsigned int h_nr_queued; /* SCHED_{NORMAL,BATCH,IDLE} */
650650
unsigned int h_nr_runnable; /* SCHED_{NORMAL,BATCH,IDLE} */
651-
unsigned int idle_nr_running; /* SCHED_IDLE */
652651
unsigned int h_nr_idle; /* SCHED_IDLE */
653652

654653
s64 avg_vruntime;

0 commit comments

Comments
 (0)