LU-9019 target: migrate to 64 bit time

[fs/lustre-release.git] / lustre / target / barrier.c

diff --git a/lustre/target/barrier.c b/lustre/target/barrier.c
index 3710908..b9363a2 100644 (file)
--- a/lustre/target/barrier.c
+++ b/lustre/target/barrier.c
@@ -53,7 +53,7 @@ struct barrier_instance {
        rwlock_t                 bi_rwlock;
        struct percpu_counter    bi_writers;
        atomic_t                 bi_ref;
-       time_t                   bi_deadline;
+       time64_t                 bi_deadline;
        __u32                    bi_status;
 };
 
@@ -173,7 +173,7 @@ static void barrier_set(struct barrier_instance *barrier, __u32 status)
 static int barrier_freeze(const struct lu_env *env,
                          struct barrier_instance *barrier, bool phase1)
 {
-       int left;
+       time64_t left;
        int rc = 0;
        __s64 inflight = 0;
        ENTRY;
@@ -195,7 +195,7 @@ static int barrier_freeze(const struct lu_env *env,
 
        LASSERT(barrier->bi_deadline != 0);
 
-       left = barrier->bi_deadline - cfs_time_current_sec();
+       left = barrier->bi_deadline - ktime_get_real_seconds();
        if (left <= 0)
                RETURN(1);
 
@@ -214,8 +214,7 @@ static int barrier_freeze(const struct lu_env *env,
                if (rc)
                        RETURN(rc);
 
-               if (cfs_time_beforeq(barrier->bi_deadline,
-                                    cfs_time_current_sec()))
+               if (ktime_get_real_seconds() > barrier->bi_deadline)
                        RETURN(1);
        }
 
@@ -237,6 +236,51 @@ void barrier_fini(void)
        LASSERT(list_empty(&barrier_instance_list));
 }
 
+bool barrier_entry(struct dt_device *key)
+{
+       struct barrier_instance *barrier;
+       bool entered = false;
+       ENTRY;
+
+       barrier = barrier_instance_find(key);
+       if (unlikely(!barrier))
+               /* Fail open */
+               RETURN(true);
+
+       read_lock(&barrier->bi_rwlock);
+       if (likely(barrier->bi_status != BS_FREEZING_P1 &&
+                  barrier->bi_status != BS_FREEZING_P2 &&
+                  barrier->bi_status != BS_FROZEN) ||
+           ktime_get_real_seconds() > barrier->bi_deadline) {
+               percpu_counter_inc(&barrier->bi_writers);
+               entered = true;
+       }
+       read_unlock(&barrier->bi_rwlock);
+
+       barrier_instance_put(barrier);
+       return entered;
+}
+EXPORT_SYMBOL(barrier_entry);
+
+void barrier_exit(struct dt_device *key)
+{
+       struct barrier_instance *barrier;
+
+       barrier = barrier_instance_find(key);
+       if (likely(barrier)) {
+               percpu_counter_dec(&barrier->bi_writers);
+
+               /* Avoid out-of-order execution the decreasing inflight
+                * modifications count and the check of barrier status. */
+               smp_mb();
+
+               if (unlikely(barrier->bi_status == BS_FREEZING_P1))
+                       wake_up_all(&barrier->bi_waitq);
+               barrier_instance_put(barrier);
+       }
+}
+EXPORT_SYMBOL(barrier_exit);
+
 int barrier_handler(struct dt_device *key, struct ptlrpc_request *req)
 {
        struct ldlm_gl_barrier_desc *desc;
@@ -278,8 +322,11 @@ int barrier_handler(struct dt_device *key, struct ptlrpc_request *req)
                break;
        case BS_FREEZING_P1:
        case BS_FREEZING_P2:
-               barrier->bi_deadline = cfs_time_current_sec() +
-                                       desc->lgbd_timeout;
+               if (OBD_FAIL_CHECK(OBD_FAIL_BARRIER_FAILURE))
+                       GOTO(fini, rc = -EINVAL);
+
+               barrier->bi_deadline = ktime_get_real_seconds() +
+                                      desc->lgbd_timeout;
                rc = barrier_freeze(&env, barrier,
                                    desc->lgbd_status == BS_FREEZING_P1);
                break;
@@ -310,7 +357,7 @@ out_barrier:
        lvb->lvb_index = barrier_dev_idx(barrier);
 
        CDEBUG(D_SNAPSHOT, "%s: handled barrier request: status %u, "
-              "deadline %lu: rc = %d\n", barrier_barrier2name(barrier),
+              "deadline %lld: rc = %d\n", barrier_barrier2name(barrier),
               lvb->lvb_status, barrier->bi_deadline, rc);
 
        barrier_instance_put(barrier);