[ipoib] Limit the number of retries to connect to broadcast group. (mlnx: 3287)

Part_man.exe – added check for pkey with partial membership. Such a values is not supported in current version.
signed off by: slavas@voltaire.com

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

diff --git a/trunk/tools/part_man/user/part_man.c b/trunk/tools/part_man/user/part_man.c
index cf397795e0cea1e6d2bc3558b62d7af3c8137f19..5eda787f57ccd622b3cffcdc1035f8a26427164c 100644 (file)
--- a/trunk/tools/part_man/user/part_man.c
+++ b/trunk/tools/part_man/user/part_man.c
@@ -7,6 +7,7 @@
 #include <iba/ib_al.h>\r
 #include "al_dev.h"\r
 \r
+#define IS_FULL_MEMBER_PKEY(pkey)      (0x8000 & (pkey))\r
 \r
 typedef enum\r
 {\r
@@ -195,7 +196,8 @@ static int reg_ibbus_pkey_add(const uint16_t *pkeys, uint16_t pkey_num,OUT pkey_
                }\r
                else\r
                {\r
-                       cnt = strlen(partKey) + sprintf(partKey + strlen(partKey),"%s:",tmp);\r
+                       sprintf(partKey + strlen(partKey),"%s:",tmp);\r
+                       cnt = strlen(partKey);\r
                }\r
        }       \r
 \r
@@ -231,7 +233,7 @@ static int reg_ibbus_pkey_add(const uint16_t *pkeys, uint16_t pkey_num,OUT pkey_
        }\r
        else\r
        {\r
-               printf("No pkey to add\n");\r
+               printf("Required pkeys already exist\n");\r
                retval = 1;\r
        }\r
        RegCloseKey( reg_handle );\r
@@ -532,6 +534,12 @@ int prepare_reg_pkey_input(OUT REQUEST_IN *input,char* cmd[],int num)
                        sscanf(cmd[i],"0x%x",&input->u.guid_pkey.pkeys[input->u.guid_pkey.pkey_num]);\r
                else\r
                        sscanf(cmd[i],"%x",&input->u.guid_pkey.pkeys[input->u.guid_pkey.pkey_num]);\r
+\r
+               if (! IS_FULL_MEMBER_PKEY(input->u.guid_pkey.pkeys[input->u.guid_pkey.pkey_num]))\r
+           {\r
+                       printf("partial member pkey %s is not suported\n",cmd[i]);\r
+                       return 0;\r
+               }\r
                input->u.guid_pkey.pkey_num++;\r
        }\r
        return 1;\r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_adapter.h b/trunk/ulp/ipoib/kernel/ipoib_adapter.h
index a9c022fdbd6c62deefbd6d3cd2a987c133c8d43c..84425e942c02c3bd932191028cd986a9cda3551e 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_adapter.h
+++ b/trunk/ulp/ipoib/kernel/ipoib_adapter.h
@@ -78,6 +78,7 @@ typedef struct _ipoib_params
        mac_addr_t      conf_mac;\r
        uint32_t        mc_leave_rescan;\r
        uint32_t        guid_mask;\r
+       uint32_t        bc_join_retry;\r
 }      ipoib_params_t;\r
 /*\r
 * FIELDS\r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_driver.c b/trunk/ulp/ipoib/kernel/ipoib_driver.c
index 0b2b40f5c9121f7ec5e9f5fe71d1e0e406ba3188..40d5c3795f95c947575d69733a55b18cebe4d2ce 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_driver.c
+++ b/trunk/ulp/ipoib/kernel/ipoib_driver.c
@@ -162,7 +162,8 @@ IPOIB_REG_ENTRY HCARegTable[] = {
        {NDIS_STRING_CONST("RecvRatio"),        1, IPOIB_OFFSET(recv_pool_ratio),       IPOIB_SIZE(recv_pool_ratio),    1,          1,      10},\r
        {NDIS_STRING_CONST("PayloadMtu"),       1, IPOIB_OFFSET(payload_mtu),           IPOIB_SIZE(payload_mtu),        2044,       60,   4092},\r
        {NDIS_STRING_CONST("lso"),              0, IPOIB_OFFSET(lso),                   IPOIB_SIZE(lso),                0,          0,      1},\r
-       {NDIS_STRING_CONST("MCLeaveRescan"),    1, IPOIB_OFFSET(mc_leave_rescan),       IPOIB_SIZE(mc_leave_rescan),    260,        1,    3600}\r
+       {NDIS_STRING_CONST("MCLeaveRescan"),    1, IPOIB_OFFSET(mc_leave_rescan),       IPOIB_SIZE(mc_leave_rescan),    260,        1,    3600},\r
+       {NDIS_STRING_CONST("BCJoinRetry"),          1, IPOIB_OFFSET(bc_join_retry),                 IPOIB_SIZE(bc_join_retry),      50,         0,    1000}\r
        \r
 };  \r
 \r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_port.c b/trunk/ulp/ipoib/kernel/ipoib_port.c
index e3be853c490e1e6add5d0187c3bad8d0da2b904a..ac978c16a46c117bbf80b0155e4402a31a0eee63 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_port.c
+++ b/trunk/ulp/ipoib/kernel/ipoib_port.c
@@ -5681,7 +5681,16 @@ __bcast_cb(
                        CL_ASSERT( p_port->p_adapter->state == IB_PNP_PORT_ADD ||\r
                                p_port->p_adapter->state == IB_PNP_PORT_DOWN ||\r
                                p_port->p_adapter->state == IB_PNP_PORT_INIT );\r
-                       status = __port_get_bcast( p_port );\r
+                       if(++p_port->bc_join_retry_cnt < p_port->p_adapter->params.bc_join_retry)\r
+                       {\r
+                               status = __port_get_bcast( p_port );\r
+                       }\r
+                       else\r
+                       {\r
+                               NdisWriteErrorLogEntry( p_port->p_adapter->h_adapter,\r
+                                       EVENT_IPOIB_BCAST_JOIN, 1, p_mcast_rec->status );\r
+                               p_port->bc_join_retry_cnt = 0;\r
+                       }\r
                }\r
                else\r
                {\r
@@ -5701,7 +5710,7 @@ __bcast_cb(
                return;\r
        }\r
        cl_obj_unlock( &p_port->obj );\r
-\r
+       p_port->bc_join_retry_cnt = 0;\r
        status = __endpt_mgr_add_bcast( p_port, p_mcast_rec );\r
        if( status != IB_SUCCESS )\r
        {\r

diff --git a/trunk/ulp/ipoib/kernel/ipoib_port.h b/trunk/ulp/ipoib/kernel/ipoib_port.h
index 4c8d6a2283819e88a6095554e337c25c9c186152..46b446aa8703f8c177c5c080c3c67c8f9a9013db 100644 (file)
--- a/trunk/ulp/ipoib/kernel/ipoib_port.h
+++ b/trunk/ulp/ipoib/kernel/ipoib_port.h
@@ -516,6 +516,7 @@ typedef struct _ipoib_port
        uint16_t                                pkey_index;\r
        KDPC                                    gc_dpc;\r
        KTIMER                                  gc_timer;\r
+       uint32_t                                bc_join_retry_cnt;\r
        ipoib_hdr_t                             hdr[1]; /* Must be last! */\r
 \r
 }      ipoib_port_t;\r

diff --git a/trunk/ulp/ipoib/kernel/netipoib.inx b/trunk/ulp/ipoib/kernel/netipoib.inx
index 3539f7a4724c6303f9a1a998a3d0fc5728589586..f288f2a6faec5c335847a38f91eb40d4ad2d468c 100644 (file)
--- a/trunk/ulp/ipoib/kernel/netipoib.inx
+++ b/trunk/ulp/ipoib/kernel/netipoib.inx
@@ -157,6 +157,14 @@ HKR, Ndi\Params\guid_mask,         Optional,       0, "0"
 HKR, Ndi\Params\guid_mask,             Min,            0, "0"\r
 HKR, Ndi\Params\guid_mask,             Max,            0, "252"\r
 \r
+HKR, Ndi\Params\BCJoinRetry,           ParamDesc,      0, "Number of retries connecting to bc"\r
+HKR, Ndi\Params\BCJoinRetry,           Type,           0, "dword"\r
+HKR, Ndi\Params\BCJoinRetry,           Default,        0, "50"\r
+HKR, Ndi\Params\BCJoinRetry,           Optional,       0, "0"\r
+HKR, Ndi\Params\BCJoinRetry,           Min,            0, "0"\r
+HKR, Ndi\Params\BCJoinRetry,           Max,            0, "1000"\r
+\r
+\r
 [IpoibService]\r
 DisplayName     = %IpoibServiceDispName%\r
 ServiceType     = 1 ;%SERVICE_KERNEL_DRIVER%\r