Rebase to upstream release PSM2_11.2.230

Resolves: rhbz#2049173

Signed-off-by: Michal Schmidt <mschmidt@redhat.com>

.gitignore

@@ -6,3 +6,7 @@
 /libpsm2-11.2.23.tar.gz
 /libpsm2-11.2.78.tar.gz
 /libpsm2-11.2.86.tar.gz
+/libpsm2-11.2.185.tar.gz
+/libpsm2-11.2.206.tar.gz
+/PSM2_11.2.229.tar.gz
+/PSM2_11.2.230.tar.gz

.libpsm2.metadata

@@ -0,0 +1 @@
+860a7dbf44cefd30ebfe1bcf9f9192857bfdbd5d PSM2_11.2.230.tar.gz

0001-Fix-multiple-definition-issues.patch

@@ -1,112 +0,0 @@
-From d91fc0569da44e7b9ebb6883974703b8e982098b Mon Sep 17 00:00:00 2001
-From: Honggang Li <honli@redhat.com>
-Date: Mon, 10 Feb 2020 04:59:36 -0500
-Subject: [PATCH] Fix multiple definition issues
-
-Signed-off-by: Honggang Li <honli@redhat.com>
----
- psm_error.h        | 2 +-
- psm_utils.c        | 6 ++++++
- psm_utils.h        | 7 ++-----
- ptl_am/ptl_fwd.h   | 2 +-
- ptl_ips/ptl_fwd.h  | 4 ++--
- ptl_self/ptl_fwd.h | 2 +-
- 6 files changed, 13 insertions(+), 10 deletions(-)
-
-diff --git a/psm_error.h b/psm_error.h
-index f335382..cb1b4ba 100644
---- a/psm_error.h
-+++ b/psm_error.h
-@@ -65,7 +65,7 @@
- #define PSMI_EP_NORETURN	    ((psm2_ep_t) -2)
- #define PSMI_EP_LOGEVENT	    ((psm2_ep_t) -3)
- 
--psm2_ep_errhandler_t psmi_errhandler_global;
-+extern psm2_ep_errhandler_t psmi_errhandler_global;
- 
- psm2_error_t MOCKABLE(psmi_handle_error)(psm2_ep_t ep, psm2_error_t error,
- 			      const char *buf, ...)
-diff --git a/psm_utils.c b/psm_utils.c
-index 521467f..7787f53 100644
---- a/psm_utils.c
-+++ b/psm_utils.c
-@@ -62,6 +62,12 @@ int psmi_ep_device_is_enabled(const psm2_ep_t ep, int devid);
- 
- struct psmi_epid_table psmi_epid_table;
- 
-+/*
-+ * Global model so we can tune defaults better for specific cpu's
-+ */
-+uint32_t psmi_cpu_model;
-+
-+
- /* Iterator to access the epid table.
-  * 'ep' can be NULL if remote endpoints from all endpoint handles are requested
-  */
-diff --git a/psm_utils.h b/psm_utils.h
-index fc38153..b94443d 100644
---- a/psm_utils.h
-+++ b/psm_utils.h
-@@ -317,10 +317,7 @@ uint32_t psmi_crc(unsigned char *buf, int len);
- #define CPUID_GENUINE_INTEL     0xf0000000
- #define CPUID_MODEL_UNDEFINED   -1
- 
--/*
-- * Global model so we can tune defaults better for specific cpu's
-- */
--uint32_t psmi_cpu_model;
-+extern uint32_t psmi_cpu_model;
- 
- /*
-  * Diagnostics, all in psm_diags.c
-@@ -337,7 +334,7 @@ void psmi_multi_ep_init();
-  * Fault injection
-  */
- struct psmi_faultinj_spec;
--int psmi_faultinj_enabled;	/* use macro to test */
-+extern int psmi_faultinj_enabled;	/* use macro to test */
- #if 1				/* possible to disable at compile time */
- #define PSMI_FAULTINJ_ENABLED()	(!!psmi_faultinj_enabled)
- #else
-diff --git a/ptl_am/ptl_fwd.h b/ptl_am/ptl_fwd.h
-index e1bd064..1d0fec4 100644
---- a/ptl_am/ptl_fwd.h
-+++ b/ptl_am/ptl_fwd.h
-@@ -57,7 +57,7 @@
- #define _PTL_FWD_AMSH_H
- 
- /* Symbol in am ptl */
--struct ptl_ctl_init psmi_ptl_amsh;
-+extern struct ptl_ctl_init psmi_ptl_amsh;
- 
- extern int psmi_shm_mq_rv_thresh;
- 
-diff --git a/ptl_ips/ptl_fwd.h b/ptl_ips/ptl_fwd.h
-index 3702fba..b774260 100644
---- a/ptl_ips/ptl_fwd.h
-+++ b/ptl_ips/ptl_fwd.h
-@@ -61,7 +61,7 @@ typedef struct ips_epaddr ips_epaddr_t;
- typedef struct ips_msgctl ips_msgctl_t;
- 
- /* Symbol in ips ptl */
--struct ptl_ctl_init psmi_ptl_ips;
-+extern struct ptl_ctl_init psmi_ptl_ips;
- 
--struct ptl_ctl_rcvthread psmi_ptl_ips_rcvthread;
-+extern struct ptl_ctl_rcvthread psmi_ptl_ips_rcvthread;
- #endif /* _PTL_FWD_IPS_H */
-diff --git a/ptl_self/ptl_fwd.h b/ptl_self/ptl_fwd.h
-index 77ee7f9..7ee6b73 100644
---- a/ptl_self/ptl_fwd.h
-+++ b/ptl_self/ptl_fwd.h
-@@ -57,6 +57,6 @@
- #define _PTL_FWD_SELF_H
- 
- /* Symbol in am ptl */
--struct ptl_ctl_init psmi_ptl_self;
-+extern struct ptl_ctl_init psmi_ptl_self;
- 
- #endif
--- 
-2.25.0
-

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+        - rhel-9
+decision_context: osci_compose_gate
+rules:
+        - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

libpsm2.spec

@@ -52,26 +52,20 @@
 #
 Summary: Intel PSM Libraries
 Name: libpsm2
-Version: 11.2.86
-Release: 6%{?dist}
+Version: 11.2.230
+Release: 1%{?dist}
 License: BSD or GPLv2
-URL: https://github.com/01org/opa-psm2/
+URL: https://github.com/cornelisnetworks/opa-psm2/
 
-# The tarball can be created by:
-# git clone https://github.com/01org/opa-psm2
-# cd opa-psm2
-# git checkout 4f0ad8cf4d6b44fcce5f745e946a056659ba54c0
-# make dist
-Source0: %{name}-%{version}.tar.gz
-Patch0: 0001-Fix-multiple-definition-issues.patch
-Patch1: makefile-distro-from-environment.patch
+Source0: https://github.com/cornelisnetworks/opa-psm2/archive/refs/tags/PSM2_%{version}.tar.gz
 
-# The OPA product is supported on x86 64 only:
+# The OPA product is supported on x86_64 only:
 ExclusiveArch: x86_64
 BuildRequires: libuuid-devel
 BuildRequires: numactl-devel
 BuildRequires: systemd
 BuildRequires: gcc
+BuildRequires: make
 Obsoletes: hfi1-psm < 1.0.0
 
 %package devel
@@ -102,9 +96,7 @@ Development files for the Intel PSM library
 Support for MPIs linked with PSM versions < 2
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%setup -q -n opa-psm2-PSM2_%{version}
 
 %build
 %{set_build_flags}
@@ -124,7 +116,7 @@ rm -f %{buildroot}%{_libdir}/*.a
 
 %files
 %license COPYING
-%{_libdir}/libpsm2.so.2.1
+%{_libdir}/libpsm2.so.2.*
 %{_libdir}/libpsm2.so.2
 %if 0%{?rhel} >= 8
 %{_udevrulesdir}/40-psm.rules
@@ -150,6 +142,33 @@ rm -f %{buildroot}%{_libdir}/*.a
 %endif
 
 %changelog
+* Wed Feb 01 2023 Kamal Heib <kheib@redhat.com> - 11.2.230-1
+- Rebase to upstream release PSM2_11.2.230
+
+* Tue Aug 02 2022 Michal Schmidt <mschmidt@redhat.com> - 11.2.229-2
+- Rebase to upstream release PSM2_11.2.229
+
+* Tue Dec 07 2021 Honggang Li <honli@redhat.com> - 11.2.206-1
+- Rebase to latest upstream release PSM2_11.2.206
+- Resolves: rhbz#2015389
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 11.2.185-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Thu Jun 17 2021 Honggang Li <honli@redhat.com> - 11.2.185-1
+- Rebase to latest upstream release PSM2_11.2.185
+- Resolves: rhbz#1924899
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 11.2.86-9
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 11.2.86-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Oct 19 2020 Jeff Law <law@redhat.com> - 11.2.86-7
+- Avoid out of bounds array index diagnostic with gcc-11
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 11.2.86-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

makefile-distro-from-environment.patch

@@ -1,13 +0,0 @@
-diff -ru ../libpsm2-11.2.86.orig/Makefile ./Makefile
---- ../libpsm2-11.2.86.orig/Makefile	2019-10-03 21:00:29.000000000 -0500
-+++ ./Makefile	2020-07-13 13:55:53.994452919 -0500
-@@ -164,7 +164,8 @@
- # The DISTRO variable is used subsequently for variable
- # behaviors of the 3 distros.
- 
--DISTRO := $(shell . /etc/os-release; echo $$ID)
-+# Use DISTRO from the environment
-+# DISTRO := $(shell . /etc/os-release; echo $$ID)
- 
- # By default the following two variables have the following values:
- LIBPSM2_COMPAT_CONF_DIR := /etc

sources

@@ -1 +1 @@
-SHA512 (libpsm2-11.2.86.tar.gz) = d4e6c8b20e94c236dd773a54c61ddef1456774b3671c481c1af7c78328fc20747935a68cabbb379798605a13edccbeb0bcd55b216885ca0e4f8cba7cae99002a
+SHA512 (PSM2_11.2.230.tar.gz) = cf17c83de38e25ddc7c116a1dd03fbe96c374403df789f19f4f03b65d73ddb1f15bb508dd2e3e2c4078b0fce1b1a13adfa532f975201c71cb0fd47ea53d790af

tests/runme.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -x
+
+# libpsm no longer support "shm". User has to run libpsm2 test over HFI hardware.
+# Unfortunately, osci gating system does not support submit test to specific machine
+# in beaker system. That is why this test is just a placeholder.

tests/tests.yml

@@ -0,0 +1,13 @@
+- hosts: localhost
+  roles:
+  - role: standard-test-basic
+    tags:
+    - classic
+    tests:
+    - simple:
+        dir: .
+        run: ./runme.sh
+    required_packages:
+    - libpsm2
+    - gcc
+    - coreutils