summaryrefslogtreecommitdiff
path: root/kernel/sched
diff options
context:
space:
mode:
authorYang Yang <yang.yang29@zte.com.cn>2023-10-09 15:24:28 +0300
committerIngo Molnar <mingo@kernel.org>2023-10-09 15:54:50 +0300
commite03dc9fa0663bc303383170e961561462ff00c93 (patch)
treeffb14a99d4b8f078cb41234b88a969cc7d03665b /kernel/sched
parent5b77261c5510f1e6f4d359e97dd3e39ee7259c3d (diff)
downloadlinux-e03dc9fa0663bc303383170e961561462ff00c93.tar.xz
sched/psi: Change update_triggers() to a 'void' function
Update_triggers() always returns now + group->rtpoll_min_period, and the return value is only used by psi_rtpoll_work(), so change update_triggers() to a void function, let group->rtpoll_next_update = now + group->rtpoll_min_period directly. This will avoid unnecessary function return value passing & simplifies the function. [ mingo: Updated changelog ] Suggested-by: Suren Baghdasaryan <surenb@google.com> Signed-off-by: Yang Yang <yang.yang29@zte.com.cn> Signed-off-by: Ingo Molnar <mingo@kernel.org> Link: https://lore.kernel.org/r/202310092024289721617@zte.com.cn
Diffstat (limited to 'kernel/sched')
-rw-r--r--kernel/sched/psi.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c
index 1d0f634725a6..be853f227e40 100644
--- a/kernel/sched/psi.c
+++ b/kernel/sched/psi.c
@@ -434,7 +434,7 @@ static u64 window_update(struct psi_window *win, u64 now, u64 value)
return growth;
}
-static u64 update_triggers(struct psi_group *group, u64 now, bool *update_total,
+static void update_triggers(struct psi_group *group, u64 now, bool *update_total,
enum psi_aggregators aggregator)
{
struct psi_trigger *t;
@@ -503,8 +503,6 @@ static u64 update_triggers(struct psi_group *group, u64 now, bool *update_total,
/* Reset threshold breach flag once event got generated */
t->pending_event = false;
}
-
- return now + group->rtpoll_min_period;
}
static u64 update_averages(struct psi_group *group, u64 now)
@@ -706,7 +704,8 @@ static void psi_rtpoll_work(struct psi_group *group)
}
if (now >= group->rtpoll_next_update) {
- group->rtpoll_next_update = update_triggers(group, now, &update_total, PSI_POLL);
+ update_triggers(group, now, &update_total, PSI_POLL);
+ group->rtpoll_next_update = now + group->rtpoll_min_period;
if (update_total)
memcpy(group->rtpoll_total, group->total[PSI_POLL],
sizeof(group->rtpoll_total));