r9315:

Fill out some unitialized fields in the ia_attr structure
returned by dat_ia_query().

Signed-off by: Arlin Davis <ardavis@ichips.intel.com>
Signed-off by: Robert Walsh <robert.walsh@qlogic.com>

diff --git a/dapl/openib/dapl_ib_util.c b/dapl/openib/dapl_ib_util.c
index f16b134547b8e0d9276293dda8ff519e4bfad945..e9d034ec09a36f1b95f43036e5b0638446c6955d 100644 (file)
--- a/dapl/openib/dapl_ib_util.c
+++ b/dapl/openib/dapl_ib_util.c
@@ -446,6 +446,7 @@ DAT_RETURN dapls_ib_query_hca (
                return(dapl_convert_errno(errno,"ib_query_hca"));
 
        if (ia_attr != NULL) {
+               (void) dapl_os_memzero(ia_attr, sizeof(*ia_attr));
                ia_attr->adapter_name[DAT_NAME_MAX_LENGTH - 1] = '\0';
                ia_attr->vendor_name[DAT_NAME_MAX_LENGTH - 1] = '\0';
                ia_attr->ia_address_ptr = 
@@ -470,7 +471,12 @@ DAT_RETURN dapls_ib_query_hca (
                /* ia_attr->hardware_version_minor   = dev_attr.fw_ver; */
                ia_attr->max_eps                  = dev_attr.max_qp;
                ia_attr->max_dto_per_ep           = dev_attr.max_qp_wr;
-               ia_attr->max_rdma_read_per_ep     = dev_attr.max_qp_rd_atom;
+               ia_attr->max_rdma_read_in         = dev_attr.max_qp_rd_atom;
+               ia_attr->max_rdma_read_out        = dev_attr.max_qp_rd_atom;
+               ia_attr->max_rdma_read_per_ep_in  = dev_attr.max_qp_rd_atom;
+               ia_attr->max_rdma_read_per_ep_out = dev_attr.max_qp_rd_atom;
+               ia_attr->max_rdma_read_per_ep_in_guaranteed  = DAT_TRUE;
+               ia_attr->max_rdma_read_per_ep_out_guaranteed = DAT_TRUE;
                ia_attr->max_evds                 = dev_attr.max_cq;
                ia_attr->max_evd_qlen             = dev_attr.max_cqe;
                ia_attr->max_iov_segments_per_dto = dev_attr.max_sge;
@@ -501,6 +507,7 @@ DAT_RETURN dapls_ib_query_hca (
        }
        
        if (ep_attr != NULL) {
+               (void) dapl_os_memzero(ep_attr, sizeof(*ep_attr));
                ep_attr->max_mtu_size     = port_attr.max_msg_sz;
                ep_attr->max_rdma_size    = port_attr.max_msg_sz;
                ep_attr->max_recv_dtos    = dev_attr.max_qp_wr;

diff --git a/dapl/openib_cma/dapl_ib_util.c b/dapl/openib_cma/dapl_ib_util.c
index 22d67a837d92b8823ce341a0f6cb391e540f8c00..4fde37709fd47e82ac54557df34e7b8866282f70 100644 (file)
--- a/dapl/openib_cma/dapl_ib_util.c
+++ b/dapl/openib_cma/dapl_ib_util.c
@@ -424,6 +424,7 @@ DAT_RETURN dapls_ib_query_hca(IN DAPL_HCA *hca_ptr,
                return(dapl_convert_errno(errno,"ib_query_hca"));
 
        if (ia_attr != NULL) {
+               (void) dapl_os_memzero(ia_attr, sizeof(*ia_attr));
                ia_attr->adapter_name[DAT_NAME_MAX_LENGTH - 1] = '\0';
                ia_attr->vendor_name[DAT_NAME_MAX_LENGTH - 1] = '\0';
                ia_attr->ia_address_ptr = 
@@ -446,6 +447,8 @@ DAT_RETURN dapls_ib_query_hca(IN DAPL_HCA *hca_ptr,
                ia_attr->hardware_version_major = dev_attr.hw_ver;
                ia_attr->max_eps                  = dev_attr.max_qp;
                ia_attr->max_dto_per_ep           = dev_attr.max_qp_wr;
+               ia_attr->max_rdma_read_in         = dev_attr.max_qp_rd_atom;
+               ia_attr->max_rdma_read_out        = dev_attr.max_qp_rd_atom;
                ia_attr->max_rdma_read_per_ep_in  = dev_attr.max_qp_rd_atom;
                ia_attr->max_rdma_read_per_ep_out = dev_attr.max_qp_rd_atom;
                ia_attr->max_rdma_read_per_ep_in_guaranteed  = DAT_TRUE;
@@ -481,6 +484,7 @@ DAT_RETURN dapls_ib_query_hca(IN DAPL_HCA *hca_ptr,
        }
        
        if (ep_attr != NULL) {
+               (void) dapl_os_memzero(ep_attr, sizeof(*ep_attr));
                ep_attr->max_mtu_size     = port_attr.max_msg_sz;
                ep_attr->max_rdma_size    = port_attr.max_msg_sz;
                ep_attr->max_recv_dtos    = dev_attr.max_qp_wr;

diff --git a/dapl/openib_scm/dapl_ib_util.c b/dapl/openib_scm/dapl_ib_util.c
index 7d581f461e507b188e6a065fc5d2580366995684..5e34b47e058b1caf805a30e5afc54f7046a96076 100644 (file)
--- a/dapl/openib_scm/dapl_ib_util.c
+++ b/dapl/openib_scm/dapl_ib_util.c
@@ -373,6 +373,7 @@ DAT_RETURN dapls_ib_query_hca (
                return(dapl_convert_errno(errno,"ib_query_hca"));
 
        if (ia_attr != NULL) {
+               (void) dapl_os_memzero(ia_attr, sizeof(*ia_attr));
                ia_attr->adapter_name[DAT_NAME_MAX_LENGTH - 1] = '\0';
                ia_attr->vendor_name[DAT_NAME_MAX_LENGTH - 1] = '\0';
                ia_attr->ia_address_ptr = (DAT_IA_ADDRESS_PTR)&hca_ptr->hca_address;
@@ -390,7 +391,12 @@ DAT_RETURN dapls_ib_query_hca (
                /* ia_attr->hardware_version_minor   = dev_attr.fw_ver; */
                ia_attr->max_eps                  = dev_attr.max_qp;
                ia_attr->max_dto_per_ep           = dev_attr.max_qp_wr;
-               ia_attr->max_rdma_read_per_ep     = dev_attr.max_qp_rd_atom;
+               ia_attr->max_rdma_read_in         = dev_attr.max_qp_rd_atom;
+               ia_attr->max_rdma_read_out        = dev_attr.max_qp_rd_atom;
+               ia_attr->max_rdma_read_per_ep_in  = dev_attr.max_qp_rd_atom;
+               ia_attr->max_rdma_read_per_ep_out = dev_attr.max_qp_rd_atom;
+               ia_attr->max_rdma_read_per_ep_in_guaranteed  = DAT_TRUE;
+               ia_attr->max_rdma_read_per_ep_out_guaranteed = DAT_TRUE;
                ia_attr->max_evds                 = dev_attr.max_cq;
                ia_attr->max_evd_qlen             = dev_attr.max_cqe;
                ia_attr->max_iov_segments_per_dto = dev_attr.max_sge;
@@ -422,6 +428,7 @@ DAT_RETURN dapls_ib_query_hca (
        }
        
        if (ep_attr != NULL) {
+               (void) dapl_os_memzero(ep_attr, sizeof(*ep_attr));
                ep_attr->max_mtu_size     = port_attr.max_msg_sz;
                ep_attr->max_rdma_size    = port_attr.max_msg_sz;
                ep_attr->max_recv_dtos    = dev_attr.max_qp_wr;