[WSD] Add locking around state checks.

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

diff --git a/trunk/ulp/wsd/user/extensions.c b/trunk/ulp/wsd/user/extensions.c
index ff8456b46b46fc09affa62f4c3802c2d27404509..83f95c68b0ec901995ce6c94ead0b6082755082a 100644 (file)
--- a/trunk/ulp/wsd/user/extensions.c
+++ b/trunk/ulp/wsd/user/extensions.c
@@ -336,15 +336,22 @@ do_rdma_op(
 \r
        CL_ASSERT( wr_type == WR_RDMA_WRITE || wr_type == WR_RDMA_READ );\r
 \r
-       /* Check the state of the socket */\r
-       if( socket_info->socket_state != IBSP_CONNECTED )\r
+       cl_spinlock_acquire( &socket_info->mutex );\r
+       switch( socket_info->socket_state )\r
        {\r
+       case IBSP_CONNECTED:\r
+       case IBSP_DISCONNECTED:\r
+               break;\r
+\r
+       default:\r
+               cl_spinlock_release( &socket_info->mutex );\r
                IBSP_ERROR_EXIT(\r
                        ("Socket is not in connected socket_state state=%s\n",\r
                        IBSP_SOCKET_STATE_STR( socket_info->socket_state )) );\r
                *lpErrno = WSAENOTCONN;\r
                return SOCKET_ERROR;\r
        }\r
+       cl_spinlock_release( &socket_info->mutex );\r
 \r
        if( socket_info->qp_error )\r
        {\r

diff --git a/trunk/ulp/wsd/user/ibspdll.c b/trunk/ulp/wsd/user/ibspdll.c
index cd28646298bb04f7e02ffa7496c30cf61d835108..eb47fb453e606dc3cc28a6ad67b2780b20d809dd 100644 (file)
--- a/trunk/ulp/wsd/user/ibspdll.c
+++ b/trunk/ulp/wsd/user/ibspdll.c
@@ -1571,15 +1571,22 @@ IBSPRecv(
                return SOCKET_ERROR;\r
        }\r
 \r
-       /* Check the state of the socket */\r
-       if( socket_info->socket_state != IBSP_CONNECTED )\r
+       cl_spinlock_acquire( &socket_info->mutex );\r
+       switch( socket_info->socket_state )\r
        {\r
+       case IBSP_CONNECTED:\r
+       case IBSP_DISCONNECTED:\r
+               break;\r
+\r
+       default:\r
+               cl_spinlock_release( &socket_info->mutex );\r
                IBSP_ERROR_EXIT(\r
                        ("Socket is not in connected socket_state state=%s\n",\r
                        IBSP_SOCKET_STATE_STR( socket_info->socket_state )) );\r
                *lpErrno = WSAENOTCONN;\r
                return SOCKET_ERROR;\r
        }\r
+       cl_spinlock_release( &socket_info->mutex );\r
 \r
        if( socket_info->qp_error != 0 )\r
        {\r
@@ -1782,7 +1789,6 @@ IBSPSend(
        CL_ASSERT( lpOverlapped != NULL );\r
 \r
        cl_spinlock_acquire( &socket_info->mutex );\r
-       /* Check the state of the socket */\r
        switch( socket_info->socket_state )\r
        {\r
        case IBSP_CONNECTED:\r
@@ -1790,7 +1796,10 @@ IBSPSend(
                break;\r
 \r
        default:\r
-               IBSP_ERROR_EXIT( ("Socket is not in connected socket_state \n") );\r
+               cl_spinlock_release( &socket_info->mutex );\r
+               IBSP_ERROR_EXIT(\r
+                       ("Socket is not in connected socket_state state=%s\n",\r
+                       IBSP_SOCKET_STATE_STR( socket_info->socket_state )) );\r
                *lpErrno = WSAENOTCONN;\r
                return SOCKET_ERROR;\r
        }\r