X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lnet%2Fklnds%2Fralnd%2Fralnd_cb.c;h=2e6ba70e19bde2407a0620406cb3356d04993d58;hb=aab1d832130ee5c181cf7e0e5aa555244d150b00;hp=ff437f68fee9e7a25d43a177c1dbade267370e0a;hpb=35a1096a4741b24dbcd674bda5daf7b8a13cfe28;p=fs%2Flustre-release.git diff --git a/lnet/klnds/ralnd/ralnd_cb.c b/lnet/klnds/ralnd/ralnd_cb.c index ff437f6..2e6ba70 100644 --- a/lnet/klnds/ralnd/ralnd_cb.c +++ b/lnet/klnds/ralnd/ralnd_cb.c @@ -38,6 +38,7 @@ * Author: Eric Barton */ +#include #include "ralnd.h" void @@ -229,7 +230,7 @@ kranal_setup_phys_buffer (kra_tx_t *tx, int nkiov, lnet_kiov_t *kiov, tx->tx_nob = nob; tx->tx_buffer = (void *)((unsigned long)(kiov->kiov_offset + offset)); - phys->Address = lnet_page2phys(kiov->kiov_page); + phys->Address = page_to_phys(kiov->kiov_page); phys++; resid = nob - (kiov->kiov_len - offset); @@ -254,7 +255,7 @@ kranal_setup_phys_buffer (kra_tx_t *tx, int nkiov, lnet_kiov_t *kiov, return -EMSGSIZE; } - phys->Address = lnet_page2phys(kiov->kiov_page); + phys->Address = page_to_phys(kiov->kiov_page); phys++; resid -= PAGE_SIZE; @@ -919,15 +920,16 @@ kranal_check_conn_timeouts (kra_conn_t *conn) conn->rac_state == RANAL_CONN_CLOSING); if (!conn->rac_close_sent && - cfs_time_aftereq(now, conn->rac_last_tx + conn->rac_keepalive * - HZ)) { + cfs_time_aftereq(now, conn->rac_last_tx + + msecs_to_jiffies(conn->rac_keepalive * + MSEC_PER_SEC))) { /* not sent in a while; schedule conn so scheduler sends a keepalive */ CDEBUG(D_NET, "Scheduling keepalive %p->%s\n", conn, libcfs_nid2str(conn->rac_peer->rap_nid)); kranal_schedule_conn(conn); } - timeout = conn->rac_timeout * HZ; + timeout = msecs_to_jiffies(conn->rac_timeout * MSEC_PER_SEC); if (!conn->rac_close_recvd && cfs_time_aftereq(now, conn->rac_last_rx + timeout)) { @@ -935,7 +937,7 @@ kranal_check_conn_timeouts (kra_conn_t *conn) (conn->rac_state == RANAL_CONN_ESTABLISHED) ? "Nothing" : "CLOSE not", libcfs_nid2str(conn->rac_peer->rap_nid), - (now - conn->rac_last_rx)/HZ); + jiffies_to_msecs(now - conn->rac_last_rx)/MSEC_PER_SEC); return -ETIMEDOUT; } @@ -955,7 +957,7 @@ kranal_check_conn_timeouts (kra_conn_t *conn) spin_unlock_irqrestore(&conn->rac_lock, flags); CERROR("tx on fmaq for %s blocked %lu seconds\n", libcfs_nid2str(conn->rac_peer->rap_nid), - (now - tx->tx_qtime)/HZ); + jiffies_to_msecs(now-tx->tx_qtime)/MSEC_PER_SEC); return -ETIMEDOUT; } } @@ -967,7 +969,7 @@ kranal_check_conn_timeouts (kra_conn_t *conn) spin_unlock_irqrestore(&conn->rac_lock, flags); CERROR("tx on rdmaq for %s blocked %lu seconds\n", libcfs_nid2str(conn->rac_peer->rap_nid), - (now - tx->tx_qtime)/HZ); + jiffies_to_msecs(now-tx->tx_qtime)/MSEC_PER_SEC); return -ETIMEDOUT; } } @@ -979,7 +981,7 @@ kranal_check_conn_timeouts (kra_conn_t *conn) spin_unlock_irqrestore(&conn->rac_lock, flags); CERROR("tx on replyq for %s blocked %lu seconds\n", libcfs_nid2str(conn->rac_peer->rap_nid), - (now - tx->tx_qtime)/HZ); + jiffies_to_msecs(now-tx->tx_qtime)/MSEC_PER_SEC); return -ETIMEDOUT; } } @@ -1231,7 +1233,7 @@ kranal_reaper (void *arg) conn_index = (conn_index + 1) % conn_entries; } - next_check_time += p * HZ; + next_check_time += msecs_to_jiffies(p * MSEC_PER_SEC); spin_lock_irqsave(&kranal_data.kra_reaper_lock, flags); @@ -1420,11 +1422,13 @@ kranal_sendmsg(kra_conn_t *conn, kra_msg_t *msg, case RAP_NOT_DONE: if (cfs_time_aftereq(jiffies, - conn->rac_last_tx + conn->rac_keepalive * - HZ)) + conn->rac_last_tx + + msecs_to_jiffies(conn->rac_keepalive * + MSEC_PER_SEC))) CWARN("EAGAIN sending %02x (idle %lu secs)\n", msg->ram_type, - (jiffies - conn->rac_last_tx)/HZ); + jiffies_to_msecs(jiffies - conn->rac_last_tx) / + MSEC_PER_SEC); return -EAGAIN; } } @@ -1456,7 +1460,8 @@ kranal_process_fmaq (kra_conn_t *conn) if (cfs_time_aftereq(jiffies, conn->rac_last_tx + - conn->rac_keepalive * HZ)) { + msecs_to_jiffies(conn->rac_keepalive * + MSEC_PER_SEC))) { CDEBUG(D_NET, "sending NOOP (rdma in progress)\n"); kranal_init_msg(&conn->rac_msg, RANAL_MSG_NOOP); kranal_sendmsg(conn, &conn->rac_msg, NULL, 0); @@ -1495,11 +1500,13 @@ kranal_process_fmaq (kra_conn_t *conn) spin_unlock_irqrestore(&conn->rac_lock, flags); if (cfs_time_aftereq(jiffies, - conn->rac_last_tx + conn->rac_keepalive * - HZ)) { + conn->rac_last_tx + + msecs_to_jiffies(conn->rac_keepalive * + MSEC_PER_SEC))) { CDEBUG(D_NET, "sending NOOP -> %s (%p idle %lu(%ld))\n", libcfs_nid2str(conn->rac_peer->rap_nid), conn, - (jiffies - conn->rac_last_tx)/HZ, + jiffies_to_msecs(jiffies - conn->rac_last_tx) / + MSEC_PER_SEC, conn->rac_keepalive); kranal_init_msg(&conn->rac_msg, RANAL_MSG_NOOP); kranal_sendmsg(conn, &conn->rac_msg, NULL, 0); @@ -1911,7 +1918,7 @@ int kranal_process_new_conn (kra_conn_t *conn) LASSERT (rrc == RAP_NOT_DONE); if (!cfs_time_aftereq(jiffies, conn->rac_last_tx + - conn->rac_timeout * HZ)) + msecs_to_jiffies(conn->rac_timeout*MSEC_PER_SEC))) return -EAGAIN; /* Too late */ @@ -2021,10 +2028,12 @@ kranal_scheduler (void *arg) /* retry with exponential backoff until HZ */ if (conn->rac_keepalive == 0) conn->rac_keepalive = 1; - else if (conn->rac_keepalive <= HZ) + else if (conn->rac_keepalive <= + msecs_to_jiffies(MSEC_PER_SEC)) conn->rac_keepalive *= 2; else - conn->rac_keepalive += HZ; + conn->rac_keepalive += + msecs_to_jiffies(MSEC_PER_SEC); deadline = conn->rac_last_tx + conn->rac_keepalive; spin_lock_irqsave(&dev->rad_lock, flags);