Update setup_ice_irdma.sh (#394)

* Update setup_ice_irdma.sh
Fix issues with scripts.

* Update setup_ice_irdma.sh

Update setup_ice_irdma.sh to fix installation issues.
Add missing download driver for ice
Add missing include for install of libfabrics

* ADD: Update common.sh to include MTL versions
ADD: Update common.sh to include MTL versions and load it.

* Fix error handling
* FIX: Common.sh to not throw error on MTL values.env missing

* Update setup_ice_irdma.sh
* Update SetupGuide.md
* Update setup_ice_irdma.sh
* Run build.sh script with sudo

Signed-off-by: Paweł Staszczuk <[email protected]>

---------

Signed-off-by: Miłosz Linkiewicz <[email protected]>
Signed-off-by: Paweł Staszczuk <[email protected]>
Co-authored-by: Pawel Staszczuk <[email protected]>

Author: Mionsz

docs/SetupGuide.md

@@ -24,7 +24,7 @@
 
     * **Option A** – Use environment preparation scripts. The scripts were tested under environments with `Ubuntu 20.04`, `Ubuntu 22.04`, `Ubuntu 24.04`, `CentOS Stream8`, and `CentOS Stream9`, installed alongside the Linux kernel 5.15.
 
-        Run the following commands, execute `setup_ice_irdma.sh` to setup and install patched drivers for NIC cards, and exec second one `setup_build_env.sh` to prepared whole build stack that is mandatory for bare metal version build of MCM:
+        Run the following commands, execute `setup_build_env.sh` to prepare the whole build stack and build dependencies that are mandatory for bare metal version of MCM and exec second one `setup_ice_irdma.sh all` to download, patch, setup and install ICE as well as iRDMA drivers for CLV NIC (E810) cards:
 
         ```bash
         sudo ./scripts/setup_build_env.sh
@@ -51,10 +51,10 @@
                 sudo yum install -y libbsd-devel cmake make rdma-core libibverbs-devel librdmacm-devel dracut
                 ```
 
-        * Install the `irdma` driver and `libfabric`:
+        * Install the `irdma` driver and `libfabric` using script:
 
             ```bash
-            ./scripts/setup_rdma_env.sh install
+            ./scripts/setup_ice_irdma.sh get-irdma
             ```
             For more information, see [Building and installing libfabric from source](https://github.com/ofiwg/libfabric?tab=readme-ov-file#building-and-installing-libfabric-from-source).
 
@@ -65,7 +65,7 @@
     Run the build script
 
     ```bash
-    ./build.sh
+    sudo ./build.sh
     ```
 
     This script builds and installs the following software components

scripts/common.sh

@@ -9,13 +9,21 @@ export BUILD_DIR="${BUILD_DIR:-${REPO_DIR}/_build}"
 export DRIVERS_DIR="${DRIVERS_DIR:-/opt/intel/drivers}"
 export PREFIX_DIR="${PREFIX_DIR:-${REPO_DIR}/_install}"
 
-VERSIONS_FILE_PATH="$(readlink -f "${VERSIONS_FILE:-${REPO_DIR}/versions.env}")"
-export VERSIONS_FILE_PATH
+MCM_VERSIONS_FILE_PATH="$(readlink -f "${MCM_VERSIONS_FILE:-${REPO_DIR}/versions.env}")"
+export MCM_VERSIONS_FILE_PATH
 
 # shellcheck source="versions.env"
-. "${VERSIONS_FILE_PATH}"
+. "${MCM_VERSIONS_FILE_PATH}"
 
 export MTL_DIR="${BUILD_DIR}/mtl"
+MTL_VERSIONS_FILE_PATH="${MTL_VERSIONS_FILE:-${MTL_DIR}/versions.env}"
+
+if [[ -f "${MTL_VERSIONS_FILE_PATH}" ]]; then
+    MTL_VERSIONS_FILE_PATH="$(readlink -f "${MTL_VERSIONS_FILE_PATH}")"
+    export MTL_VERSIONS_FILE_PATH
+    . "${MTL_VERSIONS_FILE_PATH}"    
+fi
+
 export DPDK_DIR="${BUILD_DIR}/dpdk"
 export XDP_DIR="${BUILD_DIR}/xdp"
 export BPF_DIR="${XDP_DIR}/lib/libbpf"

scripts/setup_ice_irdma.sh

@@ -4,7 +4,7 @@ SCRIPT_DIR="$(readlink -f "$(dirname -- "${BASH_SOURCE[0]}")")"
 export WORKING_DIR="${BUILD_DIR:-${REPO_DIR}/build/rdma}"
 export PERF_DIR="${DRIVERS_DIR}/perftest"
 
-. "${SCRIPT_DIR}/common.sh"
+. "${SCRIPT_DIR}/setup_build_env.sh"
 
 function print_usage()
 {
@@ -61,7 +61,6 @@ function install_os_dependencies()
             python3-pyverbs \
             libelf-dev \
             infiniband-diags \
-            rdma-core \
             ibverbs-utils \
             perftest \
             ethtool
@@ -94,6 +93,10 @@ function get_and_patch_intel_drivers()
         log_error  "MTL patch for ICE=v${ICE_VER} could not be found: ${MTL_DIR}/patches/ice_drv/${ICE_VER}"
         return 1
     fi
+    if [[ -d "${ICE_DIR}" ]]; then
+        rm -rf "${ICE_DIR}"
+    fi
+    git_download_strip_unpack "intel/ethernet-linux-ice"  "refs/tags/v${ICE_VER}"  "${ICE_DIR}"
 
     pushd "${ICE_DIR}" && \
     patch -p1 -i <(cat "${MTL_DIR}/patches/ice_drv/${ICE_VER}/"*.patch) && \
@@ -121,7 +124,6 @@ function build_install_and_config_irdma_drivers()
 {
     IRDMA_REPO="$(get_irdma_driver_tgz)"
     wget_download_strip_unpack "${IRDMA_REPO}" "${IRDMA_DIR}"
-    git_download_strip_unpack "intel/ethernet-linux-ice"  "refs/tags/v${ICE_VER}"  "${ICE_DIR}"
 
     if pushd "${IRDMA_DIR}"; then
         "${IRDMA_DIR}/build_core.sh" -y || exit 2
@@ -193,9 +195,9 @@ function install_perftest()
         exit 1
     fi
     make -j "${NPROC}" && \
-    as_root make install
+    as_root make install || \
+    { log_error log_error "Intel irdma: Could not make and/or install the perftest."; return 1; }
 
-    log_error "Intel irdma: Could not make and/or install the perftest."
     popd || log_warning "Intel irdma: Could not popd (directory). Ignoring."
     log_info "End of install_perftest method. Finished installing perftest-24.07.0."
 }
@@ -293,11 +295,11 @@ then
   fi
   if [[ "${1}" == "get-irdma" || "${1}" == "all" ]]; then
     if [[ "${1}" == "get-irdma" ]]; then
-      install_os_dependencies
+      install_os_dependencies && \
+      lib_install_fabrics
     fi
     build_install_and_config_irdma_drivers && \
-    config_intel_rdma_driver && \
-    lib_install_fabrics
+    config_intel_rdma_driver
     return_code="$?"
     if [[ "${return_code}" == "0" ]]; then
       log_success "Finished: irdma driver configuration for Intel hardware backend."