From: pmmccorm Date: Fri, 23 Jan 2015 18:10:28 +0000 (-0800) Subject: Write out openib.conf from configure script. X-Git-Tag: vofed-3.18~36 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=476685259d7942c23ef93431646ac369522b54bc;p=~emulex%2Ftmp%2Fcompat-rdma%2F.git Write out openib.conf from configure script. --- diff --git a/compat-rdma.spec b/compat-rdma.spec index e3b0dd1..4d9c743 100755 --- a/compat-rdma.spec +++ b/compat-rdma.spec @@ -358,135 +358,6 @@ if [ -f /etc/debian_version ]; then fi fi - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load UCM module" >> %{RDMA_CONF_DIR}/openib.conf - echo "UCM_LOAD=no" >> %{RDMA_CONF_DIR}/openib.conf - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load RDMA_CM module" >> %{RDMA_CONF_DIR}/openib.conf - echo "RDMA_CM_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load RDMA_UCM module" >> %{RDMA_CONF_DIR}/openib.conf - echo "RDMA_UCM_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Increase ib_mad thread priority" >> %{RDMA_CONF_DIR}/openib.conf - echo "RENICE_IB_MAD=no" >> %{RDMA_CONF_DIR}/openib.conf - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Run sysctl performance tuning script" >> %{RDMA_CONF_DIR}/openib.conf - echo "RUN_SYSCTL=yes" >> %{RDMA_CONF_DIR}/openib.conf - -%if %{build_mthca} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load MTHCA" >> %{RDMA_CONF_DIR}/openib.conf - echo "MTHCA_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_qib} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load QIB" >> %{RDMA_CONF_DIR}/openib.conf - echo "QIB_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf - echo "# QIB QME BP VER" >> %{RDMA_CONF_DIR}/openib.conf - echo "QIB_QME_BPVER=1" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_ipath} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load IPATH" >> %{RDMA_CONF_DIR}/openib.conf - echo "IPATH_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_ehca} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load eHCA" >> %{RDMA_CONF_DIR}/openib.conf - echo "EHCA_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_mlx4} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load MLX4 modules" >> %{RDMA_CONF_DIR}/openib.conf - echo "MLX4_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_mlx5} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load MLX5 modules" >> %{RDMA_CONF_DIR}/openib.conf - echo "MLX5_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_mlx4_en} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load MLX4_EN module" >> %{RDMA_CONF_DIR}/openib.conf - echo "MLX4_EN_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_cxgb3} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load CXGB3 modules" >> %{RDMA_CONF_DIR}/openib.conf - echo "CXGB3_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_cxgb4} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load CXGB4 modules" >> %{RDMA_CONF_DIR}/openib.conf - echo "CXGB4_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_nes} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load NES modules" >> %{RDMA_CONF_DIR}/openib.conf - echo "NES_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_ipoib} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load IPoIB" >> %{RDMA_CONF_DIR}/openib.conf - echo "IPOIB_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Enable IPoIB Connected Mode" >> %{RDMA_CONF_DIR}/openib.conf - echo "SET_IPOIB_CM=yes" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_sdp} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load SDP module" >> %{RDMA_CONF_DIR}/openib.conf - echo "SDP_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_srp} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load SRP module" >> %{RDMA_CONF_DIR}/openib.conf - echo "SRP_LOAD=no" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_srpt} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load SRP Target module" >> %{RDMA_CONF_DIR}/openib.conf - echo "SRPT_LOAD=no" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_iser} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load ISER module" >> %{RDMA_CONF_DIR}/openib.conf - echo "ISER_LOAD=no" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_rds} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load RDS module" >> %{RDMA_CONF_DIR}/openib.conf - echo "RDS_LOAD=no" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_qlgc_vnic} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load QLogic VNIC module" >> %{RDMA_CONF_DIR}/openib.conf - echo "QLGC_VNIC_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf -%endif - -%if %{build_ocrdma} - echo >> %{RDMA_CONF_DIR}/openib.conf - echo "# Load OCRDMA modules" >> %{RDMA_CONF_DIR}/openib.conf - echo "OCRDMA_LOAD=yes" >> %{RDMA_CONF_DIR}/openib.conf -%endif - %if 0%{?suse_version} == 1315 /usr/bin/systemctl daemon-reload >/dev/null 2>&1 || : %endif diff --git a/configure b/configure index 9f9a2c6..2fe68c7 100755 --- a/configure +++ b/configure @@ -244,6 +244,16 @@ function check_autofconf { eval "export $VAR=$VALUE" } +function add_conf { + COMMENT=$1 + VALUE=$2 + OICONF=${PWD}/ofed_scripts/openib.conf + + echo "${COMMENT}" >> "${OICONF}" + echo "${VALUE}" >> "${OICONF}" + echo >> "${OICONF}" +} + main() { ofed_patch_params= @@ -368,6 +378,8 @@ main() CONFIG_INFINIBAND_IPOIB="m" CONFIG_INFINIBAND_IPOIB_CM="y" CONFIG_INFINIBAND_IPOIB_DEBUG="y" + add_conf "# Load IPoIB" "IPOIB_LOAD=yes" + add_conf "# Enable IPoIB Connected Mode" "SET_IPOIB_CM=yes" ;; --without-ipoib-mod) CONFIG_INFINIBAND_IPOIB= @@ -393,6 +405,7 @@ main() --with-sdp-mod) CONFIG_INFINIBAND_SDP="m" CONFIG_INFINIBAND_SDP_DEBUG="y" + add_conf "# Load SDP module" "SDP_LOAD=yes" ;; --without-sdp-mod) CONFIG_INFINIBAND_SDP= @@ -420,6 +433,7 @@ main() --with-srp-mod) CONFIG_INFINIBAND_SRP="m" CONFIG_SCSI_SRP_ATTRS="m" + add_conf "# Load SRP module" "SRP_LOAD=no" ;; --without-srp-mod) CONFIG_INFINIBAND_SRP= @@ -427,6 +441,7 @@ main() ;; --with-srp-target-mod) CONFIG_INFINIBAND_SRPT="m" + add_conf "# Load SRP Target module" "SRPT_LOAD=no" ;; --without-srp-target-mod) CONFIG_INFINIBAND_SRPT= @@ -454,6 +469,7 @@ main() --with-mthca-mod) CONFIG_INFINIBAND_MTHCA="m" CONFIG_INFINIBAND_MTHCA_DEBUG="y" + add_conf "# Load MTHCA" "MTHCA_LOAD=yes" ;; --without-mthca-mod) CONFIG_INFINIBAND_MTHCA= @@ -468,12 +484,14 @@ main() CONFIG_MLX4_CORE="m" CONFIG_MLX4_INFINIBAND="m" CONFIG_MLX4_DEBUG="y" + add_conf "# Load MLX4 modules" "MLX4_LOAD=yes" ;; --with-mlx5-mod) CONFIG_MLX5_CORE="m" CONFIG_MLX5_INFINIBAND="m" CONFIG_BACKPORT_LRO="m" CONFIG_MLX5_DEBUG="y" + add_conf "# Load MLX5 modules" "MLX5_LOAD=yes" ;; --with-mlx4_core-mod) CONFIG_MLX4_CORE="m" @@ -481,13 +499,13 @@ main() --without-mlx4_core-mod) CONFIG_MLX4_CORE= ;; - --with-mlx5_core-mod) + --with-mlx5_core-mod) CONFIG_MLX5_CORE="m" ;; --without-mlx5_core-mod) CONFIG_MLX5_CORE= ;; - -without-mlx4-mod) + --without-mlx4-mod) CONFIG_MLX4_CORE= CONFIG_MLX4_INFINIBAND= CONFIG_MLX4_DEBUG= @@ -498,8 +516,9 @@ main() CONFIG_MLX5_DEBUG= ;; --with-mlx4_en-mod) - CONFIG_MLX4_CORE="m" + CONFIG_MLX4_CORE="m" CONFIG_MLX4_EN="m" + add_conf "# Load MLX4_EN module" "MLX4_EN_LOAD=yes" ;; --without-mlx4_en-mod) CONFIG_MLX4_EN= @@ -541,18 +560,22 @@ main() ;; --with-ipath_inf-mod) CONFIG_INFINIBAND_IPATH="m" + add_conf "# Load IPATH" "IPATH_LOAD=yes" ;; --without-ipath_inf-mod) CONFIG_INFINIBAND_IPATH= ;; --with-qib-mod) CONFIG_INFINIBAND_QIB="m" + add_conf "# Load QIB" "QIB_LOAD=yes" + add_conf "# QIB QME BP VER" "QIB_QME_BPVER=1" ;; --without-qib-mod) CONFIG_INFINIBAND_QIB= ;; --with-iser-mod) CONFIG_INFINIBAND_ISER="m" + add_conf "# Load ISER module" "ISER_LOAD=no" ;; --without-isert-mod) CONFIG_INFINIBAND_ISERT= @@ -569,6 +592,7 @@ main() --with-ehca-mod) CONFIG_INFINIBAND_EHCA="m" CONFIG_INFINIBAND_EHCA_SCALING="y" + add_conf "$ Load eHCA" "EHCA_LAOD=yes" ;; --without-ehca-mod) CONFIG_INFINIBAND_EHCA= @@ -578,6 +602,7 @@ main() CONFIG_RDS="m" CONFIG_RDS_RDMA="m" CONFIG_RDS_TCP="m" + add_conf "# Load RDS module" "RDS_LOAD=no" ;; --without-rds-mod) CONFIG_RDS= @@ -598,6 +623,7 @@ main() ;; --with-qlgc_vnic-mod) CONFIG_INFINIBAND_QLGC_VNIC="m" + add_conf "# Load QLogic VNIC module" "QLGC_VNIC_LOAD=yes" ;; --without-qlgc_vnic-mod) CONFIG_INFINIBAND_QLGC_VNIC= @@ -611,6 +637,7 @@ main() --with-cxgb3-mod) CONFIG_INFINIBAND_CXGB3="m" CONFIG_CHELSIO_T3="m" + add_conf "# Load CXGB3 modules" "CXGB3_LOAD=yes" ;; --without-cxgb3-mod) CONFIG_INFINIBAND_CXGB3= @@ -625,6 +652,7 @@ main() --with-cxgb4-mod) CONFIG_INFINIBAND_CXGB4="m" CONFIG_CHELSIO_T4="m" + add_conf "# Load CXGB4 modules" "CXGB4_LOAD=yes" ;; --without-cxgb4-mod) CONFIG_INFINIBAND_CXGB4= @@ -644,6 +672,7 @@ main() ;; --with-nes-mod) CONFIG_INFINIBAND_NES="m" + add_conf "# Load NES modules" "NES_LOAD=yes" ;; --without-nes-mod) CONFIG_INFINIBAND_NES= @@ -657,6 +686,7 @@ main() --with-ocrdma-mod) CONFIG_INFINIBAND_OCRDMA="m" CONFIG_BE2NET="m" + add_conf "# Load OCRDMA modules" "OCRDMA_LOAD=yes" ;; --without-ocrdma-mod) CONFIG_INFINIBAND_OCRDMA= diff --git a/ofed_scripts/openib.conf b/ofed_scripts/openib.conf index 395080e..40864e3 100644 --- a/ofed_scripts/openib.conf +++ b/ofed_scripts/openib.conf @@ -6,3 +6,19 @@ NODE_DESC=$(hostname -s) # Wait for NODE_DESC_TIME_BEFORE_UPDATE sec before node_desc update NODE_DESC_TIME_BEFORE_UPDATE=10 + +# Load UCM module +UCM_LOAD=no + +# Load RDMA_CM module +RDMA_CM_LOAD=yes + +# Load RDMA_UCM module +RDMA_UCM_LOAD=yes + +# Increase ib_mad thread priority +RENICE_IB_MAD=no + +# Run sysctl performance tuning script +RUN_SYSCTL=yes +