X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flinux%2Flustre_dlm.h;h=3d089e4b4f34f6dcafa63d51e7b0abeaf2d25c54;hb=46cd5b6f7c2e1c3731fe36176e01622d0e7c6608;hp=e552dfd280c423446a4e7ec306445d7ff9d40d70;hpb=ccb42f2458669aaac84a661091b05a59bb781197;p=fs%2Flustre-release.git diff --git a/lustre/include/linux/lustre_dlm.h b/lustre/include/linux/lustre_dlm.h index e552dfd..3d089e4 100644 --- a/lustre/include/linux/lustre_dlm.h +++ b/lustre/include/linux/lustre_dlm.h @@ -7,23 +7,27 @@ #define _LUSTRE_DLM_H__ #ifdef __KERNEL__ +# include +#endif -#include #include #include #include -#include +#include +#include /* for obd_export, for LDLM_DEBUG */ struct obd_ops; struct obd_device; -#define OBD_LDLM_DEVICENAME "ldlm" +#define LDLM_DEFAULT_LRU_SIZE 100 typedef enum { ELDLM_OK = 0, ELDLM_LOCK_CHANGED = 300, ELDLM_LOCK_ABORTED = 301, + ELDLM_LOCK_REPLACED = 302, + ELDLM_NO_LOCK_DATA = 303, ELDLM_NAMESPACE_EXISTS = 400, ELDLM_BAD_NAMESPACE = 401 @@ -32,44 +36,97 @@ typedef enum { #define LDLM_NAMESPACE_SERVER 0 #define LDLM_NAMESPACE_CLIENT 1 -#define LDLM_FL_LOCK_CHANGED (1 << 0) /* extent, mode, or resource changed */ +#define LDLM_FL_LOCK_CHANGED 0x000001 /* extent, mode, or resource changed */ /* If the server returns one of these flags, then the lock was put on that list. * If the client sends one of these flags (during recovery ONLY!), it wants the * lock added to the specified list, no questions asked. -p */ -#define LDLM_FL_BLOCK_GRANTED (1 << 1) -#define LDLM_FL_BLOCK_CONV (1 << 2) -#define LDLM_FL_BLOCK_WAIT (1 << 3) +#define LDLM_FL_BLOCK_GRANTED 0x000002 +#define LDLM_FL_BLOCK_CONV 0x000004 +#define LDLM_FL_BLOCK_WAIT 0x000008 -#define LDLM_FL_CBPENDING (1 << 4) // this lock is being destroyed -#define LDLM_FL_AST_SENT (1 << 5) // blocking or cancel packet was sent -#define LDLM_FL_WAIT_NOREPROC (1 << 6)// not a real lock flag,not saved in lock -#define LDLM_FL_CANCEL (1 << 7) // cancellation callback already run +#define LDLM_FL_CBPENDING 0x000010 /* this lock is being destroyed */ +#define LDLM_FL_AST_SENT 0x000020 /* blocking or cancel packet was sent */ +#define LDLM_FL_WAIT_NOREPROC 0x000040 /* not a real flag, not saved in lock */ +#define LDLM_FL_CANCEL 0x000080 /* cancellation callback already run */ /* Lock is being replayed. This could probably be implied by the fact that one * of BLOCK_{GRANTED,CONV,WAIT} is set, but that is pretty dangerous. */ -#define LDLM_FL_REPLAY (1 << 8) +#define LDLM_FL_REPLAY 0x000100 + +#define LDLM_FL_INTENT_ONLY 0x000200 /* don't grant lock, just do intent */ +#define LDLM_FL_LOCAL_ONLY 0x000400 /* see ldlm_cli_cancel_unused */ + +/* don't run the cancel callback under ldlm_cli_cancel_unused */ +#define LDLM_FL_FAILED 0x000800 + +#define LDLM_FL_HAS_INTENT 0x001000 /* lock request has intent */ +#define LDLM_FL_CANCELING 0x002000 /* lock cancel has already been sent */ +#define LDLM_FL_LOCAL 0x004000 /* local lock (ie, no srv/cli split) */ +#define LDLM_FL_WARN 0x008000 /* see ldlm_cli_cancel_unused */ +#define LDLM_FL_DISCARD_DATA 0x010000 /* discard (no writeback) on cancel */ +#define LDLM_FL_CONFIG_CHANGE 0x020000 /* see ldlm_cli_cancel_unused */ + +#define LDLM_FL_NO_TIMEOUT 0x040000 /* Blocked by group lock - wait + * indefinitely */ + +/* file & record locking */ +#define LDLM_FL_BLOCK_NOWAIT 0x080000 /* server told not to wait if blocked */ +#define LDLM_FL_TEST_LOCK 0x100000 /* return blocking lock */ +#define LDLM_FL_GET_BLOCKING 0x200000 /* return updated blocking proc info */ +#define LDLM_FL_DEADLOCK_CHK 0x400000 /* check for deadlock */ +#define LDLM_FL_DEADLOCK_DEL 0x800000 /* lock no longer blocked */ + +/* These are flags that are mapped into the flags and ASTs of blocking locks */ +#define LDLM_AST_DISCARD_DATA 0x80000000 /* Add FL_DISCARD to blocking ASTs */ +/* Flags sent in AST lock_flags to be mapped into the receiving lock. */ +#define LDLM_AST_FLAGS (LDLM_FL_DISCARD_DATA) + +/* XXX FIXME: This is being added to b_size as a low-risk fix to the fact that + * the LVB filling happens _after_ the lock has been granted, so another thread + * can match before the LVB has been updated. As a dirty hack, we set + * LDLM_FL_CAN_MATCH only after we've done the LVB poop. + * + * The proper fix is to do the granting inside of the completion AST, which can + * be replaced with a LVB-aware wrapping function for OSC locks. That change is + * pretty high-risk, though, and would need a lot more testing. */ +#define LDLM_FL_CAN_MATCH 0x100000 + +/* A lock contributes to the kms calculation until it has finished the part + * of it's cancelation that performs write back on its dirty pages. It + * can remain on the granted list during this whole time. Threads racing + * to update the kms after performing their writeback need to know to + * exclude each others locks from the calculation as they walk the granted + * list. */ +#define LDLM_FL_KMS_IGNORE 0x200000 + +/* completion ast to be executed */ +#define LDLM_FL_CP_REQD 0x400000 -#define LDLM_FL_INTENT_ONLY (1 << 9) /* don't grant lock, just do intent */ -#define LDLM_FL_LOCAL_ONLY (1 << 10) /* see ldlm_cli_cancel_unused */ -#define LDLM_FL_NO_CALLBACK (1 << 11) /* see ldlm_cli_cancel_unused */ -#define LDLM_FL_HAS_INTENT (1 << 12) /* lock request has intent */ -#define LDLM_FL_CANCELING (1 << 13) /* lock cancel has already been sent */ +/* cleanup_resource has already handled the lock */ +#define LDLM_FL_CLEANED 0x800000 + +/* optimization hint: LDLM can run blocking callback from current context + * w/o involving separate thread. in order to decrease cs rate */ +#define LDLM_FL_ATOMIC_CB 0x1000000 + +/* while this flag is set, the lock can't change resource */ +#define LDLM_FL_LOCK_PROTECT 0x4000000 +#define LDLM_FL_LOCK_PROTECT_BIT 26 /* The blocking callback is overloaded to perform two functions. These flags * indicate which operation should be performed. */ #define LDLM_CB_BLOCKING 1 #define LDLM_CB_CANCELING 2 -#define L2B(c) (1 << c) - /* compatibility matrix */ -#define LCK_COMPAT_EX L2B(LCK_NL) -#define LCK_COMPAT_PW (LCK_COMPAT_EX | L2B(LCK_CR)) -#define LCK_COMPAT_PR (LCK_COMPAT_PW | L2B(LCK_PR)) -#define LCK_COMPAT_CW (LCK_COMPAT_PW | L2B(LCK_CW)) -#define LCK_COMPAT_CR (LCK_COMPAT_CW | L2B(LCK_PR) | L2B(LCK_PW)) -#define LCK_COMPAT_NL (LCK_COMPAT_CR | L2B(LCK_EX)) +#define LCK_COMPAT_EX LCK_NL +#define LCK_COMPAT_PW (LCK_COMPAT_EX | LCK_CR) +#define LCK_COMPAT_PR (LCK_COMPAT_PW | LCK_PR) +#define LCK_COMPAT_CW (LCK_COMPAT_PW | LCK_CW) +#define LCK_COMPAT_CR (LCK_COMPAT_CW | LCK_PR | LCK_PW) +#define LCK_COMPAT_NL (LCK_COMPAT_CR | LCK_EX) +#define LCK_COMPAT_GROUP (LCK_GROUP | LCK_NL) static ldlm_mode_t lck_compat_array[] = { [LCK_EX] LCK_COMPAT_EX, @@ -77,17 +134,18 @@ static ldlm_mode_t lck_compat_array[] = { [LCK_PR] LCK_COMPAT_PR, [LCK_CW] LCK_COMPAT_CW, [LCK_CR] LCK_COMPAT_CR, - [LCK_NL] LCK_COMPAT_NL + [LCK_NL] LCK_COMPAT_NL, + [LCK_GROUP] LCK_COMPAT_GROUP }; -static inline int lockmode_compat(ldlm_mode_t exist, ldlm_mode_t new) +static inline void lockmode_verify(ldlm_mode_t mode) { - if (exist < LCK_EX || exist > LCK_NL) - LBUG(); - if (new < LCK_EX || new > LCK_NL) - LBUG(); + LASSERT(mode >= LCK_EX && mode <= LCK_GROUP); +} - return (lck_compat_array[exist] & L2B(new)); +static inline int lockmode_compat(ldlm_mode_t exist, ldlm_mode_t new) +{ + return (lck_compat_array[exist] & new); } /* @@ -105,25 +163,66 @@ static inline int lockmode_compat(ldlm_mode_t exist, ldlm_mode_t new) - */ +/* + * Locking rules: + * + * lr_lock + * + * lr_lock + * waiting_locks_spinlock + * + * lr_lock + * led_lock + * + * lr_lock + * ns_unused_lock + * + * lr_lvb_sem + * lr_lock + * + */ + +struct ldlm_lock; +struct ldlm_resource; +struct ldlm_namespace; + +typedef int (*ldlm_res_policy)(struct ldlm_namespace *, struct ldlm_lock **, + void *req_cookie, ldlm_mode_t mode, int flags, + void *data); + +struct ldlm_valblock_ops { + int (*lvbo_init)(struct ldlm_resource *res); + + int (*lvbo_update)(struct ldlm_resource *res, + struct lustre_msg *m, + int buf_idx, int increase); +}; + struct ldlm_namespace { char *ns_name; __u32 ns_client; /* is this a client-side lock tree? */ struct list_head *ns_hash; /* hash table for ns */ + spinlock_t ns_hash_lock; __u32 ns_refcount; /* count of resources in the hash */ struct list_head ns_root_list; /* all root resources in ns */ - struct lustre_lock ns_lock; /* protects hash, refcount, list */ struct list_head ns_list_chain; /* position in global NS list */ - /* + /* struct proc_dir_entry *ns_proc_dir; */ struct list_head ns_unused_list; /* all root resources in ns */ - unsigned int ns_nr_unused; + int ns_nr_unused; + spinlock_t ns_unused_lock; + unsigned int ns_max_unused; + unsigned long ns_next_dump; /* next dump time */ - spinlock_t ns_counter_lock; - __u64 ns_locks; + atomic_t ns_locks; __u64 ns_resources; + ldlm_res_policy ns_policy; + struct ldlm_valblock_ops *ns_lvbo; + void *ns_lvbp; + wait_queue_head_t ns_waitq; }; /* @@ -132,7 +231,7 @@ struct ldlm_namespace { * */ -#define RES_HASH_BITS 14 +#define RES_HASH_BITS 10 #define RES_HASH_SIZE (1UL << RES_HASH_BITS) #define RES_HASH_MASK (RES_HASH_SIZE - 1) @@ -140,38 +239,52 @@ struct ldlm_lock; typedef int (*ldlm_blocking_callback)(struct ldlm_lock *lock, struct ldlm_lock_desc *new, void *data, - __u32 data_len, int flag); - -typedef int (*ldlm_completion_callback)(struct ldlm_lock *lock, int flags); + int flag); +typedef int (*ldlm_completion_callback)(struct ldlm_lock *lock, int flags, + void *data); +typedef int (*ldlm_glimpse_callback)(struct ldlm_lock *lock, void *data); struct ldlm_lock { struct portals_handle l_handle; // must be first in the structure atomic_t l_refc; + + /* ldlm_lock_change_resource() can change this */ struct ldlm_resource *l_resource; + + /* set once, no need to protect it */ struct ldlm_lock *l_parent; + + /* protected by ns_hash_lock */ struct list_head l_children; struct list_head l_childof; + + /* protected by ns_hash_lock. FIXME */ struct list_head l_lru; + + /* protected by lr_lock */ struct list_head l_res_link; // position in one of three res lists + + /* protected by led_lock */ struct list_head l_export_chain; // per-export chain of locks - struct list_head l_pending_chain; // locks with callbacks pending - unsigned long l_callback_timeout; + /* protected by lr_lock */ ldlm_mode_t l_req_mode; ldlm_mode_t l_granted_mode; ldlm_completion_callback l_completion_ast; ldlm_blocking_callback l_blocking_ast; + ldlm_glimpse_callback l_glimpse_ast; struct obd_export *l_export; - struct lustre_handle *l_connh; + struct obd_export *l_conn_export; + + /* protected by lr_lock */ __u32 l_flags; + struct lustre_handle l_remote_handle; - void *l_data; - __u32 l_data_len; - struct ldlm_extent l_extent; - __u32 l_version[RES_VERSION_SIZE]; + ldlm_policy_data_t l_policy_data; + /* protected by lr_lock */ __u32 l_readers; __u32 l_writers; __u8 l_destroyed; @@ -180,39 +293,70 @@ struct ldlm_lock { * it's no longer in use. If the lock is not granted, a process sleeps * on this waitq to learn when it becomes granted. */ wait_queue_head_t l_waitq; -}; + struct timeval l_enqueued_time; -typedef int (*ldlm_res_compat)(struct ldlm_lock *child, struct ldlm_lock *new); -typedef int (*ldlm_res_policy)(struct ldlm_namespace *, struct ldlm_lock *, - void *req_cookie, ldlm_mode_t mode, int flags, - void *data); + unsigned long l_last_used; /* jiffies */ + struct ldlm_extent l_req_extent; + + /* Client-side-only members */ + __u32 l_lvb_len; /* temporary storage for */ + void *l_lvb_data; /* an LVB received during */ + void *l_lvb_swabber; /* an enqueue */ + void *l_ast_data; + + /* Server-side-only members */ + + /* protected by elt_lock */ + struct list_head l_pending_chain; /* callbacks pending */ + unsigned long l_callback_timeout; + + __u32 l_pid; /* pid which created this lock */ + __u32 l_pidb; /* who holds LOCK_PROTECT_BIT */ + + struct list_head l_tmp; + + /* for ldlm_add_ast_work_item() */ + struct list_head l_bl_ast; + struct list_head l_cp_ast; + struct ldlm_lock *l_blocking_lock; + int l_bl_ast_run; +}; #define LDLM_PLAIN 10 #define LDLM_EXTENT 11 +#define LDLM_FLOCK 12 +#define LDLM_IBITS 13 #define LDLM_MIN_TYPE 10 -#define LDLM_MAX_TYPE 11 - -extern ldlm_res_compat ldlm_res_compat_table []; -extern ldlm_res_policy ldlm_res_policy_table []; +#define LDLM_MAX_TYPE 14 struct ldlm_resource { struct ldlm_namespace *lr_namespace; + + /* protected by ns_hash_lock */ struct list_head lr_hash; struct ldlm_resource *lr_parent; /* 0 for a root resource */ struct list_head lr_children; /* list head for child resources */ struct list_head lr_childof; /* part of ns_root_list if root res, * part of lr_children if child */ + spinlock_t lr_lock; + /* protected by lr_lock */ struct list_head lr_granted; struct list_head lr_converting; struct list_head lr_waiting; ldlm_mode_t lr_most_restr; __u32 lr_type; /* LDLM_PLAIN or LDLM_EXTENT */ - struct ldlm_resource *lr_root; - __u64 lr_name[RES_NAME_SIZE]; - __u32 lr_version[RES_VERSION_SIZE]; + struct ldlm_res_id lr_name; atomic_t lr_refcount; + + /* Server-side-only lock value block elements */ + struct semaphore lr_lvb_sem; + __u32 lr_lvb_len; + void *lr_lvb_data; + + /* lr_tmp holds a list head temporarily, during the building of a work + * queue. see ldlm_add_ast_work_item and ldlm_run_ast_work */ void *lr_tmp; }; @@ -226,82 +370,146 @@ struct ldlm_ast_work { int w_datalen; }; -/* Per-export ldlm state. */ -struct ldlm_export_data { - struct list_head led_held_locks; - struct obd_import led_import; -}; - -static inline struct ldlm_extent *ldlm_res2extent(struct ldlm_resource *res) -{ - return (struct ldlm_extent *)(res->lr_name); -} - extern struct obd_ops ldlm_obd_ops; extern char *ldlm_lockname[]; extern char *ldlm_typename[]; extern char *ldlm_it2str(int it); -#define LDLM_DEBUG(lock, format, a...) \ +#define __LDLM_DEBUG(level, lock, format, a...) \ do { \ if (lock->l_resource == NULL) { \ - CDEBUG(D_DLMTRACE, "### " format \ + CDEBUG(level, "### " format \ " ns: \?\? lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s "\ - "res: \?\? rrc=\?\? type: \?\?\? remote: "LPX64")\n" \ - , ## a, lock, lock->l_handle.h_cookie, \ - atomic_read(&lock->l_refc), \ + "res: \?\? rrc=\?\? type: \?\?\? flags: %x remote: " \ + LPX64" expref: %d pid: %u\n" , ## a, lock, \ + lock->l_handle.h_cookie, atomic_read(&lock->l_refc), \ lock->l_readers, lock->l_writers, \ ldlm_lockname[lock->l_granted_mode], \ ldlm_lockname[lock->l_req_mode], \ - lock->l_remote_handle.cookie); \ + lock->l_flags, lock->l_remote_handle.cookie, \ + lock->l_export ? \ + atomic_read(&lock->l_export->exp_refcount) : -99, \ + lock->l_pid); \ break; \ } \ if (lock->l_resource->lr_type == LDLM_EXTENT) { \ - CDEBUG(D_DLMTRACE, "### " format \ + CDEBUG(level, "### " format \ " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " \ - "res: "LPU64"/"LPU64" rrc: %d type: %s ["LPU64"->"LPU64\ - "] remote: "LPX64"\n" , ## a, \ + "res: "LPU64"/"LPU64"/"LPU64" rrc: %d type: %s ["LPU64 \ + "->"LPU64"] (req "LPU64"->"LPU64") flags: %x remote: " \ + LPX64" expref: %d pid: %u\n" , ## a, \ lock->l_resource->lr_namespace->ns_name, lock, \ lock->l_handle.h_cookie, atomic_read(&lock->l_refc), \ lock->l_readers, lock->l_writers, \ ldlm_lockname[lock->l_granted_mode], \ ldlm_lockname[lock->l_req_mode], \ - lock->l_resource->lr_name[0], \ - lock->l_resource->lr_name[1], \ + lock->l_resource->lr_name.name[0], \ + lock->l_resource->lr_name.name[1], \ + lock->l_resource->lr_name.name[2], \ atomic_read(&lock->l_resource->lr_refcount), \ ldlm_typename[lock->l_resource->lr_type], \ - lock->l_extent.start, lock->l_extent.end, \ - lock->l_remote_handle.cookie); \ + lock->l_policy_data.l_extent.start, \ + lock->l_policy_data.l_extent.end, \ + lock->l_req_extent.start, lock->l_req_extent.end, \ + lock->l_flags, lock->l_remote_handle.cookie, \ + lock->l_export ? \ + atomic_read(&lock->l_export->exp_refcount) : -99, \ + lock->l_pid); \ + break; \ + } \ + if (lock->l_resource->lr_type == LDLM_FLOCK) { \ + CDEBUG(level, "### " format \ + " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " \ + "res: "LPU64"/"LPU64"/"LPU64" rrc: %d type: %s " \ + "pid: "LPU64" nid: "LPU64" ["LPU64"->"LPU64"] " \ + "flags: %x remote: "LPX64" expref: %d pid: %u\n", ## a,\ + lock->l_resource->lr_namespace->ns_name, lock, \ + lock->l_handle.h_cookie, atomic_read(&lock->l_refc), \ + lock->l_readers, lock->l_writers, \ + ldlm_lockname[lock->l_granted_mode], \ + ldlm_lockname[lock->l_req_mode], \ + lock->l_resource->lr_name.name[0], \ + lock->l_resource->lr_name.name[1], \ + lock->l_resource->lr_name.name[2], \ + atomic_read(&lock->l_resource->lr_refcount), \ + ldlm_typename[lock->l_resource->lr_type], \ + lock->l_policy_data.l_flock.pid, \ + lock->l_policy_data.l_flock.nid, \ + lock->l_policy_data.l_flock.start, \ + lock->l_policy_data.l_flock.end, \ + lock->l_flags, lock->l_remote_handle.cookie, \ + lock->l_export ? \ + atomic_read(&lock->l_export->exp_refcount) : -99, \ + lock->l_pid); \ + break; \ + } \ + if (lock->l_resource->lr_type == LDLM_IBITS) { \ + CDEBUG(level, "### " format \ + " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " \ + "res: "LPU64"/"LPU64"/"LPU64" bits "LPX64" rrc: %d " \ + "type: %s flags: %x remote: "LPX64" expref: %d " \ + "pid %u\n" , ## a, \ + lock->l_resource->lr_namespace->ns_name, \ + lock, lock->l_handle.h_cookie, \ + atomic_read (&lock->l_refc), \ + lock->l_readers, lock->l_writers, \ + ldlm_lockname[lock->l_granted_mode], \ + ldlm_lockname[lock->l_req_mode], \ + lock->l_resource->lr_name.name[0], \ + lock->l_resource->lr_name.name[1], \ + lock->l_resource->lr_name.name[2], \ + lock->l_policy_data.l_inodebits.bits, \ + atomic_read(&lock->l_resource->lr_refcount), \ + ldlm_typename[lock->l_resource->lr_type], \ + lock->l_flags, lock->l_remote_handle.cookie, \ + lock->l_export ? \ + atomic_read(&lock->l_export->exp_refcount) : -99, \ + lock->l_pid); \ break; \ } \ { \ - CDEBUG(D_DLMTRACE, "### " format \ + CDEBUG(level, "### " format \ " ns: %s lock: %p/"LPX64" lrc: %d/%d,%d mode: %s/%s " \ - "res: "LPU64"/"LPU64" rrc: %d type: %s remote: "LPX64 \ - "\n" , ## a, lock->l_resource->lr_namespace->ns_name, \ + "res: "LPU64"/"LPU64"/"LPU64"/"LPU64" rrc: %d type: %s " \ + "flags: %x remote: "LPX64" expref: %d " \ + "pid: %u\n" , ## a, \ + lock->l_resource->lr_namespace->ns_name, \ lock, lock->l_handle.h_cookie, \ atomic_read (&lock->l_refc), \ lock->l_readers, lock->l_writers, \ ldlm_lockname[lock->l_granted_mode], \ ldlm_lockname[lock->l_req_mode], \ - lock->l_resource->lr_name[0], \ - lock->l_resource->lr_name[1], \ + lock->l_resource->lr_name.name[0], \ + lock->l_resource->lr_name.name[1], \ + lock->l_resource->lr_name.name[2], \ + lock->l_resource->lr_name.name[3], \ atomic_read(&lock->l_resource->lr_refcount), \ ldlm_typename[lock->l_resource->lr_type], \ - lock->l_remote_handle.cookie); \ + lock->l_flags, lock->l_remote_handle.cookie, \ + lock->l_export ? \ + atomic_read(&lock->l_export->exp_refcount) : -99, \ + lock->l_pid); \ } \ } while (0) +#define LDLM_DEBUG(lock, format, a...) __LDLM_DEBUG(D_DLMTRACE, lock, \ + format, ## a) +#define LDLM_ERROR(lock, format, a...) __LDLM_DEBUG(D_ERROR, lock, format, ## a) + #define LDLM_DEBUG_NOLOCK(format, a...) \ CDEBUG(D_DLMTRACE, "### " format "\n" , ## a) +typedef int (*ldlm_processing_policy)(struct ldlm_lock *lock, int *flags, + int first_enq, ldlm_error_t *err, + struct list_head *work_list); + /* * Iterators. */ #define LDLM_ITER_CONTINUE 1 /* keep iterating */ -#define LDLM_ITER_STOP 0 /* stop iterating */ +#define LDLM_ITER_STOP 2 /* stop iterating */ typedef int (*ldlm_iterator_t)(struct ldlm_lock *, void *); typedef int (*ldlm_res_iterator_t)(struct ldlm_resource *, void *); @@ -314,26 +522,40 @@ int ldlm_namespace_foreach_res(struct ldlm_namespace *ns, ldlm_res_iterator_t iter, void *closure); int ldlm_replay_locks(struct obd_import *imp); +void ldlm_change_cbdata(struct ldlm_namespace *, struct ldlm_res_id *, + ldlm_iterator_t iter, void *data); + +/* ldlm_flock.c */ +int ldlm_flock_completion_ast(struct ldlm_lock *lock, int flags, void *data); +int ldlm_handle_flock_deadlock_check(struct ptlrpc_request *req); /* ldlm_extent.c */ -int ldlm_extent_compat(struct ldlm_lock *, struct ldlm_lock *); -int ldlm_extent_policy(struct ldlm_namespace *, struct ldlm_lock *, void *, - ldlm_mode_t, int flags, void *); +__u64 ldlm_extent_shift_kms(struct ldlm_lock *lock, __u64 old_kms); + /* ldlm_lockd.c */ -int ldlm_handle_enqueue(struct ptlrpc_request *req); +int ldlm_server_blocking_ast(struct ldlm_lock *, struct ldlm_lock_desc *, + void *data, int flag); +int ldlm_server_completion_ast(struct ldlm_lock *lock, int flags, void *data); +int ldlm_server_glimpse_ast(struct ldlm_lock *lock, void *data); +int ldlm_handle_enqueue(struct ptlrpc_request *req, ldlm_completion_callback, + ldlm_blocking_callback, ldlm_glimpse_callback); int ldlm_handle_convert(struct ptlrpc_request *req); int ldlm_handle_cancel(struct ptlrpc_request *req); int ldlm_del_waiting_lock(struct ldlm_lock *lock); +int ldlm_get_ref(void); +void ldlm_put_ref(int force); /* ldlm_lock.c */ -void ldlm_register_intent(ldlm_res_policy arg); -void ldlm_unregister_intent(void); +ldlm_processing_policy ldlm_get_processing_policy(struct ldlm_resource *res); +void ldlm_register_intent(struct ldlm_namespace *ns, ldlm_res_policy arg); void ldlm_lock2handle(struct ldlm_lock *lock, struct lustre_handle *lockh); struct ldlm_lock *__ldlm_handle2lock(struct lustre_handle *, int flags); void ldlm_cancel_callback(struct ldlm_lock *); -int ldlm_lock_set_data(struct lustre_handle *, void *data, int datalen); +int ldlm_lock_set_data(struct lustre_handle *, void *data); void ldlm_lock_remove_from_lru(struct ldlm_lock *); +struct ldlm_lock *ldlm_handle2lock_ns(struct ldlm_namespace *, + struct lustre_handle *); static inline struct ldlm_lock *ldlm_handle2lock(struct lustre_handle *h) { @@ -342,14 +564,14 @@ static inline struct ldlm_lock *ldlm_handle2lock(struct lustre_handle *h) #define LDLM_LOCK_PUT(lock) \ do { \ - /*LDLM_DEBUG(lock, "put");*/ \ + /*LDLM_DEBUG((lock), "put");*/ \ ldlm_lock_put(lock); \ } while (0) #define LDLM_LOCK_GET(lock) \ ({ \ ldlm_lock_get(lock); \ - /*LDLM_DEBUG(lock, "get");*/ \ + /*LDLM_DEBUG((lock), "get");*/ \ lock; \ }) @@ -358,29 +580,19 @@ void ldlm_lock_put(struct ldlm_lock *lock); void ldlm_lock_destroy(struct ldlm_lock *lock); void ldlm_lock2desc(struct ldlm_lock *lock, struct ldlm_lock_desc *desc); void ldlm_lock_addref(struct lustre_handle *lockh, __u32 mode); -void ldlm_lock_addref_internal(struct ldlm_lock *, __u32 mode); void ldlm_lock_decref(struct lustre_handle *lockh, __u32 mode); -void ldlm_grant_lock(struct ldlm_lock *lock); -int ldlm_lock_match(struct ldlm_namespace *ns, __u64 *res_id, __u32 type, - void *cookie, int cookielen, ldlm_mode_t mode, - struct lustre_handle *lockh); -struct ldlm_lock * -ldlm_lock_create(struct ldlm_namespace *ns, - struct lustre_handle *parent_lock_handle, - __u64 *res_id, __u32 type, ldlm_mode_t mode, void *data, - __u32 data_len); -ldlm_error_t ldlm_lock_enqueue(struct ldlm_namespace *, struct ldlm_lock *, - void *cookie, int cookie_len, int *flags, - ldlm_completion_callback completion, - ldlm_blocking_callback blocking); +void ldlm_lock_decref_and_cancel(struct lustre_handle *lockh, __u32 mode); +void ldlm_lock_allow_match(struct ldlm_lock *lock); +int ldlm_lock_match(struct ldlm_namespace *ns, int flags, struct ldlm_res_id *, + __u32 type, ldlm_policy_data_t *, ldlm_mode_t mode, + struct lustre_handle *); struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode, int *flags); void ldlm_lock_cancel(struct ldlm_lock *lock); void ldlm_cancel_locks_for_export(struct obd_export *export); -int ldlm_run_ast_work(struct list_head *rpc_list); void ldlm_reprocess_all(struct ldlm_resource *res); void ldlm_reprocess_all_ns(struct ldlm_namespace *ns); -void ldlm_lock_dump(int level, struct ldlm_lock *lock); +void ldlm_lock_dump(int level, struct ldlm_lock *lock, int pos); void ldlm_lock_dump_handle(int level, struct lustre_handle *); /* ldlm_test.c */ @@ -395,71 +607,61 @@ int ldlm_regression_stop(void); /* resource.c */ struct ldlm_namespace *ldlm_namespace_new(char *name, __u32 local); -int ldlm_namespace_cleanup(struct ldlm_namespace *ns, int local_only); -int ldlm_namespace_free(struct ldlm_namespace *ns); -int ldlm_proc_setup(struct obd_device *obd); -void ldlm_proc_cleanup(struct obd_device *obd); +int ldlm_namespace_cleanup(struct ldlm_namespace *ns, int flags); +int ldlm_namespace_free(struct ldlm_namespace *ns, int force); +int ldlm_proc_setup(void); +void ldlm_proc_cleanup(void); /* resource.c - internal */ struct ldlm_resource *ldlm_resource_get(struct ldlm_namespace *ns, struct ldlm_resource *parent, - __u64 *name, __u32 type, int create); + struct ldlm_res_id, __u32 type, + int create); struct ldlm_resource *ldlm_resource_getref(struct ldlm_resource *res); int ldlm_resource_putref(struct ldlm_resource *res); void ldlm_resource_add_lock(struct ldlm_resource *res, struct list_head *head, struct ldlm_lock *lock); void ldlm_resource_unlink_lock(struct ldlm_lock *lock); void ldlm_res2desc(struct ldlm_resource *res, struct ldlm_resource_desc *desc); -void ldlm_dump_all_namespaces(void); -void ldlm_namespace_dump(struct ldlm_namespace *); -void ldlm_resource_dump(struct ldlm_resource *); +void ldlm_dump_all_namespaces(int level); +void ldlm_namespace_dump(int level, struct ldlm_namespace *); +void ldlm_resource_dump(int level, struct ldlm_resource *); int ldlm_lock_change_resource(struct ldlm_namespace *, struct ldlm_lock *, - __u64 new_resid[3]); + struct ldlm_res_id); /* ldlm_request.c */ int ldlm_expired_completion_wait(void *data); -int ldlm_completion_ast(struct ldlm_lock *lock, int flags); -int ldlm_cli_enqueue(struct lustre_handle *conn, +int ldlm_completion_ast(struct ldlm_lock *lock, int flags, void *data); +int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request *req, struct ldlm_namespace *ns, - struct lustre_handle *parent_lock_handle, - __u64 *res_id, + struct ldlm_res_id, __u32 type, - void *cookie, int cookielen, + ldlm_policy_data_t *, ldlm_mode_t mode, int *flags, + ldlm_blocking_callback blocking, ldlm_completion_callback completion, - ldlm_blocking_callback callback, + ldlm_glimpse_callback glimpse, void *data, - __u32 data_len, + void *lvb, + __u32 lvb_len, + void *lvb_swabber, struct lustre_handle *lockh); -int ldlm_match_or_enqueue(struct lustre_handle *connh, - struct ptlrpc_request *req, - struct ldlm_namespace *ns, - struct lustre_handle *parent_lock_handle, - __u64 *res_id, - __u32 type, - void *cookie, int cookielen, - ldlm_mode_t mode, - int *flags, - ldlm_completion_callback completion, - ldlm_blocking_callback callback, - void *data, - __u32 data_len, - struct lustre_handle *lockh); int ldlm_server_ast(struct lustre_handle *lockh, struct ldlm_lock_desc *new, void *data, __u32 data_len); int ldlm_cli_convert(struct lustre_handle *, int new_mode, int *flags); int ldlm_cli_cancel(struct lustre_handle *lockh); -int ldlm_cli_cancel_unused(struct ldlm_namespace *, __u64 *, int flags); -int ldlm_cancel_lru(struct ldlm_namespace *ns); +int ldlm_cli_cancel_unused(struct ldlm_namespace *, struct ldlm_res_id *, + int flags, void *opaque); /* mds/handler.c */ -/* This has to be here because recurisve inclusion sucks. */ +/* This has to be here because recursive inclusion sucks. */ +int intent_disposition(struct ldlm_reply *rep, int flag); +void intent_set_disposition(struct ldlm_reply *rep, int flag); int mds_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, - void *data, __u32 data_len, int flag); + void *data, int flag); -#endif /* __KERNEL__ */ /* ioctls for trying requests */ #define IOC_LDLM_TYPE 'f' @@ -471,4 +673,36 @@ int mds_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc, #define IOC_LDLM_REGRESS_STOP _IOWR('f', 43, long) #define IOC_LDLM_MAX_NR 43 +static inline void lock_res(struct ldlm_resource *res) +{ + spin_lock(&res->lr_lock); +} + +static inline void unlock_res(struct ldlm_resource *res) +{ + spin_unlock(&res->lr_lock); +} + +static inline void check_res_locked(struct ldlm_resource *res) +{ + LASSERT_SPIN_LOCKED(&res->lr_lock); +} +#ifdef __KERNEL__ +static inline void lock_bitlock(struct ldlm_lock *lock) +{ + bit_spin_lock(LDLM_FL_LOCK_PROTECT_BIT, (void *) &lock->l_flags); + LASSERT(lock->l_pidb == 0); + lock->l_pidb = current->pid; +} + +static inline void unlock_bitlock(struct ldlm_lock *lock) +{ + LASSERT(lock->l_pidb == current->pid); + lock->l_pidb = 0; + bit_spin_unlock(LDLM_FL_LOCK_PROTECT_BIT, (void *) &lock->l_flags); +} +#endif +struct ldlm_resource * lock_res_and_lock(struct ldlm_lock *lock); +void unlock_res_and_lock(struct ldlm_lock *lock); + #endif