-/* -*- 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.
* Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*
- * Copyright (c) 2011 Whamcloud, Inc.
- *
+ * Copyright (c) 2011, 2012, Whamcloud, Inc.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
const char *status, int locks);
int (*ptlrpc_put_connection_superhack)(struct ptlrpc_connection *c);
+EXPORT_SYMBOL(ptlrpc_put_connection_superhack);
/*
* support functions: we could use inter-module communication, but this
cfs_spin_unlock(&obd_types_lock);
return NULL;
}
+EXPORT_SYMBOL(class_search_type);
struct obd_type *class_get_type(const char *name)
{
#ifdef HAVE_MODULE_LOADING_SUPPORT
if (!type) {
const char *modname = name;
+
+ if (strcmp(modname, "obdfilter") == 0)
+ modname = "ofd";
+
if (!cfs_request_module("%s", modname)) {
CDEBUG(D_INFO, "Loaded module '%s'\n", modname);
type = class_search_type(name);
RETURN(-EBUSY);
}
- if (type->typ_procroot) {
- lprocfs_remove(&type->typ_procroot);
- }
+ /* we do not use type->typ_procroot as for compatibility purposes
+ * other modules can share names (i.e. lod can use lov entry). so
+ * we can't reference pointer as it can get invalided when another
+ * module removes the entry */
+ lprocfs_try_remove_proc_entry(type->typ_name, proc_lustre_root);
if (type->typ_lu)
lu_device_type_fini(type->typ_lu);
struct obd_type *type = NULL;
int i;
int new_obd_minor = 0;
+ ENTRY;
if (strlen(name) >= MAX_OBD_NAME) {
CERROR("name/uuid must be < %u bytes long\n", MAX_OBD_NAME);
}
newdev = obd_device_alloc();
- if (newdev == NULL) {
- class_put_type(type);
- RETURN(ERR_PTR(-ENOMEM));
- }
+ if (newdev == NULL)
+ GOTO(out_type, result = ERR_PTR(-ENOMEM));
+
LASSERT(newdev->obd_magic == OBD_DEVICE_MAGIC);
cfs_write_lock(&obd_dev_lock);
if (obd && obd->obd_name &&
(strcmp(name, obd->obd_name) == 0)) {
- CERROR("Device %s already exists, won't add\n", name);
+ CERROR("Device %s already exists at %d, won't add\n",
+ name, i);
if (result) {
LASSERTF(result->obd_magic == OBD_DEVICE_MAGIC,
"%p obd_magic %08x != %08x\n", result,
if (result == NULL && i >= class_devno_max()) {
CERROR("all %u OBD devices used, increase MAX_OBD_DEVICES\n",
class_devno_max());
- result = ERR_PTR(-EOVERFLOW);
+ GOTO(out, result = ERR_PTR(-EOVERFLOW));
}
- if (IS_ERR(result)) {
- obd_device_free(newdev);
- class_put_type(type);
- } else {
- CDEBUG(D_IOCTL, "Adding new device %s (%p)\n",
- result->obd_name, result);
- }
- return result;
+ if (IS_ERR(result))
+ GOTO(out, result);
+
+ CDEBUG(D_IOCTL, "Adding new device %s (%p)\n",
+ result->obd_name, result);
+
+ RETURN(result);
+out:
+ obd_device_free(newdev);
+out_type:
+ class_put_type(type);
+ return result;
}
void class_release_dev(struct obd_device *obd)
obd, obd->obd_minor, obd_devs[obd->obd_minor]);
LASSERT(obd_type != NULL);
- CDEBUG(D_INFO, "Release obd device %s obd_type name =%s\n",
- obd->obd_name,obd->obd_type->typ_name);
+ CDEBUG(D_INFO, "Release obd device %s at %d obd_type name =%s\n",
+ obd->obd_name, obd->obd_minor, obd->obd_type->typ_name);
cfs_write_lock(&obd_dev_lock);
obd_devs[obd->obd_minor] = NULL;
class_incref(obd, __FUNCTION__, obd);
cfs_read_unlock(&obd_dev_lock);
- rc2 = obd_set_info_async(obd->obd_self_export,
+ rc2 = obd_set_info_async(NULL, obd->obd_self_export,
sizeof(KEY_SPTLRPC_CONF),
KEY_SPTLRPC_CONF, 0, NULL, NULL);
rc = rc ? rc : rc2;
ENTRY;
LASSERT_ATOMIC_ZERO(&exp->exp_refcount);
+ LASSERT(obd != NULL);
CDEBUG(D_IOCTL, "destroying export %p/%s for %s\n", exp,
exp->exp_client_uuid.uuid, obd->obd_name);
- LASSERT(obd != NULL);
-
/* "Local" exports (lctl, LOV->{mdc,osc}) have no connection. */
if (exp->exp_connection)
ptlrpc_put_connection_superhack(exp->exp_connection);
LASSERT(cfs_list_empty(&exp->exp_outstanding_replies));
LASSERT(cfs_list_empty(&exp->exp_uncommitted_replies));
LASSERT(cfs_list_empty(&exp->exp_req_replay_queue));
- LASSERT(cfs_list_empty(&exp->exp_queued_rpc));
+ LASSERT(cfs_list_empty(&exp->exp_hp_rpcs));
obd_destroy_export(exp);
class_decref(obd, "export", exp);
class_export_get(export);
}
+static struct portals_handle_ops export_handle_ops = {
+ .hop_addref = export_handle_addref,
+ .hop_free = NULL,
+};
+
struct obd_export *class_export_get(struct obd_export *exp)
{
cfs_atomic_inc(&exp->exp_refcount);
void class_export_put(struct obd_export *exp)
{
LASSERT(exp != NULL);
- LASSERT_ATOMIC_GT_LT(&exp->exp_refcount, 0, 0x5a5a5a);
+ LASSERT_ATOMIC_GT_LT(&exp->exp_refcount, 0, LI_POISON);
CDEBUG(D_INFO, "PUTting export %p : new refcount %d\n", exp,
cfs_atomic_read(&exp->exp_refcount) - 1);
export->exp_conn_cnt = 0;
export->exp_lock_hash = NULL;
+ export->exp_flock_hash = NULL;
cfs_atomic_set(&export->exp_refcount, 2);
cfs_atomic_set(&export->exp_rpc_count, 0);
cfs_atomic_set(&export->exp_cb_count, 0);
CFS_INIT_LIST_HEAD(&export->exp_uncommitted_replies);
CFS_INIT_LIST_HEAD(&export->exp_req_replay_queue);
CFS_INIT_LIST_HEAD(&export->exp_handle.h_link);
- CFS_INIT_LIST_HEAD(&export->exp_queued_rpc);
- class_handle_hash(&export->exp_handle, export_handle_addref);
- export->exp_last_request_time = cfs_time_current_sec();
+ CFS_INIT_LIST_HEAD(&export->exp_hp_rpcs);
+ class_handle_hash(&export->exp_handle, &export_handle_ops);
+ export->exp_last_request_time = cfs_time_current_sec();
cfs_spin_lock_init(&export->exp_lock);
cfs_spin_lock_init(&export->exp_rpc_lock);
CFS_INIT_HLIST_NODE(&export->exp_uuid_hash);
CFS_INIT_HLIST_NODE(&export->exp_nid_hash);
+ cfs_spin_lock_init(&export->exp_bl_list_lock);
+ CFS_INIT_LIST_HEAD(&export->exp_bl_list);
export->exp_sp_peer = LUSTRE_SP_ANY;
export->exp_flvr.sf_rpc = SPTLRPC_FLVR_INVALID;
class_import_get(import);
}
+static struct portals_handle_ops import_handle_ops = {
+ .hop_addref = import_handle_addref,
+ .hop_free = NULL,
+};
+
struct obd_import *class_import_get(struct obd_import *import)
{
cfs_atomic_inc(&import->imp_refcount);
ENTRY;
LASSERT(cfs_list_empty(&imp->imp_zombie_chain));
- LASSERT_ATOMIC_GE_LT(&imp->imp_refcount, 0, 0x5a5a5a);
+ LASSERT_ATOMIC_GT_LT(&imp->imp_refcount, 0, LI_POISON);
CDEBUG(D_INFO, "import %p refcount=%d obd=%s\n", imp,
cfs_atomic_read(&imp->imp_refcount) - 1,
obd_zombie_import_add(imp);
}
- EXIT;
+ /* catch possible import put race */
+ LASSERT_ATOMIC_GE_LT(&imp->imp_refcount, 0, LI_POISON);
+ EXIT;
}
EXPORT_SYMBOL(class_import_put);
imp->imp_last_success_conn = 0;
imp->imp_state = LUSTRE_IMP_NEW;
imp->imp_obd = class_incref(obd, "import", imp);
- cfs_sema_init(&imp->imp_sec_mutex, 1);
+ cfs_mutex_init(&imp->imp_sec_mutex);
cfs_waitq_init(&imp->imp_recovery_waitq);
cfs_atomic_set(&imp->imp_refcount, 2);
cfs_atomic_set(&imp->imp_inval_count, 0);
CFS_INIT_LIST_HEAD(&imp->imp_conn_list);
CFS_INIT_LIST_HEAD(&imp->imp_handle.h_link);
- class_handle_hash(&imp->imp_handle, import_handle_addref);
+ class_handle_hash(&imp->imp_handle, &import_handle_ops);
init_imp_at(&imp->imp_at);
/* the default magic is V2, will be used in connect RPC, and
cfs_spin_lock(&exp->exp_lock);
exp->exp_in_recovery = 0;
cfs_spin_unlock(&exp->exp_lock);
- LASSERT(obd->obd_connected_clients);
- obd->obd_connected_clients--;
+ LASSERT_ATOMIC_POS(&obd->obd_connected_clients);
+ cfs_atomic_dec(&obd->obd_connected_clients);
}
cfs_spin_unlock(&obd->obd_recovery_task_lock);
/** Cleanup req replay fields */
ENTRY;
if (export == NULL) {
- fixme();
- CDEBUG(D_IOCTL, "attempting to free NULL export %p\n", export);
+ CWARN("attempting to free NULL export %p\n", export);
RETURN(-EINVAL);
}
int (*test_export)(struct obd_export *))
{
cfs_list_t work_list;
- cfs_list_t *pos, *n;
- struct obd_export *exp;
+ struct obd_export *exp, *n;
int evicted = 0;
ENTRY;
CFS_INIT_LIST_HEAD(&work_list);
cfs_spin_lock(&obd->obd_dev_lock);
- cfs_list_for_each_safe(pos, n, &obd->obd_exports) {
- exp = cfs_list_entry(pos, struct obd_export, exp_obd_chain);
- if (test_export(exp))
- continue;
-
+ cfs_list_for_each_entry_safe(exp, n, &obd->obd_exports,
+ exp_obd_chain) {
/* don't count self-export as client */
if (obd_uuid_equals(&exp->exp_client_uuid,
&exp->exp_obd->obd_uuid))
continue;
+ /* don't evict clients which have no slot in last_rcvd
+ * (e.g. lightweight connection) */
+ if (exp->exp_target_data.ted_lr_idx == -1)
+ continue;
+
+ cfs_spin_lock(&exp->exp_lock);
+ if (test_export(exp)) {
+ cfs_spin_unlock(&exp->exp_lock);
+ continue;
+ }
+ exp->exp_failed = 1;
+ cfs_spin_unlock(&exp->exp_lock);
+
cfs_list_move(&exp->exp_obd_chain, &work_list);
evicted++;
- CDEBUG(D_ERROR, "%s: disconnect stale client %s@%s\n",
+ CDEBUG(D_HA, "%s: disconnect stale client %s@%s\n",
obd->obd_name, exp->exp_client_uuid.uuid,
exp->exp_connection == NULL ? "<unknown>" :
libcfs_nid2str(exp->exp_connection->c_peer.nid));
cfs_spin_unlock(&obd->obd_dev_lock);
if (evicted) {
- CDEBUG(D_HA, "%s: disconnecting %d stale clients\n",
- obd->obd_name, evicted);
+ LCONSOLE_WARN("%s: disconnecting %d stale clients\n",
+ obd->obd_name, evicted);
obd->obd_stale_clients += evicted;
}
class_disconnect_export_list(&work_list, exp_flags_from_obd(obd) |
if (obd_dump_on_timeout)
libcfs_debug_dumplog();
+ /* need for safe call CDEBUG after obd_disconnect */
+ class_export_get(exp);
+
/* Most callers into obd_disconnect are removing their own reference
* (request, for example) in addition to the one from the hash table.
* We don't have such a reference here, so make one. */
else
CDEBUG(D_HA, "disconnected export %p/%s\n",
exp, exp->exp_client_uuid.uuid);
+ class_export_put(exp);
}
EXPORT_SYMBOL(class_fail_export);
cfs_list_add(&exp->exp_obd_chain, &obd_zombie_exports);
cfs_spin_unlock(&obd_zombie_impexp_lock);
- if (obd_zombie_impexp_notify != NULL)
- obd_zombie_impexp_notify();
+ obd_zombie_impexp_notify();
}
/**
*/
static void obd_zombie_import_add(struct obd_import *imp) {
LASSERT(imp->imp_sec == NULL);
+ LASSERT(imp->imp_rq_pool == NULL);
cfs_spin_lock(&obd_zombie_impexp_lock);
LASSERT(cfs_list_empty(&imp->imp_zombie_chain));
zombies_count++;
cfs_list_add(&imp->imp_zombie_chain, &obd_zombie_imports);
cfs_spin_unlock(&obd_zombie_impexp_lock);
- if (obd_zombie_impexp_notify != NULL)
- obd_zombie_impexp_notify();
+ obd_zombie_impexp_notify();
}
/**