Skip to content

Commit

Permalink
sched: Make multiple runqueue task counters 32-bit
Browse files Browse the repository at this point in the history
Make:

	struct dl_rq::dl_nr_migratory
	struct dl_rq::dl_nr_running

	struct rt_rq::rt_nr_boosted
	struct rt_rq::rt_nr_migratory
	struct rt_rq::rt_nr_total

	struct rq::nr_uninterruptible

32-bit.

If total number of tasks can't exceed 2**32 (and less due to futex pid
limits), then per-runqueue counters can't as well.

This patchset has been sponsored by REX Prefix Eradication Society.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210422200228.1423391-4-adobriyan@gmail.com
  • Loading branch information
Alexey Dobriyan authored and Ingo Molnar committed May 12, 2021
1 parent 8fc2858 commit e6fe3f4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion kernel/sched/loadavg.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ long calc_load_fold_active(struct rq *this_rq, long adjust)
long nr_active, delta = 0;

nr_active = this_rq->nr_running - adjust;
nr_active += (long)this_rq->nr_uninterruptible;
nr_active += (int)this_rq->nr_uninterruptible;

if (nr_active != this_rq->calc_load_active) {
delta = nr_active - this_rq->calc_load_active;
Expand Down
12 changes: 6 additions & 6 deletions kernel/sched/sched.h
Original file line number Diff line number Diff line change
Expand Up @@ -636,8 +636,8 @@ struct rt_rq {
} highest_prio;
#endif
#ifdef CONFIG_SMP
unsigned long rt_nr_migratory;
unsigned long rt_nr_total;
unsigned int rt_nr_migratory;
unsigned int rt_nr_total;
int overloaded;
struct plist_head pushable_tasks;

Expand All @@ -651,7 +651,7 @@ struct rt_rq {
raw_spinlock_t rt_runtime_lock;

#ifdef CONFIG_RT_GROUP_SCHED
unsigned long rt_nr_boosted;
unsigned int rt_nr_boosted;

struct rq *rq;
struct task_group *tg;
Expand All @@ -668,7 +668,7 @@ struct dl_rq {
/* runqueue is an rbtree, ordered by deadline */
struct rb_root_cached root;

unsigned long dl_nr_running;
unsigned int dl_nr_running;

#ifdef CONFIG_SMP
/*
Expand All @@ -682,7 +682,7 @@ struct dl_rq {
u64 next;
} earliest_dl;

unsigned long dl_nr_migratory;
unsigned int dl_nr_migratory;
int overloaded;

/*
Expand Down Expand Up @@ -960,7 +960,7 @@ struct rq {
* one CPU and if it got migrated afterwards it may decrease
* it on another CPU. Always updated under the runqueue lock:
*/
unsigned long nr_uninterruptible;
unsigned int nr_uninterruptible;

struct task_struct __rcu *curr;
struct task_struct *idle;
Expand Down

0 comments on commit e6fe3f4

Please sign in to comment.