[WSD] Add IBWSD_POLL environment variable to allow provider to poll for

completions, improving latencies.

Signed-off-by: Fab Tillier (ftillier@silverstorm.com)
git-svn-id: svn://openib.tc.cornell.edu/gen1@104 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/ulp/wsd/user/ibsp_duplicate.c b/trunk/ulp/wsd/user/ibsp_duplicate.c
index 9258da44184a05912696a052b6e04dc2bc5bf98a..6a1d0adce1ffeba571c5c2814d8e712a6726eadf 100644 (file)
--- a/trunk/ulp/wsd/user/ibsp_duplicate.c
+++ b/trunk/ulp/wsd/user/ibsp_duplicate.c
@@ -57,7 +57,7 @@ setup_duplicate_socket(
 {\r
        char fname[100];\r
        HANDLE h = NULL;\r
-       int ret;\r
+       int ret, err;\r
        struct ibsp_duplicate_info *dup_info;\r
        ib_net64_t dest_port_guid;\r
        ib_path_rec_t path_rec;\r
@@ -176,6 +176,11 @@ setup_duplicate_socket(
                IBSP_ERROR( ("Failed to connect\n") );\r
                ret = WSAENETDOWN;\r
 err2:\r
+               g_ibsp.up_call_table.lpWPUCloseSocketHandle(\r
+                       socket_info->switch_socket, &err );\r
+               socket_info->switch_socket = INVALID_SOCKET;\r
+               STAT_DEC( wpusocket_num );\r
+\r
                ib_destroy_socket( socket_info );\r
        }\r
        else\r

diff --git a/trunk/ulp/wsd/user/ibsp_iblow.c b/trunk/ulp/wsd/user/ibsp_iblow.c
index 54424bb10ca293eca495c5699cf48d536f76560b..ca6825099cced51659535eb68a5d0b2eac896ccb 100644 (file)
--- a/trunk/ulp/wsd/user/ibsp_iblow.c
+++ b/trunk/ulp/wsd/user/ibsp_iblow.c
@@ -289,7 +289,7 @@ complete_wq(
 \r
 \r
 /* CQ completion handler. */\r
-void\r
+int\r
 ib_cq_comp(\r
                                        void                                            *cq_context )\r
 {\r
@@ -301,6 +301,7 @@ ib_cq_comp(
        io_comp_info_t                  info[WC_LIST_SIZE];\r
        int                                             cb_idx;\r
        int                                             i;\r
+       int                                             n_comp = 0;\r
 #ifdef _DEBUG_\r
        int                                             comp_count;\r
 #endif\r
@@ -387,6 +388,8 @@ ib_cq_comp(
                        }\r
                }\r
 \r
+               n_comp += i;\r
+\r
 #ifdef _DEBUG_\r
                if( comp_count > g_ibsp.max_comp_count )\r
                {\r
@@ -395,13 +398,6 @@ ib_cq_comp(
 #endif\r
        } while( !free_wclist );\r
 \r
-       status = ib_rearm_cq( cq_tinfo->cq, FALSE );\r
-       if( status != IB_SUCCESS )\r
-       {\r
-               IBSP_ERROR(\r
-                       ("ib_rearm_cq returned %s)\n", ib_get_err_str( status )) );\r
-       }\r
-\r
 done:\r
 \r
 #ifdef _DEBUG_\r
@@ -412,6 +408,7 @@ done:
 #endif\r
 \r
        IBSP_EXIT( IBSP_DBG_WQ );\r
+       return n_comp;\r
 }\r
 \r
 \r
@@ -420,8 +417,10 @@ static DWORD WINAPI
 ib_cq_thread(\r
                                        LPVOID                                          lpParameter )\r
 {\r
-       struct cq_thread_info *cq_tinfo = (struct cq_thread_info *)lpParameter;\r
-       cl_status_t cl_status;\r
+       struct cq_thread_info   *cq_tinfo = (struct cq_thread_info *)lpParameter;\r
+       cl_status_t                             cl_status;\r
+       ib_api_status_t                 status;\r
+       int                                             i;\r
 \r
        IBSP_ENTER( IBSP_DBG_HW );\r
 \r
@@ -447,9 +446,23 @@ ib_cq_thread(
                        fzprint(("%s():%d:0x%x:0x%x: Calling ib_cq_comp().\n", __FUNCTION__,\r
                                         __LINE__, GetCurrentProcessId(), GetCurrentThreadId()));\r
 \r
-                       ib_cq_comp( cq_tinfo );\r
+                       i = g_max_poll;\r
+                       do\r
+                       {\r
+                               if( ib_cq_comp( cq_tinfo ) )\r
+                                       i = g_max_poll;\r
+\r
+                       } while( i-- );\r
+\r
                        fzprint(("%s():%d:0x%x:0x%x: Done calling ib_cq_comp().\n", __FUNCTION__,\r
                                         __LINE__, GetCurrentProcessId(), GetCurrentThreadId()));\r
+\r
+                       status = ib_rearm_cq( cq_tinfo->cq, FALSE );\r
+                       if( status != IB_SUCCESS )\r
+                       {\r
+                               IBSP_ERROR(\r
+                                       ("ib_rearm_cq returned %s)\n", ib_get_err_str( status )) );\r
+                       }\r
                }\r
 \r
        } while( !cq_tinfo->ib_cq_thread_exit_wanted );\r

diff --git a/trunk/ulp/wsd/user/ibspdll.c b/trunk/ulp/wsd/user/ibspdll.c
index 9aa2a04bdbe79c137e41902f59508675c94f524a..e12a86758cc2b58f490af4c38c27ca1dc45b2a16 100644 (file)
--- a/trunk/ulp/wsd/user/ibspdll.c
+++ b/trunk/ulp/wsd/user/ibspdll.c
@@ -48,6 +48,7 @@ static const GUID provider_guid = {
 \r
 static DWORD   no_read = 0;\r
 uint32_t               g_max_inline = 0xFFFFFFFF;\r
+uint32_t               g_max_poll = 0;\r
 \r
 /*\r
  * Function: DllMain\r
@@ -111,6 +112,10 @@ _DllMain(
                if( i && i <= 16 )\r
                        g_max_inline = _tcstoul( env_var, NULL, 10 );\r
 \r
+               i = GetEnvironmentVariable( "IBWSD_POLL", env_var, sizeof(env_var) );\r
+               if( i && i <= 16 )\r
+                       g_max_poll = _tcstoul( env_var, NULL, 10 );\r
+\r
                if( init_globals() )\r
                        return FALSE;\r
                break;\r

diff --git a/trunk/ulp/wsd/user/ibspdll.h b/trunk/ulp/wsd/user/ibspdll.h
index e03a95c901ba7568988666bc818a618f6719ce48..0feaa3d854dc2fee2825cd3a490621ac580c0f99 100644 (file)
--- a/trunk/ulp/wsd/user/ibspdll.h
+++ b/trunk/ulp/wsd/user/ibspdll.h
@@ -56,5 +56,6 @@
 extern struct ibspdll_globals g_ibsp;\r
 \r
 extern uint32_t                g_max_inline;\r
+extern uint32_t                g_max_poll;\r
 \r
 #endif /* IBSPDLL_H */\r

diff --git a/trunk/ulp/wsd/user/ibspproto.h b/trunk/ulp/wsd/user/ibspproto.h
index 43a254f9cba7fbd4f0e9277d6965f16a6964167e..f799fe15b25365b9f73828c670281728770e92a7 100644 (file)
--- a/trunk/ulp/wsd/user/ibspproto.h
+++ b/trunk/ulp/wsd/user/ibspproto.h
@@ -133,7 +133,7 @@ void
 shutdown_and_destroy_socket_info(\r
        IN      OUT                     struct ibsp_socket_info         *socket_info );\r
 \r
-void\r
+int\r
 ib_cq_comp(\r
                                        void                                            *cq_context );\r
 \r