DAOS-12114 build: remove psm2 dependency (#11637)

Remove also PSM2 support from CART and psm2 references in tests

Signed-off-by: Jerome Soumagne <jerome.soumagne@intel.com>

docs/dev/development.md

@@ -122,44 +122,6 @@ scons reduces the clutter from compiler setup.
 Additionally, the tool supports options to filter by directory and file names and specify a lower
 bound value to report.
 
-### Building Optional Components
-
-There are a few optional components that can be included into the DAOS build.
-For instance, to include the `psm2` provider. Run the following `scons`
-command:
-
-```bash
-$ scons PREFIX=${daos_prefix_path}
-      INCLUDE=psm2
-      install
-      --build-deps=yes
-      --config=force
-```
-
-Refer to the built-in `scons` help command to get a full list of all the
-optional components under the `INCLUDE` optional parameter.
-
-```bash
-$ scons -h
-scons: Reading SConscript files ...
-
-INCLUDE: Optional components to build
-    (all|none|comma-separated list of names)
-    allowed names: psm2
-    default: none
-    actual:
-```
-
-The version of the components can be changed by editing the
-[utils/build.config](https://github.com/daos-stack/daos/blob/master/utils/build.config)
-file.
-
-
->**_NOTE_**
->
->The support of the optional components is not guarantee and can be removed
->without further notification.
-
 ## Go dependencies
 
 Developers contributing Go code may need to change the external dependencies

site_scons/components/__init__.py

@@ -108,29 +108,12 @@ def define_mercury(reqs):
     else:
         reqs.define('rt', libs=['rt'])
 
-    reqs.define('psm2',
-                retriever=GitRepoRetriever('https://github.com/cornelisnetworks/opa-psm2.git'),
-                # psm2 hard-codes installing into /usr/...
-                commands=[['sed',
-                           '-i',
-                           '-e',
-                           's/\\(.{DESTDIR}\\/\\)usr\\//\\1/',
-                           '-e',
-                           's/\\(INSTALL_LIB_TARG=\\/usr\\/lib\\)64/\\1/',
-                           '-e',
-                           's/\\(INSTALL_LIB_TARG=\\)\\/usr/\\1/',
-                           'Makefile',
-                           'compat/Makefile'],
-                          ['make', 'LIBDIR=/lib64'],
-                          ['make', 'DESTDIR=$PSM2_PREFIX', 'LIBDIR=/lib64', 'install']],
-                headers=['psm2.h'],
-                libs=['psm2'])
-
     # pylint: disable-next=wrong-spelling-in-comment,fixme
     # TODO: change to --enable-opx once upgraded to libfabric 1.17+
     ofi_build = ['./configure',
                  '--prefix=$OFI_PREFIX',
                  '--disable-efa',
+                 '--disable-psm2',
                  '--disable-psm3',
                  '--disable-opx',
                  '--without-gdrcopy']
@@ -140,23 +123,13 @@ def define_mercury(reqs):
     else:
         ofi_build.append('--disable-debug')
 
-    ofi_build.extend(include(reqs,
-                             'psm2',
-                             check(reqs,
-                                   'psm2',
-                                   ['--enable-psm2=$PSM2_PREFIX',
-                                    'LDFLAGS=-Wl,--enable-new-dtags -Wl,-rpath=$PSM2_PREFIX/lib64'],
-                                   ['--enable-psm2']),
-                             ['--disable-psm2']))
-
     reqs.define('ofi',
                 retriever=GitRepoRetriever('https://github.com/ofiwg/libfabric'),
                 commands=[['./autogen.sh'],
                           ofi_build,
                           ['make'],
                           ['make', 'install']],
                 libs=['fabric'],
-                requires=include(reqs, 'psm2', ['psm2'], []),
                 config_cb=ofi_config,
                 headers=['rdma/fabric.h'],
                 package='libfabric-devel' if inst(reqs, 'ofi') else None,

site_scons/prereq_tools/base.py

@@ -43,8 +43,6 @@
 from SCons.Script import BUILD_TARGETS
 from SCons.Errors import InternalError
 
-OPTIONAL_COMPS = ['psm2']
-
 
 class DownloadFailure(Exception):
     """Exception raised when source can't be downloaded
@@ -443,7 +441,6 @@ def __init__(self, env, opts):
 
         RUNNER.initialize(self.__env)
 
-        opts.Add(ListVariable('INCLUDE', "Optional components to build", 'none', OPTIONAL_COMPS))
         opts.Add(PathVariable('PREFIX', 'Installation path', install_dir,
                               PathVariable.PathIsDirCreate))
         opts.Add('ALT_PREFIX', f'Specifies {os.pathsep} separated list of alternative paths to add',
@@ -813,8 +810,6 @@ def require(self, env, *comps, **kw):
     def included(self, *comps):
         """Returns true if the components are included in the build"""
         for comp in comps:
-            if comp not in OPTIONAL_COMPS:
-                continue
             if not set([comp, 'all']).intersection(set(self.include)):
                 return False
         return True

src/cart/README.env

@@ -2,14 +2,13 @@ This file lists the environment variables used in CaRT.
 
  . D_PROVIDER (Deprecated: CRT_PHY_ADDR_STR)
    It determines which mercury NA plugin to be used:
-   1: set it as "ofi+verbs;ofi_rxm" to use OFI verbs;ofi_rxm provider
-   2: set it as "ofi+psm2" to use OFI psm2 provider
-   3: set it as "ofi+gni" to use OFI gni provider
-   4: set it as "sm" to use SM plugin which only works within single node
-   5: set it as "ofi+tcp;ofi_rxm" to use OFI tcp;ofi_rxm provider.
-   6: set it as "ofi+sockets" to use OFI sockets provider
+   - set it as "ofi+verbs;ofi_rxm" to use OFI verbs;ofi_rxm provider
+   - set it as "ofi+gni" to use OFI gni provider
+   - set it as "sm" to use SM plugin which only works within single node
+   - set it as "ofi+tcp;ofi_rxm" to use OFI tcp;ofi_rxm provider.
+   - set it as "ofi+sockets" to use OFI sockets provider
       NOTE: This provider is deprecated in favor of "ofi+tcp;ofi_rxm"
-   7: by default (not set or set as any other value) it will use ofi tcp
+   - by default (not set or set as any other value) it will use ofi tcp
       provider.
 
  . D_LOG_FILE

src/cart/crt_hg.c

@@ -37,11 +37,6 @@ struct crt_na_dict crt_na_dict[] = {
 		.nad_str	= "ofi+gni",
 		.nad_contig_eps	= true,
 		.nad_port_bind  = false,
-	}, {
-		.nad_type	= CRT_PROV_OFI_PSM2,
-		.nad_str	= "ofi+psm2",
-		.nad_contig_eps	= false,
-		.nad_port_bind  = false,
 	}, {
 		.nad_type	= CRT_PROV_OFI_TCP_RXM,
 		.nad_str	= "ofi+tcp;ofi_rxm",
@@ -532,7 +527,8 @@ crt_provider_ip_str_get(bool primary, int provider)
 static bool
 crt_provider_is_block_mode(int provider)
 {
-	if (provider == CRT_PROV_OFI_PSM2 || provider == CRT_PROV_OFI_OPX)
+	/* return false for providers that should busy poll */
+	if (provider == CRT_PROV_OFI_OPX)
 		return false;
 
 	return true;

src/cart/crt_init.c

@@ -525,8 +525,7 @@ prov_settings_apply(bool primary, crt_provider_t prov, crt_init_options_t *opt)
 		return;
 
 	/* rxm and verbs providers only works with regular EP */
-	if (prov != CRT_PROV_OFI_PSM2 &&
-	    prov != CRT_PROV_OFI_SOCKETS &&
+	if (prov != CRT_PROV_OFI_SOCKETS &&
 	    crt_provider_is_sep(primary, prov)) {
 		D_WARN("set CRT_CTX_SHARE_ADDR as 1 is invalid "
 		       "for current provider, ignoring it.\n");
@@ -544,13 +543,6 @@ prov_settings_apply(bool primary, crt_provider_t prov, crt_init_options_t *opt)
 
 	}
 
-	/* Print notice that "ofi+psm2" will be deprecated*/
-	if (prov == CRT_PROV_OFI_PSM2) {
-		D_WARN("\"ofi+psm2\" will be deprecated soon.\n");
-		setenv("FI_PSM2_NAME_SERVER", "1", true);
-		D_DEBUG(DB_ALL, "Setting FI_PSM2_NAME_SERVER to 1\n");
-	}
-
 	if (prov == CRT_PROV_OFI_CXI)
 		mrc_enable = 1;
 	else {
@@ -1004,19 +996,6 @@ crt_get_port_opx(int *port)
 	return rc;
 }
 
-static inline int
-crt_get_port_psm2(int *port)
-{
-	int		rc = 0;
-	uint16_t	pid;
-
-	pid = getpid();
-	*port = (pid << 8);
-	D_DEBUG(DB_ALL, "got a port: %d.\n", *port);
-
-	return rc;
-}
-
 #define PORT_RANGE_STR_SIZE 32
 
 static void
@@ -1173,9 +1152,6 @@ crt_na_config_init(bool primary, crt_provider_t provider,
 			    provider == CRT_PROV_OFI_TCP_RXM)
 				crt_port_range_verify(port);
 
-			if (provider == CRT_PROV_OFI_PSM2)
-				port = (uint16_t)port << 8;
-
 			if (provider == CRT_PROV_OFI_CXI && port_auto_adjust) {
 				if (port > 511) {
 					D_WARN("Port=%d outside of valid range 0-511, "
@@ -1187,12 +1163,6 @@ crt_na_config_init(bool primary, crt_provider_t provider,
 
 			D_DEBUG(DB_ALL, "OFI_PORT %d, using it as service port.\n", port);
 		}
-	} else if (provider == CRT_PROV_OFI_PSM2) {
-		rc = crt_get_port_psm2(&port);
-		if (rc != 0) {
-			D_ERROR("crt_get_port failed, rc: %d.\n", rc);
-			D_GOTO(out, rc);
-		}
 	} else if (provider == CRT_PROV_OFI_OPX) {
 		rc = crt_get_port_opx(&port);
 		if (rc != 0) {

src/include/cart/types.h

@@ -98,7 +98,6 @@ typedef enum {
 	CRT_PROV_OFI_SOCKETS,
 	CRT_PROV_OFI_VERBS_RXM,
 	CRT_PROV_OFI_GNI,
-	CRT_PROV_OFI_PSM2,
 	CRT_PROV_OFI_TCP_RXM,
 	CRT_PROV_OFI_CXI,
 	CRT_PROV_OFI_OPX,

src/tests/ftest/util/dmg_utils.py

@@ -90,14 +90,14 @@ def network_scan(self, provider=None):
         #         "HostFabric": {
         #           "Interfaces": [
         #             {
-        #               "Provider": "ofi+psm2",
+        #               "Provider": "ofi+tcp",
         #               "Device": "ib1",
         #               "NumaNode": 1,
         #               "Priority": 0,
         #               "NetDevClass": 32
         #             },
         #             {
-        #               "Provider": "ofi+psm2",
+        #               "Provider": "ofi+tcp",
         #               "Device": "ib0",
         #               "NumaNode": 0,
         #               "Priority": 1,
@@ -119,7 +119,6 @@ def network_scan(self, provider=None):
         #             }
         #           ],
         #           "Providers": [
-        #             "ofi+psm2",
         #             "ofi+verbs;ofi_rxm",
         #             "ofi+tcp;ofi_rxm",
         #             "ofi+verbs",
@@ -1131,7 +1130,7 @@ def config_generate(self, access_points, num_engines=None, scm_only=False,
             net_class (str): Network class preferred. Defaults to None.
                 i.e. "ethernet"|"infiniband"
             net_provider (str): Network provider preferred. Defaults to None.
-                i.e. "ofi+tcp;ofi_rxm"|"ofi+psm2" etc.
+                i.e. "ofi+tcp;ofi_rxm" etc.
             use_tmpfs_scm (bool, optional): Whether to use a ramdisk instead of PMem
                 as SCM. Defaults to False.
             control_metadata_path (str): External directory provided to store control

src/tests/ftest/util/ior_utils.py

@@ -345,7 +345,6 @@ def get_default_env(self, manager_cmd, log_file=None):
         env = self.env.copy()
         env["D_LOG_FILE"] = get_log_file(log_file or "{}_daos.log".format(self.command))
         env["MPI_LIB"] = '""'
-        env["FI_PSM2_DISCONNECT"] = "1"
 
         # ior POSIX api does not require the below options.
         if "POSIX" in manager_cmd:

src/tests/ftest/util/mdtest_utils.py

@@ -134,7 +134,6 @@ def get_default_env(self, manager_cmd, log_file=None):
         env = self.env.copy()
         env["D_LOG_FILE"] = get_log_file(log_file or "{}_daos.log".format(self.command))
         env["MPI_LIB"] = '""'
-        env["FI_PSM2_DISCONNECT"] = "1"
 
         if "mpirun" in manager_cmd or "srun" in manager_cmd:
             env["DAOS_POOL"] = self.dfs_pool.value

src/tests/ftest/util/server_utils_base.py

@@ -682,9 +682,8 @@ def get_network_scan_info(self, host):
         Returns:
             dict: a dictionary of network information for the host, e.g.
                     {
-                        1: {"fabric_iface": ib0, "provider": "ofi+psm2"},
-                        2: {"fabric_iface": ib0, "provider": "ofi+verbs"},
-                        3: {"fabric_iface": ib0, "provider": "ofi+tcp"},
+                        1: {"fabric_iface": ib0, "provider": "ofi+verbs"},
+                        2: {"fabric_iface": ib0, "provider": "ofi+tcp"},
                     }
 
         """

utils/build.config

@@ -9,7 +9,6 @@ ISAL_CRYPTO = v2.23.0
 SPDK = v22.01.2
 OFI = v1.17.1
 MERCURY = v2.3.0rc5
-PSM2 = PSM2_11.2.78
 PROTOBUFC = v1.3.3
 UCX=v1.13.0