NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "sched/psi: Extract update_triggers side effect"

Browse source 
This reverts commit fb4bc32fc1 which is
commit 4468fcae49f08e88fbbffe05b29496192df89991 upstream.

It is part of a patch series that breaks the Android API.  If this
series is needed in Android devices in the future, it can come back in
an ABI-safe manner.

Bug: 161946584
Change-Id: I6869017fade6bcd138d5132b80da688012436887
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-09-07 10:48:35 +00:00
parent 2c1e89916b
commit ed063a7e76
1 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

19
kernel/sched/psi.c
View file

@ -430,11 +430,11 @@ 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 u64 update_triggers(struct psi_group *group, u64 now)
{
struct psi_trigger *t;
bool update_total = false;
u64 *total = group->total[PSI_POLL];
*update_total = false;
/*
* On subsequent updates, calculate growth deltas and let
@ -462,7 +462,7 @@ static u64 update_triggers(struct psi_group *group, u64 now, bool *update_total)
* been through all of them. Also remember to extend the
* polling time if we see new stall activity.
*/
*update_total = true;
update_total = true;
/* Calculate growth since last update */
growth = window_update(&t->win, now, total[t->state]);
@ -485,6 +485,10 @@ static u64 update_triggers(struct psi_group *group, u64 now, bool *update_total)
t->pending_event = false;
}
if (update_total)
memcpy(group->rtpoll_total, total,
sizeof(group->rtpoll_total));
return now + group->rtpoll_min_period;
}
@ -618,7 +622,6 @@ static void psi_rtpoll_work(struct psi_group *group)
{
bool force_reschedule = false;
u32 changed_states;
bool update_total;
u64 now;
mutex_lock(&group->rtpoll_trigger_lock);
@ -683,12 +686,8 @@ static void psi_rtpoll_work(struct psi_group *group)
goto out;
}
if (now >= group->rtpoll_next_update) {
group->rtpoll_next_update = update_triggers(group, now, &update_total);
if (update_total)
memcpy(group->rtpoll_total, group->total[PSI_POLL],
sizeof(group->rtpoll_total));
}
if (now >= group->rtpoll_next_update)
group->rtpoll_next_update = update_triggers(group, now);
psi_schedule_rtpoll_work(group,
nsecs_to_jiffies(group->rtpoll_next_update - now) + 1,