X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fldlm%2Fldlm_internal.h;h=8f7cb5c0bba3c4586c400153bcefd2ef44391d74;hb=e3a7c58aebafce40323db54bf6056029e5af4a70;hp=c3f6937c64f3e2976ccdb3d1d330d9f090ebc070;hpb=7e2daf1cd54d99f46e1bbb4b2d1a6f2269a4142e;p=fs%2Flustre-release.git diff --git a/lustre/ldlm/ldlm_internal.h b/lustre/ldlm/ldlm_internal.h index c3f6937..8f7cb5c 100644 --- a/lustre/ldlm/ldlm_internal.h +++ b/lustre/ldlm/ldlm_internal.h @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2012, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -36,26 +36,26 @@ #define MAX_STRING_SIZE 128 -extern atomic_t ldlm_srv_namespace_nr; -extern atomic_t ldlm_cli_namespace_nr; -extern struct semaphore ldlm_srv_namespace_lock; -extern struct list_head ldlm_srv_namespace_list; -extern struct semaphore ldlm_cli_namespace_lock; -extern struct list_head ldlm_cli_namespace_list; +extern cfs_atomic_t ldlm_srv_namespace_nr; +extern cfs_atomic_t ldlm_cli_namespace_nr; +extern cfs_mutex_t ldlm_srv_namespace_lock; +extern cfs_list_t ldlm_srv_namespace_list; +extern cfs_mutex_t ldlm_cli_namespace_lock; +extern cfs_list_t ldlm_cli_namespace_list; -static inline atomic_t *ldlm_namespace_nr(ldlm_side_t client) +static inline cfs_atomic_t *ldlm_namespace_nr(ldlm_side_t client) { return client == LDLM_NAMESPACE_SERVER ? &ldlm_srv_namespace_nr : &ldlm_cli_namespace_nr; } -static inline struct list_head *ldlm_namespace_list(ldlm_side_t client) +static inline cfs_list_t *ldlm_namespace_list(ldlm_side_t client) { return client == LDLM_NAMESPACE_SERVER ? &ldlm_srv_namespace_list : &ldlm_cli_namespace_list; } -static inline struct semaphore *ldlm_namespace_lock(ldlm_side_t client) +static inline cfs_mutex_t *ldlm_namespace_lock(ldlm_side_t client) { return client == LDLM_NAMESPACE_SERVER ? &ldlm_srv_namespace_lock : &ldlm_cli_namespace_lock; @@ -72,13 +72,16 @@ enum { LDLM_CANCEL_AGED = 1 << 0, /* Cancel aged locks (non lru resize). */ LDLM_CANCEL_PASSED = 1 << 1, /* Cancel passed number of locks. */ LDLM_CANCEL_SHRINK = 1 << 2, /* Cancel locks from shrinker. */ - LDLM_CANCEL_LRUR = 1 << 3 /* Cancel locks from lru resize. */ + LDLM_CANCEL_LRUR = 1 << 3, /* Cancel locks from lru resize. */ + LDLM_CANCEL_NO_WAIT = 1 << 4 /* Cancel locks w/o blocking (neither + * sending nor waiting for any rpcs) */ }; int ldlm_cancel_lru(struct ldlm_namespace *ns, int nr, ldlm_sync_t sync, int flags); -int ldlm_cancel_lru_local(struct ldlm_namespace *ns, struct list_head *cancels, - int count, int max, int cancel_flags, int flags); +int ldlm_cancel_lru_local(struct ldlm_namespace *ns, + cfs_list_t *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); @@ -91,23 +94,31 @@ void ldlm_namespace_free_prior(struct ldlm_namespace *ns, void ldlm_namespace_free_post(struct ldlm_namespace *ns); /* ldlm_lock.c */ -/* Number of blocking/completion callbacks that will be sent in - * parallel (see bug 11301). */ -#define PARALLEL_AST_LIMIT 200 - struct ldlm_cb_set_arg { - struct ptlrpc_request_set *set; - atomic_t restart; - __u32 type; /* LDLM_BL_CALLBACK or LDLM_CP_CALLBACK */ + int type; /* LDLM_BL_CALLBACK or LDLM_CP_CALLBACK */ + unsigned int threshold; /* threshold to wake up the waiting proc */ + cfs_atomic_t rpcs; /* # of inflight rpcs in set */ + cfs_atomic_t restart; + cfs_atomic_t refcount; + cfs_waitq_t waitq; }; +static inline void ldlm_csa_put(struct ldlm_cb_set_arg *arg) +{ + if (cfs_atomic_dec_and_test(&arg->refcount)) { + LASSERT(cfs_atomic_read(&arg->rpcs) == 0); + + OBD_FREE_PTR(arg); + } +} + typedef enum { LDLM_WORK_BL_AST, LDLM_WORK_CP_AST, LDLM_WORK_REVOKE_AST } ldlm_desc_ast_t; -void ldlm_grant_lock(struct ldlm_lock *lock, struct list_head *work_list); +void ldlm_grant_lock(struct ldlm_lock *lock, cfs_list_t *work_list); struct ldlm_lock * ldlm_lock_create(struct ldlm_namespace *ns, const struct ldlm_res_id *, ldlm_type_t type, ldlm_mode_t, @@ -120,10 +131,13 @@ 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, - struct list_head *work_list); -int ldlm_reprocess_queue(struct ldlm_resource *res, struct list_head *queue, - struct list_head *work_list); -int ldlm_run_ast_work(struct list_head *rpc_list, ldlm_desc_ast_t ast_type); + cfs_list_t *work_list); +#ifdef HAVE_SERVER_SUPPORT +int ldlm_reprocess_queue(struct ldlm_resource *res, cfs_list_t *queue, + cfs_list_t *work_list); +#endif +int ldlm_run_ast_work(struct ldlm_namespace *ns, cfs_list_t *rpc_list, + ldlm_desc_ast_t ast_type); int ldlm_lock_remove_from_lru(struct ldlm_lock *lock); int ldlm_lock_remove_from_lru_nolock(struct ldlm_lock *lock); void ldlm_lock_add_to_lru_nolock(struct ldlm_lock *lock); @@ -137,29 +151,33 @@ void ldlm_cancel_locks_for_export(struct obd_export *export); 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, - struct list_head *cancels, int count); + cfs_list_t *cancels, int count, int mode); void ldlm_handle_bl_callback(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld, struct ldlm_lock *lock); +#ifdef HAVE_SERVER_SUPPORT /* ldlm_plain.c */ int ldlm_process_plain_lock(struct ldlm_lock *lock, int *flags, int first_enq, - ldlm_error_t *err, struct list_head *work_list); + ldlm_error_t *err, cfs_list_t *work_list); + +/* ldlm_inodebits.c */ +int ldlm_process_inodebits_lock(struct ldlm_lock *lock, int *flags, + int first_enq, ldlm_error_t *err, + cfs_list_t *work_list); +#endif /* ldlm_extent.c */ +#ifdef HAVE_SERVER_SUPPORT int ldlm_process_extent_lock(struct ldlm_lock *lock, int *flags, int first_enq, - ldlm_error_t *err, struct list_head *work_list); + ldlm_error_t *err, cfs_list_t *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); /* ldlm_flock.c */ int ldlm_process_flock_lock(struct ldlm_lock *req, int *flags, int first_enq, - ldlm_error_t *err, struct list_head *work_list); - -/* ldlm_inodebits.c */ -int ldlm_process_inodebits_lock(struct ldlm_lock *lock, int *flags, - int first_enq, ldlm_error_t *err, - struct list_head *work_list); + ldlm_error_t *err, cfs_list_t *work_list); /* l_lock.c */ void l_check_ns_lock(struct ldlm_namespace *ns); @@ -187,9 +205,10 @@ static inline struct ldlm_extent * ldlm_interval_extent(struct ldlm_interval *node) { struct ldlm_lock *lock; - LASSERT(!list_empty(&node->li_group)); + LASSERT(!cfs_list_empty(&node->li_group)); - lock = list_entry(node->li_group.next, struct ldlm_lock, l_sl_policy); + lock = cfs_list_entry(node->li_group.next, struct ldlm_lock, + l_sl_policy); return &lock->l_policy_data.l_extent; } @@ -198,7 +217,8 @@ void ldlm_exit(void); enum ldlm_policy_res { LDLM_POLICY_CANCEL_LOCK, - LDLM_POLICY_KEEP_LOCK + LDLM_POLICY_KEEP_LOCK, + LDLM_POLICY_SKIP_LOCK }; typedef enum ldlm_policy_res ldlm_policy_res_t; @@ -210,9 +230,9 @@ typedef enum ldlm_policy_res ldlm_policy_res_t; struct ldlm_pool *pl = data; \ type tmp; \ \ - spin_lock(&pl->pl_lock); \ + cfs_spin_lock(&pl->pl_lock); \ tmp = pl->pl_##var; \ - spin_unlock(&pl->pl_lock); \ + cfs_spin_unlock(&pl->pl_lock); \ \ return lprocfs_rd_uint(page, start, off, count, eof, &tmp); \ } \ @@ -227,14 +247,14 @@ typedef enum ldlm_policy_res ldlm_policy_res_t; int rc; \ \ rc = lprocfs_wr_uint(file, buffer, count, &tmp); \ - if (rc) { \ + if (rc < 0) { \ CERROR("Can't parse user input, rc = %d\n", rc); \ return rc; \ } \ \ - spin_lock(&pl->pl_lock); \ + cfs_spin_lock(&pl->pl_lock); \ pl->pl_##var = tmp; \ - spin_unlock(&pl->pl_lock); \ + cfs_spin_unlock(&pl->pl_lock); \ \ return rc; \ } \ @@ -247,9 +267,35 @@ static inline int is_granted_or_cancelled(struct ldlm_lock *lock) 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)) + (lock->l_flags & (LDLM_FL_FAILED | LDLM_FL_CANCEL))) ret = 1; unlock_res_and_lock(lock); return ret; } + +typedef void (*ldlm_policy_wire_to_local_t)(const ldlm_wire_policy_data_t *, + ldlm_policy_data_t *); + +typedef void (*ldlm_policy_local_to_wire_t)(const ldlm_policy_data_t *, + ldlm_wire_policy_data_t *); + +void ldlm_plain_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, + ldlm_policy_data_t *lpolicy); +void ldlm_plain_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, + ldlm_wire_policy_data_t *wpolicy); +void ldlm_ibits_policy_wire_to_local(const ldlm_wire_policy_data_t *wpolicy, + ldlm_policy_data_t *lpolicy); +void ldlm_ibits_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, + ldlm_wire_policy_data_t *wpolicy); +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, + ldlm_policy_data_t *lpolicy); + +void ldlm_flock_policy_local_to_wire(const ldlm_policy_data_t *lpolicy, + ldlm_wire_policy_data_t *wpolicy);