* Portals MTU now 512K (honest)

*  lconf configures an EKC tunable on elan nodes to help bulk comms

diff --git a/lnet/include/lnet/lib-types.h b/lnet/include/lnet/lib-types.h
index d300360..9db8489 100644 (file)
--- a/lnet/include/lnet/lib-types.h
+++ b/lnet/include/lnet/lib-types.h
@@ -137,13 +137,8 @@ typedef struct {
 } lib_counters_t;
 
 /* temporary expedient: limit number of entries in discontiguous MDs */
-#if PTL_LARGE_MTU
 # define PTL_MTU        (512<<10)
-# define PTL_MD_MAX_IOV        128
-#else
-# define PTL_MTU        (64<<10)
-# define PTL_MD_MAX_IOV 16
-#endif
+# define PTL_MD_MAX_IOV 128
 
 struct lib_msg_t {
         struct list_head  msg_list;

diff --git a/lnet/klnds/qswlnd/qswlnd_cb.c b/lnet/klnds/qswlnd/qswlnd_cb.c
index c03d592..35c7c6c 100644 (file)
--- a/lnet/klnds/qswlnd/qswlnd_cb.c
+++ b/lnet/klnds/qswlnd/qswlnd_cb.c
@@ -895,6 +895,11 @@ kqswnal_rxhandler(EP_RXD *rxd)
                 return;
         }
 
+        if (!in_interrupt()) {
+                kqswnal_rx (krx);
+                return;
+        }
+
         atomic_inc (&kqswnal_packets_received);
 
         spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags);

diff --git a/lustre/portals/include/portals/lib-types.h b/lustre/portals/include/portals/lib-types.h
index d300360..9db8489 100644 (file)
--- a/lustre/portals/include/portals/lib-types.h
+++ b/lustre/portals/include/portals/lib-types.h
@@ -137,13 +137,8 @@ typedef struct {
 } lib_counters_t;
 
 /* temporary expedient: limit number of entries in discontiguous MDs */
-#if PTL_LARGE_MTU
 # define PTL_MTU        (512<<10)
-# define PTL_MD_MAX_IOV        128
-#else
-# define PTL_MTU        (64<<10)
-# define PTL_MD_MAX_IOV 16
-#endif
+# define PTL_MD_MAX_IOV 128
 
 struct lib_msg_t {
         struct list_head  msg_list;

diff --git a/lustre/portals/knals/qswnal/qswnal_cb.c b/lustre/portals/knals/qswnal/qswnal_cb.c
index c03d592..35c7c6c 100644 (file)
--- a/lustre/portals/knals/qswnal/qswnal_cb.c
+++ b/lustre/portals/knals/qswnal/qswnal_cb.c
@@ -895,6 +895,11 @@ kqswnal_rxhandler(EP_RXD *rxd)
                 return;
         }
 
+        if (!in_interrupt()) {
+                kqswnal_rx (krx);
+                return;
+        }
+
         atomic_inc (&kqswnal_packets_received);
 
         spin_lock_irqsave (&kqswnal_data.kqn_sched_lock, flags);