-/* -*- 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.
* GPL HEADER END
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
*/
/*
* This file is part of Lustre, http://www.lustre.org/
#include <libcfs/list.h>
static int
-kptllnd_count_queue(struct list_head *q)
+kptllnd_count_queue(cfs_list_t *q)
{
- struct list_head *e;
- int n = 0;
-
- list_for_each(e, q) {
+ cfs_list_t *e;
+ int n = 0;
+
+ cfs_list_for_each(e, q) {
n++;
}
}
int
-kptllnd_get_peer_info(int index,
+kptllnd_get_peer_info(int index,
lnet_process_id_t *id,
int *state, int *sent_hello,
int *refcount, __u64 *incarnation,
__u64 *next_matchbits, __u64 *last_matchbits_seen,
int *nsendq, int *nactiveq,
- int *credits, int *outstanding_credits)
+ int *credits, int *outstanding_credits)
{
- rwlock_t *g_lock = &kptllnd_data.kptl_peer_rw_lock;
+ rwlock_t *g_lock = &kptllnd_data.kptl_peer_rw_lock;
unsigned long flags;
- struct list_head *ptmp;
+ cfs_list_t *ptmp;
kptl_peer_t *peer;
int i;
int rc = -ENOENT;
- read_lock_irqsave(g_lock, flags);
+ read_lock_irqsave(g_lock, flags);
for (i = 0; i < kptllnd_data.kptl_peer_hash_size; i++) {
-
- list_for_each (ptmp, &kptllnd_data.kptl_peers[i]) {
- peer = list_entry(ptmp, kptl_peer_t, peer_list);
+ cfs_list_for_each (ptmp, &kptllnd_data.kptl_peers[i]) {
+ peer = cfs_list_entry(ptmp, kptl_peer_t, peer_list);
if (index-- > 0)
continue;
-
+
*id = peer->peer_id;
*state = peer->peer_state;
*sent_hello = peer->peer_sent_hello;
- *refcount = atomic_read(&peer->peer_refcount);
+ *refcount = cfs_atomic_read(&peer->peer_refcount);
*incarnation = peer->peer_incarnation;
- spin_lock(&peer->peer_lock);
+ spin_lock(&peer->peer_lock);
*next_matchbits = peer->peer_next_matchbits;
*last_matchbits_seen = peer->peer_last_matchbits_seen;
*nsendq = kptllnd_count_queue(&peer->peer_sendq);
*nactiveq = kptllnd_count_queue(&peer->peer_activeq);
- spin_unlock(&peer->peer_lock);
+ spin_unlock(&peer->peer_lock);
rc = 0;
goto out;
}
}
-
+
out:
- read_unlock_irqrestore(g_lock, flags);
+ read_unlock_irqrestore(g_lock, flags);
return rc;
}
void
kptllnd_peer_add_peertable_locked (kptl_peer_t *peer)
{
- LASSERT (!kptllnd_data.kptl_shutdown);
LASSERT (kptllnd_data.kptl_n_active_peers <
kptllnd_data.kptl_expected_peers);
LASSERT (peer->peer_state == PEER_STATE_WAITING_HELLO ||
peer->peer_state == PEER_STATE_ACTIVE);
-
+
kptllnd_data.kptl_n_active_peers++;
- atomic_inc(&peer->peer_refcount); /* +1 ref for the list */
+ cfs_atomic_inc(&peer->peer_refcount); /* +1 ref for the list */
/* NB add to HEAD of peer list for MRU order!
* (see kptllnd_cull_peertable) */
- list_add(&peer->peer_list, kptllnd_nid2peerlist(peer->peer_id.nid));
+ cfs_list_add(&peer->peer_list, kptllnd_nid2peerlist(peer->peer_id.nid));
}
void
/* I'm about to add a new peer with this portals ID to the peer table,
* so (a) this peer should not exist already and (b) I want to leave at
* most (max_procs_per_nid - 1) peers with this NID in the table. */
- struct list_head *peers = kptllnd_nid2peerlist(pid.nid);
- int cull_count = *kptllnd_tunables.kptl_max_procs_per_node;
- int count;
- struct list_head *tmp;
- struct list_head *nxt;
- kptl_peer_t *peer;
-
+ cfs_list_t *peers = kptllnd_nid2peerlist(pid.nid);
+ int cull_count = *kptllnd_tunables.kptl_max_procs_per_node;
+ int count;
+ cfs_list_t *tmp;
+ cfs_list_t *nxt;
+ kptl_peer_t *peer;
+
count = 0;
- list_for_each_safe (tmp, nxt, peers) {
+ cfs_list_for_each_safe (tmp, nxt, peers) {
/* NB I rely on kptllnd_peer_add_peertable_locked to add peers
* in MRU order */
- peer = list_entry(tmp, kptl_peer_t, peer_list);
+ peer = cfs_list_entry(tmp, kptl_peer_t, peer_list);
- if (peer->peer_id.nid != pid.nid)
+ if (LNET_NIDADDR(peer->peer_id.nid) != LNET_NIDADDR(pid.nid))
continue;
LASSERT (peer->peer_id.pid != pid.pid);
}
kptl_peer_t *
-kptllnd_peer_allocate (lnet_process_id_t lpid, ptl_process_id_t ppid)
+kptllnd_peer_allocate (kptl_net_t *net, lnet_process_id_t lpid, ptl_process_id_t ppid)
{
unsigned long flags;
kptl_peer_t *peer;
memset(peer, 0, sizeof(*peer)); /* zero flags etc */
- INIT_LIST_HEAD (&peer->peer_noops);
- INIT_LIST_HEAD (&peer->peer_sendq);
- INIT_LIST_HEAD (&peer->peer_activeq);
- spin_lock_init (&peer->peer_lock);
+ CFS_INIT_LIST_HEAD (&peer->peer_noops);
+ CFS_INIT_LIST_HEAD (&peer->peer_sendq);
+ CFS_INIT_LIST_HEAD (&peer->peer_activeq);
+ spin_lock_init(&peer->peer_lock);
peer->peer_state = PEER_STATE_ALLOCATED;
peer->peer_error = 0;
peer->peer_sent_credits = 1; /* HELLO credit is implicit */
peer->peer_max_msg_size = PTLLND_MIN_BUFFER_SIZE; /* until we know better */
- atomic_set(&peer->peer_refcount, 1); /* 1 ref for caller */
+ cfs_atomic_set(&peer->peer_refcount, 1); /* 1 ref for caller */
- write_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
+ write_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
peer->peer_myincarnation = kptllnd_data.kptl_incarnation;
/* Only increase # peers under lock, to guarantee we dont grow it
* during shutdown */
- if (kptllnd_data.kptl_shutdown) {
- write_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock,
- flags);
+ if (net->net_shutdown) {
+ write_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock,
+ flags);
LIBCFS_FREE(peer, sizeof(*peer));
return NULL;
}
kptllnd_data.kptl_npeers++;
- write_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
-
+ write_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
return peer;
}
void
kptllnd_peer_destroy (kptl_peer_t *peer)
{
- unsigned long flags;
-
- CDEBUG(D_NET, "Peer=%p\n", peer);
+ unsigned long flags;
+
+ CDEBUG(D_NET, "Peer=%p\n", peer);
- LASSERT (!in_interrupt());
- LASSERT (atomic_read(&peer->peer_refcount) == 0);
- LASSERT (peer->peer_state == PEER_STATE_ALLOCATED ||
- peer->peer_state == PEER_STATE_ZOMBIE);
- LASSERT (list_empty(&peer->peer_noops));
- LASSERT (list_empty(&peer->peer_sendq));
- LASSERT (list_empty(&peer->peer_activeq));
+ LASSERT (!in_interrupt());
+ LASSERT (cfs_atomic_read(&peer->peer_refcount) == 0);
+ LASSERT (peer->peer_state == PEER_STATE_ALLOCATED ||
+ peer->peer_state == PEER_STATE_ZOMBIE);
+ LASSERT (cfs_list_empty(&peer->peer_noops));
+ LASSERT (cfs_list_empty(&peer->peer_sendq));
+ LASSERT (cfs_list_empty(&peer->peer_activeq));
- write_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
+ write_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
- if (peer->peer_state == PEER_STATE_ZOMBIE)
- list_del(&peer->peer_list);
+ if (peer->peer_state == PEER_STATE_ZOMBIE)
+ cfs_list_del(&peer->peer_list);
- kptllnd_data.kptl_npeers--;
+ kptllnd_data.kptl_npeers--;
- write_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
+ write_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
- LIBCFS_FREE (peer, sizeof (*peer));
+ LIBCFS_FREE (peer, sizeof (*peer));
}
void
-kptllnd_cancel_txlist (struct list_head *peerq, struct list_head *txs)
+kptllnd_cancel_txlist (cfs_list_t *peerq, cfs_list_t *txs)
{
- struct list_head *tmp;
- struct list_head *nxt;
- kptl_tx_t *tx;
+ cfs_list_t *tmp;
+ cfs_list_t *nxt;
+ kptl_tx_t *tx;
- list_for_each_safe (tmp, nxt, peerq) {
- tx = list_entry(tmp, kptl_tx_t, tx_list);
+ cfs_list_for_each_safe (tmp, nxt, peerq) {
+ tx = cfs_list_entry(tmp, kptl_tx_t, tx_list);
- list_del(&tx->tx_list);
- list_add_tail(&tx->tx_list, txs);
+ cfs_list_del(&tx->tx_list);
+ cfs_list_add_tail(&tx->tx_list, txs);
tx->tx_status = -EIO;
tx->tx_active = 0;
}
void
-kptllnd_peer_cancel_txs(kptl_peer_t *peer, struct list_head *txs)
+kptllnd_peer_cancel_txs(kptl_peer_t *peer, cfs_list_t *txs)
{
unsigned long flags;
- spin_lock_irqsave(&peer->peer_lock, flags);
+ spin_lock_irqsave(&peer->peer_lock, flags);
kptllnd_cancel_txlist(&peer->peer_noops, txs);
kptllnd_cancel_txlist(&peer->peer_sendq, txs);
kptllnd_cancel_txlist(&peer->peer_activeq, txs);
- spin_unlock_irqrestore(&peer->peer_lock, flags);
+ spin_unlock_irqrestore(&peer->peer_lock, flags);
}
void
kptllnd_peer_alive (kptl_peer_t *peer)
{
- /* This is racy, but everyone's only writing cfs_time_current() */
- peer->peer_last_alive = cfs_time_current();
- mb();
+ /* This is racy, but everyone's only writing cfs_time_current() */
+ peer->peer_last_alive = cfs_time_current();
+ smp_mb();
}
void
kptllnd_peer_notify (kptl_peer_t *peer)
{
unsigned long flags;
- time_t last_alive = 0;
+ kptl_net_t *net;
+ kptl_net_t **nets;
+ int i = 0;
+ int nnets = 0;
int error = 0;
-
- spin_lock_irqsave(&peer->peer_lock, flags);
+ cfs_time_t last_alive = 0;
+
+ spin_lock_irqsave(&peer->peer_lock, flags);
if (peer->peer_error != 0) {
error = peer->peer_error;
peer->peer_error = 0;
-
- last_alive = cfs_time_current_sec() -
- cfs_duration_sec(cfs_time_current() -
- peer->peer_last_alive);
+ last_alive = peer->peer_last_alive;
}
-
- spin_unlock_irqrestore(&peer->peer_lock, flags);
- if (error != 0)
- lnet_notify (kptllnd_data.kptl_ni, peer->peer_id.nid, 0,
- last_alive);
+ spin_unlock_irqrestore(&peer->peer_lock, flags);
+
+ if (error == 0)
+ return;
+
+ read_lock(&kptllnd_data.kptl_net_rw_lock);
+ cfs_list_for_each_entry (net, &kptllnd_data.kptl_nets, net_list)
+ nnets++;
+ read_unlock(&kptllnd_data.kptl_net_rw_lock);
+
+ if (nnets == 0) /* shutdown in progress */
+ return;
+
+ LIBCFS_ALLOC(nets, nnets * sizeof(*nets));
+ if (nets == NULL) {
+ CERROR("Failed to allocate nets[%d]\n", nnets);
+ return;
+ }
+ memset(nets, 0, nnets * sizeof(*nets));
+
+ read_lock(&kptllnd_data.kptl_net_rw_lock);
+ i = 0;
+ cfs_list_for_each_entry (net, &kptllnd_data.kptl_nets, net_list) {
+ LASSERT (i < nnets);
+ nets[i] = net;
+ kptllnd_net_addref(net);
+ i++;
+ }
+ read_unlock(&kptllnd_data.kptl_net_rw_lock);
+
+ for (i = 0; i < nnets; i++) {
+ lnet_nid_t peer_nid;
+
+ net = nets[i];
+ if (net == NULL)
+ break;
+
+ if (!net->net_shutdown) {
+ peer_nid = kptllnd_ptl2lnetnid(net->net_ni->ni_nid,
+ peer->peer_ptlid.nid);
+ lnet_notify(net->net_ni, peer_nid, 0, last_alive);
+ }
+
+ kptllnd_net_decref(net);
+ }
+
+ LIBCFS_FREE(nets, nnets * sizeof(*nets));
}
void
kptllnd_handle_closing_peers ()
{
unsigned long flags;
- struct list_head txs;
+ cfs_list_t txs;
kptl_peer_t *peer;
- struct list_head *tmp;
- struct list_head *nxt;
+ cfs_list_t *tmp;
+ cfs_list_t *nxt;
kptl_tx_t *tx;
int idle;
/* Check with a read lock first to avoid blocking anyone */
- read_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
- idle = list_empty(&kptllnd_data.kptl_closing_peers) &&
- list_empty(&kptllnd_data.kptl_zombie_peers);
- read_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
+ read_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
+ idle = cfs_list_empty(&kptllnd_data.kptl_closing_peers) &&
+ cfs_list_empty(&kptllnd_data.kptl_zombie_peers);
+ read_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
if (idle)
return;
- INIT_LIST_HEAD(&txs);
+ CFS_INIT_LIST_HEAD(&txs);
- write_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
+ write_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
/* Cancel txs on all zombie peers. NB anyone dropping the last peer
* ref removes it from this list, so I musn't drop the lock while
* scanning it. */
- list_for_each (tmp, &kptllnd_data.kptl_zombie_peers) {
- peer = list_entry (tmp, kptl_peer_t, peer_list);
+ cfs_list_for_each (tmp, &kptllnd_data.kptl_zombie_peers) {
+ peer = cfs_list_entry (tmp, kptl_peer_t, peer_list);
LASSERT (peer->peer_state == PEER_STATE_ZOMBIE);
* I'm the only one removing from this list, but peers can be added on
* the end any time I drop the lock. */
- list_for_each_safe (tmp, nxt, &kptllnd_data.kptl_closing_peers) {
- peer = list_entry (tmp, kptl_peer_t, peer_list);
+ cfs_list_for_each_safe (tmp, nxt, &kptllnd_data.kptl_closing_peers) {
+ peer = cfs_list_entry (tmp, kptl_peer_t, peer_list);
LASSERT (peer->peer_state == PEER_STATE_CLOSING);
- list_del(&peer->peer_list);
- list_add_tail(&peer->peer_list,
- &kptllnd_data.kptl_zombie_peers);
+ cfs_list_del(&peer->peer_list);
+ cfs_list_add_tail(&peer->peer_list,
+ &kptllnd_data.kptl_zombie_peers);
peer->peer_state = PEER_STATE_ZOMBIE;
- write_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
+ write_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock,
+ flags);
kptllnd_peer_notify(peer);
kptllnd_peer_cancel_txs(peer, &txs);
kptllnd_peer_decref(peer);
- write_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
+ write_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
}
- write_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
+ write_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
/* Drop peer's ref on all cancelled txs. This will get
* kptllnd_tx_fini() to abort outstanding comms if necessary. */
- list_for_each_safe (tmp, nxt, &txs) {
- tx = list_entry(tmp, kptl_tx_t, tx_list);
- list_del(&tx->tx_list);
+ cfs_list_for_each_safe (tmp, nxt, &txs) {
+ tx = cfs_list_entry(tmp, kptl_tx_t, tx_list);
+ cfs_list_del(&tx->tx_list);
kptllnd_tx_decref(tx);
}
}
void
kptllnd_peer_close_locked(kptl_peer_t *peer, int why)
{
- switch (peer->peer_state) {
- default:
- LBUG();
-
- case PEER_STATE_WAITING_HELLO:
- case PEER_STATE_ACTIVE:
- /* Ensure new peers see a new incarnation of me */
- LASSERT(peer->peer_myincarnation <= kptllnd_data.kptl_incarnation);
- if (peer->peer_myincarnation == kptllnd_data.kptl_incarnation)
- kptllnd_data.kptl_incarnation++;
-
- /* Removing from peer table */
- kptllnd_data.kptl_n_active_peers--;
- LASSERT (kptllnd_data.kptl_n_active_peers >= 0);
-
- list_del(&peer->peer_list);
- kptllnd_peer_unreserve_buffers();
-
- peer->peer_error = why; /* stash 'why' only on first close */
- peer->peer_state = PEER_STATE_CLOSING;
-
- /* Schedule for immediate attention, taking peer table's ref */
- list_add_tail(&peer->peer_list,
- &kptllnd_data.kptl_closing_peers);
- wake_up(&kptllnd_data.kptl_watchdog_waitq);
- break;
-
- case PEER_STATE_ZOMBIE:
- case PEER_STATE_CLOSING:
- break;
- }
+ switch (peer->peer_state) {
+ default:
+ LBUG();
+
+ case PEER_STATE_WAITING_HELLO:
+ case PEER_STATE_ACTIVE:
+ /* Ensure new peers see a new incarnation of me */
+ LASSERT(peer->peer_myincarnation <= kptllnd_data.kptl_incarnation);
+ if (peer->peer_myincarnation == kptllnd_data.kptl_incarnation)
+ kptllnd_data.kptl_incarnation++;
+
+ /* Removing from peer table */
+ kptllnd_data.kptl_n_active_peers--;
+ LASSERT (kptllnd_data.kptl_n_active_peers >= 0);
+
+ cfs_list_del(&peer->peer_list);
+ kptllnd_peer_unreserve_buffers();
+
+ peer->peer_error = why; /* stash 'why' only on first close */
+ peer->peer_state = PEER_STATE_CLOSING;
+
+ /* Schedule for immediate attention, taking peer table's ref */
+ cfs_list_add_tail(&peer->peer_list,
+ &kptllnd_data.kptl_closing_peers);
+ wake_up(&kptllnd_data.kptl_watchdog_waitq);
+ break;
+
+ case PEER_STATE_ZOMBIE:
+ case PEER_STATE_CLOSING:
+ break;
+ }
}
void
{
unsigned long flags;
- write_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
+ write_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
kptllnd_peer_close_locked(peer, why);
- write_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
+ write_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
}
int
kptllnd_peer_del(lnet_process_id_t id)
{
- struct list_head *ptmp;
- struct list_head *pnxt;
+ cfs_list_t *ptmp;
+ cfs_list_t *pnxt;
kptl_peer_t *peer;
int lo;
int hi;
* wildcard (LNET_NID_ANY) then look at all of the buckets
*/
if (id.nid != LNET_NID_ANY) {
- struct list_head *l = kptllnd_nid2peerlist(id.nid);
-
+ cfs_list_t *l = kptllnd_nid2peerlist(id.nid);
+
lo = hi = l - kptllnd_data.kptl_peers;
} else {
if (id.pid != LNET_PID_ANY)
return -EINVAL;
-
+
lo = 0;
hi = kptllnd_data.kptl_peer_hash_size - 1;
}
again:
- read_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
+ read_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
for (i = lo; i <= hi; i++) {
- list_for_each_safe (ptmp, pnxt, &kptllnd_data.kptl_peers[i]) {
- peer = list_entry (ptmp, kptl_peer_t, peer_list);
+ cfs_list_for_each_safe (ptmp, pnxt,
+ &kptllnd_data.kptl_peers[i]) {
+ peer = cfs_list_entry (ptmp, kptl_peer_t, peer_list);
if (!(id.nid == LNET_NID_ANY ||
- (peer->peer_id.nid == id.nid &&
+ (LNET_NIDADDR(peer->peer_id.nid) == LNET_NIDADDR(id.nid) &&
(id.pid == LNET_PID_ANY ||
peer->peer_id.pid == id.pid))))
continue;
kptllnd_peer_addref(peer); /* 1 ref for me... */
- read_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock,
- flags);
+ read_unlock_irqrestore(&kptllnd_data. \
+ kptl_peer_rw_lock,
+ flags);
kptllnd_peer_close(peer, 0);
kptllnd_peer_decref(peer); /* ...until here */
}
}
- read_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
+ read_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
return (rc);
}
void
+kptllnd_queue_tx(kptl_peer_t *peer, kptl_tx_t *tx)
+{
+ /* CAVEAT EMPTOR: I take over caller's ref on 'tx' */
+ unsigned long flags;
+
+ spin_lock_irqsave(&peer->peer_lock, flags);
+
+ /* Ensure HELLO is sent first */
+ if (tx->tx_msg->ptlm_type == PTLLND_MSG_TYPE_NOOP)
+ cfs_list_add(&tx->tx_list, &peer->peer_noops);
+ else if (tx->tx_msg->ptlm_type == PTLLND_MSG_TYPE_HELLO)
+ cfs_list_add(&tx->tx_list, &peer->peer_sendq);
+ else
+ cfs_list_add_tail(&tx->tx_list, &peer->peer_sendq);
+
+ spin_unlock_irqrestore(&peer->peer_lock, flags);
+}
+
+
+void
kptllnd_post_tx(kptl_peer_t *peer, kptl_tx_t *tx, int nfrag)
{
/* CAVEAT EMPTOR: I take over caller's ref on 'tx' */
ptl_handle_md_t msg_mdh;
ptl_md_t md;
ptl_err_t prc;
- unsigned long flags;
LASSERT (!tx->tx_idle);
LASSERT (!tx->tx_active);
return;
}
- spin_lock_irqsave(&peer->peer_lock, flags);
- tx->tx_deadline = jiffies + (*kptllnd_tunables.kptl_timeout * HZ);
- tx->tx_active = 1;
- tx->tx_msg_mdh = msg_mdh;
+ tx->tx_deadline = jiffies + (*kptllnd_tunables.kptl_timeout * HZ);
+ tx->tx_active = 1;
+ tx->tx_msg_mdh = msg_mdh;
+ kptllnd_queue_tx(peer, tx);
+}
+
+/* NB "restarts" comes from peer_sendq of a single peer */
+void
+kptllnd_restart_txs (kptl_net_t *net, lnet_process_id_t target,
+ cfs_list_t *restarts)
+{
+ kptl_tx_t *tx;
+ kptl_tx_t *tmp;
+ kptl_peer_t *peer;
- /* Ensure HELLO is sent first */
- if (tx->tx_msg->ptlm_type == PTLLND_MSG_TYPE_NOOP)
- list_add(&tx->tx_list, &peer->peer_noops);
- else if (tx->tx_msg->ptlm_type == PTLLND_MSG_TYPE_HELLO)
- list_add(&tx->tx_list, &peer->peer_sendq);
- else
- list_add_tail(&tx->tx_list, &peer->peer_sendq);
+ LASSERT (!cfs_list_empty(restarts));
+
+ if (kptllnd_find_target(net, target, &peer) != 0)
+ peer = NULL;
+
+ cfs_list_for_each_entry_safe (tx, tmp, restarts, tx_list) {
+ LASSERT (tx->tx_peer != NULL);
+ LASSERT (tx->tx_type == TX_TYPE_GET_REQUEST ||
+ tx->tx_type == TX_TYPE_PUT_REQUEST ||
+ tx->tx_type == TX_TYPE_SMALL_MESSAGE);
+
+ cfs_list_del_init(&tx->tx_list);
- spin_unlock_irqrestore(&peer->peer_lock, flags);
+ if (peer == NULL ||
+ tx->tx_msg->ptlm_type == PTLLND_MSG_TYPE_HELLO) {
+ kptllnd_tx_decref(tx);
+ continue;
+ }
+
+ LASSERT (tx->tx_msg->ptlm_type != PTLLND_MSG_TYPE_NOOP);
+ tx->tx_status = 0;
+ tx->tx_active = 1;
+ kptllnd_peer_decref(tx->tx_peer);
+ tx->tx_peer = NULL;
+ kptllnd_set_tx_peer(tx, peer);
+ kptllnd_queue_tx(peer, tx); /* takes over my ref on tx */
+ }
+
+ if (peer == NULL)
+ return;
+
+ kptllnd_peer_check_sends(peer);
+ kptllnd_peer_decref(peer);
}
static inline int
{
if (!peer->peer_sent_hello ||
peer->peer_credits == 0 ||
- !list_empty(&peer->peer_noops) ||
+ !cfs_list_empty(&peer->peer_noops) ||
peer->peer_outstanding_credits < PTLLND_CREDIT_HIGHWATER)
return 0;
/* No tx to piggyback NOOP onto or no credit to send a tx */
- return (list_empty(&peer->peer_sendq) || peer->peer_credits == 1);
+ return (cfs_list_empty(&peer->peer_sendq) || peer->peer_credits == 1);
}
void
kptllnd_peer_check_sends (kptl_peer_t *peer)
{
- ptl_handle_me_t meh;
- kptl_tx_t *tx;
- int rc;
- int msg_type;
- unsigned long flags;
+ ptl_handle_me_t meh;
+ kptl_tx_t *tx;
+ int rc;
+ int msg_type;
+ unsigned long flags;
- LASSERT(!in_interrupt());
+ LASSERT(!in_interrupt());
- spin_lock_irqsave(&peer->peer_lock, flags);
+ spin_lock_irqsave(&peer->peer_lock, flags);
- peer->peer_retry_noop = 0;
+ peer->peer_retry_noop = 0;
if (kptllnd_peer_send_noop(peer)) {
/* post a NOOP to return credits */
- spin_unlock_irqrestore(&peer->peer_lock, flags);
+ spin_unlock_irqrestore(&peer->peer_lock, flags);
tx = kptllnd_get_idle_tx(TX_TYPE_SMALL_MESSAGE);
if (tx == NULL) {
CERROR("Can't return credits to %s: can't allocate descriptor\n",
libcfs_id2str(peer->peer_id));
} else {
- kptllnd_init_msg(tx->tx_msg, PTLLND_MSG_TYPE_NOOP, 0);
+ kptllnd_init_msg(tx->tx_msg, PTLLND_MSG_TYPE_NOOP,
+ peer->peer_id, 0);
kptllnd_post_tx(peer, tx, 0);
}
- spin_lock_irqsave(&peer->peer_lock, flags);
+ spin_lock_irqsave(&peer->peer_lock, flags);
peer->peer_retry_noop = (tx == NULL);
}
for (;;) {
- if (!list_empty(&peer->peer_noops)) {
+ if (!cfs_list_empty(&peer->peer_noops)) {
LASSERT (peer->peer_sent_hello);
- tx = list_entry(peer->peer_noops.next,
- kptl_tx_t, tx_list);
- } else if (!list_empty(&peer->peer_sendq)) {
- tx = list_entry(peer->peer_sendq.next,
- kptl_tx_t, tx_list);
+ tx = cfs_list_entry(peer->peer_noops.next,
+ kptl_tx_t, tx_list);
+ } else if (!cfs_list_empty(&peer->peer_sendq)) {
+ tx = cfs_list_entry(peer->peer_sendq.next,
+ kptl_tx_t, tx_list);
} else {
/* nothing to send right now */
break;
/* Ensure HELLO is sent first */
if (!peer->peer_sent_hello) {
- LASSERT (list_empty(&peer->peer_noops));
+ LASSERT (cfs_list_empty(&peer->peer_noops));
if (msg_type != PTLLND_MSG_TYPE_HELLO)
break;
peer->peer_sent_hello = 1;
break;
}
- list_del(&tx->tx_list);
+ cfs_list_del(&tx->tx_list);
/* Discard any NOOP I queued if I'm not at the high-water mark
* any more or more messages have been queued */
!kptllnd_peer_send_noop(peer)) {
tx->tx_active = 0;
- spin_unlock_irqrestore(&peer->peer_lock, flags);
+ spin_unlock_irqrestore(&peer->peer_lock, flags);
CDEBUG(D_NET, "%s: redundant noop\n",
libcfs_id2str(peer->peer_id));
kptllnd_tx_decref(tx);
- spin_lock_irqsave(&peer->peer_lock, flags);
+ spin_lock_irqsave(&peer->peer_lock, flags);
continue;
}
kptllnd_msgtype2str(msg_type), tx, tx->tx_msg->ptlm_nob,
tx->tx_msg->ptlm_credits);
- list_add_tail(&tx->tx_list, &peer->peer_activeq);
+ cfs_list_add_tail(&tx->tx_list, &peer->peer_activeq);
kptllnd_tx_addref(tx); /* 1 ref for me... */
- spin_unlock_irqrestore(&peer->peer_lock, flags);
+ spin_unlock_irqrestore(&peer->peer_lock, flags);
if (tx->tx_type == TX_TYPE_PUT_REQUEST ||
tx->tx_type == TX_TYPE_GET_REQUEST) {
kptllnd_tx_decref(tx); /* drop my ref */
- spin_lock_irqsave(&peer->peer_lock, flags);
+ spin_lock_irqsave(&peer->peer_lock, flags);
}
- spin_unlock_irqrestore(&peer->peer_lock, flags);
+ spin_unlock_irqrestore(&peer->peer_lock, flags);
return;
failed:
/* Nuke everything (including tx we were trying) */
kptllnd_peer_close(peer, -EIO);
kptllnd_tx_decref(tx);
- kptllnd_schedule_ptltrace_dump();
}
kptl_tx_t *
kptllnd_find_timed_out_tx(kptl_peer_t *peer)
{
kptl_tx_t *tx;
- struct list_head *ele;
+ cfs_list_t *ele;
- list_for_each(ele, &peer->peer_sendq) {
- tx = list_entry(ele, kptl_tx_t, tx_list);
+ cfs_list_for_each(ele, &peer->peer_sendq) {
+ tx = cfs_list_entry(ele, kptl_tx_t, tx_list);
- if (time_after_eq(jiffies, tx->tx_deadline)) {
+ if (cfs_time_aftereq(jiffies, tx->tx_deadline)) {
kptllnd_tx_addref(tx);
return tx;
}
}
- list_for_each(ele, &peer->peer_activeq) {
- tx = list_entry(ele, kptl_tx_t, tx_list);
+ cfs_list_for_each(ele, &peer->peer_activeq) {
+ tx = cfs_list_entry(ele, kptl_tx_t, tx_list);
- if (time_after_eq(jiffies, tx->tx_deadline)) {
+ if (cfs_time_aftereq(jiffies, tx->tx_deadline)) {
kptllnd_tx_addref(tx);
return tx;
}
void
kptllnd_peer_check_bucket (int idx, int stamp)
{
- struct list_head *peers = &kptllnd_data.kptl_peers[idx];
- struct list_head *ptmp;
+ cfs_list_t *peers = &kptllnd_data.kptl_peers[idx];
kptl_peer_t *peer;
- kptl_tx_t *tx;
unsigned long flags;
- int nsend;
- int nactive;
- int check_sends;
CDEBUG(D_NET, "Bucket=%d, stamp=%d\n", idx, stamp);
again:
/* NB. Shared lock while I just look */
- read_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
+ read_lock_irqsave(&kptllnd_data.kptl_peer_rw_lock, flags);
- list_for_each (ptmp, peers) {
- peer = list_entry (ptmp, kptl_peer_t, peer_list);
+ cfs_list_for_each_entry (peer, peers, peer_list) {
+ kptl_tx_t *tx;
+ int check_sends;
+ int c = -1, oc = -1, sc = -1;
+ int nsend = -1, nactive = -1;
+ int sent_hello = -1, state = -1;
CDEBUG(D_NET, "Peer=%s Credits=%d Outstanding=%d Send=%d\n",
libcfs_id2str(peer->peer_id), peer->peer_credits,
peer->peer_outstanding_credits, peer->peer_sent_credits);
- spin_lock(&peer->peer_lock);
+ spin_lock(&peer->peer_lock);
if (peer->peer_check_stamp == stamp) {
/* checked already this pass */
- spin_unlock(&peer->peer_lock);
+ spin_unlock(&peer->peer_lock);
continue;
}
peer->peer_check_stamp = stamp;
tx = kptllnd_find_timed_out_tx(peer);
check_sends = peer->peer_retry_noop;
-
- spin_unlock(&peer->peer_lock);
-
+
+ if (tx != NULL) {
+ c = peer->peer_credits;
+ sc = peer->peer_sent_credits;
+ oc = peer->peer_outstanding_credits;
+ state = peer->peer_state;
+ sent_hello = peer->peer_sent_hello;
+ nsend = kptllnd_count_queue(&peer->peer_sendq);
+ nactive = kptllnd_count_queue(&peer->peer_activeq);
+ }
+
+ spin_unlock(&peer->peer_lock);
+
if (tx == NULL && !check_sends)
continue;
kptllnd_peer_addref(peer); /* 1 ref for me... */
- read_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
+ read_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock,
+ flags);
if (tx == NULL) { /* nothing timed out */
kptllnd_peer_check_sends(peer);
goto again;
}
- spin_lock_irqsave(&peer->peer_lock, flags);
- nsend = kptllnd_count_queue(&peer->peer_sendq);
- nactive = kptllnd_count_queue(&peer->peer_activeq);
- spin_unlock_irqrestore(&peer->peer_lock, flags);
-
LCONSOLE_ERROR_MSG(0x126, "Timing out %s: %s\n",
libcfs_id2str(peer->peer_id),
- (tx->tx_tposted == 0) ?
- "no free peer buffers" :
+ (tx->tx_tposted == 0) ?
+ "no free peer buffers" :
"please check Portals");
if (tx->tx_tposted) {
libcfs_id2str(peer->peer_id),
*kptllnd_tunables.kptl_timeout,
cfs_duration_sec(jiffies - tx->tx_tposted));
+ } else if (state < PEER_STATE_ACTIVE) {
+ CERROR("Could not connect %s (%d) after %ds; "
+ "peer might be down\n",
+ libcfs_id2str(peer->peer_id), state,
+ *kptllnd_tunables.kptl_timeout);
} else {
CERROR("Could not get credits for %s after %ds; "
"possible Lustre networking issues\n",
}
CERROR("%s timed out: cred %d outstanding %d, sent %d, "
- "sendq %d, activeq %d Tx %p %s (%s%s%s) status %d "
- "%sposted %lu T/O %ds\n",
- libcfs_id2str(peer->peer_id), peer->peer_credits,
- peer->peer_outstanding_credits, peer->peer_sent_credits,
- nsend, nactive, tx, kptllnd_tx_typestr(tx->tx_type),
+ "state %d, sent_hello %d, sendq %d, activeq %d "
+ "Tx %p %s %s (%s%s%s) status %d %sposted %lu T/O %ds\n",
+ libcfs_id2str(peer->peer_id), c, oc, sc,
+ state, sent_hello, nsend, nactive,
+ tx, kptllnd_tx_typestr(tx->tx_type),
+ kptllnd_msgtype2str(tx->tx_msg->ptlm_type),
tx->tx_active ? "A" : "",
PtlHandleIsEqual(tx->tx_msg_mdh, PTL_INVALID_HANDLE) ?
"" : "M",
(tx->tx_tposted == 0) ? 0UL : (jiffies - tx->tx_tposted),
*kptllnd_tunables.kptl_timeout);
-#ifdef CRAY_XT3
- if (*kptllnd_tunables.kptl_ptltrace_on_timeout)
- kptllnd_dump_ptltrace();
-#endif
-
kptllnd_tx_decref(tx);
kptllnd_peer_close(peer, -ETIMEDOUT);
goto again;
}
- read_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
+ read_unlock_irqrestore(&kptllnd_data.kptl_peer_rw_lock, flags);
}
kptl_peer_t *
kptllnd_id2peer_locked (lnet_process_id_t id)
{
- struct list_head *peers = kptllnd_nid2peerlist(id.nid);
- struct list_head *tmp;
+ cfs_list_t *peers = kptllnd_nid2peerlist(id.nid);
+ cfs_list_t *tmp;
kptl_peer_t *peer;
- list_for_each (tmp, peers) {
-
- peer = list_entry (tmp, kptl_peer_t, peer_list);
+ cfs_list_for_each (tmp, peers) {
+ peer = cfs_list_entry (tmp, kptl_peer_t, peer_list);
LASSERT(peer->peer_state == PEER_STATE_WAITING_HELLO ||
peer->peer_state == PEER_STATE_ACTIVE);
-
- if (peer->peer_id.nid != id.nid ||
- peer->peer_id.pid != id.pid)
+
+ /* NB logical LNet peers share one kptl_peer_t */
+ if (peer->peer_id.pid != id.pid ||
+ LNET_NIDADDR(id.nid) != LNET_NIDADDR(peer->peer_id.nid))
continue;
kptllnd_peer_addref(peer);
CDEBUG(D_NET, "%s -> %s (%d)\n",
- libcfs_id2str(id),
+ libcfs_id2str(id),
kptllnd_ptlid2str(peer->peer_ptlid),
- atomic_read (&peer->peer_refcount));
+ cfs_atomic_read (&peer->peer_refcount));
return peer;
}
__u64
kptllnd_get_last_seen_matchbits_locked(lnet_process_id_t lpid)
{
- kptl_peer_t *peer;
- struct list_head *tmp;
+ kptl_peer_t *peer;
+ cfs_list_t *tmp;
/* Find the last matchbits I saw this new peer using. Note..
A. This peer cannot be in the peer table - she's new!
/* peer's last matchbits can't change after it comes out of the peer
* table, so first match is fine */
- list_for_each (tmp, &kptllnd_data.kptl_closing_peers) {
- peer = list_entry (tmp, kptl_peer_t, peer_list);
+ cfs_list_for_each (tmp, &kptllnd_data.kptl_closing_peers) {
+ peer = cfs_list_entry (tmp, kptl_peer_t, peer_list);
- if (peer->peer_id.nid == lpid.nid &&
+ if (LNET_NIDADDR(peer->peer_id.nid) == LNET_NIDADDR(lpid.nid) &&
peer->peer_id.pid == lpid.pid)
return peer->peer_last_matchbits_seen;
}
-
- list_for_each (tmp, &kptllnd_data.kptl_zombie_peers) {
- peer = list_entry (tmp, kptl_peer_t, peer_list);
- if (peer->peer_id.nid == lpid.nid &&
+ cfs_list_for_each (tmp, &kptllnd_data.kptl_zombie_peers) {
+ peer = cfs_list_entry (tmp, kptl_peer_t, peer_list);
+
+ if (LNET_NIDADDR(peer->peer_id.nid) == LNET_NIDADDR(lpid.nid) &&
peer->peer_id.pid == lpid.pid)
return peer->peer_last_matchbits_seen;
}
-
+
return PTL_RESERVED_MATCHBITS;
}
kptl_peer_t *
-kptllnd_peer_handle_hello (ptl_process_id_t initiator,
- kptl_msg_t *msg)
+kptllnd_peer_handle_hello (kptl_net_t *net,
+ ptl_process_id_t initiator, kptl_msg_t *msg)
{
- rwlock_t *g_lock = &kptllnd_data.kptl_peer_rw_lock;
+ rwlock_t *g_lock = &kptllnd_data.kptl_peer_rw_lock;
kptl_peer_t *peer;
kptl_peer_t *new_peer;
lnet_process_id_t lpid;
return NULL;
}
- write_lock_irqsave(g_lock, flags);
+ write_lock_irqsave(g_lock, flags);
peer = kptllnd_id2peer_locked(lpid);
if (peer != NULL) {
if (msg->ptlm_dststamp != 0 &&
msg->ptlm_dststamp != peer->peer_myincarnation) {
- write_unlock_irqrestore(g_lock, flags);
+ write_unlock_irqrestore(g_lock, flags);
CERROR("Ignoring HELLO from %s: unexpected "
"dststamp "LPX64" ("LPX64" wanted)\n",
peer->peer_max_msg_size =
msg->ptlm_u.hello.kptlhm_max_msg_size;
- write_unlock_irqrestore(g_lock, flags);
+ write_unlock_irqrestore(g_lock, flags);
return peer;
}
if (msg->ptlm_dststamp != 0 &&
msg->ptlm_dststamp <= peer->peer_myincarnation) {
- write_unlock_irqrestore(g_lock, flags);
+ write_unlock_irqrestore(g_lock, flags);
CERROR("Ignoring stale HELLO from %s: "
"dststamp "LPX64" (current "LPX64")\n",
kptllnd_cull_peertable_locked(lpid);
- write_unlock_irqrestore(g_lock, flags);
+ write_unlock_irqrestore(g_lock, flags);
if (peer != NULL) {
CDEBUG(D_NET, "Peer %s (%s) reconnecting:"
msg->ptlm_srcstamp, peer->peer_incarnation);
kptllnd_peer_decref(peer);
+ peer = NULL;
}
hello_tx = kptllnd_get_idle_tx(TX_TYPE_SMALL_MESSAGE);
}
kptllnd_init_msg(hello_tx->tx_msg, PTLLND_MSG_TYPE_HELLO,
- sizeof(kptl_hello_msg_t));
+ lpid, sizeof(kptl_hello_msg_t));
- new_peer = kptllnd_peer_allocate(lpid, initiator);
+ new_peer = kptllnd_peer_allocate(net, lpid, initiator);
if (new_peer == NULL) {
kptllnd_tx_decref(hello_tx);
return NULL;
return NULL;
}
- write_lock_irqsave(g_lock, flags);
+ write_lock_irqsave(g_lock, flags);
again:
- if (kptllnd_data.kptl_shutdown) {
- write_unlock_irqrestore(g_lock, flags);
+ if (net->net_shutdown) {
+ write_unlock_irqrestore(g_lock, flags);
CERROR ("Shutdown started, refusing connection from %s\n",
libcfs_id2str(lpid));
peer->peer_max_msg_size =
msg->ptlm_u.hello.kptlhm_max_msg_size;
- write_unlock_irqrestore(g_lock, flags);
+ write_unlock_irqrestore(g_lock, flags);
CWARN("Outgoing instantiated peer %s\n",
libcfs_id2str(lpid));
} else {
LASSERT (peer->peer_state == PEER_STATE_ACTIVE);
- write_unlock_irqrestore(g_lock, flags);
+ write_unlock_irqrestore(g_lock, flags);
/* WOW! Somehow this peer completed the HELLO
* handshake while I slept. I guess I could have slept
if (kptllnd_data.kptl_n_active_peers ==
kptllnd_data.kptl_expected_peers) {
/* peer table full */
- write_unlock_irqrestore(g_lock, flags);
+ write_unlock_irqrestore(g_lock, flags);
kptllnd_peertable_overflow_msg("Connection from ", lpid);
return NULL;
}
- write_lock_irqsave(g_lock, flags);
+ write_lock_irqsave(g_lock, flags);
kptllnd_data.kptl_expected_peers++;
goto again;
}
new_peer->peer_last_matchbits_seen = last_matchbits_seen;
new_peer->peer_max_msg_size = msg->ptlm_u.hello.kptlhm_max_msg_size;
+ LASSERT (!net->net_shutdown);
kptllnd_peer_add_peertable_locked(new_peer);
- write_unlock_irqrestore(g_lock, flags);
+ write_unlock_irqrestore(g_lock, flags);
/* NB someone else could get in now and post a message before I post
* the HELLO, but post_tx/check_sends take care of that! */
}
int
-kptllnd_find_target(kptl_peer_t **peerp, lnet_process_id_t target)
+kptllnd_find_target(kptl_net_t *net, lnet_process_id_t target,
+ kptl_peer_t **peerp)
{
- rwlock_t *g_lock = &kptllnd_data.kptl_peer_rw_lock;
+ rwlock_t *g_lock = &kptllnd_data.kptl_peer_rw_lock;
ptl_process_id_t ptl_id;
kptl_peer_t *new_peer;
kptl_tx_t *hello_tx;
__u64 last_matchbits_seen;
/* I expect to find the peer, so I only take a read lock... */
- read_lock_irqsave(g_lock, flags);
+ read_lock_irqsave(g_lock, flags);
*peerp = kptllnd_id2peer_locked(target);
- read_unlock_irqrestore(g_lock, flags);
+ read_unlock_irqrestore(g_lock, flags);
if (*peerp != NULL)
return 0;
-
+
if ((target.pid & LNET_PID_USERFLAG) != 0) {
CWARN("Refusing to create a new connection to %s "
"(non-kernel peer)\n", libcfs_id2str(target));
return -EHOSTUNREACH;
}
- /* The new peer is a kernel ptllnd, and kernel ptllnds all have
- * the same portals PID */
+ /* The new peer is a kernel ptllnd, and kernel ptllnds all have the
+ * same portals PID, which has nothing to do with LUSTRE_SRV_LNET_PID */
ptl_id.nid = kptllnd_lnet2ptlnid(target.nid);
ptl_id.pid = kptllnd_data.kptl_portals_id.pid;
return -ENOMEM;
}
+ hello_tx->tx_acked = 1;
kptllnd_init_msg(hello_tx->tx_msg, PTLLND_MSG_TYPE_HELLO,
- sizeof(kptl_hello_msg_t));
+ target, sizeof(kptl_hello_msg_t));
- new_peer = kptllnd_peer_allocate(target, ptl_id);
+ new_peer = kptllnd_peer_allocate(net, target, ptl_id);
if (new_peer == NULL) {
rc = -ENOMEM;
goto unwind_0;
if (rc != 0)
goto unwind_1;
- write_lock_irqsave(g_lock, flags);
+ write_lock_irqsave(g_lock, flags);
again:
- if (kptllnd_data.kptl_shutdown) {
- write_unlock_irqrestore(g_lock, flags);
- rc = -ESHUTDOWN;
- goto unwind_2;
- }
+ /* Called only in lnd_send which can't happen after lnd_shutdown */
+ LASSERT (!net->net_shutdown);
*peerp = kptllnd_id2peer_locked(target);
if (*peerp != NULL) {
- write_unlock_irqrestore(g_lock, flags);
+ write_unlock_irqrestore(g_lock, flags);
goto unwind_2;
}
if (kptllnd_data.kptl_n_active_peers ==
kptllnd_data.kptl_expected_peers) {
/* peer table full */
- write_unlock_irqrestore(g_lock, flags);
+ write_unlock_irqrestore(g_lock, flags);
kptllnd_peertable_overflow_msg("Connection to ", target);
rc = -ENOMEM;
goto unwind_2;
}
- write_lock_irqsave(g_lock, flags);
+ write_lock_irqsave(g_lock, flags);
kptllnd_data.kptl_expected_peers++;
goto again;
}
hello_tx->tx_msg->ptlm_u.hello.kptlhm_matchbits = last_matchbits_seen;
hello_tx->tx_msg->ptlm_u.hello.kptlhm_max_msg_size =
*kptllnd_tunables.kptl_max_msg_size;
-
+
new_peer->peer_state = PEER_STATE_WAITING_HELLO;
new_peer->peer_last_matchbits_seen = last_matchbits_seen;
-
+
kptllnd_peer_add_peertable_locked(new_peer);
- write_unlock_irqrestore(g_lock, flags);
+ write_unlock_irqrestore(g_lock, flags);
- /* NB someone else could get in now and post a message before I post
- * the HELLO, but post_tx/check_sends take care of that! */
+ /* NB someone else could get in now and post a message before I post
+ * the HELLO, but post_tx/check_sends take care of that! */
CDEBUG(D_NETTRACE, "%s: post initial hello %p\n",
libcfs_id2str(new_peer->peer_id), hello_tx);
kptllnd_post_tx(new_peer, hello_tx, 0);
kptllnd_peer_check_sends(new_peer);
-
+
*peerp = new_peer;
return 0;
-
+
unwind_2:
kptllnd_peer_unreserve_buffers();
unwind_1:
git://git.whamcloud.com / fs / lustre-release.git / blobdiff