Whamcloud - gitweb
LU-5781 ldlm: Solve a race for LRU lock cancel
[fs/lustre-release.git] / lustre / ldlm / ldlm_internal.h
index 6b96b40..c5eef19 100644 (file)
@@ -27,7 +27,7 @@
  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2011, 2012, Intel Corporation.
+ * Copyright (c) 2011, 2013, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
 extern int ldlm_srv_namespace_nr;
 extern int ldlm_cli_namespace_nr;
 extern struct mutex ldlm_srv_namespace_lock;
-extern cfs_list_t ldlm_srv_namespace_list;
+extern struct list_head ldlm_srv_namespace_list;
 extern struct mutex ldlm_cli_namespace_lock;
-extern cfs_list_t ldlm_cli_active_namespace_list;
-extern cfs_list_t ldlm_cli_inactive_namespace_list;
+extern struct list_head ldlm_cli_active_namespace_list;
+extern struct list_head ldlm_cli_inactive_namespace_list;
+extern unsigned int ldlm_cancel_unused_locks_before_replay;
 
 static inline int ldlm_namespace_nr_read(ldlm_side_t client)
 {
@@ -66,13 +67,13 @@ static inline void ldlm_namespace_nr_dec(ldlm_side_t client)
                ldlm_cli_namespace_nr--;
 }
 
-static inline cfs_list_t *ldlm_namespace_list(ldlm_side_t client)
+static inline struct list_head *ldlm_namespace_list(ldlm_side_t client)
 {
         return client == LDLM_NAMESPACE_SERVER ?
                &ldlm_srv_namespace_list : &ldlm_cli_active_namespace_list;
 }
 
-static inline cfs_list_t *ldlm_namespace_inactive_list(ldlm_side_t client)
+static inline struct list_head *ldlm_namespace_inactive_list(ldlm_side_t client)
 {
         return client == LDLM_NAMESPACE_SERVER ?
                &ldlm_srv_namespace_list : &ldlm_cli_inactive_namespace_list;
@@ -87,7 +88,7 @@ static inline struct mutex *ldlm_namespace_lock(ldlm_side_t client)
 /* ns_bref is the number of resources in this namespace */
 static inline int ldlm_ns_empty(struct ldlm_namespace *ns)
 {
-       return cfs_atomic_read(&ns->ns_bref) == 0;
+       return atomic_read(&ns->ns_bref) == 0;
 }
 
 void ldlm_namespace_move_to_active_locked(struct ldlm_namespace *, ldlm_side_t);
@@ -108,25 +109,27 @@ enum {
 int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr,
                    ldlm_cancel_flags_t sync, int flags);
 int ldlm_cancel_lru_local(struct ldlm_namespace *ns,
-                          cfs_list_t *cancels, int count, int max,
+                         struct list_head *cancels, int count, int max,
                           ldlm_cancel_flags_t cancel_flags, int flags);
-extern int ldlm_enqueue_min;
-int ldlm_get_enq_timeout(struct ldlm_lock *lock);
-
+extern unsigned int ldlm_enqueue_min;
 /* ldlm_resource.c */
+extern struct kmem_cache *ldlm_resource_slab;
+extern struct kmem_cache *ldlm_lock_slab;
+
 int ldlm_resource_putref_locked(struct ldlm_resource *res);
 void ldlm_resource_insert_lock_after(struct ldlm_lock *original,
                                      struct ldlm_lock *new);
 void ldlm_namespace_free_prior(struct ldlm_namespace *ns,
                                struct obd_import *imp, int force);
 void ldlm_namespace_free_post(struct ldlm_namespace *ns);
+
 /* ldlm_lock.c */
 
 struct ldlm_cb_set_arg {
        struct ptlrpc_request_set       *set;
        int                              type; /* LDLM_{CP,BL,GL}_CALLBACK */
-       cfs_atomic_t                     restart;
-       cfs_list_t                      *list;
+       atomic_t                         restart;
+       struct list_head                        *list;
        union ldlm_gl_desc              *gl_desc; /* glimpse AST descriptor */
 };
 
@@ -137,7 +140,7 @@ typedef enum {
        LDLM_WORK_GL_AST
 } ldlm_desc_ast_t;
 
-void ldlm_grant_lock(struct ldlm_lock *lock, cfs_list_t *work_list);
+void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list);
 int ldlm_fill_lvb(struct ldlm_lock *lock, struct req_capsule *pill,
                  enum req_location loc, void *data, int size);
 struct ldlm_lock *
@@ -152,15 +155,17 @@ void ldlm_lock_addref_internal_nolock(struct ldlm_lock *, __u32 mode);
 void ldlm_lock_decref_internal(struct ldlm_lock *, __u32 mode);
 void ldlm_lock_decref_internal_nolock(struct ldlm_lock *, __u32 mode);
 void ldlm_add_ast_work_item(struct ldlm_lock *lock, struct ldlm_lock *new,
-                            cfs_list_t *work_list);
+                           struct list_head *work_list);
 #ifdef HAVE_SERVER_SUPPORT
-int ldlm_reprocess_queue(struct ldlm_resource *res, cfs_list_t *queue,
-                         cfs_list_t *work_list);
+int ldlm_reprocess_queue(struct ldlm_resource *res, struct list_head *queue,
+                        struct list_head *work_list);
 #endif
-int ldlm_run_ast_work(struct ldlm_namespace *ns, cfs_list_t *rpc_list,
+int ldlm_run_ast_work(struct ldlm_namespace *ns, struct list_head *rpc_list,
                       ldlm_desc_ast_t ast_type);
 int ldlm_work_gl_ast_lock(struct ptlrpc_request_set *rqset, void *opaq);
-int ldlm_lock_remove_from_lru(struct ldlm_lock *lock);
+int ldlm_lock_remove_from_lru_check(struct ldlm_lock *lock,
+                                   cfs_time_t last_use);
+#define ldlm_lock_remove_from_lru(lock) ldlm_lock_remove_from_lru_check(lock, 0)
 int ldlm_lock_remove_from_lru_nolock(struct ldlm_lock *lock);
 void ldlm_lock_add_to_lru_nolock(struct ldlm_lock *lock);
 void ldlm_lock_add_to_lru(struct ldlm_lock *lock);
@@ -174,7 +179,7 @@ int ldlm_bl_to_thread_lock(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld,
                            struct ldlm_lock *lock);
 int ldlm_bl_to_thread_list(struct ldlm_namespace *ns,
                           struct ldlm_lock_desc *ld,
-                          cfs_list_t *cancels, int count,
+                          struct list_head *cancels, int count,
                           ldlm_cancel_flags_t cancel_flags);
 
 void ldlm_handle_bl_callback(struct ldlm_namespace *ns,
@@ -184,19 +189,19 @@ void ldlm_handle_bl_callback(struct ldlm_namespace *ns,
 /* ldlm_plain.c */
 int ldlm_process_plain_lock(struct ldlm_lock *lock, __u64 *flags,
                            int first_enq, ldlm_error_t *err,
-                           cfs_list_t *work_list);
+                           struct list_head *work_list);
 
 /* ldlm_inodebits.c */
 int ldlm_process_inodebits_lock(struct ldlm_lock *lock, __u64 *flags,
                                 int first_enq, ldlm_error_t *err,
-                                cfs_list_t *work_list);
+                               struct list_head *work_list);
 #endif
 
 /* ldlm_extent.c */
 #ifdef HAVE_SERVER_SUPPORT
 int ldlm_process_extent_lock(struct ldlm_lock *lock, __u64 *flags,
                             int first_enq, ldlm_error_t *err,
-                            cfs_list_t *work_list);
+                            struct list_head *work_list);
 #endif
 void ldlm_extent_add_lock(struct ldlm_resource *res, struct ldlm_lock *lock);
 void ldlm_extent_unlink_lock(struct ldlm_lock *lock);
@@ -204,7 +209,7 @@ void ldlm_extent_unlink_lock(struct ldlm_lock *lock);
 /* ldlm_flock.c */
 int ldlm_process_flock_lock(struct ldlm_lock *req, __u64 *flags,
                            int first_enq, ldlm_error_t *err,
-                           cfs_list_t *work_list);
+                           struct list_head *work_list);
 int ldlm_init_flock_export(struct obd_export *exp);
 void ldlm_destroy_flock_export(struct obd_export *exp);
 
@@ -212,8 +217,7 @@ void ldlm_destroy_flock_export(struct obd_export *exp);
 void l_check_ns_lock(struct ldlm_namespace *ns);
 void l_check_no_ns_lock(struct ldlm_namespace *ns);
 
-extern cfs_proc_dir_entry_t *ldlm_svc_proc_dir;
-extern cfs_proc_dir_entry_t *ldlm_type_proc_dir;
+extern struct proc_dir_entry *ldlm_svc_proc_dir;
 
 struct ldlm_state {
         struct ptlrpc_service *ldlm_cb_service;
@@ -234,9 +238,9 @@ static inline struct ldlm_extent *
 ldlm_interval_extent(struct ldlm_interval *node)
 {
         struct ldlm_lock *lock;
-        LASSERT(!cfs_list_empty(&node->li_group));
+       LASSERT(!list_empty(&node->li_group));
 
-        lock = cfs_list_entry(node->li_group.next, struct ldlm_lock,
+       lock = list_entry(node->li_group.next, struct ldlm_lock,
                               l_sl_policy);
         return &lock->l_policy_data.l_extent;
 }
@@ -252,51 +256,62 @@ enum ldlm_policy_res {
 
 typedef enum ldlm_policy_res ldlm_policy_res_t;
 
-#define LDLM_POOL_PROC_READER(var, type)                                    \
-        static int lprocfs_rd_##var(char *page, char **start, off_t off,    \
-                                    int count, int *eof, void *data)        \
-        {                                                                   \
-                struct ldlm_pool *pl = data;                                \
-                type tmp;                                                   \
-                                                                            \
-               spin_lock(&pl->pl_lock);                                    \
-               tmp = pl->pl_##var;                                         \
-               spin_unlock(&pl->pl_lock);                                  \
-                                                                            \
-                return lprocfs_rd_uint(page, start, off, count, eof, &tmp); \
-        }                                                                   \
-        struct __##var##__dummy_read {;} /* semicolon catcher */
-
-#define LDLM_POOL_PROC_WRITER(var, type)                                    \
-        int lprocfs_wr_##var(struct file *file, const char *buffer,         \
-                             unsigned long count, void *data)               \
-        {                                                                   \
-                struct ldlm_pool *pl = data;                                \
-                type tmp;                                                   \
-                int rc;                                                     \
-                                                                            \
-                rc = lprocfs_wr_uint(file, buffer, count, &tmp);            \
-                if (rc < 0) {                                               \
-                        CERROR("Can't parse user input, rc = %d\n", rc);    \
-                        return rc;                                          \
-                }                                                           \
-                                                                            \
-               spin_lock(&pl->pl_lock);                                    \
-               pl->pl_##var = tmp;                                         \
-               spin_unlock(&pl->pl_lock);                                  \
-                                                                            \
-                return rc;                                                  \
-        }                                                                   \
-        struct __##var##__dummy_write {;} /* semicolon catcher */
+#define LDLM_POOL_PROC_READER_SEQ_SHOW(var, type)                      \
+       static int lprocfs_##var##_seq_show(struct seq_file *m, void *v)\
+       {                                                               \
+               struct ldlm_pool *pl = m->private;                      \
+               type tmp;                                               \
+                                                                       \
+               spin_lock(&pl->pl_lock);                                \
+               tmp = pl->pl_##var;                                     \
+               spin_unlock(&pl->pl_lock);                              \
+                                                                       \
+               return lprocfs_uint_seq_show(m, &tmp);                  \
+       }                                                               \
+       struct __##var##__dummy_read {;} /* semicolon catcher */
+
+#define LDLM_POOL_PROC_WRITER(var, type)                               \
+       static int lprocfs_wr_##var(struct file *file,                  \
+                            const char __user *buffer,                 \
+                            unsigned long count, void *data)           \
+       {                                                               \
+               struct ldlm_pool *pl = data;                            \
+               type tmp;                                               \
+               int rc;                                                 \
+                                                                       \
+               rc = lprocfs_wr_uint(file, buffer, count, &tmp);        \
+               if (rc < 0) {                                           \
+                       CERROR("Can't parse user input, rc = %d\n", rc);\
+                       return rc;                                      \
+               }                                                       \
+                                                                       \
+               spin_lock(&pl->pl_lock);                                \
+               pl->pl_##var = tmp;                                     \
+               spin_unlock(&pl->pl_lock);                              \
+                                                                       \
+               return rc;                                              \
+       }                                                               \
+       struct __##var##__dummy_write {;} /* semicolon catcher */
+
+static inline void
+ldlm_add_var(struct lprocfs_vars *vars, struct proc_dir_entry *proc_dir,
+            const char *name, void *data, const struct file_operations *ops)
+{
+       snprintf((char *)vars->name, MAX_STRING_SIZE, "%s", name);
+       vars->data = data;
+       vars->fops = ops;
+       lprocfs_add_vars(proc_dir, vars, NULL);
+}
 
 static inline int is_granted_or_cancelled(struct ldlm_lock *lock)
 {
         int ret = 0;
 
         lock_res_and_lock(lock);
-        if (((lock->l_req_mode == lock->l_granted_mode) &&
-             !(lock->l_flags & LDLM_FL_CP_REQD)) ||
-            (lock->l_flags & (LDLM_FL_FAILED | LDLM_FL_CANCEL)))
+       if ((lock->l_req_mode == lock->l_granted_mode) &&
+            !ldlm_is_cp_reqd(lock))
+               ret = 1;
+       else if (ldlm_is_failed(lock) || ldlm_is_cancel(lock))
                 ret = 1;
         unlock_res_and_lock(lock);
 
@@ -321,9 +336,7 @@ void ldlm_extent_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
                                      ldlm_policy_data_t *lpolicy);
 void ldlm_extent_policy_local_to_wire(const ldlm_policy_data_t *lpolicy,
                                      ldlm_wire_policy_data_t *wpolicy);
-void ldlm_flock_policy_wire18_to_local(const ldlm_wire_policy_data_t *wpolicy,
-                                     ldlm_policy_data_t *lpolicy);
-void ldlm_flock_policy_wire21_to_local(const ldlm_wire_policy_data_t *wpolicy,
+void ldlm_flock_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy,
                                      ldlm_policy_data_t *lpolicy);
 
 void ldlm_flock_policy_local_to_wire(const ldlm_policy_data_t *lpolicy,