[IPoIB] Enable IBAT on a device only if its packet filter is non-zero.

git-svn-id: svn://openib.tc.cornell.edu/gen1@202 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86

diff --git a/trunk/ulp/ipoib/kernel/ipoib_adapter.c b/trunk/ulp/ipoib/kernel/ipoib_adapter.c
index 0fe0418385695120907db147f6f678ecadc3f291..e2f4bc4b114124f101dcaef4da180bf77b9c8780 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_adapter.c
+++ b/trunk/ulp/ipoib/kernel/ipoib_adapter.c
@@ -126,7 +126,6 @@ ipoib_create_adapter(
        ib_api_status_t         status;\r
        cl_status_t                     cl_status;\r
        uint8_t                         port_num;\r
-       KLOCK_QUEUE_HANDLE      hdl;\r
 \r
        IPOIB_ENTER( IPOIB_DBG_INIT );\r
 \r
@@ -189,10 +188,6 @@ ipoib_create_adapter(
                return IB_ERROR;\r
        }\r
 \r
-       KeAcquireInStackQueuedSpinLock( &g_ipoib.lock, &hdl );\r
-       cl_qlist_insert_tail( &g_ipoib.adapter_list, &p_adapter->entry );\r
-       KeReleaseInStackQueuedSpinLock( &hdl );\r
-\r
        status = adapter_init( p_adapter );\r
        if( status != IB_SUCCESS )\r
        {\r
@@ -429,10 +424,19 @@ __adapter_destroying(
                p_adapter->h_pnp = NULL;\r
        }\r
 \r
-       KeAcquireInStackQueuedSpinLock( &g_ipoib.lock, &hdl );\r
-       ASSERT( cl_qlist_count( &g_ipoib.adapter_list ) );\r
-       cl_qlist_remove_item( &g_ipoib.adapter_list, &p_adapter->entry );\r
-       KeReleaseInStackQueuedSpinLock( &hdl );\r
+       if( p_adapter->packet_filter )\r
+       {\r
+               KeAcquireInStackQueuedSpinLock( &g_ipoib.lock, &hdl );\r
+               cl_obj_lock( &p_adapter->obj );\r
+\r
+               ASSERT( cl_qlist_count( &g_ipoib.adapter_list ) );\r
+               cl_qlist_remove_item( &g_ipoib.adapter_list, &p_adapter->entry );\r
+\r
+               p_adapter->packet_filter = 0;\r
+\r
+               cl_obj_unlock( &p_adapter->obj );\r
+               KeReleaseInStackQueuedSpinLock( &hdl );\r
+       }\r
 \r
        IPOIB_EXIT( IPOIB_DBG_INIT );\r
 }\r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_adapter.h b/trunk/ulp/ipoib/kernel/ipoib_adapter.h
index b2e73889e14c04588a06ec35c3b3bee0d302c335..a913585710dfc01f9d221154c73ab10b07e987cf 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_adapter.h
+++ b/trunk/ulp/ipoib/kernel/ipoib_adapter.h
@@ -183,6 +183,13 @@ typedef struct _ipoib_adapter
 *      guids\r
 *              CA and port GUIDs returned by the bus driver.\r
 *\r
+*      entry\r
+*              List item for storing all adapters in a list for address translation.\r
+*              We add adapters when their packet filter is set to a non-zero value,\r
+*              and remove them when their packet filter is cleared.  This is needed\r
+*              since user-mode removal events are generated after the packet filter\r
+*              is cleared, but before the adapter is destroyed.\r
+*\r
 *      h_al\r
 *              AL handle for all IB resources.\r
 *\r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_driver.c b/trunk/ulp/ipoib/kernel/ipoib_driver.c
index 8247b275a3fc5117460609d08fba010800d6e7aa..7283bbc965bf4c91697d2bcfab9ee77fd5c16c27 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_driver.c
+++ b/trunk/ulp/ipoib/kernel/ipoib_driver.c
@@ -1393,6 +1393,8 @@ ipoib_set_info(
 \r
        ULONG                           buf_len;\r
        uint8_t                         port_num;\r
+\r
+       KLOCK_QUEUE_HANDLE      hdl;\r
        \r
        IPOIB_ENTER( IPOIB_DBG_OID );\r
 \r
@@ -1425,6 +1427,7 @@ ipoib_set_info(
                }\r
                else\r
                {\r
+                       KeAcquireInStackQueuedSpinLock( &g_ipoib.lock, &hdl );\r
                        cl_obj_lock( &p_adapter->obj );\r
                        switch( p_adapter->state )\r
                        {\r
@@ -1445,6 +1448,9 @@ ipoib_set_info(
                        default:\r
                                if( !p_adapter->packet_filter && (*(uint32_t*)info_buf) )\r
                                {\r
+                                       cl_qlist_insert_tail(\r
+                                               &g_ipoib.adapter_list, &p_adapter->entry );\r
+\r
                                        /*\r
                                         * Filter was zero, now non-zero.  Register IP addresses\r
                                         * with SA.\r
@@ -1457,11 +1463,16 @@ ipoib_set_info(
                                         * Filter was non-zero, now zero.  Deregister IP addresses.\r
                                         */\r
                                        ipoib_dereg_addrs( p_adapter );\r
+\r
+                                       ASSERT( cl_qlist_count( &g_ipoib.adapter_list ) );\r
+                                       cl_qlist_remove_item(\r
+                                               &g_ipoib.adapter_list, &p_adapter->entry );\r
                                }\r
 \r
                                p_adapter->packet_filter = *(uint32_t*)info_buf;\r
                        }\r
                        cl_obj_unlock( &p_adapter->obj );\r
+                       KeReleaseInStackQueuedSpinLock( &hdl );\r
                }\r
                break;\r
 \r
@@ -1700,11 +1711,12 @@ void
 ipoib_resume_oids(\r
        IN                              ipoib_adapter_t* const          p_adapter )\r
 {\r
-       ULONG                   info;\r
-       NDIS_STATUS             status;\r
-       boolean_t               pending_query, pending_set;\r
-       pending_oid_t   query_oid = {0};\r
-       pending_oid_t   set_oid = {0};\r
+       ULONG                           info;\r
+       NDIS_STATUS                     status;\r
+       boolean_t                       pending_query, pending_set;\r
+       pending_oid_t           query_oid = {0};\r
+       pending_oid_t           set_oid = {0};\r
+       KLOCK_QUEUE_HANDLE      hdl;\r
 \r
        IPOIB_ENTER( IPOIB_DBG_INIT );\r
 \r
@@ -1775,25 +1787,32 @@ ipoib_resume_oids(
                case OID_GEN_CURRENT_PACKET_FILTER:\r
                        /* Validation already performed in the SetInformation path. */\r
 \r
+                       KeAcquireInStackQueuedSpinLock( &g_ipoib.lock, &hdl );\r
                        cl_obj_lock( &p_adapter->obj );\r
                        if( !p_adapter->packet_filter && (*(PULONG)set_oid.p_buf) )\r
                        {\r
+                               cl_qlist_insert_tail(\r
+                                       &g_ipoib.adapter_list, &p_adapter->entry );\r
                                /*\r
-                               * Filter was zero, now non-zero.  Register IP addresses\r
-                               * with SA.\r
-                               */\r
+                                * Filter was zero, now non-zero.  Register IP addresses\r
+                                * with SA.\r
+                                */\r
                                ipoib_reg_addrs( p_adapter );\r
                        }\r
                        else if( p_adapter->packet_filter && !(*(PULONG)set_oid.p_buf) )\r
                        {\r
-                               /*\r
-                               * Filter was non-zero, now zero.  Deregister IP addresses.\r
-                               */\r
+                               /* Filter was non-zero, now zero.  Deregister IP addresses. */\r
                                ipoib_dereg_addrs( p_adapter );\r
+\r
+                               ASSERT( cl_qlist_count( &g_ipoib.adapter_list ) );\r
+                               cl_qlist_remove_item(\r
+                                       &g_ipoib.adapter_list, &p_adapter->entry );\r
                        }\r
+                       p_adapter->packet_filter = *(PULONG)set_oid.p_buf;\r
+\r
                        cl_obj_unlock( &p_adapter->obj );\r
+                       KeReleaseInStackQueuedSpinLock( &hdl );\r
 \r
-                       p_adapter->packet_filter = *(PULONG)set_oid.p_buf;\r
                        NdisMSetInformationComplete( p_adapter->h_adapter, status );\r
                        break;\r
 \r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_ibat.c b/trunk/ulp/ipoib/kernel/ipoib_ibat.c
index f6a8b75c117570eace594226659a0e86f83ada78..a49e0c5168ad8443826242e5c5c3219140cd9ff3 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_ibat.c
+++ b/trunk/ulp/ipoib/kernel/ipoib_ibat.c
@@ -200,19 +200,6 @@ __ibat_get_ips(
                        continue;\r
 \r
                cl_obj_lock( &pAdapter->obj );\r
-\r
-               /*\r
-                * Only report IP addresses for adapters that have a non-zero\r
-                * packet filter since user-mode removal events are generated\r
-                * after the packet filter is cleared, but before the adapter\r
-                * is destroyed.\r
-                */\r
-               if( !pAdapter->packet_filter )\r
-               {\r
-                       cl_obj_unlock( &pAdapter->obj );\r
-                       continue;\r
-               }\r
-\r
                nIps += (LONG)cl_vector_get_size( &pAdapter->ip_vector );\r
 \r
                for( idx = 0;\r