* of ldlm_[res_]lvbo_[init,update,fill]() functions.
*/
struct ldlm_valblock_ops {
- int (*lvbo_init)(const struct lu_env *env, struct ldlm_resource *res);
- int (*lvbo_update)(const struct lu_env *env, struct ldlm_resource *res,
- struct ldlm_lock *lock, struct ptlrpc_request *r,
- int increase);
+ int (*lvbo_init)(struct ldlm_resource *res);
+ int (*lvbo_update)(struct ldlm_resource *res, struct ldlm_lock *lock,
+ struct ptlrpc_request *r, int increase);
int (*lvbo_free)(struct ldlm_resource *res);
/* Return size of lvb data appropriate RPC size can be reserved */
int (*lvbo_size)(struct ldlm_lock *lock);
/* Called to fill in lvb data to RPC buffer @buf */
- int (*lvbo_fill)(const struct lu_env *env, struct ldlm_lock *lock,
- void *buf, int *buflen);
+ int (*lvbo_fill)(struct ldlm_lock *lock, void *buf, int *buflen);
};
/**
* Which res in the bucket should we start with the reclaim.
*/
int nsb_reclaim_start;
+ /* counter of entries in this bucket */
+ atomic_t nsb_count;
};
enum {
/** Resource hash table for namespace. */
struct cfs_hash *ns_rs_hash;
+ struct ldlm_ns_bucket *ns_rs_buckets;
+ unsigned int ns_bucket_bits;
/** serialize */
spinlock_t ns_lock;
*/
unsigned int ns_max_unused;
- /** Maximum allowed age (last used time) for locks in the LRU */
+ /** Maximum allowed age (last used time) for locks in the LRU. Set in
+ * seconds from userspace, but stored in ns to avoid repeat conversions.
+ */
ktime_t ns_max_age;
/**
*/
unsigned int ns_timeouts;
/**
- * Number of seconds since the file change time after which the
- * MDT will return an UPDATE lock along with a LOOKUP lock.
+ * Number of seconds since the file change time after which
+ * the MDT will return an UPDATE lock along with a LOOKUP lock.
* This allows the client to start caching negative dentries
* for a directory and may save an RPC for a later stat.
*/
- time64_t ns_ctime_age_limit;
+ timeout_t ns_ctime_age_limit;
/**
- * Number of seconds since the lock was last used. The client may
- * cancel the lock limited by this age and flush related data if
- * any other client shows interest in it doing glimpse request.
- * This allows to cache stat data locally for such files early.
+ * Number of (nano)seconds since the lock was last used. The client
+ * may cancel the lock older than this age and flush related data if
+ * another client shows interest in this lock by doing glimpse request.
+ * This allows to cache stat data locally for such files early. Set in
+ * seconds from userspace, but stored in ns to avoid repeat conversions.
*/
- time64_t ns_dirty_age_limit;
+ ktime_t ns_dirty_age_limit;
/**
* Used to rate-limit ldlm_namespace_dump calls.
* \see ldlm_namespace_dump. Increased by 10 seconds every time
* The resources in this namespace remember contended state during
* \a ns_contention_time, in seconds.
*/
- time64_t ns_contention_time;
+ timeout_t ns_contention_time;
/**
* Limit size of contended extent locks, in bytes.
/** Type for glimpse callback function of a lock. */
typedef int (*ldlm_glimpse_callback)(struct ldlm_lock *lock, void *data);
+/** Type for created callback function of a lock. */
+typedef void (*ldlm_created_callback)(struct ldlm_lock *lock);
+
/** Work list for sending GL ASTs to multiple locks. */
struct ldlm_glimpse_work {
struct ldlm_lock *gl_lock; /* lock to glimpse */
struct interval_node *lit_root; /* actual ldlm_interval */
};
+/**
+ * Lists of waiting locks for each inodebit type.
+ * A lock can be in several liq_waiting lists and it remains in lr_waiting.
+ */
+struct ldlm_ibits_queues {
+ struct list_head liq_waiting[MDS_INODELOCK_NUMBITS];
+};
+
+struct ldlm_ibits_node {
+ struct list_head lin_link[MDS_INODELOCK_NUMBITS];
+ struct ldlm_lock *lock;
+};
+
/** Whether to track references to exports by LDLM locks. */
#define LUSTRE_TRACKS_LOCK_EXP_REFS (0)
LCF_ASYNC = 0x1, /* Cancel locks asynchronously. */
LCF_LOCAL = 0x2, /* Cancel locks locally, not notifing server */
LCF_BL_AST = 0x4, /* Cancel LDLM_FL_BL_AST locks in the same RPC */
- LCF_CONVERT = 0x8, /* Try to convert IBITS lock before cancel */
};
struct ldlm_flock {
*/
struct portals_handle l_handle;
/**
- * Lock reference count.
- * This is how many users have pointers to actual structure, so that
- * we do not accidentally free lock structure that is in use.
- */
- atomic_t l_refc;
- /**
* Internal spinlock protects l_resource. We should hold this lock
* first before taking res_lock.
*/
*/
struct list_head l_res_link;
/**
- * Tree node for ldlm_extent.
+ * Internal structures per lock type..
*/
- struct ldlm_interval *l_tree_node;
+ union {
+ struct ldlm_interval *l_tree_node;
+ struct ldlm_ibits_node *l_ibits_node;
+ };
/**
* Per export hash of locks.
* Protected by per-bucket exp->exp_lock_hash locks.
* under this lock.
* \see ost_rw_prolong_locks
*/
- time64_t l_callback_timeout;
+ time64_t l_callback_timestamp;
/** Local PID of process which created this lock. */
__u32 l_pid;
struct list_head l_exp_list;
};
+/**
+ * Describe the overlap between two locks. itree_overlap_cb data.
+ */
+struct ldlm_match_data {
+ struct ldlm_lock *lmd_old;
+ struct ldlm_lock *lmd_lock;
+ enum ldlm_mode *lmd_mode;
+ union ldlm_policy_data *lmd_policy;
+ __u64 lmd_flags;
+ __u64 lmd_skip_flags;
+ int lmd_unref;
+ bool lmd_has_ast_data;
+};
+
/** For uncommitted cross-MDT lock, store transno this lock belongs to */
#define l_transno l_client_cookie
/** Resource name */
struct ldlm_res_id lr_name;
- /**
- * Interval trees (only for extent locks) for all modes of this resource
- */
- struct ldlm_interval_tree *lr_itree;
+ union {
+ /**
+ * Interval trees (only for extent locks) for all modes of
+ * this resource
+ */
+ struct ldlm_interval_tree *lr_itree;
+ struct ldlm_ibits_queues *lr_ibits_queues;
+ };
union {
/**
struct lu_ref lr_reference;
};
+static inline int ldlm_is_granted(struct ldlm_lock *lock)
+{
+ return lock->l_req_mode == lock->l_granted_mode;
+}
+
static inline bool ldlm_has_layout(struct ldlm_lock *lock)
{
return lock->l_resource->lr_type == LDLM_IBITS &&
return &lock->l_resource->lr_ns_bucket->nsb_at_estimate;
}
-static inline int ldlm_lvbo_init(const struct lu_env *env,
- struct ldlm_resource *res)
+static inline int ldlm_lvbo_init(struct ldlm_resource *res)
{
struct ldlm_namespace *ns = ldlm_res_to_ns(res);
int rc = 0;
mutex_unlock(&res->lr_lvb_mutex);
return 0;
}
- rc = ns->ns_lvbo->lvbo_init(env, res);
+ rc = ns->ns_lvbo->lvbo_init(res);
if (rc < 0) {
CDEBUG(D_DLMTRACE, "lvbo_init failed for resource : rc = %d\n",
rc);
return 0;
}
-static inline int ldlm_lvbo_fill(const struct lu_env *env,
- struct ldlm_lock *lock, void *buf, int *len)
+static inline int ldlm_lvbo_fill(struct ldlm_lock *lock, void *buf, int *len)
{
struct ldlm_namespace *ns = ldlm_lock_to_ns(lock);
int rc;
if (ns->ns_lvbo != NULL) {
LASSERT(ns->ns_lvbo->lvbo_fill != NULL);
/* init lvb now if not already */
- rc = ldlm_lvbo_init(env, lock->l_resource);
+ rc = ldlm_lvbo_init(lock->l_resource);
if (rc < 0) {
CERROR("lock %p: delayed lvb init failed (rc %d)",
lock, rc);
return rc;
}
- return ns->ns_lvbo->lvbo_fill(env, lock, buf, len);
+ return ns->ns_lvbo->lvbo_fill(lock, buf, len);
}
return 0;
}
void *ei_cb_local_bl; /** blocking local lock callback */
void *ei_cb_cp; /** lock completion callback */
void *ei_cb_gl; /** lock glimpse callback */
+ ldlm_created_callback ei_cb_created; /** lock created callback */
void *ei_cbdata; /** Data to be passed into callbacks. */
void *ei_namespace; /** lock namespace **/
u64 ei_inodebits; /** lock inode bits **/
unsigned int ei_enq_slave:1; /** whether enqueue slave stripes */
+ unsigned int ei_enq_slot:1; /** whether acquire rpc slot */
};
#define ei_res_id ei_cb_gl
-extern struct obd_ops ldlm_obd_ops;
-
extern char *ldlm_lockname[];
extern char *ldlm_typename[];
extern const char *ldlm_it2str(enum ldlm_intent_flags it);
enum ldlm_error *err,
struct list_head *work_list);
+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);
+
/**
* Return values for lock iterators.
* Also used during deciding of lock grants and cancellations.
struct ldlm_res_id lpa_resid;
struct ldlm_extent lpa_extent;
enum ldlm_mode lpa_mode;
- time64_t lpa_timeout;
+ timeout_t lpa_timeout;
int lpa_locks_cnt;
int lpa_blocks_cnt;
};
/** @} ldlm_handlers */
void ldlm_revoke_export_locks(struct obd_export *exp);
-time64_t ldlm_bl_timeout(struct ldlm_lock *lock);
+timeout_t ldlm_bl_timeout(struct ldlm_lock *lock);
#endif
int ldlm_del_waiting_lock(struct ldlm_lock *lock);
-int ldlm_refresh_waiting_lock(struct ldlm_lock *lock, time64_t timeout);
+int ldlm_refresh_waiting_lock(struct ldlm_lock *lock, timeout_t timeout);
int ldlm_get_ref(void);
void ldlm_put_ref(void);
int ldlm_init_export(struct obd_export *exp);
/* ldlm_lock.c */
#ifdef HAVE_SERVER_SUPPORT
ldlm_processing_policy ldlm_get_processing_policy(struct ldlm_resource *res);
+ldlm_reprocessing_policy
+ldlm_get_reprocessing_policy(struct ldlm_resource *res);
#endif
void ldlm_register_intent(struct ldlm_namespace *ns, ldlm_res_policy arg);
void ldlm_lock2handle(const struct ldlm_lock *lock,
* Update Lock Value Block Operations (LVBO) on a resource taking into account
* data from request \a r
*/
-static inline int ldlm_lvbo_update(const struct lu_env *env,
- struct ldlm_resource *res,
+static inline int ldlm_lvbo_update(struct ldlm_resource *res,
struct ldlm_lock *lock,
struct ptlrpc_request *req, int increase)
{
int rc;
/* delayed lvb init may be required */
- rc = ldlm_lvbo_init(env, res);
+ rc = ldlm_lvbo_init(res);
if (rc < 0) {
CERROR("delayed lvb init failed (rc %d)\n", rc);
return rc;
}
if (ns->ns_lvbo && ns->ns_lvbo->lvbo_update)
- return ns->ns_lvbo->lvbo_update(env, res, lock, req, increase);
+ return ns->ns_lvbo->lvbo_update(res, lock, req, increase);
return 0;
}
-static inline int ldlm_res_lvbo_update(const struct lu_env *env,
- struct ldlm_resource *res,
+static inline int ldlm_res_lvbo_update(struct ldlm_resource *res,
struct ptlrpc_request *req,
int increase)
{
- return ldlm_lvbo_update(env, res, NULL, req, increase);
+ return ldlm_lvbo_update(res, NULL, req, increase);
}
+int is_granted_or_cancelled_nolock(struct ldlm_lock *lock);
+
int ldlm_error2errno(enum ldlm_error error);
enum ldlm_error ldlm_errno2error(int err_no); /* don't call it `errno': this
* confuses user-space. */
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(struct ldlm_namespace *ns, __u64 flags,
- const struct ldlm_res_id *, enum ldlm_type type,
- union ldlm_policy_data *, enum ldlm_mode mode,
- struct lustre_handle *, int unref);
+enum ldlm_mode ldlm_lock_match_with_skip(struct ldlm_namespace *ns,
+ __u64 flags, __u64 skip_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);
+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)
+{
+ return ldlm_lock_match_with_skip(ns, flags, 0, res_id, type, policy,
+ mode, lh, unref);
+}
+struct ldlm_lock *search_itree(struct ldlm_resource *res,
+ struct ldlm_match_data *data);
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);
+void ldlm_reprocess_all(struct ldlm_resource *res, struct ldlm_lock *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);
if (op != 0)
lprocfs_counter_incr(srv_stats, op);
-
- return;
}
/* resource.c - internal */
} while (0)
/* ldlm_request.c */
-int ldlm_expired_completion_wait(void *data);
/** \defgroup ldlm_local_ast Default AST handlers for local locks
* These AST handlers are typically used for server-side local locks and are
* also used by client-side lock handlers to perform minimum level base
void *data, __u32 lvb_len, enum lvb_type lvb_type,
const __u64 *client_cookie,
struct lustre_handle *lockh);
-int ldlm_cli_convert(struct ldlm_lock *lock, __u32 *flags);
+int ldlm_cli_convert_req(struct ldlm_lock *lock, __u32 *flags, __u64 new_bits);
+int ldlm_cli_convert(struct ldlm_lock *lock,
+ enum ldlm_cancel_flags cancel_flags);
int ldlm_cli_update_pool(struct ptlrpc_request *req);
int ldlm_cli_cancel(const struct lustre_handle *lockh,
enum ldlm_cancel_flags cancel_flags);
enum ldlm_cancel_flags flags);
int ldlm_inodebits_drop(struct ldlm_lock *lock, __u64 to_drop);
-int ldlm_cli_dropbits(struct ldlm_lock *lock, __u64 drop_bits);
-int ldlm_cli_dropbits_list(struct list_head *converts, __u64 drop_bits);
+int ldlm_cli_inodebits_convert(struct ldlm_lock *lock,
+ enum ldlm_cancel_flags cancel_flags);
/** @} ldlm_cli_api */
git://git.whamcloud.com / fs / lustre-release.git / blobdiff