[SRP] Properly format and cap the number of memory descriptors in

IDBD information units.

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

diff --git a/trunk/ulp/srp/kernel/srp_connection.c b/trunk/ulp/srp/kernel/srp_connection.c
index 821aa93a809debab25442e48dd9e399e5fb9de99..f8f2c11dabd0952e6f1dbe816513b396cdf04234 100644 (file)
--- a/trunk/ulp/srp/kernel/srp_connection.c
+++ b/trunk/ulp/srp/kernel/srp_connection.c
@@ -438,7 +438,7 @@ __srp_cm_reply_cb(
        if (( p_connection->descriptor_format & DBDF_INDIRECT_DATA_BUFFER_DESCRIPTORS ) == DBDF_INDIRECT_DATA_BUFFER_DESCRIPTORS )\r
        {\r
                p_connection->max_scatter_gather_entries =\r
-                               ( MAX( SRP_MAX_IU_SIZE, p_connection->init_to_targ_iu_sz ) - offsetof( srp_cmd_t, additional_cdb )- sizeof(srp_memory_table_descriptor_t)) / sizeof( srp_memory_descriptor_t );\r
+                               ( MIN( SRP_MAX_IU_SIZE, p_connection->init_to_targ_iu_sz ) - offsetof( srp_cmd_t, additional_cdb )- sizeof(srp_memory_table_descriptor_t)) / sizeof( srp_memory_descriptor_t );\r
        }\r
        else if (( p_connection->descriptor_format & DBDF_DIRECT_DATA_BUFFER_DESCRIPTOR ) == DBDF_DIRECT_DATA_BUFFER_DESCRIPTOR )\r
        {\r

diff --git a/trunk/ulp/srp/kernel/srp_data_path.c b/trunk/ulp/srp/kernel/srp_data_path.c
index 56364d3df16d45775d32a4833c860c115fba9385..aca2b49e2f87db81b4852abb4acd2b855d943ca9 100644 (file)
--- a/trunk/ulp/srp/kernel/srp_data_path.c
+++ b/trunk/ulp/srp/kernel/srp_data_path.c
@@ -580,7 +580,13 @@ __srp_build_cmd(
                p_scatter_gather_list = StorPortGetScatterGatherList( p_dev_ext, p_srb );\r
                CL_ASSERT( p_scatter_gather_list != NULL );\r
                scatter_gather_count = (uint8_t)p_scatter_gather_list->NumberOfElements;\r
-               CL_ASSERT( scatter_gather_count <= p_srp_conn_info->max_scatter_gather_entries );\r
+       }\r
+\r
+       /* Cap the length of the inline descriptors to the maximum IU size. */\r
+       if( p_srp_conn_info->max_scatter_gather_entries < scatter_gather_count )\r
+       {\r
+               scatter_gather_count =\r
+                       (uint8_t)p_srp_conn_info->max_scatter_gather_entries;\r
        }\r
 \r
        if ( scsi_direction == SRB_FLAGS_DATA_IN )\r
@@ -612,10 +618,14 @@ __srp_build_cmd(
                        /* we don't swap rkey - it is already in network order*/\r
                        p_table_descriptor->descriptor.virtual_address =  cl_hton64( buf_addr );\r
                        p_table_descriptor->descriptor.memory_handle = p_srp_conn_info->rkey;\r
-                       p_table_descriptor->descriptor.data_length =  cl_hton32( sizeof(srp_memory_descriptor_t) * scatter_gather_count );\r
+\r
+                       p_table_descriptor->descriptor.data_length =\r
+                               cl_hton32( sizeof(srp_memory_descriptor_t) *\r
+                               p_scatter_gather_list->NumberOfElements );\r
                        \r
                        for ( i = 0, totalLength = 0, p_sg_element = p_scatter_gather_list->List;\r
-                                 i < scatter_gather_count;     i++, p_memory_descriptor++, p_sg_element++ )\r
+                                 i < p_scatter_gather_list->NumberOfElements;\r
+                                 i++, p_memory_descriptor++, p_sg_element++ )\r
                        {\r
                                buf_addr =  p_srp_conn_info->vaddr + p_sg_element->PhysicalAddress.QuadPart;\r
                        \r
@@ -628,6 +638,8 @@ __srp_build_cmd(
                }\r
                else if ( format == DBDF_DIRECT_DATA_BUFFER_DESCRIPTOR )\r
                {\r
+                       CL_ASSERT( scatter_gather_count ==\r
+                               p_scatter_gather_list->NumberOfElements );\r
                        for ( i = 0, p_sg_element = p_scatter_gather_list->List;\r
                                  i < scatter_gather_count;     i++, p_memory_descriptor++, p_sg_element++ )\r
                        {\r

diff --git a/trunk/ulp/srp/kernel/srp_descriptors.c b/trunk/ulp/srp/kernel/srp_descriptors.c
index d6def78797740adf2b55cfffa8349139cedc4bf6..81cb0e96710e4662e156292f7d03275bf80066cd 100644 (file)
--- a/trunk/ulp/srp/kernel/srp_descriptors.c
+++ b/trunk/ulp/srp/kernel/srp_descriptors.c
@@ -385,6 +385,8 @@ srp_post_send_descriptor(
                        p_descriptor->ds[0].length = get_srp_tsk_mgmt_length( (srp_tsk_mgmt_t *)p_descriptor->data_segment );\r
                }\r
 \r
+               ASSERT( p_descriptor->ds[0].length <= p_connection->init_to_targ_iu_sz );\r
+\r
                srp_add_send_descriptor( p_descriptors, p_descriptor );\r
 \r
                status = p_ifc->post_send(\r

diff --git a/trunk/ulp/srp/kernel/srp_hba.c b/trunk/ulp/srp/kernel/srp_hba.c
index eec6c0b4a5a6431c8ead3672ff82290f45ba2158..ba8949dae716eb9b35b8c8734e6570c6a98a8e82 100644 (file)
--- a/trunk/ulp/srp/kernel/srp_hba.c
+++ b/trunk/ulp/srp/kernel/srp_hba.c
@@ -683,7 +683,10 @@ __srp_connect_sessions(
                        {\r
                                any_ioc_connected = TRUE;\r
 \r
-                               if ( p_hba->max_sg > p_session->connection.max_scatter_gather_entries )\r
+                               if ( (p_hba->max_sg >\r
+                                       p_session->connection.max_scatter_gather_entries)\r
+                                       && !(p_session->connection.descriptor_format &\r
+                                       DBDF_INDIRECT_DATA_BUFFER_DESCRIPTORS) )\r
                                {\r
                                        p_hba->max_sg = p_session->connection.max_scatter_gather_entries;\r
                                }\r