*
* Copyright (C) 2002, 2003 Cluster File Systems, Inc.
*
- * This file is part of Lustre, http://www.lustre.org.
+ * This file is part of the Lustre file system, http://www.lustre.org
+ * Lustre is a trademark of Cluster File Systems, Inc.
*
- * Lustre is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * You may have signed or agreed to another license before downloading
+ * this software. If so, you are bound by the terms and conditions
+ * of that agreement, and the following does not apply to you. See the
+ * LICENSE file included with this distribution for more information.
*
- * Lustre is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * If you did not agree to a different license, then this copy of Lustre
+ * is open source software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
*
- * You should have received a copy of the GNU General Public License
- * along with Lustre; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * In either case, Lustre is distributed in the hope that it will be
+ * useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * license text for more details.
*/
#define DEBUG_SUBSYSTEM S_LDLM
#include <liblustre.h>
#endif
-#include <linux/lustre_dlm.h>
-#include <linux/obd_class.h>
-#include <linux/obd.h>
+#include <lustre_dlm.h>
+#include <obd_class.h>
+#include <obd.h>
#include "ldlm_internal.h"
struct lock_wait_data {
struct ldlm_lock *lwd_lock;
- int lwd_generation;
+ __u32 lwd_conn_cnt;
};
int ldlm_expired_completion_wait(void *data)
struct obd_import *imp;
struct obd_device *obd;
+ ENTRY;
if (lock->l_conn_export == NULL) {
- static unsigned long next_dump = 0, last_dump = 0;
-
- if (ptlrpc_check_suspend())
- RETURN(0);
+ static cfs_time_t next_dump = 0, last_dump = 0;
- LDLM_ERROR(lock, "lock timed out; not entering recovery in "
- "server code, just going back to sleep");
- if (time_after(jiffies, next_dump)) {
+ LDLM_ERROR(lock, "lock timed out (enqueued at %lu, %lus ago); "
+ "not entering recovery in server code, just going "
+ "back to sleep", lock->l_enqueued_time.tv_sec,
+ CURRENT_SECONDS - lock->l_enqueued_time.tv_sec);
+ if (cfs_time_after(cfs_time_current(), next_dump)) {
last_dump = next_dump;
- next_dump = jiffies + 300 * HZ;
+ next_dump = cfs_time_shift(300);
ldlm_namespace_dump(D_DLMTRACE,
lock->l_resource->lr_namespace);
if (last_dump == 0)
- portals_debug_dumplog();
+ libcfs_debug_dumplog();
}
RETURN(0);
}
obd = lock->l_conn_export->exp_obd;
imp = obd->u.cli.cl_import;
- ptlrpc_fail_import(imp, lwd->lwd_generation);
- LDLM_ERROR(lock, "lock timed out, entering recovery for %s@%s",
- imp->imp_target_uuid.uuid,
- imp->imp_connection->c_remote_uuid.uuid);
+ ptlrpc_fail_import(imp, lwd->lwd_conn_cnt);
+ LDLM_ERROR(lock, "lock timed out (enqueued at %lu, %lus ago), entering "
+ "recovery for %s@%s", lock->l_enqueued_time.tv_sec,
+ CURRENT_SECONDS - lock->l_enqueued_time.tv_sec,
+ obd2cli_tgt(obd), imp->imp_connection->c_remote_uuid.uuid);
RETURN(0);
}
{
/* XXX ALLOCATE - 160 bytes */
struct lock_wait_data lwd;
- unsigned long irqflags;
struct obd_device *obd;
struct obd_import *imp = NULL;
struct l_wait_info lwi;
int rc = 0;
ENTRY;
- if (flags == LDLM_FL_WAIT_NOREPROC)
+ if (flags == LDLM_FL_WAIT_NOREPROC) {
+ LDLM_DEBUG(lock, "client-side enqueue waiting on pending lock");
goto noreproc;
+ }
if (!(flags & (LDLM_FL_BLOCK_WAIT | LDLM_FL_BLOCK_GRANTED |
LDLM_FL_BLOCK_CONV))) {
- wake_up(&lock->l_waitq);
+ cfs_waitq_signal(&lock->l_waitq);
RETURN(0);
}
lwd.lwd_lock = lock;
- if (flags & LDLM_FL_NO_TIMEOUT) {
- LDLM_DEBUG(lock, "waiting indefinitely for group lock\n");
+ if (lock->l_flags & LDLM_FL_NO_TIMEOUT) {
+ LDLM_DEBUG(lock, "waiting indefinitely because of NO_TIMEOUT");
lwi = LWI_INTR(interrupted_completion_wait, &lwd);
} else {
- lwi = LWI_TIMEOUT_INTR(obd_timeout * HZ,
+ lwi = LWI_TIMEOUT_INTR(cfs_time_seconds(obd_timeout),
ldlm_expired_completion_wait,
interrupted_completion_wait, &lwd);
}
if (imp != NULL) {
- spin_lock_irqsave(&imp->imp_lock, irqflags);
- lwd.lwd_generation = imp->imp_generation;
- spin_unlock_irqrestore(&imp->imp_lock, irqflags);
+ spin_lock(&imp->imp_lock);
+ lwd.lwd_conn_cnt = imp->imp_conn_cnt;
+ spin_unlock(&imp->imp_lock);
}
/* Go to sleep until the lock is granted or cancelled. */
RETURN(0);
}
-static int ldlm_cli_enqueue_local(struct ldlm_namespace *ns,
- struct ldlm_res_id res_id,
- __u32 type,
- ldlm_policy_data_t *policy,
- ldlm_mode_t mode,
- int *flags,
- ldlm_blocking_callback blocking,
- ldlm_completion_callback completion,
- ldlm_glimpse_callback glimpse,
- void *data, __u32 lvb_len,
- void *lvb_swabber,
- struct lustre_handle *lockh)
+/*
+ * ->l_blocking_ast() callback for LDLM locks acquired by server-side OBDs.
+ */
+int ldlm_blocking_ast(struct ldlm_lock *lock, struct ldlm_lock_desc *desc,
+ void *data, int flag)
+{
+ int do_ast;
+ ENTRY;
+
+ if (flag == LDLM_CB_CANCELING) {
+ /* Don't need to do anything here. */
+ RETURN(0);
+ }
+
+ lock_res_and_lock(lock);
+ /* Get this: if ldlm_blocking_ast is racing with intent_policy, such
+ * that ldlm_blocking_ast is called just before intent_policy method
+ * takes the ns_lock, then by the time we get the lock, we might not
+ * be the correct blocking function anymore. So check, and return
+ * early, if so. */
+ if (lock->l_blocking_ast != ldlm_blocking_ast) {
+ unlock_res_and_lock(lock);
+ RETURN(0);
+ }
+
+ lock->l_flags |= LDLM_FL_CBPENDING;
+ do_ast = (!lock->l_readers && !lock->l_writers);
+ unlock_res_and_lock(lock);
+
+ if (do_ast) {
+ struct lustre_handle lockh;
+ int rc;
+
+ LDLM_DEBUG(lock, "already unused, calling ldlm_cli_cancel");
+ ldlm_lock2handle(lock, &lockh);
+ rc = ldlm_cli_cancel(&lockh);
+ if (rc < 0)
+ CERROR("ldlm_cli_cancel: %d\n", rc);
+ } else {
+ LDLM_DEBUG(lock, "Lock still has references, will be "
+ "cancelled later");
+ }
+ RETURN(0);
+}
+
+/*
+ * ->l_glimpse_ast() for DLM extent locks acquired on the server-side. See
+ * comment in filter_intent_policy() on why you may need this.
+ */
+int ldlm_glimpse_ast(struct ldlm_lock *lock, void *reqp)
+{
+ /*
+ * Returning -ELDLM_NO_LOCK_DATA actually works, but the reason for
+ * that is rather subtle: with OST-side locking, it may so happen that
+ * _all_ extent locks are held by the OST. If client wants to obtain
+ * current file size it calls ll{,u}_glimpse_size(), and (as locks are
+ * on the server), dummy glimpse callback fires and does
+ * nothing. Client still receives correct file size due to the
+ * following fragment in filter_intent_policy():
+ *
+ * rc = l->l_glimpse_ast(l, NULL); // this will update the LVB
+ * if (rc != 0 && res->lr_namespace->ns_lvbo &&
+ * res->lr_namespace->ns_lvbo->lvbo_update) {
+ * res->lr_namespace->ns_lvbo->lvbo_update(res, NULL, 0, 1);
+ * }
+ *
+ * that is, after glimpse_ast() fails, filter_lvbo_update() runs, and
+ * returns correct file size to the client.
+ */
+ return -ELDLM_NO_LOCK_DATA;
+}
+
+int ldlm_cli_enqueue_local(struct ldlm_namespace *ns, struct ldlm_res_id res_id,
+ ldlm_type_t type, ldlm_policy_data_t *policy,
+ ldlm_mode_t mode, int *flags,
+ ldlm_blocking_callback blocking,
+ ldlm_completion_callback completion,
+ ldlm_glimpse_callback glimpse,
+ void *data, __u32 lvb_len, void *lvb_swabber,
+ struct lustre_handle *lockh)
{
struct ldlm_lock *lock;
int err;
ENTRY;
+ LASSERT(!(*flags & LDLM_FL_REPLAY));
if (ns->ns_client) {
CERROR("Trying to enqueue local lock in a shadow namespace\n");
LBUG();
ldlm_lock_addref_internal(lock, mode);
ldlm_lock2handle(lock, lockh);
+ lock_res_and_lock(lock);
lock->l_flags |= LDLM_FL_LOCAL;
if (*flags & LDLM_FL_ATOMIC_CB)
lock->l_flags |= LDLM_FL_ATOMIC_CB;
lock->l_lvb_swabber = lvb_swabber;
+ unlock_res_and_lock(lock);
if (policy != NULL)
- memcpy(&lock->l_policy_data, policy, sizeof(*policy));
+ lock->l_policy_data = *policy;
if (type == LDLM_EXTENT)
- memcpy(&lock->l_req_extent, &policy->l_extent,
- sizeof(policy->l_extent));
+ lock->l_req_extent = policy->l_extent;
err = ldlm_lock_enqueue(ns, &lock, policy, flags);
if (err != ELDLM_OK)
GOTO(out, err);
if (policy != NULL)
- memcpy(policy, &lock->l_policy_data, sizeof(*policy));
+ *policy = lock->l_policy_data;
if ((*flags) & LDLM_FL_LOCK_CHANGED)
- memcpy(&res_id, &lock->l_resource->lr_name, sizeof(res_id));
+ res_id = lock->l_resource->lr_name;
LDLM_DEBUG_NOLOCK("client-side local enqueue handler END (lock %p)",
lock);
}
}
-int ldlm_cli_enqueue(struct obd_export *exp,
- struct ptlrpc_request *req,
- struct ldlm_namespace *ns,
- struct ldlm_res_id res_id,
- __u32 type,
- ldlm_policy_data_t *policy,
- ldlm_mode_t mode,
- int *flags,
- ldlm_blocking_callback blocking,
- ldlm_completion_callback completion,
- ldlm_glimpse_callback glimpse,
- void *data,
- void *lvb,
- __u32 lvb_len,
- void *lvb_swabber,
- struct lustre_handle *lockh)
+int ldlm_cli_enqueue_fini(struct obd_export *exp, struct ptlrpc_request *req,
+ ldlm_type_t type, __u8 with_policy, ldlm_mode_t mode,
+ int *flags, void *lvb, __u32 lvb_len,
+ void *lvb_swabber, struct lustre_handle *lockh,int rc)
{
+ struct ldlm_namespace *ns = exp->exp_obd->obd_namespace;
+ int is_replay = *flags & LDLM_FL_REPLAY;
struct ldlm_lock *lock;
- struct ldlm_request *body;
struct ldlm_reply *reply;
- int rc, size[3] = {0, sizeof(*body), lvb_len}, req_passed_in = 1;
- int is_replay = *flags & LDLM_FL_REPLAY;
- int cleanup_phase = 0;
+ int cleanup_phase = 1;
ENTRY;
- if (exp == NULL) {
- LASSERT(!is_replay);
- rc = ldlm_cli_enqueue_local(ns, res_id, type, policy, mode,
- flags, blocking, completion,
- glimpse, data, lvb_len, lvb_swabber,
- lockh);
- RETURN(rc);
- }
-
- /* If we're replaying this lock, just check some invariants.
- * If we're creating a new lock, get everything all setup nice. */
- if (is_replay) {
- lock = ldlm_handle2lock(lockh);
- LDLM_DEBUG(lock, "client-side enqueue START");
- LASSERT(exp == lock->l_conn_export);
- } else {
- lock = ldlm_lock_create(ns, NULL, res_id, type, mode, blocking,
- completion, glimpse, data, lvb_len);
- if (lock == NULL)
- RETURN(-ENOMEM);
- /* for the local lock, add the reference */
- ldlm_lock_addref_internal(lock, mode);
- ldlm_lock2handle(lock, lockh);
- lock->l_lvb_swabber = lvb_swabber;
- if (policy != NULL)
- memcpy(&lock->l_policy_data, policy, sizeof(*policy));
- if (type == LDLM_EXTENT)
- memcpy(&lock->l_req_extent, &policy->l_extent,
- sizeof(policy->l_extent));
- LDLM_DEBUG(lock, "client-side enqueue START");
- }
-
- /* lock not sent to server yet */
- cleanup_phase = 2;
-
- if (req == NULL) {
- req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_DLM_VERSION,
- LDLM_ENQUEUE, 2, size, NULL);
- if (req == NULL)
- GOTO(cleanup, rc = -ENOMEM);
- req_passed_in = 0;
- }
-
- LASSERTF(req->rq_reqmsg->buflens[MDS_REQ_INTENT_LOCKREQ_OFF] ==
- sizeof(*body), "buflen[%d] = %d, not %d\n",
- MDS_REQ_INTENT_LOCKREQ_OFF,
- req->rq_reqmsg->buflens[MDS_REQ_INTENT_LOCKREQ_OFF],
- sizeof(*body));
-
- /* Dump lock data into the request buffer */
- body = lustre_msg_buf(req->rq_reqmsg, MDS_REQ_INTENT_LOCKREQ_OFF,
- sizeof (*body));
- ldlm_lock2desc(lock, &body->lock_desc);
- body->lock_flags = *flags;
-
- memcpy(&body->lock_handle1, lockh, sizeof(*lockh));
-
- /* Continue as normal. */
- if (!req_passed_in) {
- size[0] = sizeof(*reply);
- req->rq_replen = lustre_msg_size(1 + (lvb_len > 0), size);
- }
- lock->l_conn_export = exp;
- lock->l_export = NULL;
- lock->l_blocking_ast = blocking;
-
- LDLM_DEBUG(lock, "sending request");
- rc = ptlrpc_queue_wait(req);
-
+ lock = ldlm_handle2lock(lockh);
+ /* ldlm_cli_enqueue is holding a reference on this lock. */
+ LASSERT(lock != NULL);
if (rc != ELDLM_OK) {
LASSERT(!is_replay);
LDLM_DEBUG(lock, "client-side enqueue END (%s)",
rc == ELDLM_LOCK_ABORTED ? "ABORTED" : "FAILED");
if (rc == ELDLM_LOCK_ABORTED) {
/* Before we return, swab the reply */
- reply = lustre_swab_repbuf(req, 0, sizeof(*reply),
+ reply = lustre_swab_repbuf(req, DLM_LOCKREPLY_OFF,
+ sizeof(*reply),
lustre_swab_ldlm_reply);
if (reply == NULL) {
CERROR("Can't unpack ldlm_reply\n");
}
if (lvb_len) {
void *tmplvb;
- tmplvb = lustre_swab_repbuf(req, 1, lvb_len,
+ tmplvb = lustre_swab_repbuf(req,
+ DLM_REPLY_REC_OFF,
+ lvb_len,
lvb_swabber);
if (tmplvb == NULL)
GOTO(cleanup, rc = -EPROTO);
GOTO(cleanup, rc);
}
- reply = lustre_swab_repbuf(req, 0, sizeof(*reply),
+ reply = lustre_swab_repbuf(req, DLM_LOCKREPLY_OFF, sizeof(*reply),
lustre_swab_ldlm_reply);
if (reply == NULL) {
CERROR("Can't unpack ldlm_reply\n");
}
/* lock enqueued on the server */
- cleanup_phase = 1;
+ cleanup_phase = 0;
- do_gettimeofday(&lock->l_enqueued_time);
- memcpy(&lock->l_remote_handle, &reply->lock_handle,
- sizeof(lock->l_remote_handle));
+ lock_res_and_lock(lock);
+ lock->l_remote_handle = reply->lock_handle;
*flags = reply->lock_flags;
+ lock->l_flags |= reply->lock_flags & LDLM_INHERIT_FLAGS;
+ /* move NO_TIMEOUT flag to the lock to force ldlm_lock_match()
+ * to wait with no timeout as well */
+ lock->l_flags |= reply->lock_flags & LDLM_FL_NO_TIMEOUT;
+ unlock_res_and_lock(lock);
CDEBUG(D_INFO, "local: %p, remote cookie: "LPX64", flags: 0x%x\n",
lock, reply->lock_handle.cookie, *flags);
}
if (reply->lock_desc.l_resource.lr_name.name[0] !=
- lock->l_resource->lr_name.name[0] ||
- reply->lock_desc.l_resource.lr_name.name[1] !=
- lock->l_resource->lr_name.name[1]) {
+ lock->l_resource->lr_name.name[0]) {
CDEBUG(D_INFO, "remote intent success, locking %ld "
"instead of %ld\n",
(long)reply->lock_desc.l_resource.lr_name.name[0],
}
LDLM_DEBUG(lock, "client-side enqueue, new resource");
}
- if (policy != NULL)
- memcpy(&lock->l_policy_data,
- &reply->lock_desc.l_policy_data,
- sizeof(reply->lock_desc.l_policy_data));
+ if (with_policy)
+ if (!(type == LDLM_IBITS && !(exp->exp_connect_flags &
+ OBD_CONNECT_IBITS)))
+ lock->l_policy_data =
+ reply->lock_desc.l_policy_data;
if (type != LDLM_PLAIN)
LDLM_DEBUG(lock,"client-side enqueue, new policy data");
}
- if ((*flags) & LDLM_FL_AST_SENT) {
+ if ((*flags) & LDLM_FL_AST_SENT ||
+ /* Cancel extent locks as soon as possible on a liblustre client,
+ * because it cannot handle asynchronous ASTs robustly (see
+ * bug 7311). */
+ (LIBLUSTRE_CLIENT && type == LDLM_EXTENT)) {
lock_res_and_lock(lock);
lock->l_flags |= LDLM_FL_CBPENDING;
unlock_res_and_lock(lock);
* clobber the LVB with an older one. */
if (lvb_len && (lock->l_req_mode != lock->l_granted_mode)) {
void *tmplvb;
- tmplvb = lustre_swab_repbuf(req, 1, lvb_len, lvb_swabber);
- if (tmplvb == NULL) {
- cleanup_phase = 2;
+ tmplvb = lustre_swab_repbuf(req, DLM_REPLY_REC_OFF, lvb_len,
+ lvb_swabber);
+ if (tmplvb == NULL)
GOTO(cleanup, rc = -EPROTO);
- }
memcpy(lock->l_lvb_data, tmplvb, lvb_len);
}
if (!is_replay) {
rc = ldlm_lock_enqueue(ns, &lock, NULL, flags);
if (lock->l_completion_ast != NULL) {
- /* since the lock made it to the server at this point
- * it's the completion AST's responsibilty to cleanup
- * the lock if the completion processing fails since
- * it's no longer a simple local lock cancel. */
int err = lock->l_completion_ast(lock, *flags, NULL);
if (!rc)
rc = err;
+ if (rc && type != LDLM_FLOCK) /* bug 9425, bug 10250 */
+ cleanup_phase = 1;
}
}
LDLM_DEBUG(lock, "client-side enqueue END");
EXIT;
cleanup:
- switch (cleanup_phase) {
- case 2:
- if (rc)
+ if (cleanup_phase == 1 && rc)
+ failed_lock_cleanup(ns, lock, lockh, mode);
+ /* Put lock 2 times, the second reference is held by ldlm_cli_enqueue */
+ LDLM_LOCK_PUT(lock);
+ LDLM_LOCK_PUT(lock);
+ return rc;
+}
+
+/* If a request has some specific initialisation it is passed in @reqp,
+ * otherwise it is created in ldlm_cli_enqueue.
+ *
+ * Supports sync and async requests, pass @async flag accordingly. If a
+ * request was created in ldlm_cli_enqueue and it is the async request,
+ * pass it to the caller in @reqp. */
+int ldlm_cli_enqueue(struct obd_export *exp, struct ptlrpc_request **reqp,
+ struct ldlm_res_id res_id, ldlm_type_t type,
+ ldlm_policy_data_t *policy, ldlm_mode_t mode, int *flags,
+ ldlm_blocking_callback blocking,
+ ldlm_completion_callback completion,
+ ldlm_glimpse_callback glimpse,
+ void *data, void *lvb, __u32 lvb_len, void *lvb_swabber,
+ struct lustre_handle *lockh, int async)
+{
+ struct ldlm_namespace *ns = exp->exp_obd->obd_namespace;
+ struct ldlm_lock *lock;
+ struct ldlm_request *body;
+ struct ldlm_reply *reply;
+ int size[3] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body),
+ [DLM_LOCKREQ_OFF] = sizeof(*body),
+ [DLM_REPLY_REC_OFF] = lvb_len };
+ int is_replay = *flags & LDLM_FL_REPLAY;
+ int req_passed_in = 1, rc;
+ struct ptlrpc_request *req;
+ ENTRY;
+
+ LASSERT(exp != NULL);
+
+ /* If we're replaying this lock, just check some invariants.
+ * If we're creating a new lock, get everything all setup nice. */
+ if (is_replay) {
+ lock = ldlm_handle2lock(lockh);
+ LASSERT(lock != NULL);
+ LDLM_DEBUG(lock, "client-side enqueue START");
+ LASSERT(exp == lock->l_conn_export);
+ } else {
+ lock = ldlm_lock_create(ns, NULL, res_id, type, mode, blocking,
+ completion, glimpse, data, lvb_len);
+ if (lock == NULL)
+ RETURN(-ENOMEM);
+ /* for the local lock, add the reference */
+ ldlm_lock_addref_internal(lock, mode);
+ ldlm_lock2handle(lock, lockh);
+ lock->l_lvb_swabber = lvb_swabber;
+ if (policy != NULL) {
+ /* INODEBITS_INTEROP: If the server does not support
+ * inodebits, we will request a plain lock in the
+ * descriptor (ldlm_lock2desc() below) but use an
+ * inodebits lock internally with both bits set.
+ */
+ if (type == LDLM_IBITS && !(exp->exp_connect_flags &
+ OBD_CONNECT_IBITS))
+ lock->l_policy_data.l_inodebits.bits =
+ MDS_INODELOCK_LOOKUP |
+ MDS_INODELOCK_UPDATE;
+ else
+ lock->l_policy_data = *policy;
+ }
+
+ if (type == LDLM_EXTENT)
+ lock->l_req_extent = policy->l_extent;
+ LDLM_DEBUG(lock, "client-side enqueue START");
+ }
+
+ /* lock not sent to server yet */
+
+ if (reqp == NULL || *reqp == NULL) {
+ req = ptlrpc_prep_req(class_exp2cliimp(exp), LUSTRE_DLM_VERSION,
+ LDLM_ENQUEUE, 2, size, NULL);
+ if (req == NULL) {
failed_lock_cleanup(ns, lock, lockh, mode);
- case 1:
- if (!req_passed_in && req != NULL)
- ptlrpc_req_finished(req);
+ LDLM_LOCK_PUT(lock);
+ RETURN(-ENOMEM);
+ }
+ req_passed_in = 0;
+ if (reqp)
+ *reqp = req;
+ } else {
+ req = *reqp;
+ LASSERTF(lustre_msg_buflen(req->rq_reqmsg, DLM_LOCKREQ_OFF) ==
+ sizeof(*body), "buflen[%d] = %d, not "LPSZ"\n",
+ DLM_LOCKREQ_OFF,
+ lustre_msg_buflen(req->rq_reqmsg, DLM_LOCKREQ_OFF),
+ sizeof(*body));
}
- LDLM_LOCK_PUT(lock);
- return rc;
+ lock->l_conn_export = exp;
+ lock->l_export = NULL;
+ lock->l_blocking_ast = blocking;
+
+ /* Dump lock data into the request buffer */
+ body = lustre_msg_buf(req->rq_reqmsg, DLM_LOCKREQ_OFF, sizeof(*body));
+ ldlm_lock2desc(lock, &body->lock_desc);
+ body->lock_flags = *flags;
+ body->lock_handle1 = *lockh;
+
+ /* Continue as normal. */
+ if (!req_passed_in) {
+ size[DLM_LOCKREPLY_OFF] = sizeof(*reply);
+ ptlrpc_req_set_repsize(req, 2 + (lvb_len > 0), size);
+ }
+
+ /*
+ * Liblustre client doesn't get extent locks, except for O_APPEND case
+ * where [0, OBD_OBJECT_EOF] lock is taken, or truncate, where
+ * [i_size, OBD_OBJECT_EOF] lock is taken.
+ */
+ LASSERT(ergo(LIBLUSTRE_CLIENT, type != LDLM_EXTENT ||
+ policy->l_extent.end == OBD_OBJECT_EOF));
+
+ if (async) {
+ LASSERT(reqp != NULL);
+ RETURN(0);
+ }
+
+ LDLM_DEBUG(lock, "sending request");
+ rc = ptlrpc_queue_wait(req);
+ rc = ldlm_cli_enqueue_fini(exp, req, type, policy ? 1 : 0,
+ mode, flags, lvb, lvb_len, lvb_swabber,
+ lockh, rc);
+
+ if (!req_passed_in && req != NULL) {
+ ptlrpc_req_finished(req);
+ if (reqp)
+ *reqp = NULL;
+ }
+
+ RETURN(rc);
}
static int ldlm_cli_convert_local(struct ldlm_lock *lock, int new_mode,
struct ldlm_reply *reply;
struct ldlm_lock *lock;
struct ldlm_resource *res;
- struct ptlrpc_request *req = NULL;
- int rc, size = sizeof(*body);
+ struct ptlrpc_request *req;
+ int size[2] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body),
+ [DLM_LOCKREQ_OFF] = sizeof(*body) };
+ int rc;
ENTRY;
lock = ldlm_handle2lock(lockh);
LDLM_DEBUG(lock, "client-side convert");
req = ptlrpc_prep_req(class_exp2cliimp(lock->l_conn_export),
- LUSTRE_DLM_VERSION, LDLM_CONVERT, 1, &size, NULL);
+ LUSTRE_DLM_VERSION, LDLM_CONVERT, 2, size, NULL);
if (!req)
GOTO(out, rc = -ENOMEM);
- body = lustre_msg_buf(req->rq_reqmsg, 0, sizeof (*body));
- memcpy(&body->lock_handle1, &lock->l_remote_handle,
- sizeof(body->lock_handle1));
+ body = lustre_msg_buf(req->rq_reqmsg, DLM_LOCKREQ_OFF, sizeof(*body));
+ body->lock_handle1 = lock->l_remote_handle;
body->lock_desc.l_req_mode = new_mode;
body->lock_flags = *flags;
- size = sizeof(*reply);
- req->rq_replen = lustre_msg_size(1, &size);
+ size[DLM_LOCKREPLY_OFF] = sizeof(*reply);
+ ptlrpc_req_set_repsize(req, 2, size);
rc = ptlrpc_queue_wait(req);
if (rc != ELDLM_OK)
GOTO(out, rc);
- reply = lustre_swab_repbuf(req, 0, sizeof (*reply),
+ reply = lustre_swab_repbuf(req, DLM_LOCKREPLY_OFF, sizeof(*reply),
lustre_swab_ldlm_reply);
if (reply == NULL) {
CERROR ("Can't unpack ldlm_reply\n");
if (req->rq_status)
GOTO(out, rc = req->rq_status);
- res = ldlm_lock_convert(lock, new_mode,
- (int *)&reply->lock_flags);
+ res = ldlm_lock_convert(lock, new_mode, &reply->lock_flags);
if (res != NULL) {
ldlm_reprocess_all(res);
/* Go to sleep until the lock is granted. */
struct ptlrpc_request *req;
struct ldlm_lock *lock;
struct ldlm_request *body;
- int rc = 0, size = sizeof(*body);
+ int size[2] = { [MSG_PTLRPC_BODY_OFF] = sizeof(struct ptlrpc_body),
+ [DLM_LOCKREQ_OFF] = sizeof(*body) };
+ int rc = 0;
ENTRY;
/* concurrent cancels on the same handle can happen */
/* Set this flag to prevent others from getting new references*/
lock_res_and_lock(lock);
lock->l_flags |= LDLM_FL_CBPENDING;
- local_only = lock->l_flags & LDLM_FL_LOCAL_ONLY;
+ local_only = (lock->l_flags &
+ (LDLM_FL_LOCAL_ONLY|LDLM_FL_CANCEL_ON_BLOCK));
ldlm_cancel_callback(lock);
unlock_res_and_lock(lock);
goto local_cancel;
}
- req = ptlrpc_prep_req(imp, LUSTRE_DLM_VERSION, LDLM_CANCEL,
- 1, &size, NULL);
+ req = ptlrpc_prep_req(imp, LUSTRE_DLM_VERSION, LDLM_CANCEL, 2,
+ size, NULL);
if (!req)
GOTO(out, rc = -ENOMEM);
req->rq_no_resend = 1;
req->rq_request_portal = LDLM_CANCEL_REQUEST_PORTAL;
req->rq_reply_portal = LDLM_CANCEL_REPLY_PORTAL;
- body = lustre_msg_buf(req->rq_reqmsg, 0, sizeof (*body));
- memcpy(&body->lock_handle1, &lock->l_remote_handle,
- sizeof(body->lock_handle1));
-
- req->rq_replen = lustre_msg_size(0, NULL);
+ body = lustre_msg_buf(req->rq_reqmsg, DLM_LOCKREQ_OFF,
+ sizeof(*body));
+ body->lock_handle1 = lock->l_remote_handle;
+ ptlrpc_req_set_repsize(req, 1, NULL);
rc = ptlrpc_queue_wait(req);
if (rc == ESTALE) {
- char str[PTL_NALFMT_SIZE];
- CERROR("client/server (nid %s) out of sync"
- " -- not fatal\n",
- ptlrpc_peernid2str(&req->rq_import->
- imp_connection->c_peer, str));
+ CDEBUG(D_DLMTRACE, "client/server (nid %s) out of sync "
+ "-- not fatal, flags %x\n",
+ libcfs_nid2str(req->rq_import->
+ imp_connection->c_peer.nid),
+ lock->l_flags);
} else if (rc == -ETIMEDOUT) {
ptlrpc_req_finished(req);
GOTO(restart, rc);
ldlm_lock_cancel(lock);
} else {
if (lock->l_resource->lr_namespace->ns_client) {
- LDLM_ERROR(lock, "Trying to cancel local lock\n");
+ LDLM_ERROR(lock, "Trying to cancel local lock");
LBUG();
}
LDLM_DEBUG(lock, "client-side local cancel");
{
struct ldlm_lock *lock, *next;
int count, rc = 0;
- LIST_HEAD(cblist);
+ CFS_LIST_HEAD(cblist);
ENTRY;
#ifndef __KERNEL__
spin_unlock(&ns->ns_unused_lock);
lock_res_and_lock(lock);
- ldlm_lock_remove_from_lru(lock);
+ if (ldlm_lock_remove_from_lru(lock) == 0) {
+ /* other thread is removing lock from lru */
+ unlock_res_and_lock(lock);
+ LDLM_LOCK_PUT(lock);
+ spin_lock(&ns->ns_unused_lock);
+ continue;
+
+ }
+
+ /* If we have chosen to canecl this lock voluntarily, we better
+ send cancel notification to server, so that it frees
+ appropriate state. This might lead to a race where while
+ we are doing cancel here, server is also silently
+ cancelling this lock. */
+ lock->l_flags &= ~LDLM_FL_CANCEL_ON_BLOCK;
/* Setting the CBPENDING flag is a little misleading, but
* prevents an important race; namely, once CBPENDING is set,
* ns_lock below. We use l_tmp and can't use l_pending_chain as
* it is used both on server and client nevertheles bug 5666
* says it is used only on server. --umka */
- if (sync != LDLM_ASYNC || ldlm_bl_to_thread(ns, NULL, lock))
- list_add(&lock->l_tmp, &cblist);
-
+ list_add(&lock->l_tmp, &cblist);
unlock_res_and_lock(lock);
+ LDLM_LOCK_GET(lock); /* to hold lock after bl thread */
+ if (sync == LDLM_ASYNC && (ldlm_bl_to_thread(ns, NULL, lock) == 0)) {
+ lock_res_and_lock(lock);
+ list_del_init(&lock->l_tmp);
+ unlock_res_and_lock(lock);
+ }
+ LDLM_LOCK_PUT(lock);
+
spin_lock(&ns->ns_unused_lock);
if (--count == 0)
struct ldlm_res_id res_id, int flags,
void *opaque)
{
- struct list_head *tmp, *next, list = LIST_HEAD_INIT(list);
+ struct list_head *tmp, *next, list = CFS_LIST_HEAD_INIT(list);
struct ldlm_resource *res;
struct ldlm_lock *lock;
ENTRY;
if (opaque != NULL && lock->l_ast_data != opaque) {
LDLM_ERROR(lock, "data %p doesn't match opaque %p",
lock->l_ast_data, opaque);
+ //LBUG();
continue;
}
if (lock->l_readers || lock->l_writers) {
- if (flags & LDLM_FL_CONFIG_CHANGE)
- lock->l_flags |= LDLM_FL_CBPENDING;
- else if (flags & LDLM_FL_WARN)
+ if (flags & LDLM_FL_WARN) {
LDLM_ERROR(lock, "lock in use");
+ //LBUG();
+ }
continue;
}
*
* If flags & LDLM_FL_LOCAL_ONLY, throw the locks away without trying
* to notify the server.
- * If flags & LDLM_FL_NO_CALLBACK, don't run the cancel callback.
- * If flags & LDLM_FL_WARN, print a warning if some locks are still in use.
- * If flags & LDLM_FL_CONFIG_CHANGE, mark all locks as having a pending callback
- */
+ * If flags & LDLM_FL_WARN, print a warning if some locks are still in use. */
int ldlm_cli_cancel_unused(struct ldlm_namespace *ns,
struct ldlm_res_id *res_id, int flags, void *opaque)
{
int i;
- struct l_wait_info lwi = { 0 };
ENTRY;
if (ns == NULL)
rc = ldlm_cli_cancel_unused_resource(ns, res->lr_name,
flags, opaque);
+
if (rc)
CERROR("cancel_unused_res ("LPU64"): %d\n",
res->lr_name.name[0], rc);
}
spin_unlock(&ns->ns_hash_lock);
- if (flags & LDLM_FL_CONFIG_CHANGE)
- l_wait_event(ns->ns_waitq, have_no_nsresource(ns), &lwi);
-
RETURN(ELDLM_OK);
}
+/* join/split resource locks to/from lru list */
+int ldlm_cli_join_lru(struct ldlm_namespace *ns,
+ struct ldlm_res_id *res_id, int join)
+{
+ struct ldlm_resource *res;
+ struct ldlm_lock *lock, *n;
+ int count = 0;
+ ENTRY;
+
+ LASSERT(ns->ns_client == LDLM_NAMESPACE_CLIENT);
+
+ res = ldlm_resource_get(ns, NULL, *res_id, LDLM_EXTENT, 0);
+ if (res == NULL)
+ RETURN(count);
+ LASSERT(res->lr_type == LDLM_EXTENT);
+
+ lock_res(res);
+ if (!join)
+ goto split;
+
+ list_for_each_entry_safe (lock, n, &res->lr_granted, l_res_link) {
+ if (list_empty(&lock->l_lru) &&
+ !lock->l_readers && !lock->l_writers &&
+ !(lock->l_flags & LDLM_FL_LOCAL) &&
+ !(lock->l_flags & LDLM_FL_CBPENDING)) {
+ spin_lock(&ns->ns_unused_lock);
+ LASSERT(ns->ns_nr_unused >= 0);
+ list_add_tail(&lock->l_lru, &ns->ns_unused_list);
+ ns->ns_nr_unused++;
+ spin_unlock(&ns->ns_unused_lock);
+ lock->l_flags &= ~LDLM_FL_NO_LRU;
+ LDLM_DEBUG(lock, "join lock to lru");
+ count++;
+ }
+ }
+ goto unlock;
+split:
+ spin_lock(&ns->ns_unused_lock);
+ list_for_each_entry_safe (lock, n, &ns->ns_unused_list, l_lru) {
+ if (lock->l_resource == res) {
+ ldlm_lock_remove_from_lru_nolock(lock);
+ lock->l_flags |= LDLM_FL_NO_LRU;
+ LDLM_DEBUG(lock, "split lock from lru");
+ count++;
+ }
+ }
+ spin_unlock(&ns->ns_unused_lock);
+unlock:
+ unlock_res(res);
+ ldlm_resource_putref(res);
+ RETURN(count);
+}
+
/* Lock iterators. */
int ldlm_resource_foreach(struct ldlm_resource *res, ldlm_iterator_t iter,
struct ldlm_resource *res;
struct list_head *tmp;
+ ENTRY;
spin_lock(&ns->ns_hash_lock);
for (i = 0; i < RES_HASH_SIZE; i++) {
tmp = ns->ns_hash[i].next;
}
/* non-blocking function to manipulate a lock whose cb_data is being put away.*/
-void ldlm_change_cbdata(struct ldlm_namespace *ns,
- struct ldlm_res_id *res_id,
- ldlm_iterator_t iter,
- void *data)
+void ldlm_resource_iterate(struct ldlm_namespace *ns, struct ldlm_res_id *res_id,
+ ldlm_iterator_t iter, void *data)
{
struct ldlm_resource *res;
ENTRY;
struct list_head *list = closure;
/* we use l_pending_chain here, because it's unused on clients. */
- list_add(&lock->l_pending_chain, list);
+ LASSERTF(list_empty(&lock->l_pending_chain),"lock %p next %p prev %p\n",
+ lock, &lock->l_pending_chain.next,&lock->l_pending_chain.prev);
+ /* bug 9573: don't replay locks left after eviction */
+ if (!(lock->l_flags & LDLM_FL_FAILED))
+ list_add(&lock->l_pending_chain, list);
return LDLM_ITER_CONTINUE;
}
struct ldlm_lock *lock;
struct ldlm_reply *reply;
+ ENTRY;
atomic_dec(&req->rq_import->imp_replay_inflight);
if (rc != ELDLM_OK)
GOTO(out, rc);
lock = req->rq_async_args.pointer_arg[0];
LASSERT(lock != NULL);
- reply = lustre_swab_repbuf(req, 0, sizeof (*reply),
+ reply = lustre_swab_repbuf(req, DLM_LOCKREPLY_OFF, sizeof(*reply),
lustre_swab_ldlm_reply);
if (reply == NULL) {
CERROR("Can't unpack ldlm_reply\n");
GOTO (out, rc = -EPROTO);
}
- memcpy(&lock->l_remote_handle, &reply->lock_handle,
- sizeof(lock->l_remote_handle));
+ lock->l_remote_handle = reply->lock_handle;
LDLM_DEBUG(lock, "replayed lock:");
ptlrpc_import_recovery_state_machine(req->rq_import);
-out:
+ out:
if (rc != ELDLM_OK)
ptlrpc_connect_import(req->rq_import, NULL);
+
RETURN(rc);
}
struct ptlrpc_request *req;
struct ldlm_request *body;
struct ldlm_reply *reply;
- int buffers = 1;
- int size[2] = {0, sizeof(*body)};
+ int buffers = 2;
+ int size[3] = { sizeof(struct ptlrpc_body) };
int flags;
+ ENTRY;
+ /* If this is reply-less callback lock, we cannot replay it, since
+ * server might have long dropped it, but notification of that event was
+ * lost by network. (and server granted conflicting lock already) */
+ if (lock->l_flags & LDLM_FL_CANCEL_ON_BLOCK) {
+ LDLM_DEBUG(lock, "Not replaying reply-less lock:");
+ ldlm_lock_cancel(lock);
+ RETURN(0);
+ }
/*
* If granted mode matches the requested mode, this lock is granted.
*
else
flags = LDLM_FL_REPLAY;
- req = ptlrpc_prep_req(imp, LUSTRE_DLM_VERSION, LDLM_ENQUEUE,
- 2, size, NULL);
+ size[DLM_LOCKREQ_OFF] = sizeof(*body);
+ req = ptlrpc_prep_req(imp, LUSTRE_DLM_VERSION, LDLM_ENQUEUE, 2, size,
+ NULL);
if (!req)
RETURN(-ENOMEM);
/* We're part of recovery, so don't wait for it. */
req->rq_send_state = LUSTRE_IMP_REPLAY_LOCKS;
- body = lustre_msg_buf(req->rq_reqmsg, 1, sizeof (*body));
+ body = lustre_msg_buf(req->rq_reqmsg, DLM_LOCKREQ_OFF, sizeof(*body));
ldlm_lock2desc(lock, &body->lock_desc);
body->lock_flags = flags;
ldlm_lock2handle(lock, &body->lock_handle1);
- size[0] = sizeof(*reply);
+ size[DLM_LOCKREPLY_OFF] = sizeof(*reply);
if (lock->l_lvb_len != 0) {
- buffers = 2;
- size[1] = lock->l_lvb_len;
+ buffers = 3;
+ size[DLM_REPLY_REC_OFF] = lock->l_lvb_len;
}
- req->rq_replen = lustre_msg_size(buffers, size);
- /* notify the server we've replayed all requests.
- * also, we mark the request to be put on a dedicated
- * queue to be processed after all request replayes.
- * bug 6063 */
- lustre_msg_set_flags(req->rq_reqmsg, MSG_REQ_REPLAY_DONE);
+ ptlrpc_req_set_repsize(req, buffers, size);
LDLM_DEBUG(lock, "replaying lock:");
- imp->imp_locks_replayed++;
atomic_inc(&req->rq_import->imp_replay_inflight);
req->rq_async_args.pointer_arg[0] = lock;
req->rq_interpret_reply = replay_lock_interpret;
int ldlm_replay_locks(struct obd_import *imp)
{
struct ldlm_namespace *ns = imp->imp_obd->obd_namespace;
- struct list_head list, *pos, *next;
- struct ldlm_lock *lock;
+ struct list_head list;
+ struct ldlm_lock *lock, *next;
int rc = 0;
ENTRY;
- INIT_LIST_HEAD(&list);
+ CFS_INIT_LIST_HEAD(&list);
LASSERT(atomic_read(&imp->imp_replay_inflight) == 0);
- LASSERT(ns != NULL);
/* ensure this doesn't fall to 0 before all have been queued */
atomic_inc(&imp->imp_replay_inflight);
(void)ldlm_namespace_foreach(ns, ldlm_chain_lock_for_replay, &list);
- list_for_each_safe(pos, next, &list) {
- lock = list_entry(pos, struct ldlm_lock, l_pending_chain);
- rc = replay_one_lock(imp, lock);
+ list_for_each_entry_safe(lock, next, &list, l_pending_chain) {
+ list_del_init(&lock->l_pending_chain);
if (rc)
- break; /* or try to do the rest? */
+ continue; /* or try to do the rest? */
+ rc = replay_one_lock(imp, lock);
}
atomic_dec(&imp->imp_replay_inflight);
git://git.whamcloud.com / fs / lustre-release.git / blobdiff