extern cfs_mem_cache_t *ldlm_resource_slab;
extern cfs_mem_cache_t *ldlm_lock_slab;
-extern struct lustre_lock ldlm_handle_lock;
-extern struct list_head ldlm_namespace_list;
-
-extern struct semaphore ldlm_namespace_lock;
static struct semaphore ldlm_ref_sem;
static int ldlm_refcount;
struct ldlm_namespace *blwi_ns;
struct ldlm_lock_desc blwi_ld;
struct ldlm_lock *blwi_lock;
+ struct list_head blwi_head;
+ int blwi_count;
};
#ifdef __KERNEL__
RETURN(0);
}
+static int ldlm_add_waiting_lock(struct ldlm_lock *lock);
+
/* This is called from within a timer interrupt and cannot schedule */
static void waiting_locks_callback(unsigned long unused)
{
struct ldlm_lock *lock, *last = NULL;
+repeat:
spin_lock_bh(&waiting_locks_spinlock);
while (!list_empty(&waiting_locks_list)) {
lock = list_entry(waiting_locks_list.next, struct ldlm_lock,
(lock->l_req_mode == LCK_GROUP))
break;
- LDLM_ERROR(lock, "lock callback timer expired: evicting client "
- "%s@%s nid %s ",lock->l_export->exp_client_uuid.uuid,
- lock->l_export->exp_connection->c_remote_uuid.uuid,
- libcfs_nid2str(lock->l_export->exp_connection->c_peer.nid));
+ if (ptlrpc_check_suspend()) {
+ /* there is a case when we talk to one mds, holding
+ * lock from another mds. this way we easily can get
+ * here, if second mds is being recovered. so, we
+ * suspend timeouts. bug 6019 */
- if (lock == last) {
- LDLM_ERROR(lock, "waiting on lock multiple times");
- CERROR("wll %p n/p %p/%p, l_pending %p n/p %p/%p\n",
- &waiting_locks_list,
- waiting_locks_list.next, waiting_locks_list.prev,
- &lock->l_pending_chain,
- lock->l_pending_chain.next,
- lock->l_pending_chain.prev);
+ LDLM_ERROR(lock, "recharge timeout: %s@%s nid %s ",
+ lock->l_export->exp_client_uuid.uuid,
+ lock->l_export->exp_connection->c_remote_uuid.uuid,
+ libcfs_nid2str(lock->l_export->exp_connection->c_peer.nid));
- CFS_INIT_LIST_HEAD(&waiting_locks_list); /* HACK */
- expired_lock_thread.elt_dump = __LINE__;
+ list_del_init(&lock->l_pending_chain);
+ spin_unlock_bh(&waiting_locks_spinlock);
+ ldlm_add_waiting_lock(lock);
+ goto repeat;
+ }
- /* LBUG(); */
- CEMERG("would be an LBUG, but isn't (bug 5653)\n");
- libcfs_debug_dumpstack(NULL);
- /*blocks* libcfs_debug_dumplog(); */
- /*blocks* libcfs_run_lbug_upcall(file, func, line); */
- break;
+ /* if timeout overlaps the activation time of suspended timeouts
+ * then extend it to give a chance for client to reconnect */
+ if (cfs_time_before(cfs_time_sub(lock->l_callback_timeout,
+ cfs_time_seconds(obd_timeout)/2),
+ ptlrpc_suspend_wakeup_time())) {
+ LDLM_ERROR(lock, "extend timeout due to recovery: %s@%s nid %s ",
+ lock->l_export->exp_client_uuid.uuid,
+ lock->l_export->exp_connection->c_remote_uuid.uuid,
+ libcfs_nid2str(lock->l_export->exp_connection->c_peer.nid));
+
+ list_del_init(&lock->l_pending_chain);
+ spin_unlock_bh(&waiting_locks_spinlock);
+ ldlm_add_waiting_lock(lock);
+ goto repeat;
}
+
+ LDLM_ERROR(lock, "lock callback timer expired: evicting client "
+ "%s@%s nid %s\n",
+ lock->l_export->exp_client_uuid.uuid,
+ lock->l_export->exp_connection->c_remote_uuid.uuid,
+ libcfs_nid2str(lock->l_export->exp_connection->c_peer.nid));
+
last = lock;
list_del(&lock->l_pending_chain);
/*
* Prolong the lock
- *
+ *
* Called with namespace lock held.
*/
int ldlm_refresh_waiting_lock(struct ldlm_lock *lock)
struct ptlrpc_connection *conn = lock->l_export->exp_connection;
char *str = libcfs_nid2str(conn->c_peer.nid);
- LCONSOLE_ERROR("A client on nid %s was evicted from service %s.\n",
- str, lock->l_export->exp_obd->obd_name);
+ LCONSOLE_ERROR_MSG(0x138, "A client on nid %s was evicted from "
+ "service %s.\n", str,
+ lock->l_export->exp_obd->obd_name);
- LDLM_ERROR(lock, "%s AST failed (%d): evicting client %s@%s NID %s"
- " (%s)", ast_type, rc, lock->l_export->exp_client_uuid.uuid,
- conn->c_remote_uuid.uuid, libcfs_nid2str(conn->c_peer.nid),
- str);
+ LCONSOLE_ERROR_MSG(0x012, "Lock %s callback to %s timed out for "
+ "resource %d\n", ast_type,
+ obd_export_nid2str(lock->l_export), rc);
if (obd_dump_on_timeout)
libcfs_debug_dumplog();
} else if (rc) {
if (rc == -EINVAL)
LDLM_DEBUG(lock, "client (nid %s) returned %d"
- " from %s AST - normal race",
- libcfs_nid2str(peer.nid),
- lustre_msg_get_status(req->rq_repmsg),
- ast_type);
+ " from %s AST - normal race",
+ libcfs_nid2str(peer.nid),
+ req->rq_repmsg ?
+ lustre_msg_get_status(req->rq_repmsg) : -1,
+ ast_type);
else
LDLM_ERROR(lock, "client (nid %s) returned %d "
"from %s AST", libcfs_nid2str(peer.nid),
return rc;
}
+/*
+ * ->l_blocking_ast() method for server-side locks. This is invoked when newly
+ * enqueued server lock conflicts with given one.
+ *
+ * Sends blocking ast rpc to the client owning that lock; arms timeout timer
+ * to wait for client response.
+ */
int ldlm_server_blocking_ast(struct ldlm_lock *lock,
struct ldlm_lock_desc *desc,
void *data, int flag)
}
LASSERT(lock);
+ if (lock->l_export->exp_obd->obd_recovering != 0) {
+ LDLM_ERROR(lock, "BUG 6063: lock collide during recovery");
+ ldlm_lock_dump(D_ERROR, lock, 0);
+ }
req = ptlrpc_prep_req(lock->l_export->exp_imp_reverse,
LUSTRE_DLM_VERSION, LDLM_BL_CALLBACK, 2, size,
RETURN(0);
}
-#if 0
- if (CURRENT_SECONDS - lock->l_export->exp_last_request_time > 30){
- unlock_res(lock->l_resource);
- ptlrpc_req_finished(req);
- ldlm_failed_ast(lock, -ETIMEDOUT, "Not-attempted blocking");
- RETURN(-ETIMEDOUT);
- }
-#endif
-
if (lock->l_flags & LDLM_FL_CANCEL_ON_BLOCK)
instant_cancel = 1;
body = lustre_msg_buf(req->rq_reqmsg, DLM_LOCKREQ_OFF, sizeof(*body));
- body->lock_handle1 = lock->l_remote_handle;
+ body->lock_handle[0] = lock->l_remote_handle;
body->lock_desc = *desc;
body->lock_flags |= (lock->l_flags & LDLM_AST_FLAGS);
if (instant_cancel) {
unlock_res(lock->l_resource);
ldlm_lock_cancel(lock);
- } else if (lock->l_granted_mode == lock->l_req_mode) {
+ } else {
+ LASSERT(lock->l_granted_mode == lock->l_req_mode);
ldlm_add_waiting_lock(lock);
unlock_res(lock->l_resource);
}
rc = ptlrpc_queue_wait(req);
OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_GLIMPSE, 2);
}
- if (rc != 0)
+ if (rc != 0) {
+ /* If client canceled the lock but the cancel has not been
+ * recieved yet, we need to update lvbo to have the proper
+ * attributes cached. */
+ if (rc == -EINVAL)
+ ldlm_res_lvbo_update(lock->l_resource, NULL, 0, 1);
rc = ldlm_handle_ast_error(lock, req, rc, "blocking");
+ }
ptlrpc_req_finished(req);
RETURN(-ENOMEM);
body = lustre_msg_buf(req->rq_reqmsg, DLM_LOCKREQ_OFF, sizeof(*body));
- body->lock_handle1 = lock->l_remote_handle;
+ body->lock_handle[0] = lock->l_remote_handle;
body->lock_flags = flags;
ldlm_lock2desc(lock, &body->lock_desc);
instant_cancel = 1;
lock_res_and_lock(lock);
} else {
- ldlm_add_waiting_lock(lock); /* start the lock-timeout
- clock */
+ /* start the lock-timeout clock */
+ ldlm_add_waiting_lock(lock);
}
}
unlock_res_and_lock(lock);
if (lock->l_export && lock->l_export->exp_ldlm_stats)
lprocfs_counter_incr(lock->l_export->exp_ldlm_stats,
LDLM_CP_CALLBACK - LDLM_FIRST_OPC);
-
+
rc = ptlrpc_queue_wait(req);
if (rc != 0)
rc = ldlm_handle_ast_error(lock, req, rc, "completion");
RETURN(-ENOMEM);
body = lustre_msg_buf(req->rq_reqmsg, DLM_LOCKREQ_OFF, sizeof(*body));
- body->lock_handle1 = lock->l_remote_handle;
+ body->lock_handle[0] = lock->l_remote_handle;
ldlm_lock2desc(lock, &body->lock_desc);
lock_res_and_lock(lock);
else if (rc != 0)
rc = ldlm_handle_ast_error(lock, req, rc, "glimpse");
else
- rc = res->lr_namespace->ns_lvbo->lvbo_update
- (res, req->rq_repmsg, REPLY_REC_OFF, 1);
+ rc = ldlm_res_lvbo_update(res, req->rq_repmsg,
+ REPLY_REC_OFF, 1);
ptlrpc_req_finished(req);
RETURN(rc);
}
static struct ldlm_lock *
-find_existing_lock(struct obd_export *exp, struct lustre_handle *remote_hdl)
+find_existing_lock(struct obd_export *exp,
+ const struct lustre_handle *remote_hdl)
{
struct list_head *iter;
return NULL;
}
+#ifdef __KERNEL__
+extern unsigned long long lu_time_stamp_get(void);
+#else
+#define lu_time_stamp_get() time(NULL)
+#endif
/*
* Main server-side entry point into LDLM. This is called by ptlrpc service
* threads to carry out client lock enqueueing requests.
*/
-int ldlm_handle_enqueue(struct ptlrpc_request *req,
- ldlm_completion_callback completion_callback,
- ldlm_blocking_callback blocking_callback,
- ldlm_glimpse_callback glimpse_callback)
+int ldlm_handle_enqueue0(struct ldlm_namespace *ns,
+ struct ptlrpc_request *req,
+ const struct ldlm_request *dlm_req,
+ const struct ldlm_callback_suite *cbs)
{
- struct obd_device *obddev = req->rq_export->exp_obd;
struct ldlm_reply *dlm_rep;
- struct ldlm_request *dlm_req;
int size[3] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body),
[DLM_LOCKREPLY_OFF] = sizeof(*dlm_rep) };
int rc = 0;
LDLM_DEBUG_NOLOCK("server-side enqueue handler START");
- dlm_req = lustre_swab_reqbuf(req, DLM_LOCKREQ_OFF, sizeof(*dlm_req),
- lustre_swab_ldlm_request);
- if (dlm_req == NULL) {
- CERROR ("Can't unpack dlm_req\n");
- GOTO(out, rc = -EFAULT);
- }
-
+ ldlm_request_cancel(req, dlm_req, LDLM_ENQUEUE_CANCEL_OFF);
flags = dlm_req->lock_flags;
LASSERT(req->rq_export);
-
+
if (req->rq_export->exp_ldlm_stats)
lprocfs_counter_incr(req->rq_export->exp_ldlm_stats,
LDLM_ENQUEUE - LDLM_FIRST_OPC);
- if (dlm_req->lock_desc.l_resource.lr_type < LDLM_MIN_TYPE ||
- dlm_req->lock_desc.l_resource.lr_type >= LDLM_MAX_TYPE) {
- DEBUG_REQ(D_ERROR, req, "invalid lock request type %d\n",
+ if (unlikely(dlm_req->lock_desc.l_resource.lr_type < LDLM_MIN_TYPE ||
+ dlm_req->lock_desc.l_resource.lr_type >= LDLM_MAX_TYPE)) {
+ DEBUG_REQ(D_ERROR, req, "invalid lock request type %d",
dlm_req->lock_desc.l_resource.lr_type);
GOTO(out, rc = -EFAULT);
}
- if (dlm_req->lock_desc.l_req_mode <= LCK_MINMODE ||
- dlm_req->lock_desc.l_req_mode >= LCK_MAXMODE ||
- dlm_req->lock_desc.l_req_mode & (dlm_req->lock_desc.l_req_mode-1)) {
- DEBUG_REQ(D_ERROR, req, "invalid lock request mode %d\n",
+ if (unlikely(dlm_req->lock_desc.l_req_mode <= LCK_MINMODE ||
+ dlm_req->lock_desc.l_req_mode >= LCK_MAXMODE ||
+ dlm_req->lock_desc.l_req_mode &
+ (dlm_req->lock_desc.l_req_mode-1))) {
+ DEBUG_REQ(D_ERROR, req, "invalid lock request mode %d",
dlm_req->lock_desc.l_req_mode);
GOTO(out, rc = -EFAULT);
}
if (req->rq_export->exp_connect_flags & OBD_CONNECT_IBITS) {
- if (dlm_req->lock_desc.l_resource.lr_type == LDLM_PLAIN) {
+ if (unlikely(dlm_req->lock_desc.l_resource.lr_type ==
+ LDLM_PLAIN)) {
DEBUG_REQ(D_ERROR, req,
- "PLAIN lock request from IBITS client?\n");
+ "PLAIN lock request from IBITS client?");
GOTO(out, rc = -EPROTO);
}
- } else if (dlm_req->lock_desc.l_resource.lr_type == LDLM_IBITS) {
+ } else if (unlikely(dlm_req->lock_desc.l_resource.lr_type ==
+ LDLM_IBITS)) {
DEBUG_REQ(D_ERROR, req,
- "IBITS lock request from unaware client?\n");
+ "IBITS lock request from unaware client?");
GOTO(out, rc = -EPROTO);
}
#if 0
- /* FIXME this makes it impossible to use LDLM_PLAIN locks -- check
+ /* FIXME this makes it impossible to use LDLM_PLAIN locks -- check
against server's _CONNECT_SUPPORTED flags? (I don't want to use
ibits for mgc/mgs) */
}
#endif
- if (flags & LDLM_FL_REPLAY) {
+ if (unlikely(flags & LDLM_FL_REPLAY)) {
lock = find_existing_lock(req->rq_export,
- &dlm_req->lock_handle1);
+ &dlm_req->lock_handle[0]);
if (lock != NULL) {
- DEBUG_REQ(D_HA, req, "found existing lock cookie "LPX64,
- lock->l_handle.h_cookie);
+ DEBUG_REQ(D_DLMTRACE, req, "found existing lock cookie "
+ LPX64, lock->l_handle.h_cookie);
GOTO(existing_lock, rc = 0);
}
}
/* The lock's callback data might be set in the policy function */
- lock = ldlm_lock_create(obddev->obd_namespace, &dlm_req->lock_handle2,
- dlm_req->lock_desc.l_resource.lr_name,
+ lock = ldlm_lock_create(ns, &dlm_req->lock_desc.l_resource.lr_name,
dlm_req->lock_desc.l_resource.lr_type,
dlm_req->lock_desc.l_req_mode,
- blocking_callback, completion_callback,
- glimpse_callback, NULL, 0);
+ cbs->lcs_blocking, cbs->lcs_completion,
+ cbs->lcs_glimpse, NULL, 0);
+
if (!lock)
GOTO(out, rc = -ENOMEM);
do_gettimeofday(&lock->l_enqueued_time);
- lock->l_remote_handle = dlm_req->lock_handle1;
+ lock->l_remote_handle = dlm_req->lock_handle[0];
LDLM_DEBUG(lock, "server-side enqueue handler, new lock created");
OBD_FAIL_TIMEOUT(OBD_FAIL_LDLM_ENQUEUE_BLOCKED, obd_timeout * 2);
if (dlm_req->lock_desc.l_resource.lr_type == LDLM_EXTENT)
lock->l_req_extent = lock->l_policy_data.l_extent;
- err = ldlm_lock_enqueue(obddev->obd_namespace, &lock, cookie, &flags);
+ err = ldlm_lock_enqueue(ns, &lock, cookie, &flags);
if (err)
GOTO(out, err);
/* Don't move a pending lock onto the export if it has already
* been evicted. Cancel it now instead. (bug 5683) */
- if (req->rq_export->exp_failed ||
- OBD_FAIL_CHECK_ONCE(OBD_FAIL_LDLM_ENQUEUE_OLD_EXPORT)) {
+ if (unlikely(req->rq_export->exp_failed ||
+ OBD_FAIL_CHECK_ONCE(OBD_FAIL_LDLM_ENQUEUE_OLD_EXPORT))) {
LDLM_ERROR(lock, "lock on destroyed export %p", req->rq_export);
rc = -ENOTCONN;
} else if (lock->l_flags & LDLM_FL_AST_SENT) {
dlm_rep->lock_flags |= LDLM_FL_AST_SENT;
if (lock->l_granted_mode == lock->l_req_mode) {
- /* Only cancel lock if it was granted, because it
- * would be destroyed immediatelly and would never
- * be granted in the future, causing timeouts on client.
- * Not granted lock will be cancelled immediatelly after
+ /*
+ * Only cancel lock if it was granted, because it would
+ * be destroyed immediatelly and would never be granted
+ * in the future, causing timeouts on client. Not
+ * granted lock will be cancelled immediatelly after
* sending completion AST.
*/
if (dlm_rep->lock_flags & LDLM_FL_CANCEL_ON_BLOCK) {
unlock_res_and_lock(lock);
ldlm_lock_cancel(lock);
lock_res_and_lock(lock);
- } else if (lock->l_granted_mode == lock->l_req_mode)
+ } else
ldlm_add_waiting_lock(lock);
}
}
if ((dlm_req->lock_desc.l_resource.lr_type == LDLM_PLAIN ||
dlm_req->lock_desc.l_resource.lr_type == LDLM_IBITS) &&
req->rq_export->exp_libclient) {
- if (!(lock->l_flags & LDLM_FL_CANCEL_ON_BLOCK) ||
- !(dlm_rep->lock_flags & LDLM_FL_CANCEL_ON_BLOCK)) {
+ if (unlikely(!(lock->l_flags & LDLM_FL_CANCEL_ON_BLOCK) ||
+ !(dlm_rep->lock_flags & LDLM_FL_CANCEL_ON_BLOCK))){
CERROR("Granting sync lock to libclient. "
"req fl %d, rep fl %d, lock fl %d\n",
dlm_req->lock_flags, dlm_rep->lock_flags,
LDLM_DEBUG(lock, "server-side enqueue handler, sending reply"
"(err=%d, rc=%d)", err, rc);
+ lock_res_and_lock(lock);
if (rc == 0) {
- lock_res_and_lock(lock);
size[DLM_REPLY_REC_OFF] = lock->l_resource->lr_lvb_len;
if (size[DLM_REPLY_REC_OFF] > 0) {
void *lvb = lustre_msg_buf(req->rq_repmsg,
memcpy(lvb, lock->l_resource->lr_lvb_data,
size[DLM_REPLY_REC_OFF]);
}
- unlock_res_and_lock(lock);
} else {
- lock_res_and_lock(lock);
ldlm_resource_unlink_lock(lock);
ldlm_lock_destroy_nolock(lock);
- unlock_res_and_lock(lock);
}
+ unlock_res_and_lock(lock);
if (!err && dlm_req->lock_desc.l_resource.lr_type != LDLM_FLOCK)
ldlm_reprocess_all(lock->l_resource);
return rc;
}
-int ldlm_handle_convert(struct ptlrpc_request *req)
+int ldlm_handle_enqueue(struct ptlrpc_request *req,
+ ldlm_completion_callback completion_callback,
+ ldlm_blocking_callback blocking_callback,
+ ldlm_glimpse_callback glimpse_callback)
{
+ int rc;
struct ldlm_request *dlm_req;
+ struct ldlm_callback_suite cbs = {
+ .lcs_completion = completion_callback,
+ .lcs_blocking = blocking_callback,
+ .lcs_glimpse = glimpse_callback
+ };
+
+
+ dlm_req = lustre_swab_reqbuf(req, DLM_LOCKREQ_OFF,
+ sizeof *dlm_req, lustre_swab_ldlm_request);
+ if (dlm_req != NULL) {
+ rc = ldlm_handle_enqueue0(req->rq_export->exp_obd->obd_namespace,
+ req, dlm_req, &cbs);
+ } else {
+ CERROR ("Can't unpack dlm_req\n");
+ rc = -EFAULT;
+ }
+ return rc;
+}
+
+int ldlm_handle_convert0(struct ptlrpc_request *req,
+ const struct ldlm_request *dlm_req)
+{
struct ldlm_reply *dlm_rep;
struct ldlm_lock *lock;
int rc;
[DLM_LOCKREPLY_OFF] = sizeof(*dlm_rep) };
ENTRY;
- dlm_req = lustre_swab_reqbuf(req, DLM_LOCKREQ_OFF, sizeof(*dlm_req),
- lustre_swab_ldlm_request);
- if (dlm_req == NULL) {
- CERROR ("Can't unpack dlm_req\n");
- RETURN (-EFAULT);
- }
-
if (req->rq_export && req->rq_export->exp_ldlm_stats)
lprocfs_counter_incr(req->rq_export->exp_ldlm_stats,
LDLM_CONVERT - LDLM_FIRST_OPC);
sizeof(*dlm_rep));
dlm_rep->lock_flags = dlm_req->lock_flags;
- lock = ldlm_handle2lock(&dlm_req->lock_handle1);
+ lock = ldlm_handle2lock(&dlm_req->lock_handle[0]);
if (!lock) {
req->rq_status = EINVAL;
} else {
RETURN(0);
}
-int ldlm_handle_cancel(struct ptlrpc_request *req)
+int ldlm_handle_convert(struct ptlrpc_request *req)
{
+ int rc;
struct ldlm_request *dlm_req;
+
+ dlm_req = lustre_swab_reqbuf(req, DLM_LOCKREQ_OFF, sizeof *dlm_req,
+ lustre_swab_ldlm_request);
+ if (dlm_req != NULL) {
+ rc = ldlm_handle_convert0(req, dlm_req);
+ } else {
+ CERROR ("Can't unpack dlm_req\n");
+ rc = -EFAULT;
+ }
+ return rc;
+}
+
+/* Cancel all the locks, which handles are packed into ldlm_request */
+int ldlm_request_cancel(struct ptlrpc_request *req,
+ const struct ldlm_request *dlm_req, int first)
+{
+ struct ldlm_resource *res, *pres = NULL;
struct ldlm_lock *lock;
- struct ldlm_resource *res;
+ int i, count, done = 0;
+ ENTRY;
+
+ count = dlm_req->lock_count ? dlm_req->lock_count : 1;
+ if (first >= count)
+ RETURN(0);
+
+ /* There is no lock on the server at the replay time,
+ * skip lock cancelling to make replay tests to pass. */
+ if (lustre_msg_get_flags(req->rq_reqmsg) & MSG_REPLAY)
+ RETURN(0);
+
+ LDLM_DEBUG_NOLOCK("server-side cancel handler START: %d locks, "
+ "starting at %d", count, first);
+
+ for (i = first; i < count; i++) {
+ lock = ldlm_handle2lock(&dlm_req->lock_handle[i]);
+ if (!lock) {
+ LDLM_DEBUG_NOLOCK("server-side cancel handler stale "
+ "lock (cookie "LPU64")",
+ dlm_req->lock_handle[i].cookie);
+ continue;
+ }
+
+ res = lock->l_resource;
+ done++;
+
+ if (res != pres) {
+ if (pres != NULL) {
+ ldlm_reprocess_all(pres);
+ ldlm_resource_putref(pres);
+ }
+ if (res != NULL) {
+ ldlm_resource_getref(res);
+ ldlm_res_lvbo_update(res, NULL, 0, 1);
+ }
+ pres = res;
+ }
+ ldlm_lock_cancel(lock);
+ LDLM_LOCK_PUT(lock);
+ }
+ if (pres != NULL) {
+ ldlm_reprocess_all(pres);
+ ldlm_resource_putref(pres);
+ }
+ LDLM_DEBUG_NOLOCK("server-side cancel handler END");
+ RETURN(done);
+}
+
+int ldlm_handle_cancel(struct ptlrpc_request *req)
+{
+ struct ldlm_request *dlm_req;
int rc;
ENTRY;
RETURN(-ENOMEM);
}
- lock = ldlm_handle2lock(&dlm_req->lock_handle1);
- if (!lock) {
- CERROR("received cancel for unknown lock cookie "LPX64
- " from client %s id %s\n",
- dlm_req->lock_handle1.cookie,
- req->rq_export->exp_client_uuid.uuid,
- libcfs_id2str(req->rq_peer));
- LDLM_DEBUG_NOLOCK("server-side cancel handler stale lock "
- "(cookie "LPU64")",
- dlm_req->lock_handle1.cookie);
+ if (!ldlm_request_cancel(req, dlm_req, 0))
req->rq_status = ESTALE;
- } else {
- LDLM_DEBUG(lock, "server-side cancel handler START");
- res = lock->l_resource;
- if (res && res->lr_namespace->ns_lvbo &&
- res->lr_namespace->ns_lvbo->lvbo_update) {
- (void)res->lr_namespace->ns_lvbo->lvbo_update
- (res, NULL, 0, 1);
- //(res, req->rq_reqmsg, 1, 1);
- }
-
- ldlm_lock_cancel(lock);
- req->rq_status = rc;
- }
if (ptlrpc_reply(req) != 0)
LBUG();
- if (lock) {
- ldlm_reprocess_all(lock->l_resource);
- LDLM_DEBUG(lock, "server-side cancel handler END");
- LDLM_LOCK_PUT(lock);
- }
-
RETURN(0);
}
sizeof(lock->l_resource->lr_name)) != 0) {
unlock_res_and_lock(lock);
ldlm_lock_change_resource(ns, lock,
- dlm_req->lock_desc.l_resource.lr_name);
+ &dlm_req->lock_desc.l_resource.lr_name);
LDLM_DEBUG(lock, "completion AST, new resource");
CERROR("change resource!\n");
lock_res_and_lock(lock);
lock_res_and_lock(lock);
if (lock->l_granted_mode == LCK_PW &&
!lock->l_readers && !lock->l_writers &&
- cfs_time_after(cfs_time_current(),
- cfs_time_add(lock->l_last_used, cfs_time_seconds(10)))) {
+ cfs_time_after(cfs_time_current(),
+ cfs_time_add(lock->l_last_used,
+ cfs_time_seconds(10)))) {
unlock_res_and_lock(lock);
- if (ldlm_bl_to_thread(ns, NULL, lock))
+ if (ldlm_bl_to_thread_lock(ns, NULL, lock))
ldlm_handle_bl_callback(ns, NULL, lock);
EXIT;
return ptlrpc_reply(req);
}
-int ldlm_bl_to_thread(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld,
- struct ldlm_lock *lock)
-{
#ifdef __KERNEL__
+static int ldlm_bl_to_thread(struct ldlm_namespace *ns,
+ struct ldlm_lock_desc *ld, struct ldlm_lock *lock,
+ struct list_head *cancels, int count)
+{
struct ldlm_bl_pool *blp = ldlm_state->ldlm_bl_pool;
struct ldlm_bl_work_item *blwi;
ENTRY;
+ if (cancels && count == 0)
+ RETURN(0);
+
OBD_ALLOC(blwi, sizeof(*blwi));
if (blwi == NULL)
RETURN(-ENOMEM);
blwi->blwi_ns = ns;
if (ld != NULL)
blwi->blwi_ld = *ld;
- blwi->blwi_lock = lock;
-
+ if (count) {
+ list_add(&blwi->blwi_head, cancels);
+ list_del_init(cancels);
+ blwi->blwi_count = count;
+ } else {
+ blwi->blwi_lock = lock;
+ }
spin_lock(&blp->blp_lock);
list_add_tail(&blwi->blwi_entry, &blp->blp_list);
cfs_waitq_signal(&blp->blp_waitq);
spin_unlock(&blp->blp_lock);
RETURN(0);
+}
+#endif
+
+int ldlm_bl_to_thread_lock(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld,
+ struct ldlm_lock *lock)
+{
+#ifdef __KERNEL__
+ RETURN(ldlm_bl_to_thread(ns, ld, lock, NULL, 0));
+#else
+ RETURN(-ENOSYS);
+#endif
+}
+
+int ldlm_bl_to_thread_list(struct ldlm_namespace *ns, struct ldlm_lock_desc *ld,
+ struct list_head *cancels, int count)
+{
+#ifdef __KERNEL__
+ RETURN(ldlm_bl_to_thread(ns, ld, NULL, cancels, count));
#else
RETURN(-ENOSYS);
#endif
lustre_swab_ldlm_request);
if (dlm_req != NULL)
CDEBUG(D_RPCTRACE, "--> lock cookie: "LPX64"\n",
- dlm_req->lock_handle1.cookie);
+ dlm_req->lock_handle[0].cookie);
ldlm_callback_reply(req, -ENOTCONN);
RETURN(0);
rc = llog_origin_handle_close(req);
ldlm_callback_reply(req, rc);
RETURN(0);
+ case SEC_CTX_FINI:
+ /* do nothing */
+ RETURN(0);
default:
CERROR("unknown opcode %u\n",
lustre_msg_get_opc(req->rq_reqmsg));
RETURN (0);
}
- lock = ldlm_handle2lock_ns(ns, &dlm_req->lock_handle1);
+ lock = ldlm_handle2lock_ns(ns, &dlm_req->lock_handle[0]);
if (!lock) {
- CDEBUG(D_INODE, "callback on lock "LPX64" - lock disappeared\n",
- dlm_req->lock_handle1.cookie);
+ CDEBUG(D_DLMTRACE, "callback on lock "LPX64" - lock "
+ "disappeared\n", dlm_req->lock_handle[0].cookie);
ldlm_callback_reply(req, -EINVAL);
RETURN(0);
}
/* Copy hints/flags (e.g. LDLM_FL_DISCARD_DATA) from AST. */
lock_res_and_lock(lock);
lock->l_flags |= (dlm_req->lock_flags & LDLM_AST_FLAGS);
+ if (lustre_msg_get_opc(req->rq_reqmsg) == LDLM_BL_CALLBACK) {
+ /* If somebody cancels locks and cache is already droped,
+ * we can tell the server we have no lock. Otherwise, we
+ * should send cancel after dropping the cache. */
+ if ((lock->l_flags & LDLM_FL_CANCELING) &&
+ (lock->l_flags & LDLM_FL_BL_DONE)) {
+ LDLM_DEBUG(lock, "callback on lock "
+ LPX64" - lock disappeared\n",
+ dlm_req->lock_handle[0].cookie);
+ unlock_res_and_lock(lock);
+ LDLM_LOCK_PUT(lock);
+ ldlm_callback_reply(req, -EINVAL);
+ RETURN(0);
+ }
+ lock->l_flags |= LDLM_FL_BL_AST;
+ }
unlock_res_and_lock(lock);
/* We want the ost thread to get this reply so that it can respond
CDEBUG(D_INODE, "blocking ast\n");
if (!(lock->l_flags & LDLM_FL_CANCEL_ON_BLOCK))
ldlm_callback_reply(req, 0);
- if (ldlm_bl_to_thread(ns, &dlm_req->lock_desc, lock))
+ if (ldlm_bl_to_thread_lock(ns, &dlm_req->lock_desc, lock))
ldlm_handle_bl_callback(ns, &dlm_req->lock_desc, lock);
break;
case LDLM_CP_CALLBACK:
sizeof(*dlm_req),
lustre_swab_ldlm_request);
if (dlm_req != NULL)
- ldlm_lock_dump_handle(D_ERROR, &dlm_req->lock_handle1);
-
+ ldlm_lock_dump_handle(D_ERROR,
+ &dlm_req->lock_handle[0]);
ldlm_callback_reply(req, -ENOTCONN);
RETURN(0);
}
RETURN(0);
}
+void ldlm_revoke_export_locks(struct obd_export *exp)
+{
+ struct list_head *locklist = &exp->exp_ldlm_data.led_held_locks;
+ struct list_head rpc_list;
+ struct ldlm_lock *lock, *next;
+ struct ldlm_lock_desc desc;
+
+ ENTRY;
+ INIT_LIST_HEAD(&rpc_list);
+
+ spin_lock(&exp->exp_ldlm_data.led_lock);
+ list_for_each_entry_safe(lock, next, locklist, l_export_chain) {
+ lock_res_and_lock(lock);
+
+ if (lock->l_req_mode != lock->l_granted_mode) {
+ unlock_res_and_lock(lock);
+ continue;
+ }
+
+ LASSERT(lock->l_resource);
+ if (lock->l_resource->lr_type != LDLM_IBITS &&
+ lock->l_resource->lr_type != LDLM_PLAIN) {
+ unlock_res_and_lock(lock);
+ continue;
+ }
+
+ if (lock->l_flags & LDLM_FL_AST_SENT) {
+ unlock_res_and_lock(lock);
+ continue;
+ }
+
+ LASSERT(lock->l_blocking_ast);
+ LASSERT(!lock->l_blocking_lock);
+
+ lock->l_flags |= LDLM_FL_AST_SENT;
+ list_move(&lock->l_export_chain, &rpc_list);
+
+ unlock_res_and_lock(lock);
+ }
+ spin_unlock(&exp->exp_ldlm_data.led_lock);
+
+ while (!list_empty(&rpc_list)) {
+ lock = list_entry(rpc_list.next, struct ldlm_lock,
+ l_export_chain);
+ list_del_init(&lock->l_export_chain);
+
+ /* the desc just pretend to exclusive */
+ ldlm_lock2desc(lock, &desc);
+ desc.l_req_mode = LCK_EX;
+ desc.l_granted_mode = 0;
+
+ LDLM_LOCK_GET(lock);
+ lock->l_blocking_ast(lock, &desc, lock->l_ast_data,
+ LDLM_CB_BLOCKING);
+ LDLM_LOCK_PUT(lock);
+ }
+ EXIT;
+}
+
#ifdef __KERNEL__
static struct ldlm_bl_work_item *ldlm_bl_get_work(struct ldlm_bl_pool *blp)
{
if (blwi->blwi_ns == NULL)
break;
- ldlm_handle_bl_callback(blwi->blwi_ns, &blwi->blwi_ld,
- blwi->blwi_lock);
+ if (blwi->blwi_count) {
+ /* The special case when we cancel locks in lru
+ * asynchronously, we pass the list of locks here.
+ * Thus lock is marked LDLM_FL_CANCELING, and already
+ * canceled locally. */
+ ldlm_cli_cancel_list(&blwi->blwi_head,
+ blwi->blwi_count, NULL, 0, 0);
+ } else {
+ ldlm_handle_bl_callback(blwi->blwi_ns, &blwi->blwi_ld,
+ blwi->blwi_lock);
+ }
OBD_FREE(blwi, sizeof(*blwi));
}
ldlm_callback_handler, "ldlm_cbd",
ldlm_svc_proc_dir, NULL,
LDLM_THREADS_AUTO_MIN, LDLM_THREADS_AUTO_MAX,
- "ldlm_cb");
+ "ldlm_cb",
+ LCT_MD_THREAD|LCT_DT_THREAD);
if (!ldlm_state->ldlm_cb_service) {
CERROR("failed to start service\n");
LDLM_CANCEL_REPLY_PORTAL, ldlm_timeout * 6000,
ldlm_cancel_handler, "ldlm_canceld",
ldlm_svc_proc_dir, NULL,
- LDLM_THREADS_AUTO_MIN, LDLM_THREADS_AUTO_MAX,
- "ldlm_cn");
+ LDLM_THREADS_AUTO_MIN, LDLM_THREADS_AUTO_MAX,
+ "ldlm_cn",
+ LCT_MD_THREAD|LCT_DT_THREAD|LCT_CL_THREAD);
if (!ldlm_state->ldlm_cancel_service) {
CERROR("failed to start service\n");
expired_lock_thread.elt_state == ELT_READY);
#endif
+#ifdef __KERNEL__
+ rc = ldlm_pools_init();
+ if (rc)
+ GOTO(out_thread, rc);
+#endif
RETURN(0);
#ifdef __KERNEL__
#endif
ENTRY;
- if (!list_empty(&ldlm_namespace_list)) {
+ if (!list_empty(ldlm_namespace_list(LDLM_NAMESPACE_SERVER)) ||
+ !list_empty(ldlm_namespace_list(LDLM_NAMESPACE_CLIENT))) {
CERROR("ldlm still has namespaces; clean these up first.\n");
- ldlm_dump_all_namespaces(D_DLMTRACE);
+ ldlm_dump_all_namespaces(LDLM_NAMESPACE_SERVER, D_DLMTRACE);
+ ldlm_dump_all_namespaces(LDLM_NAMESPACE_CLIENT, D_DLMTRACE);
RETURN(-EBUSY);
}
#ifdef __KERNEL__
+ ldlm_pools_fini();
+#endif
+
+#ifdef __KERNEL__
while (atomic_read(&blp->blp_num_threads) > 0) {
struct ldlm_bl_work_item blwi = { .blwi_ns = NULL };
int __init ldlm_init(void)
{
init_mutex(&ldlm_ref_sem);
- init_mutex(&ldlm_namespace_lock);
+ init_mutex(ldlm_namespace_lock(LDLM_NAMESPACE_SERVER));
+ init_mutex(ldlm_namespace_lock(LDLM_NAMESPACE_CLIENT));
ldlm_resource_slab = cfs_mem_cache_create("ldlm_resources",
sizeof(struct ldlm_resource), 0,
SLAB_HWCACHE_ALIGN);
EXPORT_SYMBOL(ldlm_blocking_ast);
EXPORT_SYMBOL(ldlm_glimpse_ast);
EXPORT_SYMBOL(ldlm_expired_completion_wait);
+EXPORT_SYMBOL(ldlm_prep_enqueue_req);
EXPORT_SYMBOL(ldlm_cli_convert);
EXPORT_SYMBOL(ldlm_cli_enqueue);
EXPORT_SYMBOL(ldlm_cli_enqueue_fini);
EXPORT_SYMBOL(ldlm_cli_enqueue_local);
EXPORT_SYMBOL(ldlm_cli_cancel);
EXPORT_SYMBOL(ldlm_cli_cancel_unused);
+EXPORT_SYMBOL(ldlm_cli_cancel_unused_resource);
+EXPORT_SYMBOL(ldlm_cli_cancel_req);
EXPORT_SYMBOL(ldlm_cli_join_lru);
EXPORT_SYMBOL(ldlm_replay_locks);
EXPORT_SYMBOL(ldlm_resource_foreach);
EXPORT_SYMBOL(ldlm_namespace_foreach);
EXPORT_SYMBOL(ldlm_namespace_foreach_res);
EXPORT_SYMBOL(ldlm_resource_iterate);
+EXPORT_SYMBOL(ldlm_cancel_resource_local);
+EXPORT_SYMBOL(ldlm_cli_cancel_list);
/* ldlm_lockd.c */
EXPORT_SYMBOL(ldlm_server_blocking_ast);
EXPORT_SYMBOL(ldlm_server_completion_ast);
EXPORT_SYMBOL(ldlm_server_glimpse_ast);
EXPORT_SYMBOL(ldlm_handle_enqueue);
+EXPORT_SYMBOL(ldlm_handle_enqueue0);
EXPORT_SYMBOL(ldlm_handle_cancel);
+EXPORT_SYMBOL(ldlm_request_cancel);
EXPORT_SYMBOL(ldlm_handle_convert);
+EXPORT_SYMBOL(ldlm_handle_convert0);
EXPORT_SYMBOL(ldlm_del_waiting_lock);
EXPORT_SYMBOL(ldlm_get_ref);
EXPORT_SYMBOL(ldlm_put_ref);
EXPORT_SYMBOL(ldlm_refresh_waiting_lock);
+EXPORT_SYMBOL(ldlm_revoke_export_locks);
/* ldlm_resource.c */
EXPORT_SYMBOL(ldlm_namespace_new);
EXPORT_SYMBOL(client_obd_cleanup);
EXPORT_SYMBOL(client_connect_import);
EXPORT_SYMBOL(client_disconnect_export);
-EXPORT_SYMBOL(target_abort_recovery);
-EXPORT_SYMBOL(target_cleanup_recovery);
+EXPORT_SYMBOL(target_start_recovery_thread);
+EXPORT_SYMBOL(target_stop_recovery_thread);
EXPORT_SYMBOL(target_handle_connect);
+EXPORT_SYMBOL(target_cleanup_recovery);
EXPORT_SYMBOL(target_destroy_export);
EXPORT_SYMBOL(target_cancel_recovery_timer);
EXPORT_SYMBOL(target_send_reply);
EXPORT_SYMBOL(target_queue_recovery_request);
EXPORT_SYMBOL(target_handle_ping);
+EXPORT_SYMBOL(target_pack_pool_reply);
EXPORT_SYMBOL(target_handle_disconnect);
-EXPORT_SYMBOL(target_queue_final_reply);
/* l_lock.c */
EXPORT_SYMBOL(lock_res_and_lock);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff