X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Fptlrpc%2Fconnection.c;h=f87e4abb8f5d204d8d3fdb621520689d561313b5;hb=b2287531b63ac56692746a67ea17f576a6d2ab81;hp=a4dac744938376d6388349f73b2c333660794f78;hpb=3b4c006b28c9d6a7c3b00535cd3a6292178fa4c6;p=fs%2Flustre-release.git diff --git a/lustre/ptlrpc/connection.c b/lustre/ptlrpc/connection.c index a4dac74..f87e4ab 100644 --- a/lustre/ptlrpc/connection.c +++ b/lustre/ptlrpc/connection.c @@ -1,6 +1,4 @@ -/* -*- 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. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, Whamcloud, Inc. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -65,8 +65,8 @@ ptlrpc_connection_get(lnet_process_id_t peer, lnet_nid_t self, conn->c_peer = peer; conn->c_self = self; - INIT_HLIST_NODE(&conn->c_hash); - atomic_set(&conn->c_refcount, 1); + CFS_INIT_HLIST_NODE(&conn->c_hash); + cfs_atomic_set(&conn->c_refcount, 1); if (uuid) obd_str2uuid(&conn->c_remote_uuid, uuid->uuid); @@ -76,6 +76,9 @@ ptlrpc_connection_get(lnet_process_id_t peer, lnet_nid_t self, * connection. The object which exists in the has will be * returned and may be compared against out object. */ + /* In the function below, .hs_keycmp resolves to + * conn_keycmp() */ + /* coverity[overrun-buffer-val] */ conn2 = cfs_hash_findadd_unique(conn_hash, &peer, &conn->c_hash); if (conn != conn2) { OBD_FREE_PTR(conn); @@ -84,10 +87,11 @@ ptlrpc_connection_get(lnet_process_id_t peer, lnet_nid_t self, EXIT; out: CDEBUG(D_INFO, "conn=%p refcount %d to %s\n", - conn, atomic_read(&conn->c_refcount), + conn, cfs_atomic_read(&conn->c_refcount), libcfs_nid2str(conn->c_peer.nid)); return conn; } +EXPORT_SYMBOL(ptlrpc_connection_get); int ptlrpc_connection_put(struct ptlrpc_connection *conn) { @@ -97,7 +101,7 @@ int ptlrpc_connection_put(struct ptlrpc_connection *conn) if (!conn) RETURN(rc); - LASSERT(!hlist_unhashed(&conn->c_hash)); + LASSERT(cfs_atomic_read(&conn->c_refcount) > 1); /* * We do not remove connection from hashtable and @@ -115,28 +119,30 @@ int ptlrpc_connection_put(struct ptlrpc_connection *conn) * when ptlrpc_connection_fini()->lh_exit->conn_exit() * path is called. */ - if (atomic_dec_return(&conn->c_refcount) == 1) + if (cfs_atomic_dec_return(&conn->c_refcount) == 1) rc = 1; CDEBUG(D_INFO, "PUT conn=%p refcount %d to %s\n", - conn, atomic_read(&conn->c_refcount), + conn, cfs_atomic_read(&conn->c_refcount), libcfs_nid2str(conn->c_peer.nid)); RETURN(rc); } +EXPORT_SYMBOL(ptlrpc_connection_put); struct ptlrpc_connection * ptlrpc_connection_addref(struct ptlrpc_connection *conn) { ENTRY; - atomic_inc(&conn->c_refcount); + cfs_atomic_inc(&conn->c_refcount); CDEBUG(D_INFO, "conn=%p refcount %d to %s\n", - conn, atomic_read(&conn->c_refcount), + conn, cfs_atomic_read(&conn->c_refcount), libcfs_nid2str(conn->c_peer.nid)); RETURN(conn); } +EXPORT_SYMBOL(ptlrpc_connection_addref); int ptlrpc_connection_init(void) { @@ -145,94 +151,102 @@ int ptlrpc_connection_init(void) conn_hash = cfs_hash_create("CONN_HASH", HASH_CONN_CUR_BITS, HASH_CONN_MAX_BITS, - &conn_hash_ops, CFS_HASH_REHASH); + HASH_CONN_BKT_BITS, 0, + CFS_HASH_MIN_THETA, + CFS_HASH_MAX_THETA, + &conn_hash_ops, CFS_HASH_DEFAULT); if (!conn_hash) RETURN(-ENOMEM); RETURN(0); } +EXPORT_SYMBOL(ptlrpc_connection_init); void ptlrpc_connection_fini(void) { ENTRY; - cfs_hash_destroy(conn_hash); + cfs_hash_putref(conn_hash); EXIT; } +EXPORT_SYMBOL(ptlrpc_connection_fini); /* * Hash operations for net_peer<->connection */ static unsigned -conn_hashfn(cfs_hash_t *hs, void *key, unsigned mask) +conn_hashfn(cfs_hash_t *hs, const void *key, unsigned mask) { return cfs_hash_djb2_hash(key, sizeof(lnet_process_id_t), mask); } static int -conn_compare(void *key, struct hlist_node *hnode) +conn_keycmp(const void *key, cfs_hlist_node_t *hnode) { struct ptlrpc_connection *conn; - lnet_process_id_t *conn_key; + const lnet_process_id_t *conn_key; LASSERT(key != NULL); conn_key = (lnet_process_id_t*)key; - conn = hlist_entry(hnode, struct ptlrpc_connection, c_hash); + conn = cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash); return conn_key->nid == conn->c_peer.nid && conn_key->pid == conn->c_peer.pid; } static void * -conn_key(struct hlist_node *hnode) +conn_key(cfs_hlist_node_t *hnode) { struct ptlrpc_connection *conn; - conn = hlist_entry(hnode, struct ptlrpc_connection, c_hash); + conn = cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash); return &conn->c_peer; } static void * -conn_get(struct hlist_node *hnode) +conn_object(cfs_hlist_node_t *hnode) { - struct ptlrpc_connection *conn; + return cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash); +} - conn = hlist_entry(hnode, struct ptlrpc_connection, c_hash); - atomic_inc(&conn->c_refcount); +static void +conn_get(cfs_hash_t *hs, cfs_hlist_node_t *hnode) +{ + struct ptlrpc_connection *conn; - return conn; + conn = cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash); + cfs_atomic_inc(&conn->c_refcount); } -static void * -conn_put(struct hlist_node *hnode) +static void +conn_put_locked(cfs_hash_t *hs, cfs_hlist_node_t *hnode) { struct ptlrpc_connection *conn; - conn = hlist_entry(hnode, struct ptlrpc_connection, c_hash); - atomic_dec(&conn->c_refcount); - - return conn; + conn = cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash); + cfs_atomic_dec(&conn->c_refcount); } static void -conn_exit(struct hlist_node *hnode) +conn_exit(cfs_hash_t *hs, cfs_hlist_node_t *hnode) { struct ptlrpc_connection *conn; - conn = hlist_entry(hnode, struct ptlrpc_connection, c_hash); + conn = cfs_hlist_entry(hnode, struct ptlrpc_connection, c_hash); /* * Nothing should be left. Connection user put it and * connection also was deleted from table by this time * so we should have 0 refs. */ - LASSERTF(atomic_read(&conn->c_refcount) == 0, + LASSERTF(cfs_atomic_read(&conn->c_refcount) == 0, "Busy connection with %d refs\n", - atomic_read(&conn->c_refcount)); + cfs_atomic_read(&conn->c_refcount)); OBD_FREE_PTR(conn); } static cfs_hash_ops_t conn_hash_ops = { - .hs_hash = conn_hashfn, - .hs_compare = conn_compare, - .hs_key = conn_key, - .hs_get = conn_get, - .hs_put = conn_put, - .hs_exit = conn_exit, + .hs_hash = conn_hashfn, + .hs_keycmp = conn_keycmp, + .hs_key = conn_key, + .hs_object = conn_object, + .hs_get = conn_get, + .hs_put_locked = conn_put_locked, + .hs_exit = conn_exit, };