History

PM-runtime: Fix deadlock with ktime_get()

A deadlock has been seen when swicthing clocksources which use PM-runtime. The call path is: change_clocksource ... write_seqcount_begin ... timekeeping_update ... sh_cmt_clocksource_enable ... rpm_resume pm_runtime_mark_last_busy ktime_get do read_seqcount_begin while read_seqcount_retry .... write_seqcount_end Although we should be safe because we haven't yet changed the clocksource at that time, we can't do that because of seqcount protection. Use ktime_get_mono_fast_ns() instead which is lock safe for such cases. With ktime_get_mono_fast_ns, the timestamp is not guaranteed to be monotonic across an update and as a result can goes backward. According to update_fast_timekeeper() description: "In the worst case, this can result is a slightly wrong timestamp (a few nanoseconds)". For PM-runtime autosuspend, this means only that the suspend decision may be slightly suboptimal.

Vincent Guittot committed 7 years ago

Commit 15efb471 parent f17b5f02 files · +6 −6Browse files

Unified · Split

2 files
  1. drivers/base/power/runtime.c +5 −5
  2. include/linux/pm_runtime.h +1 −1
drivers/base/power/runtime.c+5−5
@@ -130,7 +130,7 @@ u64 pm_runtime_autosuspend_expiration(struct device *dev) · 129 unmodified lines
130{130{
131 int autosuspend_delay;131 int autosuspend_delay;
132 u64 last_busy, expires = 0;132 u64 last_busy, expires = 0;
133 u64 now = ktime_to_ns(ktime_get());133 u64 now = ktime_get_mono_fast_ns();
134 134
135 if (!dev->power.use_autosuspend)135 if (!dev->power.use_autosuspend)
136 goto out;136 goto out;
@@ -909,7 +909,7 @@ static enum hrtimer_restart pm_suspend_timer_fn(struct hrtimer *timer) · 772 unmodified lines
909 * If 'expires' is after the current time, we've been called909 * If 'expires' is after the current time, we've been called
910 * too early.910 * too early.
911 */911 */
912 if (expires > 0 && expires < ktime_to_ns(ktime_get())) {912 if (expires > 0 && expires < ktime_get_mono_fast_ns()) {
913 dev->power.timer_expires = 0;913 dev->power.timer_expires = 0;
914 rpm_suspend(dev, dev->power.timer_autosuspends ?914 rpm_suspend(dev, dev->power.timer_autosuspends ?
915 (RPM_ASYNC | RPM_AUTO) : RPM_ASYNC);915 (RPM_ASYNC | RPM_AUTO) : RPM_ASYNC);
@@ -928,7 +928,7 @@ static enum hrtimer_restart pm_suspend_timer_fn(struct hrtimer *timer) · 12 unmodified lines
928int pm_schedule_suspend(struct device *dev, unsigned int delay)928int pm_schedule_suspend(struct device *dev, unsigned int delay)
929{929{
930 unsigned long flags;930 unsigned long flags;
931 ktime_t expires;931 u64 expires;
932 int retval;932 int retval;
933 933
934 spin_lock_irqsave(&dev->power.lock, flags);934 spin_lock_irqsave(&dev->power.lock, flags);
@@ -945,8 +945,8 @@ int pm_schedule_suspend(struct device *dev, unsigned int delay) · 10 unmodified lines
945 /* Other scheduled or pending requests need to be canceled. */945 /* Other scheduled or pending requests need to be canceled. */
946 pm_runtime_cancel_pending(dev);946 pm_runtime_cancel_pending(dev);
947 947
948 expires = ktime_add(ktime_get(), ms_to_ktime(delay));948 expires = ktime_get_mono_fast_ns() + (u64)delay * NSEC_PER_MSEC;
949 dev->power.timer_expires = ktime_to_ns(expires);949 dev->power.timer_expires = expires;
950 dev->power.timer_autosuspends = 0;950 dev->power.timer_autosuspends = 0;
951 hrtimer_start(&dev->power.suspend_timer, expires, HRTIMER_MODE_ABS);951 hrtimer_start(&dev->power.suspend_timer, expires, HRTIMER_MODE_ABS);
952 952
include/linux/pm_runtime.h+1−1
@@ -105,7 +105,7 @@ static inline bool pm_runtime_callbacks_present(struct device *dev) · 104 unmodified lines
105 105
106static inline void pm_runtime_mark_last_busy(struct device *dev)106static inline void pm_runtime_mark_last_busy(struct device *dev)
107{107{
108 WRITE_ONCE(dev->power.last_busy, ktime_to_ns(ktime_get()));108 WRITE_ONCE(dev->power.last_busy, ktime_get_mono_fast_ns());
109}109}
110 110
111static inline bool pm_runtime_is_irq_safe(struct device *dev)111static inline bool pm_runtime_is_irq_safe(struct device *dev)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t