*
* Copyright (C) 2002 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_RPC
#ifdef __KERNEL__
-#include <linux/obd_support.h>
-#include <linux/obd_class.h>
-#include <linux/lustre_net.h>
+#include <obd_support.h>
+#include <obd_class.h>
+#include <lustre_net.h>
#else
#include <liblustre.h>
#endif
#include "ptlrpc_internal.h"
+#include <class_hash.h>
static spinlock_t conn_lock;
static struct list_head conn_list;
static struct list_head conn_unused_list;
+static struct lustre_class_hash_body *conn_hash_body;
+static struct lustre_class_hash_body *conn_unused_hash_body;
+
+extern struct lustre_hash_operations conn_hash_operations;
void ptlrpc_dump_connections(void)
{
list_for_each(tmp, &conn_list) {
c = list_entry(tmp, struct ptlrpc_connection, c_link);
- CERROR("Connection %p/%s has refcount %d (nid="LPX64" on %s)\n",
+ CERROR("Connection %p/%s has refcount %d (nid=%s->%s)\n",
c, c->c_remote_uuid.uuid, atomic_read(&c->c_refcount),
- c->c_peer.peer_nid, c->c_peer.peer_ni->pni_name);
+ libcfs_nid2str(c->c_self),
+ libcfs_nid2str(c->c_peer.nid));
}
EXIT;
}
-struct ptlrpc_connection *ptlrpc_get_connection(struct ptlrpc_peer *peer,
- struct obd_uuid *uuid)
+struct ptlrpc_connection*
+ptlrpc_lookup_conn_locked (lnet_process_id_t peer)
{
- struct list_head *tmp, *pos;
struct ptlrpc_connection *c;
- ENTRY;
+ c = lustre_hash_get_object_by_key(conn_hash_body, &peer);
+ if (c != NULL)
+ return c;
- CDEBUG(D_INFO, "peer is "LPX64" on %s\n",
- peer->peer_nid, peer->peer_ni->pni_name);
+ c = lustre_hash_get_object_by_key(conn_unused_hash_body, &peer);
+ if (c != NULL)
+ return c;
- spin_lock(&conn_lock);
- if (list_empty(&conn_list)) {
- if (!ptlrpc_get_ldlm_hooks()) {
- spin_unlock(&conn_lock);
- RETURN(NULL);
- }
- }
+ return NULL;
+}
- list_for_each(tmp, &conn_list) {
- c = list_entry(tmp, struct ptlrpc_connection, c_link);
- if (peer->peer_nid == c->c_peer.peer_nid &&
- peer->peer_ni == c->c_peer.peer_ni) {
- ptlrpc_connection_addref(c);
- GOTO(out, c);
- }
- }
- list_for_each_safe(tmp, pos, &conn_unused_list) {
- c = list_entry(tmp, struct ptlrpc_connection, c_link);
- if (peer->peer_nid == c->c_peer.peer_nid &&
- peer->peer_ni == c->c_peer.peer_ni) {
- ptlrpc_connection_addref(c);
- list_del(&c->c_link);
- list_add(&c->c_link, &conn_list);
- GOTO(out, c);
- }
- }
+struct ptlrpc_connection *ptlrpc_get_connection(lnet_process_id_t peer,
+ lnet_nid_t self, struct obd_uuid *uuid)
+{
+ struct ptlrpc_connection *c;
+ struct ptlrpc_connection *c2;
+ int rc = 0;
+ ENTRY;
+
+ CDEBUG(D_INFO, "self %s peer %s\n",
+ libcfs_nid2str(self), libcfs_id2str(peer));
+
+ spin_lock(&conn_lock);
+
+ c = ptlrpc_lookup_conn_locked(peer);
+
+ spin_unlock(&conn_lock);
- /* FIXME: this should be a slab once we can validate slab addresses
- * without OOPSing */
+ if (c != NULL)
+ RETURN (c);
+
OBD_ALLOC(c, sizeof(*c));
if (c == NULL)
- GOTO(out, c);
-
- c->c_generation = 1;
- c->c_epoch = 1;
- c->c_bootcount = 0;
- c->c_flags = 0;
- if (uuid && uuid->uuid) /* XXX ???? */
+ RETURN (NULL);
+
+ atomic_set(&c->c_refcount, 1);
+ c->c_peer = peer;
+ c->c_self = self;
+ INIT_HLIST_NODE(&c->c_hash);
+ INIT_LIST_HEAD(&c->c_link);
+ if (uuid != NULL)
obd_str2uuid(&c->c_remote_uuid, uuid->uuid);
- atomic_set(&c->c_refcount, 0);
- memcpy(&c->c_peer, peer, sizeof(c->c_peer));
- spin_lock_init(&c->c_lock);
- ptlrpc_connection_addref(c);
+ spin_lock(&conn_lock);
- list_add(&c->c_link, &conn_list);
+ c2 = ptlrpc_lookup_conn_locked(peer);
+ if (c2 == NULL) {
+ list_add(&c->c_link, &conn_list);
+ rc = lustre_hash_additem_unique(conn_hash_body, &peer,
+ &c->c_hash);
+ if (rc != 0) {
+ list_del(&c->c_link);
+ CERROR("Cannot add connection to conn_hash_body\n");
+ goto out_conn;
+ }
+ }
+
+out_conn:
- EXIT;
- out:
spin_unlock(&conn_lock);
- return c;
+
+ if (c2 == NULL && rc == 0)
+ RETURN (c);
+
+ if (c != NULL)
+ OBD_FREE(c, sizeof(*c));
+ RETURN (c2);
}
int ptlrpc_put_connection(struct ptlrpc_connection *c)
RETURN(0);
}
- CDEBUG (D_INFO, "connection=%p refcount %d to "LPX64" on %s\n",
- c, atomic_read(&c->c_refcount) - 1, c->c_peer.peer_nid,
- c->c_peer.peer_ni->pni_name);
+ CDEBUG (D_INFO, "connection=%p refcount %d to %s\n",
+ c, atomic_read(&c->c_refcount) - 1,
+ libcfs_nid2str(c->c_peer.nid));
+
+ spin_lock(&conn_lock);
+ LASSERT(!hlist_unhashed(&c->c_hash));
+ spin_unlock(&conn_lock);
+
+ if (atomic_dec_return(&c->c_refcount) == 1) {
- if (atomic_dec_and_test(&c->c_refcount)) {
spin_lock(&conn_lock);
+
+ lustre_hash_delitem(conn_hash_body, &c->c_peer, &c->c_hash);
list_del(&c->c_link);
+
list_add(&c->c_link, &conn_unused_list);
- if (list_empty(&conn_list)) {
- ptlrpc_put_ldlm_hooks();
+ rc = lustre_hash_additem_unique(conn_unused_hash_body, &c->c_peer,
+ &c->c_hash);
+ if (rc != 0) {
+ spin_unlock(&conn_lock);
+ CERROR("Cannot hash connection to conn_hash_body\n");
+ GOTO(ret, rc);
}
+
spin_unlock(&conn_lock);
rc = 1;
- }
+
+ }
+
if (atomic_read(&c->c_refcount) < 0)
CERROR("connection %p refcount %d!\n",
c, atomic_read(&c->c_refcount));
+ret :
RETURN(rc);
}
{
ENTRY;
atomic_inc(&c->c_refcount);
- CDEBUG (D_INFO, "connection=%p refcount %d to "LPX64" on %s\n",
- c, atomic_read(&c->c_refcount), c->c_peer.peer_nid,
- c->c_peer.peer_ni->pni_name);
+ CDEBUG (D_INFO, "connection=%p refcount %d to %s\n",
+ c, atomic_read(&c->c_refcount),
+ libcfs_nid2str(c->c_peer.nid));
RETURN(c);
}
-void ptlrpc_init_connection(void)
+int ptlrpc_init_connection(void)
{
- INIT_LIST_HEAD(&conn_list);
- INIT_LIST_HEAD(&conn_unused_list);
- conn_lock = SPIN_LOCK_UNLOCKED;
+ int rc = 0;
+ CFS_INIT_LIST_HEAD(&conn_list);
+ rc = lustre_hash_init(&conn_hash_body, "CONN_HASH",
+ 128, &conn_hash_operations);
+ if (rc)
+ GOTO(ret, rc);
+
+ CFS_INIT_LIST_HEAD(&conn_unused_list);
+ rc = lustre_hash_init(&conn_unused_hash_body, "CONN_UNUSED_HASH",
+ 128, &conn_hash_operations);
+ if (rc)
+ GOTO(ret, rc);
+
+ spin_lock_init(&conn_lock);
+ret:
+ if (rc) {
+ lustre_hash_exit(&conn_hash_body);
+ lustre_hash_exit(&conn_unused_hash_body);
+ }
+ RETURN(rc);
}
void ptlrpc_cleanup_connection(void)
struct ptlrpc_connection *c;
spin_lock(&conn_lock);
+
+ lustre_hash_exit(&conn_unused_hash_body);
list_for_each_safe(tmp, pos, &conn_unused_list) {
c = list_entry(tmp, struct ptlrpc_connection, c_link);
list_del(&c->c_link);
OBD_FREE(c, sizeof(*c));
}
+
+ lustre_hash_exit(&conn_hash_body);
list_for_each_safe(tmp, pos, &conn_list) {
c = list_entry(tmp, struct ptlrpc_connection, c_link);
- CERROR("Connection %p/%s has refcount %d (nid="LPX64" on %s)\n",
+ CERROR("Connection %p/%s has refcount %d (nid=%s)\n",
c, c->c_remote_uuid.uuid, atomic_read(&c->c_refcount),
- c->c_peer.peer_nid, c->c_peer.peer_ni->pni_name);
+ libcfs_nid2str(c->c_peer.nid));
list_del(&c->c_link);
OBD_FREE(c, sizeof(*c));
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff