Always disable nagle in the socknal, even for 0conf setups (from b1_0).

b=2578

diff --git a/lnet/klnds/socklnd/socklnd.c b/lnet/klnds/socklnd/socklnd.c
index f61a2bc..ac8a044 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.c
+++ b/lnet/klnds/socklnd/socklnd.c
@@ -206,7 +206,7 @@ ksocknal_bind_irq (unsigned int irq)
 
 ksock_route_t *
 ksocknal_create_route (__u32 ipaddr, int port, int buffer_size,
-                       int nonagel, int irq_affinity, int eager)
+                       int irq_affinity, int eager)
 {
         ksock_route_t *route;
 
@@ -223,7 +223,6 @@ ksocknal_create_route (__u32 ipaddr, int port, int buffer_size,
         route->ksnr_port = port;
         route->ksnr_buffer_size = buffer_size;
         route->ksnr_irq_affinity = irq_affinity;
-        route->ksnr_nonagel = nonagel;
         route->ksnr_eager = eager;
         route->ksnr_connecting = 0;
         route->ksnr_connected = 0;
@@ -403,7 +402,7 @@ ksocknal_get_route_by_idx (int index)
 
 int
 ksocknal_add_route (ptl_nid_t nid, __u32 ipaddr, int port, int bufnob,
-                    int nonagle, int bind_irq, int share, int eager)
+                    int bind_irq, int share, int eager)
 {
         unsigned long      flags;
         ksock_peer_t      *peer;
@@ -421,7 +420,7 @@ ksocknal_add_route (ptl_nid_t nid, __u32 ipaddr, int port, int bufnob,
                 return (-ENOMEM);
 
         route = ksocknal_create_route (ipaddr, port, bufnob, 
-                                       nonagle, bind_irq, eager);
+                                       bind_irq, eager);
         if (route == NULL) {
                 ksocknal_put_peer (peer);
                 return (-ENOMEM);
@@ -1318,8 +1317,7 @@ ksocknal_cmd(struct portals_cfg *pcfg, void * private)
                         pcfg->pcfg_count = route->ksnr_conn_count;
                         pcfg->pcfg_size  = route->ksnr_buffer_size;
                         pcfg->pcfg_wait  = route->ksnr_sharecount;
-                        pcfg->pcfg_flags = (route->ksnr_nonagel      ? 1 : 0) |
-                                           (route->ksnr_irq_affinity ? 2 : 0) |
+                        pcfg->pcfg_flags = (route->ksnr_irq_affinity ? 2 : 0) |
                                            (route->ksnr_eager        ? 4 : 0);
                         ksocknal_put_route (route);
                 }
@@ -1328,7 +1326,6 @@ ksocknal_cmd(struct portals_cfg *pcfg, void * private)
         case NAL_CMD_ADD_AUTOCONN: {
                 rc = ksocknal_add_route (pcfg->pcfg_nid, pcfg->pcfg_id,
                                          pcfg->pcfg_misc, pcfg->pcfg_size,
-                                         (pcfg->pcfg_flags & 0x01) != 0,
                                          (pcfg->pcfg_flags & 0x02) != 0,
                                          (pcfg->pcfg_flags & 0x04) != 0,
                                          (pcfg->pcfg_flags & 0x08) != 0);

diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h
index 46cd0d8..0f0b9bd 100644 (file)
--- a/lnet/klnds/socklnd/socklnd.h
+++ b/lnet/klnds/socklnd/socklnd.h
@@ -334,7 +334,6 @@ typedef struct ksock_route
         int                 ksnr_port;          /* port to connect to */
         int                 ksnr_buffer_size;   /* size of socket buffers */
         unsigned int        ksnr_irq_affinity:1; /* set affinity? */
-        unsigned int        ksnr_nonagel:1;     /* disable nagle? */
         unsigned int        ksnr_eager:1;       /* connect eagery? */
         unsigned int        ksnr_connecting:4;  /* autoconnects in progress by type */
         unsigned int        ksnr_connected:4;   /* connections established by type */

diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index 985b432..45a1508 100644 (file)
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -2271,7 +2271,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
                 goto out;
         }
 
-        if (route->ksnr_nonagel) {
+        {
                 int  option = 1;
                 
                 set_fs (KERNEL_DS);
@@ -2279,7 +2279,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
                                             (char *)&option, sizeof (option));
                 set_fs (oldmm);
                 if (rc != 0) {
-                        CERROR ("Can't disable nagel: %d\n", rc);
+                        CERROR ("Can't disable nagle: %d\n", rc);
                         goto out;
                 }
         }

diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 5ca5873..267c61c 100644 (file)
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -403,7 +403,7 @@ int lustre_process_log(struct lustre_mount_data *lmd, char * profile,
                 pcfg.pcfg_nid     = lmd->lmd_server_nid;
                 pcfg.pcfg_id      = lmd->lmd_server_ipaddr;
                 pcfg.pcfg_misc    = lmd->lmd_port;
-                pcfg.pcfg_size    = 0;
+                pcfg.pcfg_size    = 8388608;
                 pcfg.pcfg_flags   = 0x4; /*share*/
                 err = kportal_nal_cmd(&pcfg);
                 if (err <0)

diff --git a/lustre/portals/knals/socknal/socknal.c b/lustre/portals/knals/socknal/socknal.c
index f61a2bc..ac8a044 100644 (file)
--- a/lustre/portals/knals/socknal/socknal.c
+++ b/lustre/portals/knals/socknal/socknal.c
@@ -206,7 +206,7 @@ ksocknal_bind_irq (unsigned int irq)
 
 ksock_route_t *
 ksocknal_create_route (__u32 ipaddr, int port, int buffer_size,
-                       int nonagel, int irq_affinity, int eager)
+                       int irq_affinity, int eager)
 {
         ksock_route_t *route;
 
@@ -223,7 +223,6 @@ ksocknal_create_route (__u32 ipaddr, int port, int buffer_size,
         route->ksnr_port = port;
         route->ksnr_buffer_size = buffer_size;
         route->ksnr_irq_affinity = irq_affinity;
-        route->ksnr_nonagel = nonagel;
         route->ksnr_eager = eager;
         route->ksnr_connecting = 0;
         route->ksnr_connected = 0;
@@ -403,7 +402,7 @@ ksocknal_get_route_by_idx (int index)
 
 int
 ksocknal_add_route (ptl_nid_t nid, __u32 ipaddr, int port, int bufnob,
-                    int nonagle, int bind_irq, int share, int eager)
+                    int bind_irq, int share, int eager)
 {
         unsigned long      flags;
         ksock_peer_t      *peer;
@@ -421,7 +420,7 @@ ksocknal_add_route (ptl_nid_t nid, __u32 ipaddr, int port, int bufnob,
                 return (-ENOMEM);
 
         route = ksocknal_create_route (ipaddr, port, bufnob, 
-                                       nonagle, bind_irq, eager);
+                                       bind_irq, eager);
         if (route == NULL) {
                 ksocknal_put_peer (peer);
                 return (-ENOMEM);
@@ -1318,8 +1317,7 @@ ksocknal_cmd(struct portals_cfg *pcfg, void * private)
                         pcfg->pcfg_count = route->ksnr_conn_count;
                         pcfg->pcfg_size  = route->ksnr_buffer_size;
                         pcfg->pcfg_wait  = route->ksnr_sharecount;
-                        pcfg->pcfg_flags = (route->ksnr_nonagel      ? 1 : 0) |
-                                           (route->ksnr_irq_affinity ? 2 : 0) |
+                        pcfg->pcfg_flags = (route->ksnr_irq_affinity ? 2 : 0) |
                                            (route->ksnr_eager        ? 4 : 0);
                         ksocknal_put_route (route);
                 }
@@ -1328,7 +1326,6 @@ ksocknal_cmd(struct portals_cfg *pcfg, void * private)
         case NAL_CMD_ADD_AUTOCONN: {
                 rc = ksocknal_add_route (pcfg->pcfg_nid, pcfg->pcfg_id,
                                          pcfg->pcfg_misc, pcfg->pcfg_size,
-                                         (pcfg->pcfg_flags & 0x01) != 0,
                                          (pcfg->pcfg_flags & 0x02) != 0,
                                          (pcfg->pcfg_flags & 0x04) != 0,
                                          (pcfg->pcfg_flags & 0x08) != 0);

diff --git a/lustre/portals/knals/socknal/socknal.h b/lustre/portals/knals/socknal/socknal.h
index 46cd0d8..0f0b9bd 100644 (file)
--- a/lustre/portals/knals/socknal/socknal.h
+++ b/lustre/portals/knals/socknal/socknal.h
@@ -334,7 +334,6 @@ typedef struct ksock_route
         int                 ksnr_port;          /* port to connect to */
         int                 ksnr_buffer_size;   /* size of socket buffers */
         unsigned int        ksnr_irq_affinity:1; /* set affinity? */
-        unsigned int        ksnr_nonagel:1;     /* disable nagle? */
         unsigned int        ksnr_eager:1;       /* connect eagery? */
         unsigned int        ksnr_connecting:4;  /* autoconnects in progress by type */
         unsigned int        ksnr_connected:4;   /* connections established by type */

diff --git a/lustre/portals/knals/socknal/socknal_cb.c b/lustre/portals/knals/socknal/socknal_cb.c
index 985b432..45a1508 100644 (file)
--- a/lustre/portals/knals/socknal/socknal_cb.c
+++ b/lustre/portals/knals/socknal/socknal_cb.c
@@ -2271,7 +2271,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
                 goto out;
         }
 
-        if (route->ksnr_nonagel) {
+        {
                 int  option = 1;
                 
                 set_fs (KERNEL_DS);
@@ -2279,7 +2279,7 @@ ksocknal_connect_peer (ksock_route_t *route, int type)
                                             (char *)&option, sizeof (option));
                 set_fs (oldmm);
                 if (rc != 0) {
-                        CERROR ("Can't disable nagel: %d\n", rc);
+                        CERROR ("Can't disable nagle: %d\n", rc);
                         goto out;
                 }
         }