Skip to content

Commit 8048ba2

Browse files
committed
Merge tag 'timers-urgent-2024-03-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Ingo Molnar: "Fix timer migration bug that can result in long bootup delays and other oddities" * tag 'timers-urgent-2024-03-17' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: timer/migration: Remove buggy early return on deactivation
2 parents b463a3c + 4b6f4c5 commit 8048ba2

File tree

1 file changed

+0
-20
lines changed

1 file changed

+0
-20
lines changed

kernel/time/timer_migration.c

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -751,26 +751,6 @@ bool tmigr_update_events(struct tmigr_group *group, struct tmigr_group *child,
751751

752752
first_childevt = evt = data->evt;
753753

754-
/*
755-
* Walking the hierarchy is required in any case when a
756-
* remote expiry was done before. This ensures to not lose
757-
* already queued events in non active groups (see section
758-
* "Required event and timerqueue update after a remote
759-
* expiry" in the documentation at the top).
760-
*
761-
* The two call sites which are executed without a remote expiry
762-
* before, are not prevented from propagating changes through
763-
* the hierarchy by the return:
764-
* - When entering this path by tmigr_new_timer(), @evt->ignore
765-
* is never set.
766-
* - tmigr_inactive_up() takes care of the propagation by
767-
* itself and ignores the return value. But an immediate
768-
* return is required because nothing has to be done in this
769-
* level as the event could be ignored.
770-
*/
771-
if (evt->ignore && !remote)
772-
return true;
773-
774754
raw_spin_lock(&group->lock);
775755

776756
childstate.state = 0;

0 commit comments

Comments
 (0)