| Message ID | 20200420205743.19964-1-adobriyan@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/15] sched: make nr_running() return "unsigned int" | expand |
On Mon, Apr 20, 2020 at 11:57:29PM +0300, Alexey Dobriyan wrote: > I don't anyone have been crazy enough to spawn 2^32 threads. > It'd require absurd amounts of physical memory, and bump into futex pid > limit anyway. > > Meanwhile save few bits on REX prefixes and some stack space for upcoming > print_integer() stuff. > > And remove "extern" from prototypes while I'm at it. It seems like there's a few more places to fix in this regard? kernel/sched/fair.c:static u64 __sched_period(unsigned long nr_running) kernel/sched/sched.h: unsigned long dl_nr_running; kernel/sched/core.c:unsigned long nr_iowait_cpu(int cpu) kernel/sched/core.c:unsigned long nr_iowait(void) kernel/sched/loadavg.c: long nr_active, delta = 0; kernel/sched/sched.h: unsigned long rt_nr_migratory; kernel/sched/sched.h: unsigned long rt_nr_total; kernel/sched/sched.h: unsigned long rt_nr_boosted; kernel/sched/sched.h: unsigned long dl_nr_running; kernel/sched/sched.h: unsigned long dl_nr_migratory; kernel/sched/sched.h: unsigned long nr_uninterruptible;
On Mon, Apr 20, 2020 at 02:05:57PM -0700, Matthew Wilcox wrote: > On Mon, Apr 20, 2020 at 11:57:29PM +0300, Alexey Dobriyan wrote: > > I don't anyone have been crazy enough to spawn 2^32 threads. > > It'd require absurd amounts of physical memory, and bump into futex pid > > limit anyway. > > > > Meanwhile save few bits on REX prefixes and some stack space for upcoming > > print_integer() stuff. > > > > And remove "extern" from prototypes while I'm at it. > > It seems like there's a few more places to fix in this regard? > > kernel/sched/fair.c:static u64 __sched_period(unsigned long nr_running) > kernel/sched/sched.h: unsigned long dl_nr_running; > kernel/sched/core.c:unsigned long nr_iowait_cpu(int cpu) > kernel/sched/core.c:unsigned long nr_iowait(void) > kernel/sched/loadavg.c: long nr_active, delta = 0; > kernel/sched/sched.h: unsigned long rt_nr_migratory; > kernel/sched/sched.h: unsigned long rt_nr_total; > kernel/sched/sched.h: unsigned long rt_nr_boosted; > kernel/sched/sched.h: unsigned long dl_nr_running; > kernel/sched/sched.h: unsigned long dl_nr_migratory; > kernel/sched/sched.h: unsigned long nr_uninterruptible; Sure. I changed nr_running() and nr_iowait() because they're in format strings in /proc as %lu.
diff --git a/fs/proc/loadavg.c b/fs/proc/loadavg.c index 8468baee951d..f32878d9a39f 100644 --- a/fs/proc/loadavg.c +++ b/fs/proc/loadavg.c @@ -16,7 +16,7 @@ static int loadavg_proc_show(struct seq_file *m, void *v) get_avenrun(avnrun, FIXED_1/200, 0); - seq_printf(m, "%lu.%02lu %lu.%02lu %lu.%02lu %ld/%d %d\n", + seq_printf(m, "%lu.%02lu %lu.%02lu %lu.%02lu %u/%d %d\n", LOAD_INT(avnrun[0]), LOAD_FRAC(avnrun[0]), LOAD_INT(avnrun[1]), LOAD_FRAC(avnrun[1]), LOAD_INT(avnrun[2]), LOAD_FRAC(avnrun[2]), diff --git a/fs/proc/stat.c b/fs/proc/stat.c index 46b3293015fe..93ce344f62a5 100644 --- a/fs/proc/stat.c +++ b/fs/proc/stat.c @@ -197,7 +197,7 @@ static int show_stat(struct seq_file *p, void *v) "\nctxt %llu\n" "btime %llu\n" "processes %lu\n" - "procs_running %lu\n" + "procs_running %u\n" "procs_blocked %lu\n", nr_context_switches(), (unsigned long long)boottime.tv_sec, diff --git a/include/linux/sched/stat.h b/include/linux/sched/stat.h index 568286411b43..f3b86515bafe 100644 --- a/include/linux/sched/stat.h +++ b/include/linux/sched/stat.h @@ -16,7 +16,7 @@ extern unsigned long total_forks; extern int nr_threads; DECLARE_PER_CPU(unsigned long, process_counts); extern int nr_processes(void); -extern unsigned long nr_running(void); +unsigned int nr_running(void); extern bool single_task_running(void); extern unsigned long nr_iowait(void); extern unsigned long nr_iowait_cpu(int cpu); diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 3a61a3b8eaa9..d9bae602966c 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -3381,9 +3381,9 @@ context_switch(struct rq *rq, struct task_struct *prev, * externally visible scheduler statistics: current number of runnable * threads, total number of context switches performed since bootup. */ -unsigned long nr_running(void) +unsigned int nr_running(void) { - unsigned long i, sum = 0; + unsigned int i, sum = 0; for_each_online_cpu(i) sum += cpu_rq(i)->nr_running;
I don't anyone have been crazy enough to spawn 2^32 threads. It'd require absurd amounts of physical memory, and bump into futex pid limit anyway. Meanwhile save few bits on REX prefixes and some stack space for upcoming print_integer() stuff. And remove "extern" from prototypes while I'm at it. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> --- fs/proc/loadavg.c | 2 +- fs/proc/stat.c | 2 +- include/linux/sched/stat.h | 2 +- kernel/sched/core.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-)