* Rename max_immd_size -> max_msg_size to reduce further confusion, and align with...

diff --git a/lnet/include/lnet/ptllnd_wire.h b/lnet/include/lnet/ptllnd_wire.h
index 6fa8ee5..02f595c 100644 (file)
--- a/lnet/include/lnet/ptllnd_wire.h
+++ b/lnet/include/lnet/ptllnd_wire.h
@@ -50,7 +50,7 @@ typedef struct
 typedef struct
 {
         __u64             kptlhm_matchbits;       /* matchbits */
-        __u32             kptlhm_max_immd_size;   /* immd message size */
+        __u32             kptlhm_max_msg_size;    /* max message size */
 } WIRE_ATTR kptl_hello_msg_t;
 
 typedef struct kptl_msg

diff --git a/lnet/klnds/ptllnd/README b/lnet/klnds/ptllnd/README
index d6cfc37..5cb6cfc 100644 (file)
--- a/lnet/klnds/ptllnd/README
+++ b/lnet/klnds/ptllnd/README
@@ -41,7 +41,7 @@
             The maximum number of concurrent sends that are
             outstanding to a single piere at any given instant.
 
-        max_immd_size:
+        max_msg_size:
             The maximum immedate message size.  This MUST be
             the same on all nodes in a cluster.  A peer connecting
-            with a diffrent max_immd_size will be rejected.
+            with a diffrent max_msg_size will be rejected.

diff --git a/lnet/klnds/ptllnd/ptllnd.c b/lnet/klnds/ptllnd/ptllnd.c
index f4f07e2..2c641f9 100755 (executable)
--- a/lnet/klnds/ptllnd/ptllnd.c
+++ b/lnet/klnds/ptllnd/ptllnd.c
@@ -183,7 +183,7 @@ kptllnd_msg_unpack(kptl_msg_t *msg, int nob,kptl_data_t *kptllnd_data)
                                 break;
                         case PTLLND_MSG_TYPE_HELLO:
                                 __swab64s(&msg->ptlm_u.hello.kptlhm_matchbits);
-                                __swab32s(&msg->ptlm_u.hello.kptlhm_max_immd_size);
+                                __swab32s(&msg->ptlm_u.hello.kptlhm_max_msg_size);
                                 break;
                         default:
                                 CERROR("Bad message type: %d\n", msg->ptlm_type);
@@ -478,7 +478,7 @@ kptllnd_startup (lnet_ni_t *ni)
 
         kptllnd_data->kptl_rx_cache = cfs_mem_cache_create (
                 "ptllnd_rx",
-                sizeof(kptl_rx_t) + *kptllnd_tunables.kptl_max_immd_size,
+                sizeof(kptl_rx_t) + *kptllnd_tunables.kptl_max_msg_size,
                 0, /* offset */
                 0, /* flags */
                 NULL,NULL); /* CTOR/DTOR */
@@ -710,7 +710,7 @@ kptllnd_module_init (void)
         CDEBUG(D_INFO,"rxb_npages = %d\n",*kptllnd_tunables.kptl_rxb_npages);
         CDEBUG(D_INFO,"credits = %d\n",*kptllnd_tunables.kptl_credits);
         CDEBUG(D_INFO,"peercredits = %d\n",*kptllnd_tunables.kptl_peercredits);
-        CDEBUG(D_INFO,"max_immd_size = %d\n",*kptllnd_tunables.kptl_max_immd_size);
+        CDEBUG(D_INFO,"max_msg_size = %d\n",*kptllnd_tunables.kptl_max_msg_size);
 
         ptllnd_assert_wire_constants();
 

diff --git a/lnet/klnds/ptllnd/ptllnd.h b/lnet/klnds/ptllnd/ptllnd.h
index 30bb60e..91dbe98 100755 (executable)
--- a/lnet/klnds/ptllnd/ptllnd.h
+++ b/lnet/klnds/ptllnd/ptllnd.h
@@ -94,7 +94,7 @@ typedef struct
         int             *kptl_rxb_npages;       /* number of pages for rx buffer */
         int             *kptl_credits;          /* number of credits */
         int             *kptl_peercredits;      /* number of credits */
-        int             *kptl_max_immd_size;    /* max immd message size*/
+        int             *kptl_max_msg_size;     /* max immd message size*/
         int             *kptl_peer_hash_table_size; /* # slots in peer hash table */
 
 #ifdef PJK_DEBUGGING

diff --git a/lnet/klnds/ptllnd/ptllnd_cb.c b/lnet/klnds/ptllnd/ptllnd_cb.c
index f91ad30..7286526 100644 (file)
--- a/lnet/klnds/ptllnd/ptllnd_cb.c
+++ b/lnet/klnds/ptllnd/ptllnd_cb.c
@@ -463,7 +463,7 @@ kptllnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
 
                 /* Is the payload small enough not to need RDMA? */
                 nob = offsetof(kptl_msg_t, ptlm_u.immediate.kptlim_payload[payload_nob]);
-                if (nob <= *kptllnd_tunables.kptl_max_immd_size)
+                if (nob <= *kptllnd_tunables.kptl_max_msg_size)
                         break;
 
 
@@ -498,7 +498,7 @@ kptllnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
 
                 /* Is the payload small enough not to need RDMA? */
                 nob = offsetof(kptl_msg_t, ptlm_u.immediate.kptlim_payload[lntmsg->msg_md->md_length]);
-                if (nob <= *kptllnd_tunables.kptl_max_immd_size)
+                if (nob <= *kptllnd_tunables.kptl_max_msg_size)
                         break;
 
                 STAT_UPDATE(kps_send_get);
@@ -550,7 +550,7 @@ kptllnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
 
                         /* Is the payload small enough not to need RDMA? */
                         nob = offsetof(kptl_msg_t, ptlm_u.immediate.kptlim_payload[payload_nob]);
-                        if (nob <= *kptllnd_tunables.kptl_max_immd_size)
+                        if (nob <= *kptllnd_tunables.kptl_max_msg_size)
                                 break;
 
                         kptllnd_do_put(tx,lntmsg,kptllnd_data);
@@ -571,11 +571,11 @@ kptllnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
                         if (rx->rx_msg->ptlm_type == PTLLND_MSG_TYPE_IMMEDIATE) {
                                 /* RDMA not expected */
                                 nob = offsetof(kptl_msg_t, ptlm_u.immediate.kptlim_payload[payload_nob]);
-                                if (nob > *kptllnd_tunables.kptl_max_immd_size) {
+                                if (nob > *kptllnd_tunables.kptl_max_msg_size) {
                                         CERROR("REPLY for "LPX64" too big but RDMA not requested:"
                                                "%d (max for message is %d)\n",
                                                target.nid, payload_nob,
-                                               *kptllnd_tunables.kptl_max_immd_size);
+                                               *kptllnd_tunables.kptl_max_msg_size);
                                         CERROR("Can't REPLY IMMEDIATE %d to "LPX64"\n",
                                                nob, target.nid);
                                         return -EINVAL;
@@ -631,7 +631,7 @@ kptllnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
         STAT_UPDATE(kps_send_immd);
 
         LASSERT (offsetof(kptl_msg_t, ptlm_u.immediate.kptlim_payload[payload_nob])
-                 <= *kptllnd_tunables.kptl_max_immd_size);
+                 <= *kptllnd_tunables.kptl_max_msg_size);
 
         /*
          * Setup the header
@@ -641,14 +641,14 @@ kptllnd_send(lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg)
         if (payload_nob > 0) {
                 if (payload_kiov != NULL)
                         lnet_copy_kiov2flat(
-                                *kptllnd_tunables.kptl_max_immd_size,
+                                *kptllnd_tunables.kptl_max_msg_size,
                                 tx->tx_msg->ptlm_u.immediate.kptlim_payload,
                                 0,
                                 payload_niov, payload_kiov,
                                 payload_offset, payload_nob);
                 else
                         lnet_copy_iov2flat(
-                                *kptllnd_tunables.kptl_max_immd_size,
+                                *kptllnd_tunables.kptl_max_msg_size,
                                 tx->tx_msg->ptlm_u.immediate.kptlim_payload,
                                 0,
                                 payload_niov, payload_iov,
@@ -676,7 +676,7 @@ int kptllnd_eager_recv(
 
         PJK_UT_MSG_DATA("Eager RX=%p RXB=%p\n",rx,rx->rx_rxb);
 
-        LASSERT(rx->rx_nob < *kptllnd_tunables.kptl_max_immd_size);
+        LASSERT(rx->rx_nob < *kptllnd_tunables.kptl_max_msg_size);
 
         /*
          * Copy the data directly into the RX
@@ -739,7 +739,7 @@ int kptllnd_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed,
                 PJK_UT_MSG_DATA("PTLLND_MSG_TYPE_IMMEDIATE\n");
 
                 nob = offsetof(kptl_msg_t, ptlm_u.immediate.kptlim_payload[rlen]);
-                if (nob > *kptllnd_tunables.kptl_max_immd_size) {
+                if (nob > *kptllnd_tunables.kptl_max_msg_size) {
                         CERROR ("Immediate message from "LPX64" too big: %d\n",
                                 rxmsg->ptlm_u.immediate.kptlim_hdr.src_nid, rlen);
                         rc = -EINVAL;
@@ -749,14 +749,14 @@ int kptllnd_recv (lnet_ni_t *ni, void *private, lnet_msg_t *lntmsg, int delayed,
                 if (kiov != NULL)
                         lnet_copy_flat2kiov(
                                 niov, kiov, offset,
-                                *kptllnd_tunables.kptl_max_immd_size,
+                                *kptllnd_tunables.kptl_max_msg_size,
                                 rxmsg->ptlm_u.immediate.kptlim_payload,
                                 0,
                                 mlen);
                 else
                         lnet_copy_flat2iov(
                                 niov, iov, offset,
-                                *kptllnd_tunables.kptl_max_immd_size,
+                                *kptllnd_tunables.kptl_max_msg_size,
                                 rxmsg->ptlm_u.immediate.kptlim_payload,
                                 0,
                                 mlen);

diff --git a/lnet/klnds/ptllnd/ptllnd_modparams.c b/lnet/klnds/ptllnd/ptllnd_modparams.c
index e067903..bf06d44 100644 (file)
--- a/lnet/klnds/ptllnd/ptllnd_modparams.c
+++ b/lnet/klnds/ptllnd/ptllnd_modparams.c
@@ -51,8 +51,8 @@ static int peercredits = PTLLND_PEERCREDITS;
 CFS_MODULE_PARM(peercredits, "i", int, 0444,
                "concurrent sends to 1 peer");
 
-static int max_immd_size = PTLLND_MAX_MSG_SIZE;
-CFS_MODULE_PARM(max_immd_size, "i", int, 0444,
+static int max_msg_size = PTLLND_MAX_MSG_SIZE;
+CFS_MODULE_PARM(max_msg_size, "i", int, 0444,
                "max size of immediate message");
 
 static int peer_hash_table_size = PTLLND_PEER_HASH_SIZE;
@@ -75,7 +75,7 @@ kptl_tunables_t kptllnd_tunables = {
         .kptl_rxb_npages             = &rxb_npages,
         .kptl_credits                = &credits,
         .kptl_peercredits            = &peercredits,
-        .kptl_max_immd_size          = &max_immd_size,
+        .kptl_max_msg_size           = &max_msg_size,
         .kptl_peer_hash_table_size   = &peer_hash_table_size,
 #ifdef PJK_DEBUGGING
         .kptl_simulation_bitmap      = &simulation_bitmap,
@@ -102,7 +102,7 @@ static ctl_table kptllnd_ctl_table[] = {
         sizeof(int), 0444, NULL, &proc_dointvec},
        {8, "peercredits", &peercredits,
         sizeof(int), 0444, NULL, &proc_dointvec},
-       {9, "max_immd_size", &max_immd_size,
+       {9, "max_msg_size", &max_msg_size,
         sizeof(int), 0444, NULL, &proc_dointvec},
        {10, "peer_hash_table_size,", &peer_hash_table_size,
         sizeof(int), 0444, NULL, &proc_dointvec},

diff --git a/lnet/klnds/ptllnd/ptllnd_peer.c b/lnet/klnds/ptllnd/ptllnd_peer.c
index bd7f717..48f599a 100644 (file)
--- a/lnet/klnds/ptllnd/ptllnd_peer.c
+++ b/lnet/klnds/ptllnd/ptllnd_peer.c
@@ -1078,11 +1078,11 @@ kptllnd_peer_handle_hello (
         /*
          * Immediate message sizes MUST be equal
          */
-        if(  msg->ptlm_u.hello.kptlhm_max_immd_size !=
-                *kptllnd_tunables.kptl_max_immd_size){
+        if(  msg->ptlm_u.hello.kptlhm_max_msg_size !=
+                *kptllnd_tunables.kptl_max_msg_size){
                 CERROR("IMMD message size MUST be equal for all peers got %d expected %d\n",
-                        msg->ptlm_u.hello.kptlhm_max_immd_size,
-                        *kptllnd_tunables.kptl_max_immd_size);
+                        msg->ptlm_u.hello.kptlhm_max_msg_size,
+                        *kptllnd_tunables.kptl_max_msg_size);
 
                 return 0;
         }
@@ -1180,8 +1180,8 @@ kptllnd_peer_handle_hello (
                  */
                 tx_hello->tx_msg->ptlm_u.hello.kptlhm_matchbits =
                         safe_matchbits_to_peer;
-                tx_hello->tx_msg->ptlm_u.hello.kptlhm_max_immd_size =
-                        *kptllnd_tunables.kptl_max_immd_size;
+                tx_hello->tx_msg->ptlm_u.hello.kptlhm_max_msg_size =
+                        *kptllnd_tunables.kptl_max_msg_size;
 
                 /*
                  * Try and attach this peer to the list
@@ -1335,8 +1335,8 @@ kptllnd_tx_launch (
          * a default message.
          */
         tx_hello->tx_msg->ptlm_u.hello.kptlhm_matchbits = 0;
-        tx_hello->tx_msg->ptlm_u.hello.kptlhm_max_immd_size =
-                *kptllnd_tunables.kptl_max_immd_size;
+        tx_hello->tx_msg->ptlm_u.hello.kptlhm_max_msg_size =
+                *kptllnd_tunables.kptl_max_msg_size;
 
         /*
          * Allocate a new peer

diff --git a/lnet/klnds/ptllnd/ptllnd_rx_buf.c b/lnet/klnds/ptllnd/ptllnd_rx_buf.c
index 9667615..7ee5383 100644 (file)
--- a/lnet/klnds/ptllnd/ptllnd_rx_buf.c
+++ b/lnet/klnds/ptllnd/ptllnd_rx_buf.c
@@ -220,7 +220,7 @@ kptllnd_rx_buffer_pool_reserve(
          * +1 to handle any rounding error
          */
         nbuffers = (rxbp->rxbp_reserved) *
-                (*kptllnd_tunables.kptl_max_immd_size) /
+                (*kptllnd_tunables.kptl_max_msg_size) /
                 (PAGE_SIZE * (*kptllnd_tunables.kptl_rxb_npages));
         ++nbuffers ;
 
@@ -395,7 +395,7 @@ kptllnd_rx_buffer_post(
         md.options |= PTL_MD_EVENT_START_DISABLE;
         md.options |= PTL_MD_MAX_SIZE;
         md.user_ptr = rxb;
-        md.max_size = *kptllnd_tunables.kptl_max_immd_size;
+        md.max_size = *kptllnd_tunables.kptl_max_msg_size;
         md.eq_handle = kptllnd_data->kptl_eqh;
 
 

diff --git a/lnet/klnds/ptllnd/ptllnd_tx.c b/lnet/klnds/ptllnd/ptllnd_tx.c
index 4d3b7b5..17994b6 100644 (file)
--- a/lnet/klnds/ptllnd/ptllnd_tx.c
+++ b/lnet/klnds/ptllnd/ptllnd_tx.c
@@ -54,7 +54,7 @@ kptllnd_setup_tx_descs (kptl_data_t *kptllnd_data)
                  */
                 tx->tx_state = TX_STATE_ON_IDLE_QUEUE;
 
-                LIBCFS_ALLOC( tx->tx_msg, *kptllnd_tunables.kptl_max_immd_size );
+                LIBCFS_ALLOC( tx->tx_msg, *kptllnd_tunables.kptl_max_msg_size );
                 if(tx->tx_msg == NULL){
                         CERROR("Failed to allocate TX payload\n");
                         kptllnd_cleanup_tx_descs(kptllnd_data);
@@ -91,7 +91,7 @@ kptllnd_cleanup_tx_descs(kptl_data_t *kptllnd_data)
 
                 LASSERT( tx->tx_state == TX_STATE_ON_IDLE_QUEUE );
 
-                LIBCFS_FREE(tx->tx_msg,*kptllnd_tunables.kptl_max_immd_size);
+                LIBCFS_FREE(tx->tx_msg,*kptllnd_tunables.kptl_max_msg_size);
         }
 }
 

diff --git a/lnet/klnds/ptllnd/wirecheck.c b/lnet/klnds/ptllnd/wirecheck.c
index 83f33eb..3ea6823 100644 (file)
--- a/lnet/klnds/ptllnd/wirecheck.c
+++ b/lnet/klnds/ptllnd/wirecheck.c
@@ -189,7 +189,7 @@ main (int argc, char **argv)
 
         CHECK_STRUCT (kptl_hello_msg_t);
         CHECK_MEMBER (kptl_hello_msg_t, kptlhm_matchbits);
-        CHECK_MEMBER (kptl_hello_msg_t, kptlhm_max_immd_size);
+        CHECK_MEMBER (kptl_hello_msg_t, kptlhm_max_msg_size);
 
         printf ("}\n\n");