Fix cv_timedwait timeout

[mirror_spl.git] / module / spl / spl-condvar.c

diff --git a/module/spl/spl-condvar.c b/module/spl/spl-condvar.c
index c420d18cadfe14f61cf01dec57e119bd0be401e4..80c2ef09051fd79129ae20d14bf33ae46f8852ea 100644 (file)
--- a/module/spl/spl-condvar.c
+++ b/module/spl/spl-condvar.c
@@ -26,6 +26,7 @@
 
 #include <sys/condvar.h>
 #include <sys/time.h>
+#include <linux/hrtimer.h>
 
 void
 __cv_init(kcondvar_t *cvp, char *name, kcv_type_t type, void *arg)
@@ -165,22 +166,19 @@ __cv_timedwait_common(kcondvar_t *cvp, kmutex_t *mp, clock_t expire_time,
        ASSERT(mp);
        ASSERT(cvp->cv_magic == CV_MAGIC);
        ASSERT(mutex_owned(mp));
-       atomic_inc(&cvp->cv_refs);
 
+       /* XXX - Does not handle jiffie wrap properly */
+       time_left = expire_time - jiffies;
+       if (time_left <= 0)
+               return (-1);
+
+       atomic_inc(&cvp->cv_refs);
        m = ACCESS_ONCE(cvp->cv_mutex);
        if (!m)
                m = xchg(&cvp->cv_mutex, mp);
        /* Ensure the same mutex is used by all callers */
        ASSERT(m == NULL || m == mp);
 
-       /* XXX - Does not handle jiffie wrap properly */
-       time_left = expire_time - jiffies;
-       if (time_left <= 0) {
-               /* XXX - doesn't reset cv_mutex */
-               atomic_dec(&cvp->cv_refs);
-               return (-1);
-       }
-
        prepare_to_wait_exclusive(&cvp->cv_event, &wait, state);
        atomic_inc(&cvp->cv_waiters);
 
@@ -237,29 +235,25 @@ __cv_timedwait_hires(kcondvar_t *cvp, kmutex_t *mp, hrtime_t expire_time,
 {
        DEFINE_WAIT(wait);
        kmutex_t *m;
-       hrtime_t time_left, now;
-       unsigned long time_left_us;
+       hrtime_t time_left;
+       ktime_t ktime_left;
 
        ASSERT(cvp);
        ASSERT(mp);
        ASSERT(cvp->cv_magic == CV_MAGIC);
        ASSERT(mutex_owned(mp));
-       atomic_inc(&cvp->cv_refs);
 
+       time_left = expire_time - gethrtime();
+       if (time_left <= 0)
+               return (-1);
+
+       atomic_inc(&cvp->cv_refs);
        m = ACCESS_ONCE(cvp->cv_mutex);
        if (!m)
                m = xchg(&cvp->cv_mutex, mp);
        /* Ensure the same mutex is used by all callers */
        ASSERT(m == NULL || m == mp);
 
-       now = gethrtime();
-       time_left = expire_time - now;
-       if (time_left <= 0) {
-               atomic_dec(&cvp->cv_refs);
-               return (-1);
-       }
-       time_left_us = time_left / NSEC_PER_USEC;
-
        prepare_to_wait_exclusive(&cvp->cv_event, &wait, state);
        atomic_inc(&cvp->cv_waiters);
 
@@ -273,7 +267,9 @@ __cv_timedwait_hires(kcondvar_t *cvp, kmutex_t *mp, hrtime_t expire_time,
         * Allow a 100 us range to give kernel an opportunity to coalesce
         * interrupts
         */
-       usleep_range(time_left_us, time_left_us + 100);
+       ktime_left = ktime_set(0, time_left);
+       schedule_hrtimeout_range(&ktime_left, 100 * NSEC_PER_USEC,
+           HRTIMER_MODE_REL);
 
        /* No more waiters a different mutex could be used */
        if (atomic_dec_and_test(&cvp->cv_waiters)) {
@@ -290,15 +286,15 @@ __cv_timedwait_hires(kcondvar_t *cvp, kmutex_t *mp, hrtime_t expire_time,
 
        mutex_enter(mp);
        time_left = expire_time - gethrtime();
-       return (time_left > 0 ? time_left : -1);
+       return (time_left > 0 ? NSEC_TO_TICK(time_left) : -1);
 }
 
 /*
  * Compatibility wrapper for the cv_timedwait_hires() Illumos interface.
  */
-clock_t
-cv_timedwait_hires(kcondvar_t *cvp, kmutex_t *mp, hrtime_t tim, hrtime_t res,
-    int flag)
+static clock_t
+cv_timedwait_hires_common(kcondvar_t *cvp, kmutex_t *mp, hrtime_t tim, hrtime_t res,
+    int flag, int state)
 {
        if (res > 1) {
                /*
@@ -312,10 +308,27 @@ cv_timedwait_hires(kcondvar_t *cvp, kmutex_t *mp, hrtime_t tim, hrtime_t res,
        if (!(flag & CALLOUT_FLAG_ABSOLUTE))
                tim += gethrtime();
 
-       return (__cv_timedwait_hires(cvp, mp, tim, TASK_UNINTERRUPTIBLE));
+       return (__cv_timedwait_hires(cvp, mp, tim, state));
+}
+
+clock_t
+cv_timedwait_hires(kcondvar_t *cvp, kmutex_t *mp, hrtime_t tim, hrtime_t res,
+    int flag)
+{
+       return (cv_timedwait_hires_common(cvp, mp, tim, res, flag,
+           TASK_UNINTERRUPTIBLE));
 }
 EXPORT_SYMBOL(cv_timedwait_hires);
 
+clock_t
+cv_timedwait_sig_hires(kcondvar_t *cvp, kmutex_t *mp, hrtime_t tim, hrtime_t res,
+    int flag)
+{
+       return (cv_timedwait_hires_common(cvp, mp, tim, res, flag,
+           TASK_INTERRUPTIBLE));
+}
+EXPORT_SYMBOL(cv_timedwait_sig_hires);
+
 void
 __cv_signal(kcondvar_t *cvp)
 {