Whamcloud - gitweb
LU-13456 ldlm: fix reprocessing of locks with more bits
[fs/lustre-release.git] / lustre / include / lustre_dlm.h
index 8cefd83..ee4dea1 100644 (file)
@@ -27,7 +27,6 @@
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
- * Lustre is a trademark of Sun Microsystems, Inc.
  */
 
 /** \defgroup LDLM Lustre Distributed Lock Manager
@@ -68,6 +67,8 @@ extern struct kset *ldlm_svc_kset;
  * client shows interest in that lock, e.g. glimpse is occured. */
 #define LDLM_DIRTY_AGE_LIMIT (10)
 #define LDLM_DEFAULT_PARALLEL_AST_LIMIT 1024
+#define LDLM_DEFAULT_LRU_SHRINK_BATCH (16)
+#define LDLM_DEFAULT_SLV_RECALC_PCT (10)
 
 /**
  * LDLM non-error return states
@@ -196,6 +197,17 @@ static inline int lockmode_compat(enum ldlm_mode exist_mode,
  *
  */
 
+/* Cancel lru flag, it indicates we cancel aged locks. */
+enum ldlm_lru_flags {
+       LDLM_LRU_FLAG_NO_WAIT   = 0x1, /* Cancel locks w/o blocking (neither
+                                       * sending nor waiting for any RPCs) */
+       LDLM_LRU_FLAG_CLEANUP   = 0x2, /* Used when clearing lru, tells
+                                       * prepare_lru_list to set discard flag
+                                       * on PR extent locks so we don't waste
+                                       * time saving pages that will be
+                                       * discarded momentarily */
+};
+
 struct ldlm_pool;
 struct ldlm_lock;
 struct ldlm_resource;
@@ -211,7 +223,7 @@ struct ldlm_namespace;
  */
 struct ldlm_pool_ops {
        /** Recalculate pool \a pl usage */
-       int (*po_recalc)(struct ldlm_pool *pl);
+       int (*po_recalc)(struct ldlm_pool *pl, bool force);
        /** Cancel at least \a nr locks from pool \a pl */
        int (*po_shrink)(struct ldlm_pool *pl, int nr, gfp_t gfp_mask);
        int (*po_setup)(struct ldlm_pool *pl, int limit);
@@ -253,8 +265,9 @@ struct ldlm_pool {
        __u64                   pl_server_lock_volume;
        /** Current biggest client lock volume. Protected by pl_lock. */
        __u64                   pl_client_lock_volume;
-       /** Lock volume factor. SLV on client is calculated as following:
-        *  server_slv * lock_volume_factor. */
+       /** Lock volume factor, shown in percents in procfs, but internally
+        *  Client SLV calculated as: server_slv * lock_volume_factor >> 8.
+        */
        atomic_t                pl_lock_volume_factor;
        /** Time when last SLV from server was obtained. */
        time64_t                pl_recalc_time;
@@ -353,6 +366,14 @@ enum ldlm_ns_type {
        LDLM_NS_TYPE_MGT,               /**< MGT namespace */
 };
 
+enum ldlm_namespace_flags {
+       /**
+        * Flag to indicate the LRU cancel is in progress.
+        * Used to limit the process by 1 thread only.
+        */
+       LDLM_LRU_CANCEL = 0
+};
+
 /**
  * LDLM Namespace.
  *
@@ -435,6 +456,17 @@ struct ldlm_namespace {
         */
        unsigned int            ns_max_unused;
 
+       /**
+        * Cancel batch, if unused lock count exceed lru_size
+        * Only be used if LRUR disable.
+        */
+       unsigned int            ns_cancel_batch;
+
+       /**
+        * How much the SLV should decrease in %% to trigger LRU cancel urgently.
+        */
+       unsigned int            ns_recalc_pct;
+
        /** Maximum allowed age (last used time) for locks in the LRU.  Set in
         * seconds from userspace, but stored in ns to avoid repeat conversions.
         */
@@ -529,7 +561,13 @@ struct ldlm_namespace {
         * Flag to indicate namespace is being freed. Used to determine if
         * recalculation of LDLM pool statistics should be skipped.
         */
-       unsigned                ns_stopping:1;
+       unsigned                ns_stopping:1,
+
+       /**
+        * Flag to indicate the LRU recalc on RPC reply is in progress.
+        * Used to limit the process by 1 thread only.
+        */
+                               ns_rpc_recalc:1;
 
        /**
         * Which bucket should we start with the lock reclaim.
@@ -538,6 +576,11 @@ struct ldlm_namespace {
 
        struct kobject          ns_kobj; /* sysfs object */
        struct completion       ns_kobj_unregister;
+
+       /**
+        * To avoid another ns_lock usage, a separate bitops field.
+        */
+       unsigned long           ns_flags;
 };
 
 /**
@@ -739,13 +782,10 @@ struct ldlm_lock {
         */
        struct portals_handle   l_handle;
        /**
-        * Internal spinlock protects l_resource.  We should hold this lock
-        * first before taking res_lock.
-        */
-       spinlock_t              l_lock;
-       /**
         * Pointer to actual resource this lock is in.
-        * ldlm_lock_change_resource() can change this.
+        * ldlm_lock_change_resource() can change this on the client.
+        * When this is possible, rcu must be used to stablise
+        * the resource while we lock and check it hasn't been changed.
         */
        struct ldlm_resource    *l_resource;
        /**
@@ -965,6 +1005,13 @@ struct ldlm_lock {
        struct list_head        l_exp_list;
 };
 
+enum ldlm_match_flags {
+       LDLM_MATCH_UNREF   = BIT(0),
+       LDLM_MATCH_AST     = BIT(1),
+       LDLM_MATCH_AST_ANY = BIT(2),
+       LDLM_MATCH_RIGHT   = BIT(3),
+};
+
 /**
  * Describe the overlap between two locks.  itree_overlap_cb data.
  */
@@ -975,8 +1022,7 @@ struct ldlm_match_data {
        union ldlm_policy_data  *lmd_policy;
        __u64                    lmd_flags;
        __u64                    lmd_skip_flags;
-       int                      lmd_unref;
-       bool                     lmd_has_ast_data;
+       enum ldlm_match_flags    lmd_match;
 };
 
 /** For uncommitted cross-MDT lock, store transno this lock belongs to */
@@ -1011,9 +1057,13 @@ struct ldlm_resource {
 
        /**
         * List item for list in namespace hash.
-        * protected by ns_lock
+        * protected by ns_lock.
+        * Shared with linkage for RCU-delayed free.
         */
-       struct hlist_node       lr_hash;
+       union {
+               struct hlist_node       lr_hash;
+               struct rcu_head         lr_rcu;
+       };
 
        /** Reference count for this resource */
        atomic_t                lr_refcount;
@@ -1172,7 +1222,7 @@ static inline int ldlm_lvbo_fill(struct ldlm_lock *lock, void *buf, int *len)
                /* init lvb now if not already */
                rc = ldlm_lvbo_init(lock->l_resource);
                if (rc < 0) {
-                       CERROR("lock %p: delayed lvb init failed (rc %d)",
+                       CERROR("lock %p: delayed lvb init failed (rc %d)\n",
                               lock, rc);
                        return rc;
                }
@@ -1311,7 +1361,7 @@ typedef int (*ldlm_reprocessing_policy)(struct ldlm_resource *res,
                                        struct list_head *queue,
                                        struct list_head *work_list,
                                        enum ldlm_process_intention intention,
-                                       struct ldlm_lock *hint);
+                                       __u64 hint);
 
 /**
  * Return values for lock iterators.
@@ -1428,7 +1478,7 @@ static inline struct ldlm_lock *ldlm_handle2lock(const struct lustre_handle *h)
 }
 
 #define LDLM_LOCK_REF_DEL(lock) \
-       lu_ref_del(&lock->l_reference, "handle", current)
+       lu_ref_del(&lock->l_reference, "handle", lock)
 
 static inline struct ldlm_lock *
 ldlm_handle2lock_long(const struct lustre_handle *h, __u64 flags)
@@ -1536,6 +1586,7 @@ void ldlm_lock_fail_match_locked(struct ldlm_lock *lock);
 void ldlm_lock_fail_match(struct ldlm_lock *lock);
 void ldlm_lock_allow_match(struct ldlm_lock *lock);
 void ldlm_lock_allow_match_locked(struct ldlm_lock *lock);
+
 enum ldlm_mode ldlm_lock_match_with_skip(struct ldlm_namespace *ns,
                                         __u64 flags, __u64 skip_flags,
                                         const struct ldlm_res_id *res_id,
@@ -1543,18 +1594,17 @@ enum ldlm_mode ldlm_lock_match_with_skip(struct ldlm_namespace *ns,
                                         union ldlm_policy_data *policy,
                                         enum ldlm_mode mode,
                                         struct lustre_handle *lh,
-                                        int unref);
+                                        enum ldlm_match_flags match_flags);
 static inline enum ldlm_mode ldlm_lock_match(struct ldlm_namespace *ns,
                                             __u64 flags,
                                             const struct ldlm_res_id *res_id,
                                             enum ldlm_type type,
                                             union ldlm_policy_data *policy,
                                             enum ldlm_mode mode,
-                                            struct lustre_handle *lh,
-                                            int unref)
+                                            struct lustre_handle *lh)
 {
        return ldlm_lock_match_with_skip(ns, flags, 0, res_id, type, policy,
-                                        mode, lh, unref);
+                                        mode, lh, 0);
 }
 struct ldlm_lock *search_itree(struct ldlm_resource *res,
                               struct ldlm_match_data *data);
@@ -1562,7 +1612,7 @@ enum ldlm_mode ldlm_revalidate_lock_handle(const struct lustre_handle *lockh,
                                           __u64 *bits);
 void ldlm_lock_mode_downgrade(struct ldlm_lock *lock, enum ldlm_mode new_mode);
 void ldlm_lock_cancel(struct ldlm_lock *lock);
-void ldlm_reprocess_all(struct ldlm_resource *res, struct ldlm_lock *hint);
+void ldlm_reprocess_all(struct ldlm_resource *res, __u64 hint);
 void ldlm_reprocess_recovery_done(struct ldlm_namespace *ns);
 void ldlm_lock_dump_handle(int level, const struct lustre_handle *lockh);
 void ldlm_unlink_lock_skiplist(struct ldlm_lock *req);
@@ -1680,9 +1730,8 @@ int ldlm_handle_enqueue0(struct ldlm_namespace *ns, struct ptlrpc_request *req,
                         const struct ldlm_request *dlm_req,
                         const struct ldlm_callback_suite *cbs);
 int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req,
-                         enum ldlm_type type, __u8 with_policy,
-                         enum ldlm_mode mode, __u64 *flags, void *lvb,
-                         __u32 lvb_len,
+                         struct ldlm_enqueue_info *einfo, __u8 with_policy,
+                         __u64 *flags, void *lvb, __u32 lvb_len,
                          const struct lustre_handle *lockh, int rc);
 int ldlm_cli_enqueue_local(const struct lu_env *env,
                           struct ldlm_namespace *ns,
@@ -1785,7 +1834,7 @@ int ldlm_pool_init(struct ldlm_pool *pl, struct ldlm_namespace *ns,
 int ldlm_pool_shrink(struct ldlm_pool *pl, int nr, gfp_t gfp_mask);
 void ldlm_pool_fini(struct ldlm_pool *pl);
 int ldlm_pool_setup(struct ldlm_pool *pl, int limit);
-time64_t ldlm_pool_recalc(struct ldlm_pool *pl);
+time64_t ldlm_pool_recalc(struct ldlm_pool *pl, bool force);
 __u32 ldlm_pool_get_lvf(struct ldlm_pool *pl);
 __u64 ldlm_pool_get_slv(struct ldlm_pool *pl);
 __u64 ldlm_pool_get_clv(struct ldlm_pool *pl);