From 90b055a8d17f17af9e46cae293917462a8ba658d Mon Sep 17 00:00:00 2001 From: eeb Date: Mon, 12 Sep 2005 13:49:36 +0000 Subject: [PATCH] * tidied up NID printing (s/LPX64/%s/ && s/nid/libcfs_nid2str(nid)/) --- lnet/klnds/iiblnd/iiblnd.c | 68 +++++----- lnet/klnds/iiblnd/iiblnd.h | 34 ++--- lnet/klnds/iiblnd/iiblnd_cb.c | 242 ++++++++++++++++++++---------------- lnet/klnds/openiblnd/openiblnd_cb.c | 184 ++++++++++++++------------- lnet/klnds/ralnd/ralnd.h | 10 +- lnet/klnds/viblnd/viblnd.h | 8 +- lnet/libcfs/module.c | 4 +- lnet/lnet/lib-msg.c | 4 +- lnet/lnet/router.c | 14 ++- lnet/tests/ping_cli.c | 4 +- lnet/tests/ping_srv.c | 5 +- lnet/tests/sping_cli.c | 4 +- lnet/tests/sping_srv.c | 5 +- 13 files changed, 324 insertions(+), 262 deletions(-) diff --git a/lnet/klnds/iiblnd/iiblnd.c b/lnet/klnds/iiblnd/iiblnd.c index 5cb300d..d8421e7 100644 --- a/lnet/klnds/iiblnd/iiblnd.c +++ b/lnet/klnds/iiblnd/iiblnd.c @@ -60,7 +60,8 @@ static ctl_table kibnal_top_ctl_table[] = { void print_service(IB_SERVICE_RECORD *service, char *tag, int rc) { - char name[32]; + char name[32]; + lnet_nid_t nid; if (service == NULL) { @@ -70,14 +71,15 @@ print_service(IB_SERVICE_RECORD *service, char *tag, int rc) } strncpy (name, service->ServiceName, sizeof(name)-1); name[sizeof(name)-1] = 0; + nid = *kibnal_service_nid_field(service); CWARN("tag : %s\n" "status : %d\n" "service id: "LPX64"\n" "name : %s\n" - "NID : "LPX64"\n", tag, rc, + "NID : %s\n", tag, rc, service->RID.ServiceID, name, - *kibnal_service_nid_field(service)); + libcfs_nid2str(nid)); } #endif @@ -176,9 +178,10 @@ kibnal_advertise (void) fill_fod(fod, FabOpSetServiceRecord); svc = &fod->Value.ServiceRecordValue.ServiceRecord; - CDEBUG(D_NET, "Advertising service id "LPX64" %s:"LPX64"\n", + CDEBUG(D_NET, "Advertising service id "LPX64" %s:%s\n", svc->RID.ServiceID, - svc->ServiceName, *kibnal_service_nid_field(svc)); + svc->ServiceName, + libcfs_nid2str(*kibnal_service_nid_field(svc))); frc = iibt_sd_port_fabric_operation(kibnal_data.kib_sd, kibnal_data.kib_port_guid, @@ -186,8 +189,8 @@ kibnal_advertise (void) NULL, &frc2); if (frc != FSUCCESS && frc != FPENDING) { - CERROR ("Immediate error %d advertising NID "LPX64"\n", - frc, kibnal_data.kib_ni->ni_nid); + CERROR ("Immediate error %d advertising NID %s\n", + frc, libcfs_nid2str(kibnal_data.kib_ni->ni_nid)); goto out; } @@ -195,8 +198,8 @@ kibnal_advertise (void) frc = frc2; if (frc != FSUCCESS) - CERROR ("Error %d advertising BUD "LPX64"\n", - frc, kibnal_data.kib_ni->ni_nid); + CERROR ("Error %d advertising BUD %s\n", + frc, libcfs_nid2str(kibnal_data.kib_ni->ni_nid)); out: PORTAL_FREE(fod, sizeof(*fod)); return (frc == FSUCCESS) ? 0 : -EINVAL; @@ -219,8 +222,9 @@ kibnal_unadvertise (int expect_success) fill_fod(fod, FabOpDeleteServiceRecord); svc = &fod->Value.ServiceRecordValue.ServiceRecord; - CDEBUG(D_NET, "Unadvertising service %s:"LPX64"\n", - svc->ServiceName, *kibnal_service_nid_field(svc)); + CDEBUG(D_NET, "Unadvertising service %s:%s\n", + svc->ServiceName, + libcfs_nid2str(*kibnal_service_nid_field(svc))); frc = iibt_sd_port_fabric_operation(kibnal_data.kib_sd, kibnal_data.kib_port_guid, @@ -228,8 +232,8 @@ kibnal_unadvertise (int expect_success) NULL, &frc2); if (frc != FSUCCESS && frc != FPENDING) { - CERROR ("Immediate error %d unadvertising NID "LPX64"\n", - frc, kibnal_data.kib_ni->ni_nid); + CERROR ("Immediate error %d unadvertising NID %s\n", + frc, libcfs_nid2str(kibnal_data.kib_ni->ni_nid)); goto out; } @@ -239,11 +243,11 @@ kibnal_unadvertise (int expect_success) goto out; if (expect_success) - CERROR("Error %d unadvertising NID "LPX64"\n", - frc2, kibnal_data.kib_ni->ni_nid); + CERROR("Error %d unadvertising NID %s\n", + frc2, libcfs_nid2str(kibnal_data.kib_ni->ni_nid)); else - CWARN("Removed conflicting NID "LPX64"\n", - kibnal_data.kib_ni->ni_nid); + CWARN("Removed conflicting NID %s\n", + libcfs_nid2str(kibnal_data.kib_ni->ni_nid)); out: PORTAL_FREE(fod, sizeof(*fod)); } @@ -255,8 +259,9 @@ kibnal_set_mynid(lnet_nid_t nid) int rc; FSTATUS frc; - CDEBUG(D_IOCTL, "setting mynid to "LPX64" (old nid="LPX64")\n", - nid, kibnal_data.kib_ni->ni_nid); + CDEBUG(D_IOCTL, "setting mynid to %s (old nid=%s)\n", + libcfs_nid2str(nid), + libcfs_nid2str(kibnal_data.kib_ni->ni_nid)); do_gettimeofday(&tv); @@ -268,8 +273,9 @@ kibnal_set_mynid(lnet_nid_t nid) return (0); } - CDEBUG(D_NET, "NID "LPX64"("LPX64")\n", - kibnal_data.kib_ni->ni_nid, nid); + CDEBUG(D_NET, "NID %s(%s)\n", + libcfs_nid2str(kibnal_data.kib_ni->ni_nid), + libcfs_nid2str(nid)); if (kibnal_data.kib_ni->ni_nid != LNET_NID_ANY) { @@ -410,8 +416,9 @@ kibnal_find_peer_locked (lnet_nid_t nid) if (peer->ibp_nid != nid) continue; - CDEBUG(D_NET, "got peer [%p] -> "LPX64" (%d)\n", - peer, nid, atomic_read (&peer->ibp_refcount)); + CDEBUG(D_NET, "got peer [%p] -> %s (%d)\n", + peer, libcfs_nid2str(nid), + atomic_read (&peer->ibp_refcount)); return (peer); } return (NULL); @@ -601,8 +608,9 @@ kibnal_get_conn_by_idx (int index) continue; conn = list_entry (ctmp, kib_conn_t, ibc_list); - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_inc (&conn->ibc_refcount); read_unlock_irqrestore(&kibnal_data.kib_global_lock, @@ -807,8 +815,9 @@ kibnal_put_conn (kib_conn_t *conn) { unsigned long flags; - CDEBUG (D_NET, "putting conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG (D_NET, "putting conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); LASSERT (atomic_read (&conn->ibc_refcount) > 0); @@ -858,8 +867,9 @@ kibnal_close_stale_conns_locked (kib_peer_t *peer, __u64 incarnation) if (conn->ibc_incarnation == incarnation) continue; - CDEBUG(D_NET, "Closing stale conn nid:"LPX64" incarnation:"LPX64"("LPX64")\n", - peer->ibp_nid, conn->ibc_incarnation, incarnation); + CDEBUG(D_NET, "Closing stale conn nid:%s incarnation:"LPX64"("LPX64")\n", + libcfs_nid2str(peer->ibp_nid), + conn->ibc_incarnation, incarnation); count++; kibnal_close_conn_locked (conn, -ESTALE); diff --git a/lnet/klnds/iiblnd/iiblnd.h b/lnet/klnds/iiblnd/iiblnd.h index 3fef233..23ff832 100644 --- a/lnet/klnds/iiblnd/iiblnd.h +++ b/lnet/klnds/iiblnd/iiblnd.h @@ -713,24 +713,26 @@ static inline int wrq_signals_completion(IB_WORK_REQ *wrq) /* these are purposely avoiding using local vars so they don't increase * stack consumption. */ -#define kib_peer_addref(peer) do { \ - LASSERTF(atomic_read(&peer->ibp_refcount) > 0, "%d\n", \ - atomic_read(&peer->ibp_refcount)); \ - CDEBUG(D_NET, "++peer[%p] -> "LPX64" (%d)\n", \ - peer, peer->ibp_nid, atomic_read (&peer->ibp_refcount)); \ - atomic_inc(&peer->ibp_refcount); \ +#define kib_peer_addref(peer) do { \ + LASSERTF(atomic_read(&peer->ibp_refcount) > 0, "%d\n", \ + atomic_read(&peer->ibp_refcount)); \ + CDEBUG(D_NET, "++peer[%p] -> %s (%d)\n", \ + peer, libcfs_nid2str(peer->ibp_nid), \ + atomic_read (&peer->ibp_refcount)); \ + atomic_inc(&peer->ibp_refcount); \ } while (0) -#define kib_peer_decref(peer) do { \ - LASSERTF(atomic_read(&peer->ibp_refcount) > 0, "%d\n", \ - atomic_read(&peer->ibp_refcount)); \ - CDEBUG(D_NET, "--peer[%p] -> "LPX64" (%d)\n", \ - peer, peer->ibp_nid, atomic_read (&peer->ibp_refcount)); \ - if (atomic_dec_and_test (&peer->ibp_refcount)) { \ - CDEBUG (D_NET, "destroying peer "LPX64" %p\n", \ - peer->ibp_nid, peer); \ - kibnal_destroy_peer (peer); \ - } \ +#define kib_peer_decref(peer) do { \ + LASSERTF(atomic_read(&peer->ibp_refcount) > 0, "%d\n", \ + atomic_read(&peer->ibp_refcount)); \ + CDEBUG(D_NET, "--peer[%p] -> %s (%d)\n", \ + peer, libcfs_nid2str(peer->ibp_nid), \ + atomic_read (&peer->ibp_refcount)); \ + if (atomic_dec_and_test (&peer->ibp_refcount)) { \ + CDEBUG (D_NET, "destroying peer %s %p\n", \ + libcfs_nid2str(peer->ibp_nid), peer); \ + kibnal_destroy_peer (peer); \ + } \ } while (0) /******************************************************************************/ diff --git a/lnet/klnds/iiblnd/iiblnd_cb.c b/lnet/klnds/iiblnd/iiblnd_cb.c index 4467777..72392aa 100644 --- a/lnet/klnds/iiblnd/iiblnd_cb.c +++ b/lnet/klnds/iiblnd/iiblnd_cb.c @@ -220,8 +220,8 @@ kibnal_complete_passive_rdma(kib_conn_t *conn, __u64 cookie, int status) spin_unlock_irqrestore (&conn->ibc_lock, flags); - CERROR ("Unmatched (late?) RDMA completion "LPX64" from "LPX64"\n", - cookie, conn->ibc_peer->ibp_nid); + CERROR ("Unmatched (late?) RDMA completion "LPX64" from %s\n", + cookie, libcfs_nid2str(conn->ibc_peer->ibp_nid)); } static __u32 @@ -286,12 +286,12 @@ kibnal_post_rx (kib_rx_t *rx, int do_credits) } if (conn->ibc_state == IBNAL_CONN_ESTABLISHED) { - CERROR ("Error posting receive -> "LPX64": %d\n", - conn->ibc_peer->ibp_nid, rc); + CERROR ("Error posting receive -> %s: %d\n", + libcfs_nid2str(conn->ibc_peer->ibp_nid), rc); kibnal_close_conn (rx->rx_conn, rc); } else { - CDEBUG (D_NET, "Error posting receive -> "LPX64": %d\n", - conn->ibc_peer->ibp_nid, rc); + CDEBUG (D_NET, "Error posting receive -> %s: %d\n", + libcfs_nid2str(conn->ibc_peer->ibp_nid), rc); } /* Drop rx's ref */ @@ -374,14 +374,15 @@ kibnal_rx_callback (IB_WORK_COMPLETION *wc) goto failed; if (wc->Status != WRStatusSuccess) { - CERROR("Rx from "LPX64" failed: %d\n", - conn->ibc_peer->ibp_nid, wc->Status); + CERROR("Rx from %s failed: %d\n", + libcfs_nid2str(conn->ibc_peer->ibp_nid), wc->Status); goto failed; } if (nob < base_nob) { - CERROR ("Short rx from "LPX64": %d < expected %d\n", - conn->ibc_peer->ibp_nid, nob, base_nob); + CERROR ("Short rx from %s: %d < expected %d\n", + libcfs_nid2str(conn->ibc_peer->ibp_nid), + nob, base_nob); goto failed; } @@ -393,8 +394,9 @@ kibnal_rx_callback (IB_WORK_COMPLETION *wc) flipped = 0; } else { if (msg->ibm_magic != __swab32(IBNAL_MSG_MAGIC)) { - CERROR ("Unrecognised magic: %08x from "LPX64"\n", - msg->ibm_magic, conn->ibc_peer->ibp_nid); + CERROR ("Unrecognised magic: %08x from %s\n", + msg->ibm_magic, + libcfs_nid2str(conn->ibc_peer->ibp_nid)); goto failed; } flipped = 1; @@ -444,8 +446,9 @@ kibnal_rx_callback (IB_WORK_COMPLETION *wc) case IBNAL_MSG_IMMEDIATE: if (nob < base_nob + sizeof (kib_immediate_msg_t)) { - CERROR ("Short IMMEDIATE from "LPX64": %d\n", - conn->ibc_peer->ibp_nid, nob); + CERROR ("Short IMMEDIATE from %s: %d\n", + libcfs_nid2str(conn->ibc_peer->ibp_nid), + nob); goto failed; } break; @@ -453,8 +456,8 @@ kibnal_rx_callback (IB_WORK_COMPLETION *wc) case IBNAL_MSG_PUT_RDMA: case IBNAL_MSG_GET_RDMA: if (nob < base_nob + sizeof (kib_rdma_msg_t)) { - CERROR ("Short RDMA msg from "LPX64": %d\n", - conn->ibc_peer->ibp_nid, nob); + CERROR ("Short RDMA msg from %s: %d\n", + libcfs_nid2str(conn->ibc_peer->ibp_nid), nob); goto failed; } if (flipped) @@ -491,8 +494,8 @@ kibnal_rx_callback (IB_WORK_COMPLETION *wc) case IBNAL_MSG_PUT_DONE: case IBNAL_MSG_GET_DONE: if (nob < base_nob + sizeof (kib_completion_msg_t)) { - CERROR ("Short COMPLETION msg from "LPX64": %d\n", - conn->ibc_peer->ibp_nid, nob); + CERROR ("Short COMPLETION msg from %s: %d\n", + libcfs_nid2str(conn->ibc_peer->ibp_nid), nob); goto failed; } if (flipped) @@ -509,8 +512,8 @@ kibnal_rx_callback (IB_WORK_COMPLETION *wc) return; default: - CERROR ("Can't parse type from "LPX64": %d\n", - conn->ibc_peer->ibp_nid, msg->ibm_type); + CERROR ("Can't parse type from %s: %d\n", + libcfs_nid2str(conn->ibc_peer->ibp_nid), msg->ibm_type); goto failed; } @@ -549,8 +552,8 @@ kibnal_rx (kib_rx_t *rx) /* Otherwise, I'll send a failed completion now to prevent * the peer's GET blocking for the full timeout. */ - CERROR ("Completing unmatched RDMA GET from "LPX64"\n", - rx->rx_conn->ibc_peer->ibp_nid); + CERROR ("Completing unmatched RDMA GET from %s\n", + libcfs_nid2str(rx->rx_conn->ibc_peer->ibp_nid)); kibnal_start_active_rdma (IBNAL_MSG_GET_DONE, -EIO, rx, NULL, 0, NULL, NULL, 0, 0); break; @@ -565,8 +568,8 @@ kibnal_rx (kib_rx_t *rx) * inconsistent with this message type, so it's the * sender's fault for sending garbage and she can time * herself out... */ - CERROR ("Uncompleted RMDA PUT from "LPX64"\n", - rx->rx_conn->ibc_peer->ibp_nid); + CERROR ("Uncompleted RMDA PUT from %s\n", + libcfs_nid2str(rx->rx_conn->ibc_peer->ibp_nid)); break; case IBNAL_MSG_IMMEDIATE: @@ -983,11 +986,11 @@ kibnal_check_sends (kib_conn_t *conn) spin_unlock_irqrestore (&conn->ibc_lock, flags); if (conn->ibc_state == IBNAL_CONN_ESTABLISHED) - CERROR ("Error %d posting transmit to "LPX64"\n", - rc, conn->ibc_peer->ibp_nid); + CERROR ("Error %d posting transmit to %s\n", rc, + libcfs_nid2str(conn->ibc_peer->ibp_nid)); else - CDEBUG (D_NET, "Error %d posting transmit to " - LPX64"\n", rc, conn->ibc_peer->ibp_nid); + CDEBUG (D_NET, "Error %d posting transmit to %s\n", + rc, libcfs_nid2str(conn->ibc_peer->ibp_nid)); kibnal_close_conn (conn, rc); @@ -1031,8 +1034,9 @@ kibnal_tx_callback (IB_WORK_COMPLETION *wc) if (idle) list_del(&tx->tx_list); - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_inc (&conn->ibc_refcount); @@ -1049,8 +1053,9 @@ kibnal_tx_callback (IB_WORK_COMPLETION *wc) kibnal_tx_done (tx); if (wc->Status != WRStatusSuccess) { - CERROR ("Tx completion to "LPX64" failed: %d\n", - conn->ibc_peer->ibp_nid, wc->Status); + CERROR ("Tx completion to %s failed: %d\n", + libcfs_nid2str(conn->ibc_peer->ibp_nid), + wc->Status); kibnal_close_conn (conn, -ENETDOWN); } else { /* can I shovel some more sends out the door? */ @@ -1180,8 +1185,9 @@ kibnal_launch_tx (kib_tx_t *tx, lnet_nid_t nid) conn = kibnal_find_conn_locked (peer); if (conn != NULL) { - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_inc (&conn->ibc_refcount); /* 1 ref for the tx */ read_unlock_irqrestore(g_lock, flags); @@ -1205,8 +1211,9 @@ kibnal_launch_tx (kib_tx_t *tx, lnet_nid_t nid) conn = kibnal_find_conn_locked (peer); if (conn != NULL) { /* Connection exists; queue message on it */ - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_inc (&conn->ibc_refcount); /* 1 ref for the tx */ write_unlock_irqrestore (g_lock, flags); @@ -1276,7 +1283,8 @@ kibnal_start_passive_rdma (int type, lnet_nid_t nid, 0, nob, 0); if (rc != 0) { - CERROR ("Can't map RDMA for "LPX64": %d\n", nid, rc); + CERROR ("Can't map RDMA for %s: %d\n", + libcfs_nid2str(nid), rc); goto failed; } @@ -1285,8 +1293,8 @@ kibnal_start_passive_rdma (int type, lnet_nid_t nid, tx->tx_ptlmsg[1] = lnet_create_reply_msg(kibnal_data.kib_ni, nid, ptlmsg); if (tx->tx_ptlmsg[1] == NULL) { - CERROR ("Can't create reply for GET -> "LPX64"\n", - nid); + CERROR ("Can't create reply for GET -> %s\n", + libcfs_nid2str(nid)); rc = -ENOMEM; goto failed; } @@ -1373,9 +1381,9 @@ kibnal_start_active_rdma (int type, int status, tx = kibnal_get_idle_tx (0); /* Mustn't block */ if (tx == NULL) { - CERROR ("tx descs exhausted on RDMA from "LPX64 + CERROR ("tx descs exhausted on RDMA from %s" " completing locally with failure\n", - rx->rx_conn->ibc_peer->ibp_nid); + libcfs_nid2str(rx->rx_conn->ibc_peer->ibp_nid)); lnet_finalize (kibnal_data.kib_ni, NULL, ptlmsg, -ENOMEM); return; } @@ -1393,8 +1401,8 @@ kibnal_start_active_rdma (int type, int status, rc = kibnal_map_iov (tx, access, niov, iov, offset, nob, 1); if (rc != 0) { - CERROR ("Can't map RDMA -> "LPX64": %d\n", - rx->rx_conn->ibc_peer->ibp_nid, rc); + CERROR ("Can't map RDMA -> %s: %d\n", + libcfs_nid2str(rx->rx_conn->ibc_peer->ibp_nid), rc); /* We'll skip the RDMA and complete with failure. */ status = rc; nob = 0; @@ -1479,9 +1487,9 @@ init_tx: } /* +1 ref for this tx... */ - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", rx->rx_conn, rx->rx_conn->ibc_state, - rx->rx_conn->ibc_peer->ibp_nid, + libcfs_nid2str(rx->rx_conn->ibc_peer->ibp_nid), atomic_read (&rx->rx_conn->ibc_refcount)); atomic_inc (&rx->rx_conn->ibc_refcount); /* ...and queue it up */ @@ -1544,16 +1552,17 @@ kibnal_send(ptl_ni_t *ni, /* Incoming message consistent with immediate reply? */ if (rx->rx_msg->ibm_type != IBNAL_MSG_IMMEDIATE) { - CERROR ("REPLY to "LPX64" bad opbm type %d!!!\n", - target.nid, rx->rx_msg->ibm_type); + CERROR ("REPLY to %s bad ibm type %d!!!\n", + libcfs_nid2str(target.nid), + rx->rx_msg->ibm_type); return (-EIO); } /* Will it fit in a message? */ nob = offsetof(kib_msg_t, ibm_u.immediate.ibim_payload[payload_nob]); if (nob >= IBNAL_MSG_SIZE) { - CERROR("REPLY for "LPX64" too big (RDMA not requested): %d\n", - target.nid, payload_nob); + CERROR("REPLY for %s too big (RDMA not requested): %d\n", + libcfs_nid2str(target.nid), payload_nob); return (-EIO); } break; @@ -1585,8 +1594,9 @@ kibnal_send(ptl_ni_t *ni, type == PTL_MSG_REPLY || in_interrupt())); if (tx == NULL) { - CERROR ("Can't send %d to "LPX64": tx descs exhausted%s\n", - type, target.nid, in_interrupt() ? " (intr)" : ""); + CERROR ("Can't send %d to %s: tx descs exhausted%s\n", + type, libcfs_nid2str(target.nid), + in_interrupt() ? " (intr)" : ""); return (-ENOMEM); } @@ -1637,8 +1647,9 @@ kibnal_recv (ptl_ni_t *ni, void *private, ptl_msg_t *ptlmsg, case IBNAL_MSG_IMMEDIATE: msg_nob = offsetof(kib_msg_t, ibm_u.immediate.ibim_payload[rlen]); if (msg_nob > IBNAL_MSG_SIZE) { - CERROR ("Immediate message from "LPX64" too big: %d\n", - rxmsg->ibm_u.immediate.ibim_hdr.src_nid, rlen); + CERROR ("Immediate message from %s too big: %d\n", + libcfs_nid2str(rxmsg->ibm_u.immediate.ibim_hdr.src_nid), + rlen); return (-EIO); } @@ -1714,15 +1725,17 @@ kibnal_close_conn_locked (kib_conn_t *conn, int error) return; /* already disconnecting */ CDEBUG (error == 0 ? D_NET : D_ERROR, - "closing conn to "LPX64": error %d\n", peer->ibp_nid, error); + "closing conn to %s: error %d\n", + libcfs_nid2str(peer->ibp_nid), error); if (conn->ibc_state == IBNAL_CONN_ESTABLISHED) { /* kib_connd_conns takes ibc_list's ref */ list_del (&conn->ibc_list); } else { /* new ref for kib_connd_conns */ - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_inc (&conn->ibc_refcount); } @@ -1811,8 +1824,8 @@ kibnal_peer_connect_failed (kib_peer_t *peer, int active, int rc) write_unlock_irqrestore (&kibnal_data.kib_global_lock, flags); if (!list_empty (&zombies)) - CERROR ("Deleting messages for "LPX64": connection failed\n", - peer->ibp_nid); + CERROR ("Deleting messages for %s: connection failed\n", + libcfs_nid2str(peer->ibp_nid)); while (!list_empty (&zombies)) { tx = list_entry (zombies.next, kib_tx_t, tx_list); @@ -1866,8 +1879,9 @@ kibnal_connreq_done (kib_conn_t *conn, int active, int status) /* +1 ref for ibc_list; caller(== CM)'s ref remains until * the IB_CM_IDLE callback */ - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_inc (&conn->ibc_refcount); list_add (&conn->ibc_list, &peer->ibp_conns); @@ -1884,8 +1898,9 @@ kibnal_connreq_done (kib_conn_t *conn, int active, int status) list_del (&tx->tx_list); /* +1 ref for each tx */ - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_inc (&conn->ibc_refcount); kibnal_queue_tx_locked (tx, conn); @@ -1902,8 +1917,9 @@ kibnal_connreq_done (kib_conn_t *conn, int active, int status) /* queue up all the receives */ for (i = 0; i < IBNAL_RX_MSGS; i++) { /* +1 ref for rx desc */ - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_inc (&conn->ibc_refcount); @@ -1950,8 +1966,9 @@ kibnal_accept (kib_conn_t **connp, IB_HANDLE *cep, return (-ENOMEM); if (queue_depth != IBNAL_MSG_QUEUE_SIZE) { - CERROR("Can't accept "LPX64": bad queue depth %d (%d expected)\n", - nid, queue_depth, IBNAL_MSG_QUEUE_SIZE); + CERROR("Can't accept %s: bad queue depth %d (%d expected)\n", + libcfs_nid2str(nid), + queue_depth, IBNAL_MSG_QUEUE_SIZE); atomic_dec (&conn->ibc_refcount); kibnal_destroy_conn(conn); return (-EPROTO); @@ -1960,8 +1977,9 @@ kibnal_accept (kib_conn_t **connp, IB_HANDLE *cep, /* assume 'nid' is a new peer */ peer = kibnal_create_peer (nid); if (peer == NULL) { - CDEBUG(D_NET, "--conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG(D_NET, "--conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_dec (&conn->ibc_refcount); kibnal_destroy_conn(conn); @@ -2144,32 +2162,35 @@ kibnal_connect_reply (IB_HANDLE cep, CM_CONN_INFO *info, void *arg) wcr = (kib_wire_connreq_t *)info->Info.Reply.PrivateData; if (wcr->wcr_magic != cpu_to_le32(IBNAL_MSG_MAGIC)) { - CERROR ("Can't connect "LPX64": bad magic %08x\n", - conn->ibc_peer->ibp_nid, le32_to_cpu(wcr->wcr_magic)); + CERROR ("Can't connect %s: bad magic %08x\n", + libcfs_nid2str(conn->ibc_peer->ibp_nid), + le32_to_cpu(wcr->wcr_magic)); GOTO(reject, reason = RC_USER_REJ); } if (wcr->wcr_version != cpu_to_le16(IBNAL_MSG_VERSION)) { - CERROR ("Can't connect "LPX64": bad version %d\n", - conn->ibc_peer->ibp_nid, le16_to_cpu(wcr->wcr_magic)); + CERROR ("Can't connect %s: bad version %d\n", + libcfs_nid2str(conn->ibc_peer->ibp_nid), + le16_to_cpu(wcr->wcr_magic)); GOTO(reject, reason = RC_USER_REJ); } if (wcr->wcr_queue_depth != cpu_to_le16(IBNAL_MSG_QUEUE_SIZE)) { - CERROR ("Can't connect "LPX64": bad queue depth %d\n", - conn->ibc_peer->ibp_nid, + CERROR ("Can't connect %s: bad queue depth %d\n", + libcfs_nid2str(conn->ibc_peer->ibp_nid), le16_to_cpu(wcr->wcr_queue_depth)); GOTO(reject, reason = RC_USER_REJ); } if (le64_to_cpu(wcr->wcr_nid) != conn->ibc_peer->ibp_nid) { - CERROR ("Unexpected NID "LPX64" from "LPX64"\n", - le64_to_cpu(wcr->wcr_nid), conn->ibc_peer->ibp_nid); + CERROR ("Unexpected NID %s from %s\n", + libcfs_nid2str(le64_to_cpu(wcr->wcr_nid)), + libcfs_nid2str(conn->ibc_peer->ibp_nid)); GOTO(reject, reason = RC_USER_REJ); } - CDEBUG(D_NET, "Connection %p -> "LPX64" REP_RECEIVED.\n", - conn, conn->ibc_peer->ibp_nid); + CDEBUG(D_NET, "Connection %p -> %s REP_RECEIVED.\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid)); conn->ibc_incarnation = le64_to_cpu(wcr->wcr_incarnation); conn->ibc_credits = IBNAL_MSG_QUEUE_SIZE; @@ -2182,8 +2203,8 @@ kibnal_connect_reply (IB_HANDLE cep, CM_CONN_INFO *info, void *arg) ca_attr->MaxQPInitiatorDepth), rep->StartingPSN); if (frc != FSUCCESS) { - CERROR("Connection %p -> "LPX64" QP RTS/RTR failed: %d\n", - conn, conn->ibc_peer->ibp_nid, frc); + CERROR("Connection %p -> %s QP RTS/RTR failed: %d\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid), frc); GOTO(reject, reason = RC_NO_QP); } @@ -2192,15 +2213,15 @@ kibnal_connect_reply (IB_HANDLE cep, CM_CONN_INFO *info, void *arg) frc = iibt_cm_accept(cep, &conn->ibc_connreq->cr_discarded, NULL, NULL, NULL, NULL); if (frc != FCM_CONNECT_ESTABLISHED) { - CERROR("Connection %p -> "LPX64" CMAccept failed: %d\n", - conn, conn->ibc_peer->ibp_nid, frc); + CERROR("Connection %p -> %s CMAccept failed: %d\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid), frc); kibnal_connreq_done (conn, 1, -ECONNABORTED); /* XXX don't call reject after accept fails? */ return; } - CDEBUG(D_NET, "Connection %p -> "LPX64" Established\n", - conn, conn->ibc_peer->ibp_nid); + CDEBUG(D_NET, "Connection %p -> %s Established\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid)); kibnal_connreq_done (conn, 1, 0); return; @@ -2221,8 +2242,9 @@ kibnal_cm_callback(IB_HANDLE cep, CM_CONN_INFO *info, void *arg) /* Established Connection Notifier */ switch (info->Status) { default: - CERROR("unknown status %d on Connection %p -> "LPX64"\n", - info->Status, conn, conn->ibc_peer->ibp_nid); + CERROR("unknown status %d on Connection %p -> %s\n", + info->Status, conn, + libcfs_nid2str(conn->ibc_peer->ibp_nid)); LBUG(); break; @@ -2241,8 +2263,8 @@ kibnal_cm_callback(IB_HANDLE cep, CM_CONN_INFO *info, void *arg) /* these both guarantee that no more cm callbacks will occur */ case FCM_DISCONNECTED: /* aka FCM_DISCONNECT_TIMEOUT */ case FCM_DISCONNECT_REPLY: - CDEBUG(D_NET, "Connection %p -> "LPX64" disconnect done.\n", - conn, conn->ibc_peer->ibp_nid); + CDEBUG(D_NET, "Connection %p -> %s disconnect done.\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid)); conn->ibc_state = IBNAL_CONN_DISCONNECTED; kibnal_flush_pending(conn); @@ -2300,8 +2322,8 @@ kibnal_listen_callback(IB_HANDLE cep, CM_CONN_INFO *info, void *arg) req = &info->Info.Request; wcr = (kib_wire_connreq_t *)req->PrivateData; - CDEBUG(D_NET, "%d from "LPX64"\n", info->Status, - le64_to_cpu(wcr->wcr_nid)); + CDEBUG(D_NET, "%d from %s\n", info->Status, + libcfs_nid2str(le64_to_cpu(wcr->wcr_nid))); if (info->Status == FCM_CONNECT_CANCEL) return; @@ -2325,8 +2347,8 @@ kibnal_listen_callback(IB_HANDLE cep, CM_CONN_INFO *info, void *arg) le64_to_cpu(wcr->wcr_incarnation), le16_to_cpu(wcr->wcr_queue_depth)); if (rc != 0) { - CERROR ("Can't accept "LPX64": %d\n", - le64_to_cpu(wcr->wcr_nid), rc); + CERROR ("Can't accept %s: %d\n", + libcfs_nid2str(le64_to_cpu(wcr->wcr_nid)), rc); GOTO(out, reason = RC_NO_RESOURCES); } @@ -2339,15 +2361,15 @@ kibnal_listen_callback(IB_HANDLE cep, CM_CONN_INFO *info, void *arg) req->CEPInfo.StartingPSN); if (frc != FSUCCESS) { - CERROR ("Can't mark QP RTS/RTR "LPX64": %d\n", - le64_to_cpu(wcr->wcr_nid), frc); + CERROR ("Can't mark QP RTS/RTR %s: %d\n", + libcfs_nid2str(le64_to_cpu(wcr->wcr_nid)), frc); GOTO(out, reason = RC_NO_QP); } frc = iibt_qp_query(conn->ibc_qp, &conn->ibc_qp_attrs, NULL); if (frc != FSUCCESS) { - CERROR ("Couldn't query qp attributes "LPX64": %d\n", - le64_to_cpu(wcr->wcr_nid), frc); + CERROR ("Couldn't query qp attributes %s: %d\n", + libcfs_nid2str(le64_to_cpu(wcr->wcr_nid)), frc); GOTO(out, reason = RC_NO_QP); } query = &conn->ibc_qp_attrs; @@ -2403,8 +2425,8 @@ kibnal_listen_callback(IB_HANDLE cep, CM_CONN_INFO *info, void *arg) goto out; } - CDEBUG(D_WARNING, "Connection %p -> "LPX64" ESTABLISHED.\n", - conn, conn->ibc_peer->ibp_nid); + CDEBUG(D_WARNING, "Connection %p -> %s ESTABLISHED.\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid)); out: if (reason) { @@ -2444,6 +2466,7 @@ kibnal_pathreq_callback (void *arg, QUERY *query, kib_conn_t *conn = arg; PATH_RESULTS *path; FSTATUS frc; + lnet_nid_t nid; if (query_res->Status != FSUCCESS || query_res->ResultDataSize == 0) { CERROR ("status %d data size %d\n", query_res->Status, @@ -2513,9 +2536,11 @@ kibnal_pathreq_callback (void *arg, QUERY *query, /* Flag I'm getting involved with the CM... */ conn->ibc_state = IBNAL_CONN_CONNECTING; - CDEBUG(D_NET, "Connecting to, service id "LPX64", on "LPX64"\n", + nid = *kibnal_service_nid_field(&conn->ibc_connreq->cr_service); + + CDEBUG(D_NET, "Connecting to, service id "LPX64", on %s\n", conn->ibc_connreq->cr_service.RID.ServiceID, - *kibnal_service_nid_field(&conn->ibc_connreq->cr_service)); + libcfs_nid2str(nid)); memset(conn->ibc_connreq->cr_cmreq.PrivateData, 0, CM_REQUEST_INFO_USER_LEN); @@ -2560,6 +2585,7 @@ kibnal_service_get_callback (void *arg, QUERY *query, COMMAND_CONTROL_PARAMETERS sd_params; QUERY path_query; FSTATUS frc; + lnet_nid_t nid; if (query_res->Status != FSUCCESS || query_res->ResultDataSize == 0) { CERROR ("status %d data size %d\n", query_res->Status, @@ -2579,10 +2605,11 @@ kibnal_service_get_callback (void *arg, QUERY *query, dump_service_records(svc); conn->ibc_connreq->cr_service = svc->ServiceRecords[0]; - - CDEBUG(D_NET, "Got status %d, service id "LPX64", on "LPX64"\n", + nid = *kibnal_service_nid_field(&conn->ibc_connreq->cr_service); + + CDEBUG(D_NET, "Got status %d, service id "LPX64", on %s\n", query_res->Status , conn->ibc_connreq->cr_service.RID.ServiceID, - *kibnal_service_nid_field(&conn->ibc_connreq->cr_service)); + libcfs_nid2str(nid)); memset(&path_query, 0, sizeof(path_query)); path_query.InputType = InputTypePortGuidPair; @@ -2734,16 +2761,17 @@ kibnal_check_conns (int idx) if (!kibnal_conn_timed_out(conn)) continue; - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, peer->ibp_nid, + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_inc (&conn->ibc_refcount); read_unlock_irqrestore(&kibnal_data.kib_global_lock, flags); - CERROR("Timed out RDMA with "LPX64"\n", - peer->ibp_nid); + CERROR("Timed out RDMA with %s\n", + libcfs_nid2str(peer->ibp_nid)); kibnal_close_conn (conn, -ETIMEDOUT); kibnal_put_conn (conn); diff --git a/lnet/klnds/openiblnd/openiblnd_cb.c b/lnet/klnds/openiblnd/openiblnd_cb.c index 6eb28f7..1514408 100644 --- a/lnet/klnds/openiblnd/openiblnd_cb.c +++ b/lnet/klnds/openiblnd/openiblnd_cb.c @@ -825,8 +825,8 @@ kibnal_tx_callback (struct ib_cq_entry *e) kibnal_tx_done (tx); if (e->status != IB_COMPLETION_STATUS_SUCCESS) { - CERROR ("Tx completion to "LPX64" failed: %d\n", - conn->ibc_peer->ibp_nid, e->status); + CERROR ("Tx completion to %s failed: %d\n", + libcfs_nid2str(conn->ibc_peer->ibp_nid), e->status); kibnal_close_conn (conn, -ENETDOWN); } else { /* can I shovel some more sends out the door? */ @@ -985,8 +985,9 @@ kibnal_launch_tx (kib_tx_t *tx, lnet_nid_t nid) conn = kibnal_find_conn_locked (peer); if (conn != NULL) { /* Connection exists; queue message on it */ - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_inc (&conn->ibc_refcount); /* 1 ref for the tx */ write_unlock_irqrestore (g_lock, flags); @@ -1050,7 +1051,8 @@ kibnal_start_passive_rdma (int type, lnet_nid_t nid, 0, nob); if (rc != 0) { - CERROR ("Can't map RDMA for "LPX64": %d\n", nid, rc); + CERROR ("Can't map RDMA for %s: %d\n", + libcfs_nid2str(nid), rc); goto failed; } @@ -1059,8 +1061,8 @@ kibnal_start_passive_rdma (int type, lnet_nid_t nid, tx->tx_ptlmsg[1] = lnet_create_reply_msg(kibnal_data.kib_ni, nid, ptlmsg); if (tx->tx_ptlmsg[1] == NULL) { - CERROR ("Can't create reply for GET -> "LPX64"\n", - nid); + CERROR ("Can't create reply for GET -> %s\n", + libcfs_nid2str(nid)); rc = -ENOMEM; goto failed; } @@ -1142,9 +1144,9 @@ kibnal_start_active_rdma (int type, int status, tx = kibnal_get_idle_tx (0); /* Mustn't block */ if (tx == NULL) { - CERROR ("tx descs exhausted on RDMA from "LPX64 + CERROR ("tx descs exhausted on RDMA from %s" " completing locally with failure\n", - rx->rx_conn->ibc_peer->ibp_nid); + libcfs_nid2str(rx->rx_conn->ibc_peer->ibp_nid)); lnet_finalize (kibnal_data.kib_ni, NULL, ptlmsg, -ENOMEM); return; } @@ -1163,8 +1165,9 @@ kibnal_start_active_rdma (int type, int status, niov, iov, offset, nob); if (rc != 0) { - CERROR ("Can't map RDMA -> "LPX64": %d\n", - rx->rx_conn->ibc_peer->ibp_nid, rc); + CERROR ("Can't map RDMA -> %s: %d\n", + libcfs_nid2str(rx->rx_conn->ibc_peer->ibp_nid), + rc); /* We'll skip the RDMA and complete with failure. */ status = rc; nob = 0; @@ -1216,9 +1219,9 @@ kibnal_start_active_rdma (int type, int status, } /* +1 ref for this tx... */ - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", rx->rx_conn, rx->rx_conn->ibc_state, - rx->rx_conn->ibc_peer->ibp_nid, + libcfs_nid2str(rx->rx_conn->ibc_peer->ibp_nid), atomic_read (&rx->rx_conn->ibc_refcount)); atomic_inc (&rx->rx_conn->ibc_refcount); /* ...and queue it up */ @@ -1281,16 +1284,17 @@ kibnal_send(ptl_ni_t *ni, /* Incoming message consistent with immediate reply? */ if (rx->rx_msg->ibm_type != IBNAL_MSG_IMMEDIATE) { - CERROR ("REPLY to "LPX64" bad opbm type %d!!!\n", - target.nid, rx->rx_msg->ibm_type); + CERROR ("REPLY to %s bad opbm type %d!!!\n", + libcfs_nid2str(target.nid), + rx->rx_msg->ibm_type); return (-EIO); } /* Will it fit in a message? */ nob = offsetof(kib_msg_t, ibm_u.immediate.ibim_payload[payload_nob]); if (nob > IBNAL_MSG_SIZE) { - CERROR("REPLY for "LPX64" too big (RDMA not requested): %d\n", - target.nid, payload_nob); + CERROR("REPLY for %s too big (RDMA not requested): %d\n", + libcfs_nid2str(target.nid), payload_nob); return (-EIO); } break; @@ -1322,8 +1326,9 @@ kibnal_send(ptl_ni_t *ni, type == PTL_MSG_REPLY || in_interrupt())); if (tx == NULL) { - CERROR ("Can't send %d to "LPX64": tx descs exhausted%s\n", - type, target.nid, in_interrupt() ? " (intr)" : ""); + CERROR ("Can't send %d to %s: tx descs exhausted%s\n", + type, libcfs_nid2str(target.nid), + in_interrupt() ? " (intr)" : ""); return (-ENOMEM); } @@ -1373,8 +1378,9 @@ kibnal_recv (ptl_ni_t *ni, void *private, ptl_msg_t *ptlmsg, case IBNAL_MSG_IMMEDIATE: msg_nob = offsetof(kib_msg_t, ibm_u.immediate.ibim_payload[rlen]); if (msg_nob > IBNAL_MSG_SIZE) { - CERROR ("Immediate message from "LPX64" too big: %d\n", - rxmsg->ibm_u.immediate.ibim_hdr.src_nid, rlen); + CERROR ("Immediate message from %s too big: %d\n", + libcfs_nid2str(rxmsg->ibm_u.immediate.ibim_hdr.src_nid), + rlen); return (-EIO); } @@ -1432,7 +1438,8 @@ kibnal_close_conn_locked (kib_conn_t *conn, int error) kib_peer_t *peer = conn->ibc_peer; CDEBUG (error == 0 ? D_NET : D_ERROR, - "closing conn to "LPX64": error %d\n", peer->ibp_nid, error); + "closing conn to %s: error %d\n", + libcfs_nid2str(peer->ibp_nid), error); LASSERT (conn->ibc_state == IBNAL_CONN_ESTABLISHED || conn->ibc_state == IBNAL_CONN_CONNECTING); @@ -1442,8 +1449,9 @@ kibnal_close_conn_locked (kib_conn_t *conn, int error) list_del (&conn->ibc_list); } else { /* new ref for kib_reaper_conns */ - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_inc (&conn->ibc_refcount); } @@ -1540,8 +1548,8 @@ kibnal_peer_connect_failed (kib_peer_t *peer, int rc) write_unlock_irqrestore (&kibnal_data.kib_global_lock, flags); if (!list_empty (&zombies)) - CERROR ("Deleting messages for "LPX64": connection failed\n", - peer->ibp_nid); + CERROR ("Deleting messages for %s: connection failed\n", + libcfs_nid2str(peer->ibp_nid)); while (!list_empty (&zombies)) { tx = list_entry (zombies.next, kib_tx_t, tx_list); @@ -1607,8 +1615,9 @@ kibnal_connreq_done (kib_conn_t *conn, int status) /* +1 ref for ibc_list; caller(== CM)'s ref remains until * the IB_CM_IDLE callback */ - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_inc (&conn->ibc_refcount); list_add (&conn->ibc_list, &peer->ibp_conns); @@ -1625,8 +1634,9 @@ kibnal_connreq_done (kib_conn_t *conn, int status) list_del (&tx->tx_list); /* +1 ref for each tx */ - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_inc (&conn->ibc_refcount); kibnal_queue_tx_locked (tx, conn); @@ -1643,8 +1653,9 @@ kibnal_connreq_done (kib_conn_t *conn, int status) /* queue up all the receives */ for (i = 0; i < IBNAL_RX_MSGS; i++) { /* +1 ref for rx desc */ - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_inc (&conn->ibc_refcount); @@ -1690,17 +1701,18 @@ kibnal_accept_connreq (kib_conn_t **connp, tTS_IB_CM_COMM_ID cid, return -EPROTO; } - CDEBUG(D_NET, "connreq from "LPX64"\n", msg->ibm_srcnid); + CDEBUG(D_NET, "connreq from %s\n", libcfs_nid2str(msg->ibm_srcnid)); if (msg->ibm_type != IBNAL_MSG_CONNREQ) { - CERROR("Unexpected connreq msg type: %x from "LPX64"\n", - msg->ibm_type, msg->ibm_srcnid); + CERROR("Unexpected connreq msg type: %x from %s\n", + msg->ibm_type, libcfs_nid2str(msg->ibm_srcnid)); return -EPROTO; } if (msg->ibm_u.connparams.ibcp_queue_depth != IBNAL_MSG_QUEUE_SIZE) { - CERROR("Can't accept "LPX64": bad queue depth %d (%d expected)\n", - msg->ibm_srcnid, msg->ibm_u.connparams.ibcp_queue_depth, + CERROR("Can't accept %s: bad queue depth %d (%d expected)\n", + libcfs_nid2str(msg->ibm_srcnid), + msg->ibm_u.connparams.ibcp_queue_depth, IBNAL_MSG_QUEUE_SIZE); return (-EPROTO); } @@ -1712,8 +1724,9 @@ kibnal_accept_connreq (kib_conn_t **connp, tTS_IB_CM_COMM_ID cid, /* assume 'nid' is a new peer */ rc = kibnal_create_peer(&peer, msg->ibm_srcnid); if (rc != 0) { - CDEBUG(D_NET, "--conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, conn->ibc_peer->ibp_nid, + CDEBUG(D_NET, "--conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(conn->ibc_peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_dec (&conn->ibc_refcount); kibnal_destroy_conn(conn); @@ -1731,8 +1744,8 @@ kibnal_accept_connreq (kib_conn_t **connp, tTS_IB_CM_COMM_ID cid, msg->ibm_dststamp != kibnal_data.kib_incarnation) { write_unlock_irqrestore (&kibnal_data.kib_global_lock, flags); - CERROR("Stale connection params from "LPX64"\n", - msg->ibm_srcnid); + CERROR("Stale connection params from %s\n", + libcfs_nid2str(msg->ibm_srcnid)); atomic_dec(&conn->ibc_refcount); kibnal_destroy_conn(conn); kibnal_put_peer(peer); @@ -1795,20 +1808,20 @@ kibnal_conn_callback (tTS_IB_CM_EVENT event, switch (event) { default: - CERROR("Connection %p -> "LPX64" ERROR %d\n", - conn, conn->ibc_peer->ibp_nid, event); + CERROR("Connection %p -> %s ERROR %d\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid), event); kibnal_close_conn (conn, -ECONNABORTED); break; case TS_IB_CM_DISCONNECTED: - CDEBUG(D_WARNING, "Connection %p -> "LPX64" DISCONNECTED.\n", - conn, conn->ibc_peer->ibp_nid); + CDEBUG(D_WARNING, "Connection %p -> %s DISCONNECTED.\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid)); kibnal_close_conn (conn, 0); break; case TS_IB_CM_IDLE: - CDEBUG(D_NET, "Connection %p -> "LPX64" IDLE.\n", - conn, conn->ibc_peer->ibp_nid); + CDEBUG(D_NET, "Connection %p -> %s IDLE.\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid)); /* LASSERT (no further callbacks) */ rc = tsIbCmCallbackModify(cid, kibnal_bad_conn_callback, conn); @@ -1886,9 +1899,9 @@ kibnal_passive_conn_callback (tTS_IB_CM_EVENT event, return TS_IB_CM_CALLBACK_ABORT; } - CERROR ("%s event %p -> "LPX64": %d\n", + CERROR ("%s event %p -> %s: %d\n", (event == TS_IB_CM_IDLE) ? "IDLE" : "Unexpected", - conn, conn->ibc_peer->ibp_nid, event); + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid), event); kibnal_connreq_done(conn, -ECONNABORTED); kibnal_put_conn(conn); /* drop CM's ref */ return TS_IB_CM_CALLBACK_ABORT; @@ -1900,13 +1913,13 @@ kibnal_passive_conn_callback (tTS_IB_CM_EVENT event, LASSERT (conn == NULL); /* Don't really know srcnid until successful unpack */ - CDEBUG(D_NET, "REQ from ?"LPX64"?\n", msg->ibm_srcnid); + CDEBUG(D_NET, "REQ from ?%s?\n", libcfs_nid2str(msg->ibm_srcnid)); rc = kibnal_accept_connreq(&conn, cid, msg, req->remote_private_data_len); if (rc != 0) { - CERROR ("Can't accept ?"LPX64"?: %d\n", - msg->ibm_srcnid, rc); + CERROR ("Can't accept ?%s?: %d\n", + libcfs_nid2str(msg->ibm_srcnid), rc); return TS_IB_CM_CALLBACK_ABORT; } @@ -1937,8 +1950,8 @@ kibnal_passive_conn_callback (tTS_IB_CM_EVENT event, case TS_IB_CM_ESTABLISHED: LASSERT (conn != NULL); - CDEBUG(D_WARNING, "Connection %p -> "LPX64" ESTABLISHED.\n", - conn, conn->ibc_peer->ibp_nid); + CDEBUG(D_WARNING, "Connection %p -> %s ESTABLISHED.\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid)); kibnal_connreq_done(conn, 0); return TS_IB_CM_CALLBACK_PROCEED; @@ -1963,16 +1976,17 @@ kibnal_active_conn_callback (tTS_IB_CM_EVENT event, rc = kibnal_unpack_msg(msg, nob); if (rc != 0) { - CERROR ("Error %d unpacking conn ack from "LPX64"\n", - rc, conn->ibc_peer->ibp_nid); + CERROR ("Error %d unpacking conn ack from %s\n", + rc, libcfs_nid2str(conn->ibc_peer->ibp_nid)); kibnal_connreq_done(conn, rc); kibnal_put_conn(conn); /* drop CM's ref */ return TS_IB_CM_CALLBACK_ABORT; } if (msg->ibm_type != IBNAL_MSG_CONNACK) { - CERROR ("Unexpected conn ack type %d from "LPX64"\n", - msg->ibm_type, conn->ibc_peer->ibp_nid); + CERROR ("Unexpected conn ack type %d from %s\n", + msg->ibm_type, + libcfs_nid2str(conn->ibc_peer->ibp_nid)); kibnal_connreq_done(conn, -EPROTO); kibnal_put_conn(conn); /* drop CM's ref */ return TS_IB_CM_CALLBACK_ABORT; @@ -1983,39 +1997,39 @@ kibnal_active_conn_callback (tTS_IB_CM_EVENT event, msg->ibm_dstnid) || msg->ibm_srcstamp != conn->ibc_incarnation || msg->ibm_dststamp != kibnal_data.kib_incarnation) { - CERROR("Stale conn ack from "LPX64"\n", - conn->ibc_peer->ibp_nid); + CERROR("Stale conn ack from %s\n", + libcfs_nid2str(conn->ibc_peer->ibp_nid)); kibnal_connreq_done(conn, -ESTALE); kibnal_put_conn(conn); /* drop CM's ref */ return TS_IB_CM_CALLBACK_ABORT; } if (msg->ibm_u.connparams.ibcp_queue_depth != IBNAL_MSG_QUEUE_SIZE) { - CERROR ("Bad queue depth %d from "LPX64"\n", + CERROR ("Bad queue depth %d from %s\n", msg->ibm_u.connparams.ibcp_queue_depth, - conn->ibc_peer->ibp_nid); + libcfs_nid2str(conn->ibc_peer->ibp_nid)); kibnal_connreq_done(conn, -EPROTO); kibnal_put_conn(conn); /* drop CM's ref */ return TS_IB_CM_CALLBACK_ABORT; } - CDEBUG(D_NET, "Connection %p -> "LPX64" REP_RECEIVED.\n", - conn, conn->ibc_peer->ibp_nid); + CDEBUG(D_NET, "Connection %p -> %s REP_RECEIVED.\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid)); conn->ibc_credits = IBNAL_MSG_QUEUE_SIZE; return TS_IB_CM_CALLBACK_PROCEED; } case TS_IB_CM_ESTABLISHED: - CDEBUG(D_WARNING, "Connection %p -> "LPX64" ESTABLISHED\n", - conn, conn->ibc_peer->ibp_nid); + CDEBUG(D_WARNING, "Connection %p -> %s ESTABLISHED\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid)); kibnal_connreq_done(conn, 0); return TS_IB_CM_CALLBACK_PROCEED; case TS_IB_CM_IDLE: - CERROR("Connection %p -> "LPX64" IDLE\n", - conn, conn->ibc_peer->ibp_nid); + CERROR("Connection %p -> %s IDLE\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid)); /* I assume this connection attempt was rejected because the * peer found a stale QP; I'll just try again */ write_lock_irqsave(&kibnal_data.kib_global_lock, flags); @@ -2027,8 +2041,8 @@ kibnal_active_conn_callback (tTS_IB_CM_EVENT event, return TS_IB_CM_CALLBACK_ABORT; default: - CERROR("Connection %p -> "LPX64" ERROR %d\n", - conn, conn->ibc_peer->ibp_nid, event); + CERROR("Connection %p -> %s ERROR %d\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid), event); kibnal_connreq_done(conn, -ECONNABORTED); kibnal_put_conn(conn); /* drop CM's ref */ return TS_IB_CM_CALLBACK_ABORT; @@ -2045,8 +2059,8 @@ kibnal_pathreq_callback (tTS_IB_CLIENT_QUERY_TID tid, int status, kib_msg_t *msg = &conn->ibc_connreq->cr_msg; if (status != 0) { - CERROR ("Pathreq %p -> "LPX64" failed: %d\n", - conn, conn->ibc_peer->ibp_nid, status); + CERROR ("Pathreq %p -> %s failed: %d\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid), status); kibnal_connreq_done(conn, status); kibnal_put_conn(conn); /* drop callback's ref */ return 1; /* non-zero prevents further callbacks */ @@ -2077,8 +2091,9 @@ kibnal_pathreq_callback (tTS_IB_CLIENT_QUERY_TID tid, int status, /* Flag I'm getting involved with the CM... */ conn->ibc_state = IBNAL_CONN_CONNECTING; - CDEBUG(D_NET, "Connecting to, service id "LPX64", on "LPX64"\n", - conn->ibc_connreq->cr_svcrsp.ibsr_svc_id, peer->ibp_nid); + CDEBUG(D_NET, "Connecting to, service id "LPX64", on %s\n", + conn->ibc_connreq->cr_svcrsp.ibsr_svc_id, + libcfs_nid2str(peer->ibp_nid)); /* kibnal_connect_callback gets my conn ref */ status = ib_cm_connect (&conn->ibc_connreq->cr_connparam, @@ -2087,8 +2102,8 @@ kibnal_pathreq_callback (tTS_IB_CLIENT_QUERY_TID tid, int status, kibnal_active_conn_callback, conn, &conn->ibc_comm_id); if (status != 0) { - CERROR ("Connect %p -> "LPX64" failed: %d\n", - conn, conn->ibc_peer->ibp_nid, status); + CERROR ("Connect %p -> %s failed: %d\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid), status); /* Back out state change: I've not got a CM comm_id yet... */ conn->ibc_state = IBNAL_CONN_INIT_QP; kibnal_connreq_done(conn, status); @@ -2150,8 +2165,8 @@ kibnal_connect_peer (kib_peer_t *peer) if (rc == 0) return; /* callback now has my ref on conn */ - CERROR ("Path record request %p -> "LPX64" failed: %d\n", - conn, conn->ibc_peer->ibp_nid, rc); + CERROR ("Path record request %p -> %s failed: %d\n", + conn, libcfs_nid2str(conn->ibc_peer->ibp_nid), rc); kibnal_connreq_done(conn, rc); kibnal_put_conn(conn); /* drop my ref */ } @@ -2230,16 +2245,17 @@ kibnal_check_conns (int idx) if (!kibnal_conn_timed_out(conn)) continue; - CDEBUG(D_NET, "++conn[%p] state %d -> "LPX64" (%d)\n", - conn, conn->ibc_state, peer->ibp_nid, + CDEBUG(D_NET, "++conn[%p] state %d -> %s (%d)\n", + conn, conn->ibc_state, + libcfs_nid2str(peer->ibp_nid), atomic_read (&conn->ibc_refcount)); atomic_inc (&conn->ibc_refcount); read_unlock_irqrestore(&kibnal_data.kib_global_lock, flags); - CERROR("Timed out RDMA with "LPX64"\n", - peer->ibp_nid); + CERROR("Timed out RDMA with %s\n", + libcfs_nid2str(peer->ibp_nid)); kibnal_close_conn (conn, -ETIMEDOUT); kibnal_put_conn (conn); @@ -2263,8 +2279,8 @@ kibnal_terminate_conn (kib_conn_t *conn) rc = ib_cm_disconnect (conn->ibc_comm_id); if (rc != 0) - CERROR ("Error %d disconnecting conn %p -> "LPX64"\n", - rc, conn, conn->ibc_peer->ibp_nid); + CERROR ("Error %d disconnecting conn %p -> %s\n", + rc, conn, libcfs_nid2str(conn->ibc_peer->ibp_nid)); } int diff --git a/lnet/klnds/ralnd/ralnd.h b/lnet/klnds/ralnd/ralnd.h index 9d91db4..f5b912f 100644 --- a/lnet/klnds/ralnd/ralnd.h +++ b/lnet/klnds/ralnd/ralnd.h @@ -364,7 +364,7 @@ extern void kranal_destroy_conn(kra_conn_t *conn); static inline void kranal_peer_addref(kra_peer_t *peer) { - CDEBUG(D_NET, "%p->"LPX64"\n", peer, peer->rap_nid); + CDEBUG(D_NET, "%p->%s\n", peer, libcfs_nid2str(peer->rap_nid)); LASSERT(atomic_read(&peer->rap_refcount) > 0); atomic_inc(&peer->rap_refcount); } @@ -372,7 +372,7 @@ kranal_peer_addref(kra_peer_t *peer) static inline void kranal_peer_decref(kra_peer_t *peer) { - CDEBUG(D_NET, "%p->"LPX64"\n", peer, peer->rap_nid); + CDEBUG(D_NET, "%p->%s\n", peer, libcfs_nid2str(peer->rap_nid)); LASSERT(atomic_read(&peer->rap_refcount) > 0); if (atomic_dec_and_test(&peer->rap_refcount)) kranal_destroy_peer(peer); @@ -396,7 +396,8 @@ kranal_peer_active(kra_peer_t *peer) static inline void kranal_conn_addref(kra_conn_t *conn) { - CDEBUG(D_NET, "%p->"LPX64"\n", conn, conn->rac_peer->rap_nid); + CDEBUG(D_NET, "%p->%s\n", conn, + libcfs_nid2str(conn->rac_peer->rap_nid)); LASSERT(atomic_read(&conn->rac_refcount) > 0); atomic_inc(&conn->rac_refcount); } @@ -404,7 +405,8 @@ kranal_conn_addref(kra_conn_t *conn) static inline void kranal_conn_decref(kra_conn_t *conn) { - CDEBUG(D_NET, "%p->"LPX64"\n", conn, conn->rac_peer->rap_nid); + CDEBUG(D_NET, "%p->%s\n", conn, + libcfs_nid2str(conn->rac_peer->rap_nid)); LASSERT(atomic_read(&conn->rac_refcount) > 0); if (atomic_dec_and_test(&conn->rac_refcount)) kranal_destroy_conn(conn); diff --git a/lnet/klnds/viblnd/viblnd.h b/lnet/klnds/viblnd/viblnd.h index d8c7021..6d88f8d 100644 --- a/lnet/klnds/viblnd/viblnd.h +++ b/lnet/klnds/viblnd/viblnd.h @@ -483,8 +483,8 @@ do { \ #define kibnal_peer_addref(peer) \ do { \ - CDEBUG(D_NET, "peer[%p] -> "LPX64" (%d)++\n", \ - (peer), (peer)->ibp_nid, \ + CDEBUG(D_NET, "peer[%p] -> %s (%d)++\n", \ + (peer), libcfs_nid2str((peer)->ibp_nid), \ atomic_read (&(peer)->ibp_refcount)); \ LASSERT(atomic_read(&(peer)->ibp_refcount) > 0); \ atomic_inc(&(peer)->ibp_refcount); \ @@ -492,8 +492,8 @@ do { \ #define kibnal_peer_decref(peer) \ do { \ - CDEBUG(D_NET, "peer[%p] -> "LPX64" (%d)--\n", \ - (peer), (peer)->ibp_nid, \ + CDEBUG(D_NET, "peer[%p] -> %s (%d)--\n", \ + (peer), libcfs_nid2str((peer)->ibp_nid), \ atomic_read (&(peer)->ibp_refcount)); \ LASSERT(atomic_read(&(peer)->ibp_refcount) > 0); \ if (atomic_dec_and_test(&(peer)->ibp_refcount)) \ diff --git a/lnet/libcfs/module.c b/lnet/libcfs/module.c index 60aa493..02d90b9 100644 --- a/lnet/libcfs/module.c +++ b/lnet/libcfs/module.c @@ -286,8 +286,8 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, void *a extern void (kping_client)(struct portal_ioctl_data *); void (*ping)(struct portal_ioctl_data *); - CDEBUG(D_IOCTL, "doing %d pings to nid "LPX64" (%s)\n", - data->ioc_count, data->ioc_nid, + CDEBUG(D_IOCTL, "doing %d pings to nid %s (%s)\n", + data->ioc_count, libcfs_nid2str(data->ioc_nid), libcfs_nid2str(data->ioc_nid)); ping = PORTAL_SYMBOL_GET(kping_client); if (!ping) diff --git a/lnet/lnet/lib-msg.c b/lnet/lnet/lib-msg.c index d8389b7..1b77d0a 100644 --- a/lnet/lnet/lib-msg.c +++ b/lnet/lnet/lib-msg.c @@ -88,8 +88,8 @@ lnet_finalize (ptl_ni_t *ni, void *private, ptl_msg_t *msg, int status) msg->msg_ev.initiator, NULL, 0, 0); if (rc != 0) { /* send failed: there's nothing else to clean up. */ - CERROR("Error %d sending ACK to "LPX64"\n", - rc, msg->msg_ev.initiator.nid); + CERROR("Error %d sending ACK to %s\n", + rc, libcfs_id2str(msg->msg_ev.initiator)); } } diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c index 9372b01..8dfb553 100644 --- a/lnet/lnet/router.c +++ b/lnet/lnet/router.c @@ -202,10 +202,12 @@ kpr_ge_isbetter (kpr_gateway_entry_t *ge1, kpr_gateway_entry_t *ge2) atomic_read (&ge2->kpge_weight)) & significant_bits; int rc = (diff > (significant_bits >> 1)); - CDEBUG(D_NET, "[%p]"LPX64"=%d %s [%p]"LPX64"=%d\n", - ge1, ge1->kpge_nid, atomic_read (&ge1->kpge_weight), + CDEBUG(D_NET, "[%p]%s=%d %s [%p]%s=%d\n", + ge1, libcfs_nid2str(ge1->kpge_nid), + atomic_read (&ge1->kpge_weight), rc ? ">" : "<", - ge2, ge2->kpge_nid, atomic_read (&ge2->kpge_weight)); + ge2, libcfs_nid2str(ge2->kpge_nid), + atomic_read (&ge2->kpge_weight)); return (rc); } @@ -221,8 +223,8 @@ kpr_update_weight (kpr_gateway_entry_t *ge, int nob) * rounded and scaled to the portals header size, so we get better * use of the significant bits in kpge_weight. */ - CDEBUG(D_NET, "gateway [%p]"LPX64" += %d\n", ge, - ge->kpge_nid, weight); + CDEBUG(D_NET, "gateway [%p]%s += %d\n", ge, + libcfs_nid2str(ge->kpge_nid), weight); atomic_add (weight, &ge->kpge_weight); } @@ -244,7 +246,7 @@ lnet_lookup (ptl_ni_t **nip, lnet_nid_t target_nid, int nob) /* Return the NID I must send to, to reach 'target_nid' */ - CDEBUG (D_NET, "lookup "LPX64" from %s\n", target_nid, + CDEBUG (D_NET, "lookup %s from %s\n", libcfs_nid2str(target_nid), (ni == NULL) ? "<>" : libcfs_nid2str(ni->ni_nid)); if (ni == NULL) { /* ni not determined yet */ diff --git a/lnet/tests/ping_cli.c b/lnet/tests/ping_cli.c index 54086e3..181900b 100644 --- a/lnet/tests/ping_cli.c +++ b/lnet/tests/ping_cli.c @@ -117,9 +117,9 @@ pingcli_start(struct portal_ioctl_data *args) client->size = args->ioc_u32[0]; client->timeout = args->ioc_u32[1]; - CDEBUG (D_OTHER, "pingcli_setup args: nid "LPX64" (%s), \ + CDEBUG (D_OTHER, "pingcli_setup args: nid %s (%s), \ size %u, count: %u, timeout: %u\n", - client->nid, + libcfs_nid2str(client->nid), libcfs_nid2str(client->nid), client->size, client->count, client->timeout); diff --git a/lnet/tests/ping_srv.c b/lnet/tests/ping_srv.c index c407fb7..90e11c5 100644 --- a/lnet/tests/ping_srv.c +++ b/lnet/tests/ping_srv.c @@ -165,9 +165,10 @@ static void pingsrv_callback(lnet_event_t *ev) } server->evnt = *ev; - CWARN ("received ping from nid "LPX64" " + CWARN ("received ping from nid %s " "(off=%u rlen=%u mlen=%u head=%x seq=%d size=%d)\n", - ev->initiator.nid, ev->offset, ev->rlength, ev->mlength, + libcfs_nid2str(ev->initiator.nid), + ev->offset, ev->rlength, ev->mlength, __le32_to_cpu(*((int *)(ev->md.start + ev->offset))), __le32_to_cpu(*((int *)(ev->md.start + ev->offset + sizeof(unsigned)))), __le32_to_cpu(*((int *)(ev->md.start + ev->offset + 2 * diff --git a/lnet/tests/sping_cli.c b/lnet/tests/sping_cli.c index d7d4813..d21cf65 100644 --- a/lnet/tests/sping_cli.c +++ b/lnet/tests/sping_cli.c @@ -110,9 +110,9 @@ pingcli_start(struct portal_ioctl_data *args) client->size = args->ioc_u32[0]; client->timeout = args->ioc_u32[1]; - CDEBUG (D_OTHER, "pingcli_setup args: nid "LPX64" (%s), " + CDEBUG (D_OTHER, "pingcli_setup args: nid %s (%s), " "size %u, count: %u, timeout: %u\n", - client->nid, + libcfs_nid2str(client->nid), libcfs_nid2str(client->nid), client->size, client->count, client->timeout); diff --git a/lnet/tests/sping_srv.c b/lnet/tests/sping_srv.c index 8ff3860..e22eea5 100644 --- a/lnet/tests/sping_srv.c +++ b/lnet/tests/sping_srv.c @@ -174,9 +174,10 @@ static void pingsrv_callback(lnet_event_t *ev) } server->evnt = *ev; - CWARN("Lustre: received ping from nid "LPX64" " + CWARN("Lustre: received ping from %s " "(off=%u rlen=%u mlen=%u head=%x)\n", - ev->initiator.nid, ev->offset, ev->rlength, ev->mlength, + libcfs_id2str(ev->initiator), + ev->offset, ev->rlength, ev->mlength, *((int *)(ev->md.start + ev->offset))); packets_valid++; -- 1.8.3.1