From: James Simmons Date: Tue, 7 Jun 2016 15:02:27 +0000 (-0400) Subject: LU-6245 libcfs: remove types abstraction from libcfs/LNet code X-Git-Tag: 2.8.55~61 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=2b8c4566a6a63cdf09e555a744ce6a1453651b98 LU-6245 libcfs: remove types abstraction from libcfs/LNet code Originally when lustre code was built for userland we needed a proper way to handle 32 bit and 64 bit platforms when reporting unsigned longs. Now that this code is only built for kernel space and the kernel has it own special string handling functions we don't need this abstraction anymore. The libcfs types.h is not removed yet so not to break any other patches ready to land. Had checkpatch.pl updated to report to developers to not use the LP* abstraction. This patch only updates the LNet/libcfs layers. Change-Id: I0a338b4eb181d86b9c7d0f535d8c12c9f7045fb3 Signed-off-by: James Simmons Reviewed-on: http://review.whamcloud.com/20204 Reviewed-by: Frank Zago Tested-by: Jenkins Reviewed-by: Dmitry Eremin Tested-by: Maloo Reviewed-by: Oleg Drokin --- diff --git a/contrib/scripts/checkpatch.pl b/contrib/scripts/checkpatch.pl index 372ed4c..aff1404 100755 --- a/contrib/scripts/checkpatch.pl +++ b/contrib/scripts/checkpatch.pl @@ -465,6 +465,17 @@ my %dep_functions = ( 'ldlm_type_t', 'enum ldlm_type', 'ldlm_wire_policy_data_t', 'union ldlm_wire_policy_data', + 'LPU64' '%llu' + 'LPD64' '%lld' + 'LPX64' '%#llx' + 'LPX64i' '%llx' + 'LPO64' '%#llo' + + 'LPLU' '%lu' + 'LPLD' '%ld' + 'LPLX' '%#lx' + 'LPPID' '%d' + 'LPROCFS', 'CONFIG_PROC_FS', 'mktemp', 'mkstemp', 'sprintf', 'snprintf', diff --git a/libcfs/include/libcfs/libcfs_debug.h b/libcfs/include/libcfs/libcfs_debug.h index 51fcf28..b481bbe 100644 --- a/libcfs/include/libcfs/libcfs_debug.h +++ b/libcfs/include/libcfs/libcfs_debug.h @@ -291,13 +291,13 @@ do { \ #if defined(CDEBUG_ENTRY_EXIT) && defined(__KERNEL__) void libcfs_log_goto(struct libcfs_debug_msg_data *goto_data, - const char *label, long_ptr_t rc); + const char *label, long rc); # define GOTO(label, rc) \ do { \ if (cfs_cdebug_show(D_TRACE, DEBUG_SUBSYSTEM)) { \ LIBCFS_DEBUG_MSG_DATA_DECL(_goto_data, D_TRACE, NULL); \ - libcfs_log_goto(&_goto_data, #label, (long_ptr_t)(rc)); \ + libcfs_log_goto(&_goto_data, #label, (long)(rc)); \ } else { \ (void)(rc); \ } \ @@ -329,7 +329,7 @@ do { \ if (cfs_cdebug_show(D_TRACE, DEBUG_SUBSYSTEM)) { \ typeof(rc) __rc = (rc); \ LIBCFS_DEBUG_MSG_DATA_DECL(msgdata, D_TRACE, NULL); \ - libcfs_log_return(&msgdata, (long_ptr_t)__rc); \ + libcfs_log_return(&msgdata, (long)__rc); \ return __rc; \ } \ \ diff --git a/libcfs/include/libcfs/libcfs_prim.h b/libcfs/include/libcfs/libcfs_prim.h index 44cfdae..06ae853 100644 --- a/libcfs/include/libcfs/libcfs_prim.h +++ b/libcfs/include/libcfs/libcfs_prim.h @@ -45,7 +45,7 @@ /* * Timer */ -typedef void (cfs_timer_func_t)(ulong_ptr_t); +typedef void (cfs_timer_func_t)(uintptr_t); void cfs_init_timer(struct timer_list *t); void cfs_timer_init(struct timer_list *t, cfs_timer_func_t *func, void *arg); diff --git a/libcfs/include/libcfs/types.h b/libcfs/include/libcfs/types.h index 171e380..5a80d09 100644 --- a/libcfs/include/libcfs/types.h +++ b/libcfs/include/libcfs/types.h @@ -65,7 +65,4 @@ # error "cannot define L{I,L,P}_POISON" #endif /* BITS_PER_LONG != 32 */ -typedef unsigned long ulong_ptr_t; -typedef long long_ptr_t; - #endif /* _LIBCFS_TYPES_H */ diff --git a/libcfs/libcfs/debug.c b/libcfs/libcfs/debug.c index bce0b57..673dc9b 100644 --- a/libcfs/libcfs/debug.c +++ b/libcfs/libcfs/debug.c @@ -231,8 +231,8 @@ void libcfs_debug_dumplog_internal(void *arg) current_time > last_dump_time) { last_dump_time = current_time; snprintf(debug_file_name, sizeof(debug_file_name) - 1, - "%s.%ld." LPLD, libcfs_debug_file_path_arr, - current_time, (long_ptr_t)arg); + "%s.%ld.%ld", libcfs_debug_file_path_arr, + current_time, (uintptr_t)arg); printk(KERN_ALERT "LustreError: dumping log to %s\n", debug_file_name); cfs_tracefile_dump_all_pages(debug_file_name); @@ -349,9 +349,9 @@ long libcfs_log_return(struct libcfs_debug_msg_data *msgdata, long rc) EXPORT_SYMBOL(libcfs_log_return); void libcfs_log_goto(struct libcfs_debug_msg_data *msgdata, const char *label, - long_ptr_t rc) + long rc) { - libcfs_debug_msg(msgdata, "Process leaving via %s (rc=" LPLU " : " LPLD - " : " LPLX ")\n", label, (ulong_ptr_t)rc, rc, rc); + libcfs_debug_msg(msgdata, "Process leaving via %s (rc=%lu : %ld" + " : %#lx)\n", label, rc, rc, rc); } EXPORT_SYMBOL(libcfs_log_goto); diff --git a/libcfs/libcfs/watchdog.c b/libcfs/libcfs/watchdog.c index 514bcf9..95a0177 100644 --- a/libcfs/libcfs/watchdog.c +++ b/libcfs/libcfs/watchdog.c @@ -107,7 +107,7 @@ lcw_dump(struct lc_watchdog *lcw) ENTRY; rcu_read_lock(); if (lcw->lcw_task == NULL) { - LCONSOLE_WARN("Process " LPPID " was not found in the task " + LCONSOLE_WARN("Process %d was not found in the task " "list; watchdog callback may be incomplete\n", (int)lcw->lcw_pid); } else { @@ -118,7 +118,7 @@ lcw_dump(struct lc_watchdog *lcw) EXIT; } -static void lcw_cb(ulong_ptr_t data) +static void lcw_cb(uintptr_t data) { struct lc_watchdog *lcw = (struct lc_watchdog *)data; ENTRY; @@ -209,7 +209,7 @@ static void lcw_dump_stack(struct lc_watchdog *lcw) static void lc_watchdog_dumplog(pid_t pid, void *data) { - libcfs_debug_dumplog_internal((void *)((long_ptr_t)pid)); + libcfs_debug_dumplog_internal((void *)((uintptr_t)pid)); } static int lcw_dispatch_main(void *data) @@ -272,7 +272,7 @@ static int lcw_dispatch_main(void *data) spin_unlock_bh(&lcw_pending_timers_lock); spin_unlock_bh(&lcw->lcw_lock); - CDEBUG(D_INFO, "found lcw for pid " LPPID "\n", + CDEBUG(D_INFO, "found lcw for pid %d\n", lcw->lcw_pid); lcw_dump_stack(lcw); diff --git a/lnet/klnds/gnilnd/gnilnd.c b/lnet/klnds/gnilnd/gnilnd.c index 1fa2bbc..7ccfbf2 100644 --- a/lnet/klnds/gnilnd/gnilnd.c +++ b/lnet/klnds/gnilnd/gnilnd.c @@ -117,8 +117,8 @@ kgnilnd_close_stale_conns_locked(kgn_peer_t *peer, kgn_conn_t *newconn) newconn->gnc_peer_connstamp == conn->gnc_my_connstamp) { CDEBUG(D_NET, "skipping prune of %p, " "loopback and matching stamps" - " connstamp "LPU64"("LPU64")" - " peerstamp "LPU64"("LPU64")\n", + " connstamp %llu(%llu)" + " peerstamp %llu(%llu)\n", conn, newconn->gnc_my_connstamp, conn->gnc_peer_connstamp, newconn->gnc_peer_connstamp, @@ -128,25 +128,25 @@ kgnilnd_close_stale_conns_locked(kgn_peer_t *peer, kgn_conn_t *newconn) if (conn->gnc_peerstamp != newconn->gnc_peerstamp) { LASSERTF(conn->gnc_peerstamp < newconn->gnc_peerstamp, - "conn 0x%p peerstamp "LPU64" >= " - "newconn 0x%p peerstamp "LPU64"\n", + "conn 0x%p peerstamp %llu >= " + "newconn 0x%p peerstamp %llu\n", conn, conn->gnc_peerstamp, newconn, newconn->gnc_peerstamp); CDEBUG(D_NET, "Closing stale conn nid: %s " - " peerstamp:"LPX64"("LPX64")\n", + " peerstamp:%#llx(%#llx)\n", libcfs_nid2str(peer->gnp_nid), conn->gnc_peerstamp, newconn->gnc_peerstamp); } else { LASSERTF(conn->gnc_peer_connstamp < newconn->gnc_peer_connstamp, - "conn 0x%p peer_connstamp "LPU64" >= " - "newconn 0x%p peer_connstamp "LPU64"\n", + "conn 0x%p peer_connstamp %llu >= " + "newconn 0x%p peer_connstamp %llu\n", conn, conn->gnc_peer_connstamp, newconn, newconn->gnc_peer_connstamp); CDEBUG(D_NET, "Closing stale conn nid: %s" - " connstamp:"LPU64"("LPU64")\n", + " connstamp:%llu(%llu)\n", libcfs_nid2str(peer->gnp_nid), conn->gnc_peer_connstamp, newconn->gnc_peer_connstamp); } @@ -175,8 +175,8 @@ kgnilnd_conn_isdup_locked(kgn_peer_t *peer, kgn_conn_t *newconn) list_for_each(tmp, &peer->gnp_conns) { conn = list_entry(tmp, kgn_conn_t, gnc_list); CDEBUG(D_NET, "checking conn 0x%p for peer %s" - " lo %d new "LPU64" existing "LPU64 - " new peer "LPU64" existing peer "LPU64 + " lo %d new %llu existing %llu" + " new peer %llu existing peer %llu" " new dev %p existing dev %p\n", conn, libcfs_nid2str(peer->gnp_nid), loopback, @@ -924,8 +924,8 @@ kgnilnd_set_conn_params(kgn_dgram_t *dgram) /* log this for help in debuggin SMSG buffer re-use */ CDEBUG(D_NET, "conn %p src %s dst %s smsg %p acquired" - " local cqid %u SMSG %p->%u hndl "LPX64"."LPX64 - " remote cqid %u SMSG %p->%u hndl "LPX64"."LPX64"\n", + " local cqid %u SMSG %p->%u hndl %#llx.%#llx" + " remote cqid %u SMSG %p->%u hndl %#llx.%#llx\n", conn, libcfs_nid2str(connreq->gncr_srcnid), libcfs_nid2str(connreq->gncr_dstnid), &conn->gnpr_smsg_attr, @@ -1224,7 +1224,7 @@ kgnilnd_release_purgatory_list(struct list_head *conn_list) list_for_each_entry_safe(gmp, gmpN, &conn->gnc_mdd_list, gmp_list) { CDEBUG(D_NET, - "dev %p releasing held mdd "LPX64"."LPX64"\n", + "dev %p releasing held mdd %#llx.%#llx\n", conn->gnc_device, gmp->gmp_map_key.qword1, gmp->gmp_map_key.qword2); @@ -2132,7 +2132,7 @@ kgnilnd_dev_fini(kgn_device_t *dev) dev->gnd_map_nphys, dev->gnd_map_physnop); LASSERTF(dev->gnd_map_nvirt == 0 && dev->gnd_map_virtnob == 0, - "%d virtual mappings of "LPU64" bytes still mapped\n", + "%d virtual mappings of %llu bytes still mapped\n", dev->gnd_map_nvirt, dev->gnd_map_virtnob); LASSERTF(atomic_read(&dev->gnd_n_mdd) == 0 && diff --git a/lnet/klnds/gnilnd/gnilnd_api_wrap.h b/lnet/klnds/gnilnd/gnilnd_api_wrap.h index 0a5a562..b711a0d 100644 --- a/lnet/klnds/gnilnd/gnilnd_api_wrap.h +++ b/lnet/klnds/gnilnd/gnilnd_api_wrap.h @@ -476,7 +476,7 @@ static inline gni_return_t kgnilnd_get_quiesce_status( #undef apick_fmt #define apick_fn "kgnilnd_cq_create" -#define apick_fmt "0x%p, %u, %u, 0x%p, "LPX64", 0x%p" +#define apick_fmt "0x%p, %u, %u, 0x%p, %#llx, 0x%p" static inline gni_return_t kgnilnd_cq_create( IN gni_nic_handle_t nic_hndl, IN uint32_t entry_count, @@ -964,7 +964,7 @@ static inline gni_return_t kgnilnd_ep_destroy( #undef apick_fmt #define apick_fn "kgnilnd_ep_postdata_w_id" -#define apick_fmt "0x%p, 0x%p, %d, 0x%p, %d, "LPU64"" +#define apick_fmt "0x%p, 0x%p, %d, 0x%p, %d, %llu" static inline gni_return_t kgnilnd_ep_postdata_w_id( IN gni_ep_handle_t ep_hndl, IN void *in_data, @@ -1010,7 +1010,7 @@ static inline gni_return_t kgnilnd_ep_postdata_w_id( #undef apick_fmt #define apick_fn "kgnilnd_ep_postdata_test_by_id" -#define apick_fmt "0x%p, "LPU64", 0x%p, 0x%p, 0x%p" +#define apick_fmt "0x%p, %llu, 0x%p, 0x%p, 0x%p" static inline gni_return_t kgnilnd_ep_postdata_test_by_id( IN gni_ep_handle_t ep_hndl, IN uint64_t datagram_id, @@ -1066,7 +1066,7 @@ static inline gni_return_t kgnilnd_ep_postdata_test_by_id( #undef apick_fmt #define apick_fn "kgnilnd_ep_postdata_cancel_by_id" -#define apick_fmt "0x%p, "LPU64"" +#define apick_fmt "0x%p, %llu" static inline gni_return_t kgnilnd_ep_postdata_cancel_by_id( IN gni_ep_handle_t ep_hndl, IN uint64_t datagram_id @@ -1217,7 +1217,7 @@ static inline gni_return_t kgnilnd_post_rdma( #undef apick_fmt #define apick_fn "kgnilnd_get_completed" -#define apick_fmt "0x%p,"LPX64",0x%p" +#define apick_fmt "0x%p,%#llx,0x%p" static inline gni_return_t kgnilnd_get_completed( IN gni_cq_handle_t cq_hndl, IN gni_cq_entry_t event_data, @@ -1262,7 +1262,7 @@ static inline gni_return_t kgnilnd_get_completed( #undef apick_fmt #define apick_fn "kgnilnd_cq_error_str" -#define apick_fmt LPX64",0x%p,%d" +#define apick_fmt "%#llx,0x%p,%d" static inline gni_return_t kgnilnd_cq_error_str( IN gni_cq_entry_t entry, IN void *buffer, @@ -1307,7 +1307,7 @@ static inline gni_return_t kgnilnd_cq_error_str( #undef apick_fmt #define apick_fn "kgnilnd_cq_error_recoverable" -#define apick_fmt LPX64",0x%p" +#define apick_fmt "%#llx,0x%p" static inline gni_return_t kgnilnd_cq_error_recoverable( IN gni_cq_entry_t entry, IN uint32_t *recoverable @@ -1392,7 +1392,7 @@ kgnilnd_mem_register_segments( #undef apick_fmt #define apick_fn "kgnilnd_mem_register" -#define apick_fmt "0x%p,"LPX64","LPX64"0x%p,%u,0x%p" +#define apick_fmt "0x%p,%#llx,%#llx0x%p,%u,0x%p" static inline gni_return_t kgnilnd_mem_register( IN gni_nic_handle_t nic_hndl, IN uint64_t address, diff --git a/lnet/klnds/gnilnd/gnilnd_aries.h b/lnet/klnds/gnilnd/gnilnd_aries.h index 70a62af..b36603e 100644 --- a/lnet/klnds/gnilnd/gnilnd_aries.h +++ b/lnet/klnds/gnilnd/gnilnd_aries.h @@ -113,7 +113,7 @@ kgnilnd_nid_to_nicaddrs(__u32 nid, int numnic, __u32 *nicaddr) } if (nid < kgnilnd_data.kgn_nid_trans_private) { CERROR("Request for invalid nid translation %u," - "minimum "LPU64"\n", + "minimum %llu\n", nid, kgnilnd_data.kgn_nid_trans_private); return -ESRCH; } diff --git a/lnet/klnds/gnilnd/gnilnd_cb.c b/lnet/klnds/gnilnd/gnilnd_cb.c index d9839ce..7376443 100644 --- a/lnet/klnds/gnilnd/gnilnd_cb.c +++ b/lnet/klnds/gnilnd/gnilnd_cb.c @@ -474,7 +474,7 @@ kgnilnd_nak_rdma(kgn_conn_t *conn, int rx_type, int error, __u64 cookie, lnet_ni LBUG(); } /* only allow NAK on error and truncate to zero */ - LASSERTF(error <= 0, "error %d conn 0x%p, cookie "LPU64"\n", + LASSERTF(error <= 0, "error %d conn 0x%p, cookie %llu\n", error, conn, cookie); tx = kgnilnd_new_tx_msg(nak_type, source); @@ -947,7 +947,7 @@ kgnilnd_mem_add_map_list(kgn_device_t *dev, kgn_tx_t *tx) if (tx->tx_msg.gnm_type == GNILND_MSG_PUT_ACK || tx->tx_msg.gnm_type == GNILND_MSG_GET_REQ) { atomic64_add(bytes, &dev->gnd_rdmaq_bytes_out); - GNIDBG_TX(D_NETTRACE, tx, "rdma ++ %d to "LPD64"", + GNIDBG_TX(D_NETTRACE, tx, "rdma ++ %d to %lld", bytes, atomic64_read(&dev->gnd_rdmaq_bytes_out)); } @@ -998,7 +998,7 @@ kgnilnd_mem_del_map_list(kgn_device_t *dev, kgn_tx_t *tx) atomic64_sub(bytes, &dev->gnd_rdmaq_bytes_out); LASSERTF(atomic64_read(&dev->gnd_rdmaq_bytes_out) >= 0, "bytes_out negative! %ld\n", atomic64_read(&dev->gnd_rdmaq_bytes_out)); - GNIDBG_TX(D_NETTRACE, tx, "rdma -- %d to "LPD64"", + GNIDBG_TX(D_NETTRACE, tx, "rdma -- %d to %lld", bytes, atomic64_read(&dev->gnd_rdmaq_bytes_out)); } @@ -1057,7 +1057,7 @@ kgnilnd_map_buffer(kgn_tx_t *tx) * GART resource, etc starvation handling */ if (rrc != GNI_RC_SUCCESS) { GNIDBG_TX(D_NET, tx, "Can't map %d pages: dev %d " - "phys %u pp %u, virt %u nob "LPU64"", + "phys %u pp %u, virt %u nob %llu", tx->tx_phys_npages, dev->gnd_id, dev->gnd_map_nphys, dev->gnd_map_physnop, dev->gnd_map_nvirt, dev->gnd_map_virtnob); @@ -1074,7 +1074,7 @@ kgnilnd_map_buffer(kgn_tx_t *tx) NULL, flags, &tx->tx_map_key); if (rrc != GNI_RC_SUCCESS) { GNIDBG_TX(D_NET, tx, "Can't map %u bytes: dev %d " - "phys %u pp %u, virt %u nob "LPU64"", + "phys %u pp %u, virt %u nob %llu", tx->tx_nob, dev->gnd_id, dev->gnd_map_nphys, dev->gnd_map_physnop, dev->gnd_map_nvirt, dev->gnd_map_virtnob); @@ -1175,7 +1175,7 @@ kgnilnd_unmap_buffer(kgn_tx_t *tx, int error) hold_timeout = GNILND_TIMEOUT2DEADMAN; GNIDBG_TX(D_NET, tx, - "dev %p delaying MDD release for %dms key "LPX64"."LPX64"", + "dev %p delaying MDD release for %dms key %#llx.%#llx", tx->tx_conn->gnc_device, hold_timeout, tx->tx_map_key.qword1, tx->tx_map_key.qword2); } @@ -1990,7 +1990,7 @@ kgnilnd_rdma(kgn_tx_t *tx, int type, tx, conn, conn->gnc_close_sent); GNIDBG_TX(D_NET, tx, "Post RDMA type 0x%02x conn %p dlvr_mode " - "0x%x cookie:"LPX64, + "0x%x cookie:%#llx", type, conn, tx->tx_rdma_desc.dlvr_mode, cookie); /* set CQ dedicated for RDMA */ @@ -2377,7 +2377,7 @@ kgnilnd_eager_recv(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, CERROR("Couldnt find matching peer %p or conn %p / %p\n", peer, conn, found_conn); if (found_conn) { - CERROR("Unexpected connstamp "LPX64"("LPX64" expected)" + CERROR("Unexpected connstamp %#llx(%#llx expected)" " from %s", rxmsg->gnm_connstamp, found_conn->gnc_peer_connstamp, libcfs_nid2str(peer->gnp_nid)); @@ -3193,7 +3193,7 @@ kgnilnd_check_rdma_cq(kgn_device_t *dev) "this is bad, somehow our credits didn't protect us" " from CQ overrun\n"); LASSERTF(GNI_CQ_GET_TYPE(event_data) == GNI_CQ_EVENT_TYPE_POST, - "rrc %d, GNI_CQ_GET_TYPE("LPX64") = "LPX64"\n", rrc, + "rrc %d, GNI_CQ_GET_TYPE(%#llx) = %#llx\n", rrc, event_data, GNI_CQ_GET_TYPE(event_data)); rrc = kgnilnd_get_completed(dev->gnd_snd_rdma_cqh, event_data, @@ -3346,7 +3346,7 @@ kgnilnd_check_fma_send_cq(kgn_device_t *dev) if (rrc == GNI_RC_NOT_DONE) { CDEBUG(D_INFO, - "SMSG send CQ %d not ready (data "LPX64") " + "SMSG send CQ %d not ready (data %#llx) " "processed %ld\n", dev->gnd_id, event_data, num_processed); return num_processed; @@ -3359,7 +3359,7 @@ kgnilnd_check_fma_send_cq(kgn_device_t *dev) "this is bad, somehow our credits didn't " "protect us from CQ overrun\n"); LASSERTF(GNI_CQ_GET_TYPE(event_data) == GNI_CQ_EVENT_TYPE_SMSG, - "rrc %d, GNI_CQ_GET_TYPE("LPX64") = "LPX64"\n", rrc, + "rrc %d, GNI_CQ_GET_TYPE(%#llx) = %#llx\n", rrc, event_data, GNI_CQ_GET_TYPE(event_data)); /* if SMSG couldn't handle an error, time for conn to die */ @@ -3373,7 +3373,7 @@ kgnilnd_check_fma_send_cq(kgn_device_t *dev) if (conn == NULL) { /* Conn was destroyed? */ CDEBUG(D_NET, - "SMSG CQID lookup "LPX64" failed\n", + "SMSG CQID lookup %#llx failed\n", GNI_CQ_GET_INST_ID(event_data)); write_unlock(&kgnilnd_data.kgn_peer_conn_lock); continue; @@ -3501,7 +3501,7 @@ kgnilnd_check_fma_rcv_cq(kgn_device_t *dev) kgnilnd_gl_mutex_unlock(&dev->gnd_cq_mutex); if (rrc == GNI_RC_NOT_DONE) { - CDEBUG(D_INFO, "SMSG RX CQ %d empty data "LPX64" " + CDEBUG(D_INFO, "SMSG RX CQ %d empty data %#llx " "processed %ld\n", dev->gnd_id, event_data, num_processed); return num_processed; @@ -3525,7 +3525,7 @@ kgnilnd_check_fma_rcv_cq(kgn_device_t *dev) /* sender should get error event too and take care of failed transaction by re-transmitting */ if (rrc == GNI_RC_TRANSACTION_ERROR) { - CDEBUG(D_NET, "SMSG RX CQ error "LPX64"\n", event_data); + CDEBUG(D_NET, "SMSG RX CQ error %#llx\n", event_data); continue; } @@ -3534,12 +3534,12 @@ kgnilnd_check_fma_rcv_cq(kgn_device_t *dev) conn = kgnilnd_cqid2conn_locked( GNI_CQ_GET_INST_ID(event_data)); if (conn == NULL) { - CDEBUG(D_NET, "SMSG RX CQID lookup "LPU64" " - "failed, dropping event "LPX64"\n", + CDEBUG(D_NET, "SMSG RX CQID lookup %llu " + "failed, dropping event %#llx\n", GNI_CQ_GET_INST_ID(event_data), event_data); } else { - CDEBUG(D_NET, "SMSG RX: CQID "LPU64" " + CDEBUG(D_NET, "SMSG RX: CQID %llu " "conn %p->%s\n", GNI_CQ_GET_INST_ID(event_data), conn, conn->gnc_peer ? @@ -3799,7 +3799,7 @@ kgnilnd_process_fmaq(kgn_conn_t *conn) GNITX_ASSERTF(tx, tx->tx_id.txe_smsg_id != 0, "tx with zero id", NULL); - CDEBUG(D_NET, "sending regular msg: %p, type %s(0x%02x), cookie "LPX64"\n", + CDEBUG(D_NET, "sending regular msg: %p, type %s(0x%02x), cookie %#llx\n", tx, kgnilnd_msgtype2str(tx->tx_msg.gnm_type), tx->tx_msg.gnm_type, tx->tx_id.txe_cookie); @@ -3997,8 +3997,8 @@ _kgnilnd_match_reply(kgn_conn_t *conn, int type1, int type2, __u64 cookie) GNITX_ASSERTF(tx, ((tx->tx_id.txe_idx == ev_id.txe_idx) && (tx->tx_id.txe_cookie = cookie)), "conn 0x%p->%s tx_ref_table hosed: wanted " - "txe_cookie "LPX64" txe_idx %d " - "found tx %p cookie "LPX64" txe_idx %d\n", + "txe_cookie %#llx txe_idx %d " + "found tx %p cookie %#llx txe_idx %d\n", conn, libcfs_nid2str(conn->gnc_peer->gnp_nid), cookie, ev_id.txe_idx, tx, tx->tx_id.txe_cookie, tx->tx_id.txe_idx); @@ -4012,7 +4012,7 @@ _kgnilnd_match_reply(kgn_conn_t *conn, int type1, int type2, __u64 cookie) tx->tx_state, GNILND_TX_WAITING_REPLY, libcfs_nid2str(conn->gnc_peer->gnp_nid)); } else { - CWARN("Unmatched reply %02x, or %02x/"LPX64" from %s\n", + CWARN("Unmatched reply %02x, or %02x/%#llx from %s\n", type1, type2, cookie, libcfs_nid2str(conn->gnc_peer->gnp_nid)); } return tx; @@ -4040,7 +4040,7 @@ kgnilnd_complete_tx(kgn_tx_t *tx, int rc) tx->tx_state &= ~GNILND_TX_WAITING_REPLY; if (rc == -EFAULT) { - CDEBUG(D_NETERROR, "Error %d TX data: TX %p tx_id %x nob %16"LPF64"u physnop %8d buffertype %#8x MemHandle "LPX64"."LPX64"x\n", + CDEBUG(D_NETERROR, "Error %d TX data: TX %p tx_id %x nob %16llu physnop %8d buffertype %#8x MemHandle %#llx.%#llxx\n", rc, tx, id, nob, physnop, buftype, hndl.qword1, hndl.qword2); if(*kgnilnd_tunables.kgn_efault_lbug) { @@ -4287,7 +4287,7 @@ kgnilnd_check_fma_rx(kgn_conn_t *conn) } if (msg->gnm_connstamp != conn->gnc_peer_connstamp) { - GNIDBG_MSG(D_NETERROR, msg, "Unexpected connstamp "LPX64"("LPX64 + GNIDBG_MSG(D_NETERROR, msg, "Unexpected connstamp %#llx(%#llx" " expected) from %s", msg->gnm_connstamp, conn->gnc_peer_connstamp, libcfs_nid2str(peer->gnp_nid)); @@ -4844,7 +4844,7 @@ kgnilnd_process_mapped_tx(kgn_device_t *dev) } else { GNIDBG_TX(log_retrans_level, tx, "transient map failure #%d %d pages/%d bytes phys %u@%u " - "virt %u@"LPU64" " + "virt %u@%llu " "nq_map %d mdd# %d/%d GART %ld", dev->gnd_map_attempt, tx->tx_phys_npages, tx->tx_nob, dev->gnd_map_nphys, dev->gnd_map_physnop * PAGE_SIZE, diff --git a/lnet/klnds/gnilnd/gnilnd_conn.c b/lnet/klnds/gnilnd/gnilnd_conn.c index e00a8f9..066fe1e 100644 --- a/lnet/klnds/gnilnd/gnilnd_conn.c +++ b/lnet/klnds/gnilnd/gnilnd_conn.c @@ -217,7 +217,7 @@ kgnilnd_alloc_fmablk(kgn_device_t *device, int use_phys) fma_blk->gnm_avail_mboxs = fma_blk->gnm_num_mboxs = num_mbox; CDEBUG(D_MALLOC, "alloc fmablk 0x%p num %d msg_maxsize %d credits %d " - "mbox_size %d MDD "LPX64"."LPX64"\n", + "mbox_size %d MDD %#llx.%#llx\n", fma_blk, num_mbox, smsg_attr.msg_maxsize, smsg_attr.mbox_maxcredit, fma_blk->gnm_mbox_size, fma_blk->gnm_hndl.qword1, fma_blk->gnm_hndl.qword2); @@ -415,7 +415,7 @@ kgnilnd_find_free_mbox(kgn_conn_t *conn) CDEBUG(D_NET, "conn %p smsg %p fmablk %p " "allocating SMSG mbox %d buf %p " - "offset %u hndl "LPX64"."LPX64"\n", + "offset %u hndl %#llx.%#llx\n", conn, smsg_attr, fma_blk, id, smsg_attr->msg_buffer, smsg_attr->mbox_offset, fma_blk->gnm_hndl.qword1, @@ -505,14 +505,14 @@ kgnilnd_release_mbox(kgn_conn_t *conn, int purgatory_hold) * > 0 - hold it for now */ if (purgatory_hold == 0) { CDEBUG(D_NET, "conn %p smsg %p fmablk %p freeing SMSG mbox %d " - "hndl "LPX64"."LPX64"\n", + "hndl %#llx.%#llx\n", conn, smsg_attr, fma_blk, id, fma_blk->gnm_hndl.qword1, fma_blk->gnm_hndl.qword2); fma_blk->gnm_avail_mboxs++; } else if (purgatory_hold > 0) { CDEBUG(D_NET, "conn %p smsg %p fmablk %p holding SMSG mbox %d " - "hndl "LPX64"."LPX64"\n", + "hndl %#llx.%#llx\n", conn, smsg_attr, fma_blk, id, fma_blk->gnm_hndl.qword1, fma_blk->gnm_hndl.qword2); @@ -521,7 +521,7 @@ kgnilnd_release_mbox(kgn_conn_t *conn, int purgatory_hold) conn->gnc_timeout); } else { CDEBUG(D_NET, "conn %p smsg %p fmablk %p release SMSG mbox %d " - "hndl "LPX64"."LPX64"\n", + "hndl %#llx.%#llx\n", conn, smsg_attr, fma_blk, id, fma_blk->gnm_hndl.qword1, fma_blk->gnm_hndl.qword2); @@ -941,7 +941,7 @@ kgnilnd_unpack_connreq(kgn_dgram_t *dgram) } if (connreq->gncr_peerstamp == 0 || connreq->gncr_connstamp == 0) { - CERROR("Recived bad timestamps peer "LPU64" conn "LPU64"\n", + CERROR("Recived bad timestamps peer %llu conn %llu\n", connreq->gncr_peerstamp, connreq->gncr_connstamp); return -EPROTO; } @@ -1439,13 +1439,13 @@ kgnilnd_probe_for_dgram(kgn_device_t *dev, kgn_dgram_t **dgramp) RETURN(0); } - CDEBUG(D_NET, "ready "LPX64" on device 0x%p\n", + CDEBUG(D_NET, "ready %#llx on device 0x%p\n", readyid, dev); dgram = (kgn_dgram_t *)readyid; LASSERTF(dgram->gndg_magic == GNILND_DGRAM_MAGIC, - "dgram 0x%p from id "LPX64" with bad magic %x\n", + "dgram 0x%p from id %#llx with bad magic %x\n", dgram, readyid, dgram->gndg_magic); LASSERTF(dgram->gndg_state == GNILND_DGRAM_POSTED || @@ -1479,7 +1479,7 @@ kgnilnd_probe_for_dgram(kgn_device_t *dev, kgn_dgram_t **dgramp) spin_unlock(&dev->gnd_dgram_lock); LASSERTF(grc != GNI_RC_NO_MATCH, "kgni lied! probe_by_id told us that" - " id "LPU64" was ready\n", readyid); + " id %llu was ready\n", readyid); CDEBUG(D_NET, "grc %d dgram 0x%p type %s post_state %d " "remote_addr %u remote_id %u\n", grc, dgram, @@ -1695,7 +1695,7 @@ kgnilnd_wait_for_canceled_dgrams(kgn_device_t *dev) if (grc != GNI_RC_SUCCESS) continue; - CDEBUG(D_NET, "ready "LPX64" on device %d->0x%p\n", + CDEBUG(D_NET, "ready %#llx on device %d->0x%p\n", readyid, dev->gnd_id, dev); rc = kgnilnd_probe_for_dgram(dev, &dgram); diff --git a/lnet/klnds/gnilnd/gnilnd_debug.c b/lnet/klnds/gnilnd/gnilnd_debug.c index 36a9844..effa86c 100644 --- a/lnet/klnds/gnilnd/gnilnd_debug.c +++ b/lnet/klnds/gnilnd/gnilnd_debug.c @@ -83,7 +83,7 @@ _kgnilnd_debug_tx(kgn_tx_t *tx, struct libcfs_debug_msg_data *msgdata, va_start(args, fmt); libcfs_debug_vmsg2(msgdata, fmt, args, - " tx@0x%p->%s id "LPX64 + " tx@0x%p->%s id %#llx" "/%u/%d:%d msg %x/%s/%d x%d q %s@%lds->0x%p f %x re %d\n", tx, nid, id->txe_cookie, id->txe_smsg_id, id->txe_cqid, id->txe_idx, tx->tx_msg.gnm_type, diff --git a/lnet/klnds/gnilnd/gnilnd_proc.c b/lnet/klnds/gnilnd/gnilnd_proc.c index 86891d9..93c6901 100644 --- a/lnet/klnds/gnilnd/gnilnd_proc.c +++ b/lnet/klnds/gnilnd/gnilnd_proc.c @@ -136,7 +136,7 @@ _kgnilnd_proc_run_cksum_test(int caseno, int nloops, int nob) diff = kgnilnd_ts_sub(end, begin); - LCONSOLE_INFO("running "LPD64"MB took %ld.%ld seconds\n", + LCONSOLE_INFO("running %lldMB took %ld.%ld seconds\n", mbytes, diff.tv_sec, diff.tv_nsec); unwind: @@ -238,7 +238,7 @@ kgnilnd_stats_seq_show(struct seq_file *sf, void *v) "TX phys nmaps: %d\n" "TX phys bytes: %lu\n" "TX virt nmaps: %d\n" - "TX virt bytes: "LPU64"\n" + "TX virt bytes: %llu\n" "RDMAQ bytes_auth: %ld\n" "RDMAQ bytes_left: %ld\n" "RDMAQ nstalls: %d\n" @@ -491,7 +491,7 @@ kgnilnd_mdd_seq_show(struct seq_file *s, void *iter) hndl.qword1 = tx->tx_map_key.qword1; hndl.qword2 = tx->tx_map_key.qword2; - seq_printf(s, "%p %x %16"LPF64"u %8d %#8x "LPX64"."LPX64"x\n", + seq_printf(s, "%p %x %16llu %8d %#8x %#llx.%#llxx\n", tx, id, nob, physnop, buftype, hndl.qword1, hndl.qword2); @@ -697,7 +697,7 @@ kgnilnd_smsg_seq_show(struct seq_file *s, void *iter) spin_unlock(&dev->gnd_fmablk_lock); if (live) { - seq_printf(s, "%5d %4s %6d/%5d/%5d %9d %18p "LPX64"."LPX64"\n", + seq_printf(s, "%5d %4s %6d/%5d/%5d %9d %18p %#llx.%#llx\n", (int) gseq->gsmsg_off, kgnilnd_fmablk_state2str(state), avail_mboxs, held_mboxs, num_mboxs, blk_size, fmablk, hndl.qword1, hndl.qword2); @@ -905,7 +905,7 @@ kgnilnd_conn_seq_show(struct seq_file *s, void *iter) "rx sq %u %dms/%dms " "noop r/s %d/%d w/s/cq %lds/%lds/%lds " "sched a/d %lds/%lds " - "tx_re "LPD64" TO %ds %s\n", + "tx_re %lld TO %ds %s\n", conn, peer ? libcfs_nid2str(peer->gnp_nid) : "", atomic_read(&conn->gnc_refcount), kgnilnd_count_list(&conn->gnc_fmaq), diff --git a/lnet/klnds/gnilnd/gnilnd_stack.c b/lnet/klnds/gnilnd/gnilnd_stack.c index 1da0fbe..6268f31 100644 --- a/lnet/klnds/gnilnd/gnilnd_stack.c +++ b/lnet/klnds/gnilnd/gnilnd_stack.c @@ -535,7 +535,7 @@ kgnilnd_quiesce_end_callback(gni_nic_handle_t nic_handle, uint64_t msecs) if (!kgnilnd_data.kgn_ruhroh_shutdown) { - CDEBUG(D_NET, "requesting timeout bump by "LPD64" msecs\n", msecs); + CDEBUG(D_NET, "requesting timeout bump by %lld msecs\n", msecs); /* Save the bump interval and request the bump. * The memory barrier ensures that the interval is in place before diff --git a/lnet/klnds/o2iblnd/o2iblnd.c b/lnet/klnds/o2iblnd/o2iblnd.c index 09d4f56..d8e870b 100644 --- a/lnet/klnds/o2iblnd/o2iblnd.c +++ b/lnet/klnds/o2iblnd/o2iblnd.c @@ -576,7 +576,7 @@ static void kiblnd_debug_tx (kib_tx_t *tx) { CDEBUG(D_CONSOLE, " %p snd %d q %d w %d rc %d dl %lx " - "cookie "LPX64" msg %s%s type %x cred %d\n", + "cookie %#llx msg %s%s type %x cred %d\n", tx, tx->tx_sending, tx->tx_queued, tx->tx_waiting, tx->tx_status, tx->tx_deadline, tx->tx_cookie, tx->tx_lntmsg[0] == NULL ? "-" : "!", @@ -1030,7 +1030,7 @@ kiblnd_close_stale_conns_locked(kib_peer_t *peer, continue; CDEBUG(D_NET, "Closing stale conn -> %s version: %x, " - "incarnation:"LPX64"(%x, "LPX64")\n", + "incarnation:%#llx(%x, %#llx)\n", libcfs_nid2str(peer->ibp_nid), conn->ibc_version, conn->ibc_incarnation, version, incarnation); @@ -1266,7 +1266,7 @@ kiblnd_map_rx_descs(kib_conn_t *conn) rx->rx_msgaddr)); KIBLND_UNMAP_ADDR_SET(rx, rx_msgunmap, rx->rx_msgaddr); - CDEBUG(D_NET, "rx %d: %p "LPX64"("LPX64")\n", + CDEBUG(D_NET, "rx %d: %p %#llx(%#llx)\n", i, rx->rx_msg, rx->rx_msgaddr, (__u64)(page_to_phys(pg) + pg_off)); @@ -2494,7 +2494,7 @@ kiblnd_hdev_get_attr(kib_hca_dev_t *hdev) return 0; } - CERROR("Invalid mr size: "LPX64"\n", hdev->ibh_mr_size); + CERROR("Invalid mr size: %#llx\n", hdev->ibh_mr_size); return -EINVAL; } diff --git a/lnet/klnds/o2iblnd/o2iblnd_cb.c b/lnet/klnds/o2iblnd/o2iblnd_cb.c index 6b4bd30..79eb8b7 100644 --- a/lnet/klnds/o2iblnd/o2iblnd_cb.c +++ b/lnet/klnds/o2iblnd/o2iblnd_cb.c @@ -261,7 +261,7 @@ kiblnd_handle_completion(kib_conn_t *conn, int txtype, int status, __u64 cookie) if (tx == NULL) { spin_unlock(&conn->ibc_lock); - CWARN("Unmatched completion type %x cookie "LPX64" from %s\n", + CWARN("Unmatched completion type %x cookie %#llx from %s\n", txtype, cookie, libcfs_nid2str(conn->ibc_peer->ibp_nid)); kiblnd_close_conn(conn, -EPROTO); return; @@ -856,7 +856,7 @@ __must_hold(&conn->ibc_lock) } LASSERTF(bad->wr_id == kiblnd_ptr2wreqid(tx, IBLND_WID_TX), - "bad wr_id "LPX64", opc %d, flags %d, peer: %s\n", + "bad wr_id %#llx, opc %d, flags %d, peer: %s\n", bad->wr_id, bad->opcode, bad->send_flags, libcfs_nid2str(conn->ibc_peer->ibp_nid)); @@ -984,7 +984,7 @@ kiblnd_tx_complete (kib_tx_t *tx, int status) if (failed) { if (conn->ibc_state == IBLND_CONN_ESTABLISHED) - CNETERR("Tx -> %s cookie "LPX64 + CNETERR("Tx -> %s cookie %#llx" " sending %d waiting %d: failed %d\n", libcfs_nid2str(conn->ibc_peer->ibp_nid), tx->tx_cookie, tx->tx_sending, tx->tx_waiting, @@ -2412,7 +2412,7 @@ kiblnd_passive_connect(struct rdma_cm_id *cmid, void *priv, int priv_nob) } write_unlock_irqrestore(g_lock, flags); - CWARN("Conn stale %s version %x/%x incarnation "LPU64"/"LPU64"\n", + CWARN("Conn stale %s version %x/%x incarnation %llu/%llu\n", libcfs_nid2str(nid), peer2->ibp_version, version, peer2->ibp_incarnation, reqmsg->ibm_srcstamp); diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c index 15d9ed1..5530b7a 100644 --- a/lnet/klnds/socklnd/socklnd.c +++ b/lnet/klnds/socklnd/socklnd.c @@ -2474,7 +2474,7 @@ ksocknal_base_startup(void) snprintf(name, sizeof(name), "socknal_cd%02d", i); rc = ksocknal_thread_start(ksocknal_connd, - (void *)((ulong_ptr_t)i), name); + (void *)((uintptr_t)i), name); if (rc != 0) { spin_lock_bh(&ksocknal_data.ksnd_connd_lock); ksocknal_data.ksnd_connd_starting--; @@ -2524,7 +2524,7 @@ ksocknal_debug_peerhash (lnet_ni_t *ni) ksock_conn_t *conn; CWARN ("Active peer on shutdown: %s, ref %d, scnt %d, " - "closing %d, accepting %d, err %d, zcookie "LPU64", " + "closing %d, accepting %d, err %d, zcookie %llu, " "txq %d, zc_req %d\n", libcfs_id2str(peer->ksnp_id), atomic_read(&peer->ksnp_refcount), peer->ksnp_sharecount, peer->ksnp_closing, diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c index e89ccb9..ee29f8a 100644 --- a/lnet/klnds/socklnd/socklnd_cb.c +++ b/lnet/klnds/socklnd/socklnd_cb.c @@ -1197,7 +1197,7 @@ ksocknal_process_receive (ksock_conn_t *conn) conn->ksnc_msg.ksm_zc_cookies[1]); if (rc != 0) { - CERROR("%s: Unknown ZC-ACK cookie: "LPU64", "LPU64"\n", + CERROR("%s: Unknown ZC-ACK cookie: %llu, %llu\n", libcfs_id2str(conn->ksnc_peer->ksnp_id), cookie, conn->ksnc_msg.ksm_zc_cookies[1]); ksocknal_new_packet(conn, 0); diff --git a/lnet/klnds/socklnd/socklnd_proto.c b/lnet/klnds/socklnd/socklnd_proto.c index 914da56..6ea8494 100644 --- a/lnet/klnds/socklnd/socklnd_proto.c +++ b/lnet/klnds/socklnd/socklnd_proto.c @@ -192,7 +192,7 @@ ksocknal_queue_tx_zcack_v3(ksock_conn_t *conn, if (cookie == tx->tx_msg.ksm_zc_cookies[0] || cookie == tx->tx_msg.ksm_zc_cookies[1]) { - CWARN("%s: duplicated ZC cookie: "LPU64"\n", + CWARN("%s: duplicated ZC cookie: %llu\n", libcfs_id2str(conn->ksnc_peer->ksnp_id), cookie); return 1; /* XXX return error in the future */ } @@ -244,7 +244,7 @@ ksocknal_queue_tx_zcack_v3(ksock_conn_t *conn, /* ksm_zc_cookies[0] < ksm_zc_cookies[1], it is range of cookies */ if (cookie >= tx->tx_msg.ksm_zc_cookies[0] && cookie <= tx->tx_msg.ksm_zc_cookies[1]) { - CWARN("%s: duplicated ZC cookie: "LPU64"\n", + CWARN("%s: duplicated ZC cookie: %llu\n", libcfs_id2str(conn->ksnc_peer->ksnp_id), cookie); return 1; /* XXX: return error in the future */ } diff --git a/lnet/lnet/acceptor.c b/lnet/lnet/acceptor.c index 496325c..d6448fe 100644 --- a/lnet/lnet/acceptor.c +++ b/lnet/lnet/acceptor.c @@ -354,7 +354,7 @@ lnet_acceptor(void *arg) __u32 magic; __u32 peer_ip; int peer_port; - int secure = (int)((long_ptr_t)arg); + int secure = (int)((uintptr_t)arg); LASSERT (lnet_acceptor_state.pta_sock == NULL); @@ -486,7 +486,7 @@ lnet_acceptor_start(void) if (lnet_count_acceptor_nis() == 0) /* not required */ return 0; - task = kthread_run(lnet_acceptor, (void *)(ulong_ptr_t)secure, + task = kthread_run(lnet_acceptor, (void *)(uintptr_t)secure, "acceptor_%03ld", secure); if (IS_ERR(task)) { rc2 = PTR_ERR(task); diff --git a/lnet/lnet/api-ni.c b/lnet/lnet/api-ni.c index ec777fe..99f5267 100644 --- a/lnet/lnet/api-ni.c +++ b/lnet/lnet/api-ni.c @@ -2205,7 +2205,7 @@ EXPORT_SYMBOL(LNetGetId); void LNetSnprintHandle(char *str, int len, lnet_handle_any_t h) { - snprintf(str, len, LPX64, h.cookie); + snprintf(str, len, "%#llx", h.cookie); } EXPORT_SYMBOL(LNetSnprintHandle); diff --git a/lnet/lnet/lib-me.c b/lnet/lnet/lib-me.c index a5f52ed..9f39a87 100644 --- a/lnet/lnet/lib-me.c +++ b/lnet/lnet/lib-me.c @@ -280,7 +280,7 @@ lnet_me_unlink(lnet_me_t *me) static void lib_me_dump(lnet_me_t *me) { - CWARN("Match Entry %p ("LPX64")\n", me, + CWARN("Match Entry %p (%#llx)\n", me, me->me_lh.lh_cookie); CWARN("\tMatch/Ignore\t= %016lx / %016lx\n", diff --git a/lnet/lnet/lib-move.c b/lnet/lnet/lib-move.c index fef10ab..0df68dc 100644 --- a/lnet/lnet/lib-move.c +++ b/lnet/lnet/lib-move.c @@ -1483,7 +1483,7 @@ lnet_parse_put(lnet_ni_t *ni, lnet_msg_t *msg) /* fall through */ case LNET_MATCHMD_DROP: - CNETERR("Dropping PUT from %s portal %d match "LPU64 + CNETERR("Dropping PUT from %s portal %d match %llu" " offset %d length %d: %d\n", libcfs_id2str(info.mi_id), info.mi_portal, info.mi_mbits, info.mi_roffset, info.mi_rlength, rc); @@ -1516,7 +1516,7 @@ lnet_parse_get(lnet_ni_t *ni, lnet_msg_t *msg, int rdma_get) rc = lnet_ptl_match_md(&info, msg); if (rc == LNET_MATCHMD_DROP) { - CNETERR("Dropping GET from %s portal %d match "LPU64 + CNETERR("Dropping GET from %s portal %d match %llu" " offset %d length %d\n", libcfs_id2str(info.mi_id), info.mi_portal, info.mi_mbits, info.mi_roffset, info.mi_rlength); @@ -1578,7 +1578,7 @@ lnet_parse_reply(lnet_ni_t *ni, lnet_msg_t *msg) md = lnet_wire_handle2md(&hdr->msg.reply.dst_wmd); if (md == NULL || md->md_threshold == 0 || md->md_me != NULL) { CNETERR("%s: Dropping REPLY from %s for %s " - "MD "LPX64"."LPX64"\n", + "MD %#llx.%#llx\n", libcfs_nid2str(ni->ni_nid), libcfs_id2str(src), (md == NULL) ? "invalid" : "inactive", hdr->msg.reply.dst_wmd.wh_interface_cookie, @@ -1599,7 +1599,7 @@ lnet_parse_reply(lnet_ni_t *ni, lnet_msg_t *msg) if (mlength < rlength && (md->md_options & LNET_MD_TRUNCATE) == 0) { CNETERR("%s: Dropping REPLY from %s length %d " - "for MD "LPX64" would overflow (%d)\n", + "for MD %#llx would overflow (%d)\n", libcfs_nid2str(ni->ni_nid), libcfs_id2str(src), rlength, hdr->msg.reply.dst_wmd.wh_object_cookie, mlength); @@ -1607,7 +1607,7 @@ lnet_parse_reply(lnet_ni_t *ni, lnet_msg_t *msg) return -ENOENT; /* -ve: OK but no match */ } - CDEBUG(D_NET, "%s: Reply from %s of length %d/%d into md "LPX64"\n", + CDEBUG(D_NET, "%s: Reply from %s of length %d/%d into md %#llx\n", libcfs_nid2str(ni->ni_nid), libcfs_id2str(src), mlength, rlength, hdr->msg.reply.dst_wmd.wh_object_cookie); @@ -1647,7 +1647,7 @@ lnet_parse_ack(lnet_ni_t *ni, lnet_msg_t *msg) if (md == NULL || md->md_threshold == 0 || md->md_me != NULL) { /* Don't moan; this is expected */ CDEBUG(D_NET, - "%s: Dropping ACK from %s to %s MD "LPX64"."LPX64"\n", + "%s: Dropping ACK from %s to %s MD %#llx.%#llx\n", libcfs_nid2str(ni->ni_nid), libcfs_id2str(src), (md == NULL) ? "invalid" : "inactive", hdr->msg.ack.dst_wmd.wh_interface_cookie, @@ -1660,7 +1660,7 @@ lnet_parse_ack(lnet_ni_t *ni, lnet_msg_t *msg) return -ENOENT; /* -ve! */ } - CDEBUG(D_NET, "%s: ACK from %s into md "LPX64"\n", + CDEBUG(D_NET, "%s: ACK from %s into md %#llx\n", libcfs_nid2str(ni->ni_nid), libcfs_id2str(src), hdr->msg.ack.dst_wmd.wh_object_cookie); @@ -1771,20 +1771,20 @@ lnet_print_hdr(lnet_hdr_t * hdr) break; case LNET_MSG_PUT: - CWARN(" Ptl index %d, ack md "LPX64"."LPX64", " - "match bits "LPU64"\n", + CWARN(" Ptl index %d, ack md %#llx.%#llx, " + "match bits %llu\n", hdr->msg.put.ptl_index, hdr->msg.put.ack_wmd.wh_interface_cookie, hdr->msg.put.ack_wmd.wh_object_cookie, hdr->msg.put.match_bits); - CWARN(" Length %d, offset %d, hdr data "LPX64"\n", + CWARN(" Length %d, offset %d, hdr data %#llx\n", hdr->payload_length, hdr->msg.put.offset, hdr->msg.put.hdr_data); break; case LNET_MSG_GET: - CWARN(" Ptl index %d, return md "LPX64"."LPX64", " - "match bits "LPU64"\n", hdr->msg.get.ptl_index, + CWARN(" Ptl index %d, return md %#llx.%#llx, " + "match bits %llu\n", hdr->msg.get.ptl_index, hdr->msg.get.return_wmd.wh_interface_cookie, hdr->msg.get.return_wmd.wh_object_cookie, hdr->msg.get.match_bits); @@ -1794,7 +1794,7 @@ lnet_print_hdr(lnet_hdr_t * hdr) break; case LNET_MSG_ACK: - CWARN(" dst md "LPX64"."LPX64", " + CWARN(" dst md %#llx.%#llx, " "manipulated length %d\n", hdr->msg.ack.dst_wmd.wh_interface_cookie, hdr->msg.ack.dst_wmd.wh_object_cookie, @@ -1802,7 +1802,7 @@ lnet_print_hdr(lnet_hdr_t * hdr) break; case LNET_MSG_REPLY: - CWARN(" dst md "LPX64"."LPX64", " + CWARN(" dst md %#llx.%#llx, " "length %d\n", hdr->msg.reply.dst_wmd.wh_interface_cookie, hdr->msg.reply.dst_wmd.wh_object_cookie, @@ -2065,7 +2065,7 @@ lnet_drop_delayed_msg_list(struct list_head *head, char *reason) LASSERT(msg->msg_rxpeer != NULL); LASSERT(msg->msg_hdr.type == LNET_MSG_PUT); - CWARN("Dropping delayed PUT from %s portal %d match "LPU64 + CWARN("Dropping delayed PUT from %s portal %d match %llu" " offset %d length %d: %s\n", libcfs_id2str(id), msg->msg_hdr.msg.put.ptl_index, @@ -2111,7 +2111,7 @@ lnet_recv_delayed_msg_list(struct list_head *head) LASSERT(msg->msg_hdr.type == LNET_MSG_PUT); CDEBUG(D_NET, "Resuming delayed PUT from %s portal %d " - "match "LPU64" offset %d length %d.\n", + "match %llu offset %d length %d.\n", libcfs_id2str(id), msg->msg_hdr.msg.put.ptl_index, msg->msg_hdr.msg.put.match_bits, msg->msg_hdr.msg.put.offset, @@ -2198,7 +2198,7 @@ LNetPut(lnet_nid_t self, lnet_handle_md_t mdh, lnet_ack_req_t ack, md = lnet_handle2md(&mdh); if (md == NULL || md->md_threshold == 0 || md->md_me != NULL) { - CERROR("Dropping PUT ("LPU64":%d:%s): MD (%d) invalid\n", + CERROR("Dropping PUT (%llu:%d:%s): MD (%d) invalid\n", match_bits, portal, libcfs_id2str(target), md == NULL ? -1 : md->md_threshold); if (md != NULL && md->md_me != NULL) @@ -2396,7 +2396,7 @@ LNetGet(lnet_nid_t self, lnet_handle_md_t mdh, md = lnet_handle2md(&mdh); if (md == NULL || md->md_threshold == 0 || md->md_me != NULL) { - CERROR("Dropping GET ("LPU64":%d:%s): MD (%d) invalid\n", + CERROR("Dropping GET (%llu:%d:%s): MD (%d) invalid\n", match_bits, portal, libcfs_id2str(target), md == NULL ? -1 : md->md_threshold); if (md != NULL && md->md_me != NULL) diff --git a/lnet/lnet/lib-ptl.c b/lnet/lnet/lib-ptl.c index 574ef5b..cd4ad63 100644 --- a/lnet/lnet/lib-ptl.c +++ b/lnet/lnet/lib-ptl.c @@ -184,7 +184,7 @@ lnet_try_match_md(lnet_libmd_t *md, mlength = info->mi_rlength; } else if ((md->md_options & LNET_MD_TRUNCATE) == 0) { /* this packet _really_ is too big */ - CERROR("Matching packet from %s, match "LPU64 + CERROR("Matching packet from %s, match %llu" " length %d too big: %d left, %d allowed\n", libcfs_id2str(info->mi_id), info->mi_mbits, info->mi_rlength, md->md_length - offset, mlength); @@ -194,7 +194,7 @@ lnet_try_match_md(lnet_libmd_t *md, /* Commit to this ME/MD */ CDEBUG(D_NET, "Incoming %s index %x from %s of " - "length %d/%d into md "LPX64" [%d] + %d\n", + "length %d/%d into md %#llx [%d] + %d\n", (info->mi_opc == LNET_MD_OP_PUT) ? "put" : "get", info->mi_portal, libcfs_id2str(info->mi_id), mlength, info->mi_rlength, md->md_lh.lh_cookie, md->md_niov, offset); @@ -567,7 +567,7 @@ lnet_ptl_match_md(struct lnet_match_info *info, struct lnet_msg *msg) int rc; CDEBUG(D_NET, "Request from %s of length %d into portal %d " - "MB="LPX64"\n", libcfs_id2str(info->mi_id), + "MB=%#llx\n", libcfs_id2str(info->mi_id), info->mi_rlength, info->mi_portal, info->mi_mbits); if (info->mi_portal >= the_lnet.ln_nportals) { @@ -623,7 +623,7 @@ lnet_ptl_match_md(struct lnet_match_info *info, struct lnet_msg *msg) /* LNET_MATCHMD_NONE means msg was added to the delay queue */ if (rc & LNET_MATCHMD_NONE) { CDEBUG(D_NET, - "Delaying %s from %s ptl %d MB "LPX64" off %d len %d\n", + "Delaying %s from %s ptl %d MB %#llx off %d len %d\n", info->mi_opc == LNET_MD_OP_PUT ? "PUT" : "GET", libcfs_id2str(info->mi_id), info->mi_portal, info->mi_mbits, info->mi_roffset, info->mi_rlength); @@ -714,7 +714,7 @@ lnet_ptl_attach_md(lnet_me_t *me, lnet_libmd_t *md, list_add_tail(&msg->msg_list, matches); CDEBUG(D_NET, "Resuming delayed PUT from %s portal %d " - "match "LPU64" offset %d length %d.\n", + "match %llu offset %d length %d.\n", libcfs_id2str(info.mi_id), info.mi_portal, info.mi_mbits, info.mi_roffset, info.mi_rlength); diff --git a/lnet/lnet/router_proc.c b/lnet/lnet/router_proc.c index f58fc27..28d2e2b 100644 --- a/lnet/lnet/router_proc.c +++ b/lnet/lnet/router_proc.c @@ -83,7 +83,7 @@ static int __proc_lnet_stats(void *data, int write, lnet_counters_t *ctrs; int len; char *tmpstr; - const int tmpsiz = 256; /* 7 %u and 4 LPU64 */ + const int tmpsiz = 256; /* 7 %u and 4 __u64 */ if (write) { lnet_counters_reset(); @@ -105,8 +105,8 @@ static int __proc_lnet_stats(void *data, int write, lnet_counters_get(ctrs); len = snprintf(tmpstr, tmpsiz, - "%u %u %u %u %u %u %u "LPU64" "LPU64" " - LPU64" "LPU64, + "%u %u %u %u %u %u %u %llu %llu " + "%llu %llu", ctrs->msgs_alloc, ctrs->msgs_max, ctrs->errors, ctrs->send_count, ctrs->recv_count, diff --git a/lnet/selftest/brw_test.c b/lnet/selftest/brw_test.c index ec0157f..2b57088 100644 --- a/lnet/selftest/brw_test.c +++ b/lnet/selftest/brw_test.c @@ -209,7 +209,7 @@ brw_check_page(struct page *pg, int pattern, __u64 magic) LBUG (); bad_data: - CERROR ("Bad data in page %p: "LPX64", "LPX64" expected\n", + CERROR ("Bad data in page %p: %#llx, %#llx expected\n", pg, data, magic); return 1; } diff --git a/lnet/selftest/framework.c b/lnet/selftest/framework.c index 24f2e39..07a2812 100644 --- a/lnet/selftest/framework.c +++ b/lnet/selftest/framework.c @@ -257,7 +257,7 @@ sfw_session_expired (void *data) LASSERT (sn->sn_timer_active); LASSERT (sn == sfw_data.fw_session); - CWARN ("Session expired! sid: %s-"LPU64", name: %s\n", + CWARN ("Session expired! sid: %s-%llu, name: %s\n", libcfs_nid2str(sn->sn_id.ses_nid), sn->sn_id.ses_stamp, &sn->sn_name[0]); @@ -757,7 +757,7 @@ sfw_add_test_instance (sfw_batch_t *tsb, srpc_server_rpc_t *rpc) LIBCFS_ALLOC(tsi, sizeof(*tsi)); if (tsi == NULL) { - CERROR ("Can't allocate test instance for batch: "LPU64"\n", + CERROR ("Can't allocate test instance for batch: %llu\n", tsb->bat_id.bat_id); return -ENOMEM; } @@ -1017,7 +1017,7 @@ sfw_run_batch (sfw_batch_t *tsb) sfw_test_instance_t *tsi; if (sfw_batch_active(tsb)) { - CDEBUG(D_NET, "Batch already active: "LPU64" (%d)\n", + CDEBUG(D_NET, "Batch already active: %llu (%d)\n", tsb->bat_id.bat_id, atomic_read(&tsb->bat_nactive)); return 0; } @@ -1052,7 +1052,7 @@ sfw_stop_batch (sfw_batch_t *tsb, int force) srpc_client_rpc_t *rpc; if (!sfw_batch_active(tsb)) { - CDEBUG(D_NET, "Batch "LPU64" inactive\n", tsb->bat_id.bat_id); + CDEBUG(D_NET, "Batch %llu inactive\n", tsb->bat_id.bat_id); return 0; } diff --git a/lnet/selftest/rpc.c b/lnet/selftest/rpc.c index 8e2cfbe..eb9e9dc 100644 --- a/lnet/selftest/rpc.c +++ b/lnet/selftest/rpc.c @@ -385,7 +385,7 @@ srpc_post_passive_rdma(int portal, int local, __u64 matchbits, void *buf, } CDEBUG (D_NET, - "Posted passive RDMA: peer %s, portal %d, matchbits "LPX64"\n", + "Posted passive RDMA: peer %s, portal %d, matchbits %#llx\n", libcfs_id2str(peer), portal, matchbits); return 0; } @@ -425,7 +425,7 @@ srpc_post_active_rdma(int portal, __u64 matchbits, void *buf, int len, } if (rc != 0) { - CERROR ("LNet%s(%s, %d, "LPD64") failed: %d\n", + CERROR ("LNet%s(%s, %d, %lld) failed: %d\n", ((options & LNET_MD_OP_PUT) != 0) ? "Put" : "Get", libcfs_id2str(peer), portal, matchbits, rc); @@ -436,7 +436,7 @@ srpc_post_active_rdma(int portal, __u64 matchbits, void *buf, int len, LASSERT (rc == 0); } else { CDEBUG (D_NET, - "Posted active RDMA: peer %s, portal %u, matchbits "LPX64"\n", + "Posted active RDMA: peer %s, portal %u, matchbits %#llx\n", libcfs_id2str(peer), portal, matchbits); } return 0;