/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
* vim:expandtab:shiftwidth=8:tabstop=8:
*
- * Copyright (c) 2003 Los Alamos National Laboratory (LANL)
+ * GPL HEADER START
*
- * This file is part of Lustre, http://www.lustre.org/
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
- * 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.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 only,
+ * as published by the Free Software Foundation.
*
- * 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.
+ * This program 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 version 2 for more details (a copy is included
+ * in the LICENSE file that accompanied this code).
*
- * 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.
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ * GPL HEADER END
+ */
+/*
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved
+ * Use is subject to license terms.
+ *
+ * Copyright (c) 2003 Los Alamos National Laboratory (LANL)
+ */
+/*
+ * This file is part of Lustre, http://www.lustre.org/
+ * Lustre is a trademark of Sun Microsystems, Inc.
*/
/*
void
gmnal_notify_peer_down(gmnal_tx_t *tx)
{
- struct timeval now;
time_t then;
- do_gettimeofday (&now);
- then = now.tv_sec - (jiffies - tx->tx_launchtime)/HZ;
+ then = cfs_time_current_sec() -
+ cfs_duration_sec(cfs_time_current() -
+ tx->tx_launchtime);
lnet_notify(tx->tx_gmni->gmni_ni, tx->tx_nid, 0, then);
}
msg->gmm_magic = GMNAL_MSG_MAGIC;
msg->gmm_version = GMNAL_MSG_VERSION;
msg->gmm_type = type;
- msg->gmm_srcnid = lnet_ptlcompat_srcnid(gmni->gmni_ni->ni_nid,
- dstnid);
+ msg->gmm_srcnid = gmni->gmni_ni->ni_nid;
msg->gmm_dstnid = dstnid;
}
/* 6 bytes are enough to have received magic + version */
if (rx->rx_recv_nob < 6) {
- CERROR("Short message from gmid %u: %d\n",
+ CERROR("Short message from gmid %u: %d\n",
rx->rx_recv_gmid, rx->rx_recv_nob);
return -EPROTO;
}
msg->gmm_magic == __swab32(LNET_PROTO_MAGIC)) {
return EPROTO;
} else {
- CERROR("Bad magic from gmid %u: %08x\n",
+ CERROR("Bad magic from gmid %u: %08x\n",
rx->rx_recv_gmid, msg->gmm_magic);
return -EPROTO;
}
- if (msg->gmm_version !=
+ if (msg->gmm_version !=
(flip ? __swab16(GMNAL_MSG_VERSION) : GMNAL_MSG_VERSION)) {
return EPROTO;
}
__swab64s(&msg->gmm_srcnid);
__swab64s(&msg->gmm_dstnid);
}
-
+
if (msg->gmm_srcnid == LNET_NID_ANY) {
- CERROR("Bad src nid from %u: %s\n",
+ CERROR("Bad src nid from %u: %s\n",
rx->rx_recv_gmid, libcfs_nid2str(msg->gmm_srcnid));
return -EPROTO;
}
- if (!lnet_ptlcompat_matchnid(gmni->gmni_ni->ni_nid,
- msg->gmm_dstnid)) {
+ if (gmni->gmni_ni->ni_nid != msg->gmm_dstnid) {
CERROR("Bad dst nid from %u: %s\n",
rx->rx_recv_gmid, libcfs_nid2str(msg->gmm_dstnid));
return -EPROTO;
}
-
+
switch (msg->gmm_type) {
default:
- CERROR("Unknown message type from %u: %x\n",
+ CERROR("Unknown message type from %u: %x\n",
rx->rx_recv_gmid, msg->gmm_type);
return -EPROTO;
-
+
case GMNAL_MSG_IMMEDIATE:
- if (rx->rx_recv_nob < offsetof(gmnal_msg_t, gmm_u.immediate.gmim_payload[0])) {
- CERROR("Short IMMEDIATE from %u: %d("LPSZ")\n",
- rx->rx_recv_gmid, rx->rx_recv_nob,
- offsetof(gmnal_msg_t, gmm_u.immediate.gmim_payload[0]));
+ if (rx->rx_recv_nob <
+ offsetof(gmnal_msg_t, gmm_u.immediate.gmim_payload[0])) {
+ CERROR("Short IMMEDIATE from %u: %d(%lu)\n",
+ rx->rx_recv_gmid, rx->rx_recv_nob,
+ (long)offsetof(gmnal_msg_t,
+ gmm_u.immediate.gmim_payload[0]));
return -EPROTO;
}
break;
gmnal_tx_t *
gmnal_get_tx(gmnal_ni_t *gmni)
{
- gmnal_tx_t *tx = NULL;
+ gmnal_tx_t *tx = NULL;
- spin_lock(&gmni->gmni_tx_lock);
+ cfs_spin_lock(&gmni->gmni_tx_lock);
if (gmni->gmni_shutdown ||
- list_empty(&gmni->gmni_idle_txs)) {
- spin_unlock(&gmni->gmni_tx_lock);
+ cfs_list_empty(&gmni->gmni_idle_txs)) {
+ cfs_spin_unlock(&gmni->gmni_tx_lock);
return NULL;
}
-
- tx = list_entry(gmni->gmni_idle_txs.next, gmnal_tx_t, tx_list);
- list_del(&tx->tx_list);
- spin_unlock(&gmni->gmni_tx_lock);
+ tx = cfs_list_entry(gmni->gmni_idle_txs.next, gmnal_tx_t, tx_list);
+ cfs_list_del(&tx->tx_list);
+
+ cfs_spin_unlock(&gmni->gmni_tx_lock);
LASSERT (tx->tx_lntmsg == NULL);
LASSERT (tx->tx_ltxb == NULL);
LASSERT (!tx->tx_credit);
-
+
return tx;
}
void
gmnal_tx_done(gmnal_tx_t *tx, int rc)
{
- gmnal_ni_t *gmni = tx->tx_gmni;
+ gmnal_ni_t *gmni = tx->tx_gmni;
int wake_sched = 0;
lnet_msg_t *lnetmsg = tx->tx_lntmsg;
-
+
tx->tx_lntmsg = NULL;
- spin_lock(&gmni->gmni_tx_lock);
-
+ cfs_spin_lock(&gmni->gmni_tx_lock);
+
if (tx->tx_ltxb != NULL) {
wake_sched = 1;
- list_add_tail(&tx->tx_ltxb->txb_list, &gmni->gmni_idle_ltxbs);
+ cfs_list_add_tail(&tx->tx_ltxb->txb_list,
+ &gmni->gmni_idle_ltxbs);
tx->tx_ltxb = NULL;
}
-
+
if (tx->tx_credit) {
wake_sched = 1;
gmni->gmni_tx_credits++;
tx->tx_credit = 0;
}
-
- list_add_tail(&tx->tx_list, &gmni->gmni_idle_txs);
+
+ cfs_list_add_tail(&tx->tx_list, &gmni->gmni_idle_txs);
if (wake_sched)
gmnal_check_txqueues_locked(gmni);
- spin_unlock(&gmni->gmni_tx_lock);
+ cfs_spin_unlock(&gmni->gmni_tx_lock);
/* Delay finalize until tx is free */
if (lnetmsg != NULL)
- lnet_finalize(gmni->gmni_ni, lnetmsg, 0);
+ lnet_finalize(gmni->gmni_ni, lnetmsg, rc);
}
-void
-gmnal_drop_sends_callback(struct gm_port *gm_port, void *context,
+void
+gmnal_drop_sends_callback(struct gm_port *gm_port, void *context,
gm_status_t status)
{
- gmnal_tx_t *tx = (gmnal_tx_t*)context;
+ gmnal_tx_t *tx = (gmnal_tx_t*)context;
+
+ LASSERT(!cfs_in_interrupt());
- LASSERT(!in_interrupt());
-
- CDEBUG(D_NET, "status for tx [%p] is [%d][%s], nid %s\n",
+ CDEBUG(D_NET, "status for tx [%p] is [%d][%s], nid %s\n",
tx, status, gmnal_gmstatus2str(status),
libcfs_nid2str(tx->tx_nid));
gmnal_tx_done(tx, -EIO);
}
-void
+void
gmnal_tx_callback(gm_port_t *gm_port, void *context, gm_status_t status)
{
- gmnal_tx_t *tx = (gmnal_tx_t*)context;
- gmnal_ni_t *gmni = tx->tx_gmni;
+ gmnal_tx_t *tx = (gmnal_tx_t*)context;
+ gmnal_ni_t *gmni = tx->tx_gmni;
- LASSERT(!in_interrupt());
+ LASSERT(!cfs_in_interrupt());
- switch(status) {
+ switch(status) {
case GM_SUCCESS:
gmnal_tx_done(tx, 0);
return;
case GM_SEND_DROPPED:
- CDEBUG(D_NETERROR, "Dropped tx %p to %s\n",
+ CDEBUG(D_NETERROR, "Dropped tx %p to %s\n",
tx, libcfs_nid2str(tx->tx_nid));
/* Another tx failed and called gm_drop_sends() which made this
* one complete immediately */
gmnal_tx_done(tx, -EIO);
return;
-
+
default:
/* Some error; NB don't complete tx yet; we need its credit for
* gm_drop_sends() */
CDEBUG(D_NETERROR, "tx %p error %d(%s), nid %s\n",
- tx, status, gmnal_gmstatus2str(status),
+ tx, status, gmnal_gmstatus2str(status),
libcfs_nid2str(tx->tx_nid));
gmnal_notify_peer_down(tx);
- spin_lock(&gmni->gmni_gm_lock);
- gm_drop_sends(gmni->gmni_port,
+ cfs_spin_lock(&gmni->gmni_gm_lock);
+ gm_drop_sends(gmni->gmni_port,
tx->tx_ltxb != NULL ?
GMNAL_LARGE_PRIORITY : GMNAL_SMALL_PRIORITY,
- tx->tx_gmlid, *gmnal_tunables.gm_port,
+ tx->tx_gmlid, *gmnal_tunables.gm_port,
gmnal_drop_sends_callback, tx);
- spin_unlock(&gmni->gmni_gm_lock);
- return;
- }
+ cfs_spin_unlock(&gmni->gmni_gm_lock);
+ return;
+ }
/* not reached */
LBUG();
int gmsize;
int pri;
void *netaddr;
-
- tx = list_empty(&gmni->gmni_buf_txq) ? NULL :
- list_entry(gmni->gmni_buf_txq.next, gmnal_tx_t, tx_list);
+
+ tx = cfs_list_empty(&gmni->gmni_buf_txq) ? NULL :
+ cfs_list_entry(gmni->gmni_buf_txq.next, gmnal_tx_t, tx_list);
if (tx != NULL &&
- (tx->tx_large_nob == 0 ||
- !list_empty(&gmni->gmni_idle_ltxbs))) {
+ (tx->tx_large_nob == 0 ||
+ !cfs_list_empty(&gmni->gmni_idle_ltxbs))) {
/* consume tx */
- list_del(&tx->tx_list);
-
+ cfs_list_del(&tx->tx_list);
+
LASSERT (tx->tx_ltxb == NULL);
if (tx->tx_large_nob != 0) {
- ltxb = list_entry(gmni->gmni_idle_ltxbs.next,
- gmnal_txbuf_t, txb_list);
+ ltxb = cfs_list_entry(gmni->gmni_idle_ltxbs.next,
+ gmnal_txbuf_t, txb_list);
/* consume large buffer */
- list_del(<xb->txb_list);
+ cfs_list_del(<xb->txb_list);
- spin_unlock(&gmni->gmni_tx_lock);
+ cfs_spin_unlock(&gmni->gmni_tx_lock);
/* Unlocking here allows sends to get re-ordered,
* but we want to allow other CPUs to progress... */
tx->tx_msgnob += tx->tx_large_nob;
- spin_lock(&gmni->gmni_tx_lock);
+ cfs_spin_lock(&gmni->gmni_tx_lock);
}
- list_add_tail(&tx->tx_list, &gmni->gmni_cred_txq);
+ cfs_list_add_tail(&tx->tx_list, &gmni->gmni_cred_txq);
}
- if (!list_empty(&gmni->gmni_cred_txq) &&
+ if (!cfs_list_empty(&gmni->gmni_cred_txq) &&
gmni->gmni_tx_credits != 0) {
- tx = list_entry(gmni->gmni_cred_txq.next, gmnal_tx_t, tx_list);
+ tx = cfs_list_entry(gmni->gmni_cred_txq.next, gmnal_tx_t,
+ tx_list);
/* consume tx and 1 credit */
- list_del(&tx->tx_list);
+ cfs_list_del(&tx->tx_list);
gmni->gmni_tx_credits--;
- spin_unlock(&gmni->gmni_tx_lock);
+ cfs_spin_unlock(&gmni->gmni_tx_lock);
/* Unlocking here allows sends to get re-ordered, but we want
* to allow other CPUs to progress... */
LASSERT(!tx->tx_credit);
tx->tx_credit = 1;
- tx->tx_launchtime = jiffies;
+ tx->tx_launchtime = cfs_time_current();
if (tx->tx_msgnob <= gmni->gmni_small_msgsize) {
LASSERT (tx->tx_ltxb == NULL);
pri = GMNAL_LARGE_PRIORITY;
}
- spin_lock(&gmni->gmni_gm_lock);
+ cfs_spin_lock(&gmni->gmni_gm_lock);
- gm_send_to_peer_with_callback(gmni->gmni_port,
- netaddr, gmsize,
+ gm_send_to_peer_with_callback(gmni->gmni_port,
+ netaddr, gmsize,
tx->tx_msgnob,
- pri,
+ pri,
tx->tx_gmlid,
- gmnal_tx_callback,
+ gmnal_tx_callback,
(void*)tx);
- spin_unlock(&gmni->gmni_gm_lock);
- spin_lock(&gmni->gmni_tx_lock);
+ cfs_spin_unlock(&gmni->gmni_gm_lock);
+ cfs_spin_lock(&gmni->gmni_tx_lock);
}
}
GMNAL_SMALL_PRIORITY;
void *buffer = GMNAL_NETBUF_LOCAL_NETADDR(&rx->rx_buf);
- CDEBUG(D_NET, "posting rx %p buf %p\n", rx, buffer);
+ CDEBUG(D_NET, "posting rx %p buf %p\n", rx, buffer);
- spin_lock(&gmni->gmni_gm_lock);
- gm_provide_receive_buffer_with_tag(gmni->gmni_port,
+ cfs_spin_lock(&gmni->gmni_gm_lock);
+ gm_provide_receive_buffer_with_tag(gmni->gmni_port,
buffer, gmsize, pri, 0);
- spin_unlock(&gmni->gmni_gm_lock);
+ cfs_spin_unlock(&gmni->gmni_gm_lock);
}
void
tx->tx_msgnob = offsetof(gmnal_msg_t, gmm_type);
tx->tx_large_nob = 0;
- spin_lock(&gmni->gmni_tx_lock);
+ cfs_spin_lock(&gmni->gmni_tx_lock);
- list_add_tail(&tx->tx_list, &gmni->gmni_buf_txq);
+ cfs_list_add_tail(&tx->tx_list, &gmni->gmni_buf_txq);
gmnal_check_txqueues_locked(gmni);
- spin_unlock(&gmni->gmni_tx_lock);
+ cfs_spin_unlock(&gmni->gmni_tx_lock);
}
int
gmnal_rx_thread(void *arg)
{
- gmnal_ni_t *gmni = arg;
- gm_recv_event_t *rxevent = NULL;
- gm_recv_t *recv = NULL;
+ gmnal_ni_t *gmni = arg;
+ gm_recv_event_t *rxevent = NULL;
+ gm_recv_t *recv = NULL;
gmnal_rx_t *rx;
int rc;
- cfs_daemonize("gmnal_rxd");
-
- down(&gmni->gmni_rx_mutex);
+ cfs_daemonize("gmnal_rxd");
- while (!gmni->gmni_shutdown) {
+ while (!gmni->gmni_shutdown) {
+ rc = down_interruptible(&gmni->gmni_rx_mutex);
+ LASSERT (rc == 0 || rc == -EINTR);
+ if (rc != 0)
+ continue;
- spin_lock(&gmni->gmni_gm_lock);
- rxevent = gm_blocking_receive_no_spin(gmni->gmni_port);
- spin_unlock(&gmni->gmni_gm_lock);
+ cfs_spin_lock(&gmni->gmni_gm_lock);
+ rxevent = gm_blocking_receive_no_spin(gmni->gmni_port);
+ cfs_spin_unlock(&gmni->gmni_gm_lock);
switch (GM_RECV_EVENT_TYPE(rxevent)) {
default:
gm_unknown(gmni->gmni_port, rxevent);
+ cfs_up(&gmni->gmni_rx_mutex);
continue;
case GM_FAST_RECV_EVENT:
case GM_HIGH_RECV_EVENT:
break;
}
-
+
recv = &rxevent->recv;
- rx = gm_hash_find(gmni->gmni_rx_hash,
+ rx = gm_hash_find(gmni->gmni_rx_hash,
gm_ntohp(recv->buffer));
LASSERT (rx != NULL);
break;
}
- up(&gmni->gmni_rx_mutex);
+ cfs_up(&gmni->gmni_rx_mutex);
- CDEBUG (D_NET, "rx %p: buf %p(%p) nob %d\n", rx,
+ CDEBUG (D_NET, "rx %p: buf %p(%p) nob %d\n", rx,
GMNAL_NETBUF_LOCAL_NETADDR(&rx->rx_buf),
gm_ntohp(recv->buffer), rx->rx_recv_nob);
if (rc == 0) {
gmnal_msg_t *msg = GMNAL_NETBUF_MSG(&rx->rx_buf);
-
+
LASSERT (msg->gmm_type == GMNAL_MSG_IMMEDIATE);
- rc = lnet_parse(gmni->gmni_ni,
- &msg->gmm_u.immediate.gmim_hdr,
- msg->gmm_srcnid,
- rx, 0);
+ rc = lnet_parse(gmni->gmni_ni,
+ &msg->gmm_u.immediate.gmim_hdr,
+ msg->gmm_srcnid, rx, 0);
} else if (rc > 0) {
gmnal_version_reply(gmni, rx);
rc = -EPROTO; /* repost rx */
if (rc < 0) /* parse failure */
gmnal_post_rx(gmni, rx);
+ }
- down(&gmni->gmni_rx_mutex);
- }
-
- up(&gmni->gmni_rx_mutex);
-
- CDEBUG(D_NET, "exiting\n");
- atomic_dec(&gmni->gmni_nthreads);
- return 0;
+ CDEBUG(D_NET, "exiting\n");
+ cfs_atomic_dec(&gmni->gmni_nthreads);
+ return 0;
}
void
int count = 2;
gmni->gmni_shutdown = 1;
- mb();
-
+ cfs_mb();
+
/* wake rxthread owning gmni_rx_mutex with an alarm. */
- spin_lock(&gmni->gmni_gm_lock);
- gm_set_alarm(gmni->gmni_port, &gmni->gmni_alarm, 0, NULL, NULL);
- spin_unlock(&gmni->gmni_gm_lock);
+ cfs_spin_lock(&gmni->gmni_gm_lock);
+ gm_set_alarm(gmni->gmni_port, &gmni->gmni_alarm, 0, NULL, NULL);
+ cfs_spin_unlock(&gmni->gmni_gm_lock);
- while (atomic_read(&gmni->gmni_nthreads) != 0) {
+ while (cfs_atomic_read(&gmni->gmni_nthreads) != 0) {
count++;
if ((count & (count - 1)) == 0)
CWARN("Waiting for %d threads to stop\n",
- atomic_read(&gmni->gmni_nthreads));
+ cfs_atomic_read(&gmni->gmni_nthreads));
gmnal_yield(1);
- }
+ }
}
int
int pid;
LASSERT (!gmni->gmni_shutdown);
- LASSERT (atomic_read(&gmni->gmni_nthreads) == 0);
+ LASSERT (cfs_atomic_read(&gmni->gmni_nthreads) == 0);
- gm_initialize_alarm(&gmni->gmni_alarm);
+ gm_initialize_alarm(&gmni->gmni_alarm);
- for (i = 0; i < num_online_cpus(); i++) {
+ for (i = 0; i < cfs_num_online_cpus(); i++) {
- pid = kernel_thread(gmnal_rx_thread, (void*)gmni, 0);
+ pid = cfs_kernel_thread(gmnal_rx_thread, (void*)gmni, 0);
if (pid < 0) {
CERROR("rx thread failed to start: %d\n", pid);
gmnal_stop_threads(gmni);
return pid;
}
- atomic_inc(&gmni->gmni_nthreads);
- }
+ cfs_atomic_inc(&gmni->gmni_nthreads);
+ }
- return 0;
+ return 0;
}
git://git.whamcloud.com / fs / lustre-release.git / blobdiff