]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
rust: time: Pass correct timer mode ID to hrtimer_start_range_ns
authorLyude Paul <lyude@redhat.com>
Thu, 10 Jul 2025 22:51:13 +0000 (18:51 -0400)
committerMiguel Ojeda <ojeda@kernel.org>
Wed, 16 Jul 2025 22:55:35 +0000 (00:55 +0200)
While rebasing rvkms I noticed that timers I was setting seemed to have
pretty random timer values that amounted slightly over 2x the time value I
set each time. After a lot of debugging, I finally managed to figure out
why: it seems that since we moved to Instant and Delta, we mistakenly
began passing the clocksource ID to hrtimer_start_range_ns, when we should
be passing the timer mode instead. Presumably, this works fine for simple
relative timers - but immediately breaks on other types of timers.

So, fix this by passing the ID for the timer mode instead.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Acked-by: Andreas Hindborg <a.hindborg@kernel.org>
Reviewed-by: FUJITA Tomonori <fujita.tomonori@gmail.com>
Fixes: e0c0ab04f678 ("rust: time: Make HasHrTimer generic over HrTimerMode")
Link: https://lore.kernel.org/r/20250710225129.670051-1-lyude@redhat.com
[ Removed cast, applied `rustfmt`, fixed `Fixes:` tag. - Miguel ]
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
rust/kernel/time/hrtimer.rs

index d6830b6bbee7a0c255e35a0d98dedd427b13473e..144e3b57cc7800d5f384ca4bf9c465aa1e7ea06d 100644 (file)
@@ -398,7 +398,7 @@ pub unsafe trait HasHrTimer<T> {
                 Self::c_timer_ptr(this).cast_mut(),
                 expires.as_nanos(),
                 0,
-                <Self::TimerMode as HrTimerMode>::Clock::ID as u32,
+                <Self::TimerMode as HrTimerMode>::C_MODE,
             );
         }
     }