Skip to contentSkip to conversation

alarmtimer: return correct remaining time

PATCH In review Andrei Vagin 3 participants 3 messages Apr 8, 2019 – Apr 10, 2019 Timekeeping, clocksource core, NTP, alarmtimer

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 alarmtimer: return correct remaining time

To calculate a remaining time, we need to subtract the current time from the expiration time. Currently, arguments of ktime_sub are swapped.

---
 kernel/time/alarmtimer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/alarmtimer.c +1 -1
index 2c97e8c2d29f..0519a8805aab 100644
@@ -594,7 +594,7 @@ static ktime_t alarm_timer_remaining(struct k_itimer *timr, ktime_t now)
 {
 	struct alarm *alarm = &timr->it.alarm.alarmtimer;
 
-	return ktime_sub(now, alarm->node.expires);
+	return ktime_sub(alarm->node.expires, now);
 }
 
 /**
Signature · 1 line
2.20.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines · Andrei Vagin

To calculate a remaining time, we need to subtract the current time from the expiration time. Currently, arguments of ktime_sub are swapped.

---
  kernel/time/alarmtimer.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/alarmtimer.c +0 -0
index 2c97e8c2d29f..0519a8805aab 100644

kernel/time/alarmtimer.c static ktime_t alarm_timer_remaining(struct k_itimer *timr, ktime_t now) · line 597

Quoted 5 lines
kernel/time/alarmtimer.c +1 -1
@@ -594,7 +594,7 @@ static ktime_t alarm_timer_remaining(struct k_itimer *timr, ktime_t now)
  {
  	struct alarm *alarm = &timr->it.alarm.alarmtimer;
 
-	return ktime_sub(now, alarm->node.expires);
+	return ktime_sub(alarm->node.expires, now);

Looks good to me.

Cheers,
-Mukesh

Quoted 3 lines
kernel/time/alarmtimer.c +0 -0
  }
 
  /**
#2 lore raw

[tip:timers/urgent] alarmtimer: Return correct remaining time

In reply to Andrei Vagin
alarmtimer: Return correct remaining time
Commit-ID:  07d7e12091f4ab869cc6a4bb276399057e73b0b3
Gitweb:     https://git.kernel.org/tip/07d7e12091f4ab869cc6a4bb276399057e73b0b3
Author:     Andrei Vagin <[email protected]>
AuthorDate: Sun, 7 Apr 2019 21:15:42 -0700
Committer:  Thomas Gleixner <[email protected]>
CommitDate: Wed, 10 Apr 2019 15:23:26 +0200

alarmtimer: Return correct remaining time

To calculate a remaining time, it's required to subtract the current time from the expiration time. In alarm_timer_remaining() the arguments of ktime_sub are swapped.

Fixes d653d8457c76 ("alarmtimer: Implement remaining callback")
Cc Stephen Boyd <[email protected]>
Cc John Stultz <[email protected]>
---
 kernel/time/alarmtimer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/time/alarmtimer.c +1 -1
index 2c97e8c2d29f..0519a8805aab 100644
@@ -594,7 +594,7 @@ static ktime_t alarm_timer_remaining(struct k_itimer *timr, ktime_t now)
 {
 	struct alarm *alarm = &timr->it.alarm.alarmtimer;
 
-	return ktime_sub(now, alarm->node.expires);
+	return ktime_sub(alarm->node.expires, now);
 }
 
 /**