From: Alexey Dobriyan <adobriyan@gmail.com>
To: mingo@redhat.com, peterz@infradead.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 4/5] sched: make nr_iowait_cpu() return 32-bit
Date: Sat, 6 Feb 2021 18:24:11 +0300 [thread overview]
Message-ID: <20210206152411.GD487103@localhost.localdomain> (raw)
In-Reply-To: <20210206151832.GA487103@localhost.localdomain>
Runqueue ->nr_iowait counters are 32-bit anyway.
Propagate 32-bitness into other code, but don't try too hard.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
drivers/cpuidle/governors/menu.c | 6 +++---
include/linux/sched/stat.h | 2 +-
kernel/sched/core.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
--- a/drivers/cpuidle/governors/menu.c
+++ b/drivers/cpuidle/governors/menu.c
@@ -117,7 +117,7 @@ struct menu_device {
int interval_ptr;
};
-static inline int which_bucket(u64 duration_ns, unsigned long nr_iowaiters)
+static inline int which_bucket(u64 duration_ns, unsigned int nr_iowaiters)
{
int bucket = 0;
@@ -150,7 +150,7 @@ static inline int which_bucket(u64 duration_ns, unsigned long nr_iowaiters)
* to be, the higher this multiplier, and thus the higher
* the barrier to go to an expensive C state.
*/
-static inline int performance_multiplier(unsigned long nr_iowaiters)
+static inline int performance_multiplier(unsigned int nr_iowaiters)
{
/* for IO wait tasks (per cpu!) we add 10x each */
return 1 + 10 * nr_iowaiters;
@@ -270,7 +270,7 @@ static int menu_select(struct cpuidle_driver *drv, struct cpuidle_device *dev,
unsigned int predicted_us;
u64 predicted_ns;
u64 interactivity_req;
- unsigned long nr_iowaiters;
+ unsigned int nr_iowaiters;
ktime_t delta_next;
int i, idx;
--- a/include/linux/sched/stat.h
+++ b/include/linux/sched/stat.h
@@ -19,7 +19,7 @@ extern int nr_processes(void);
unsigned int nr_running(void);
extern bool single_task_running(void);
unsigned int nr_iowait(void);
-extern unsigned long nr_iowait_cpu(int cpu);
+unsigned int nr_iowait_cpu(int cpu);
static inline int sched_info_on(void)
{
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -4383,7 +4383,7 @@ unsigned long long nr_context_switches(void)
* it does become runnable.
*/
-unsigned long nr_iowait_cpu(int cpu)
+unsigned int nr_iowait_cpu(int cpu)
{
return atomic_read(&cpu_rq(cpu)->nr_iowait);
}
next prev parent reply other threads:[~2021-02-06 15:25 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-06 15:18 [PATCH 1/5] sched: make struct task_struct::state 32-bit Alexey Dobriyan
2021-02-06 15:20 ` [PATCH 2/5] sched: make nr_running() return 32-bit Alexey Dobriyan
2021-02-06 15:22 ` [PATCH 3/5] sched: make nr_iowait() return 32-bit value Alexey Dobriyan
2021-02-06 15:24 ` Alexey Dobriyan [this message]
2021-02-06 15:30 ` [PATCH 5/5] sched: make multiple runqueue task counters 32-bit Alexey Dobriyan
2021-02-08 10:34 ` [PATCH 1/5] sched: make struct task_struct::state 32-bit Peter Zijlstra
2021-02-08 14:30 ` Alexey Dobriyan
2021-02-08 14:52 ` Alexey Dobriyan
2021-02-08 15:25 ` Peter Zijlstra
2021-02-08 16:45 ` Alexey Dobriyan
2021-02-08 10:39 ` Peter Zijlstra
2021-02-08 14:33 ` Alexey Dobriyan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210206152411.GD487103@localhost.localdomain \
--to=adobriyan@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).