From 6f28ea0b60a813d5fd175a055db74b0e6216827b63ee9d581415a0d7073628f7 Mon Sep 17 00:00:00 2001 From: Nicolas Morey-Chaisemartin Date: Wed, 14 Sep 2022 06:20:09 +0000 Subject: [PATCH] Accepting request 1003443 from home:NMoreyChaisemartin:branches:science:HPC - Update to v42.0 - Fixes for all providers - Dropped patches merged upstream: - util-Add-barriers-support-for-RISC-V.patch - cmake-Make-modprobe.d-path-configurable.patch - Update gen-pandoc.sh to support python3 - Update to v39.1 - Major fixes for hns provider - Bug fixes for all providers - systemd hardening - NDR rate support - Dropped srp_daemon-Detect-proper-path-to-systemctl.patch as it was fixed upstream OBS-URL: https://build.opensuse.org/request/show/1003443 OBS-URL: https://build.opensuse.org/package/show/science:HPC/rdma-core?expand=0&rev=161 --- _service | 2 +- cmake-Make-modprobe.d-path-configurable.patch | 46 ----------- gen-pandoc.sh | 4 +- prebuilt-pandoc.tgz | 4 +- rdma-core-38.1.0.f291942cf7c9.tar.gz | 3 - rdma-core-42.0.0.196bad56ed06.tar.gz | 3 + rdma-core.changes | 21 +++++ rdma-core.spec | 16 ++-- ...emon-Detect-proper-path-to-systemctl.patch | 78 ------------------- util-Add-barriers-support-for-RISC-V.patch | 46 ----------- 10 files changed, 36 insertions(+), 187 deletions(-) delete mode 100644 cmake-Make-modprobe.d-path-configurable.patch delete mode 100644 rdma-core-38.1.0.f291942cf7c9.tar.gz create mode 100644 rdma-core-42.0.0.196bad56ed06.tar.gz delete mode 100644 srp_daemon-Detect-proper-path-to-systemctl.patch delete mode 100644 util-Add-barriers-support-for-RISC-V.patch diff --git a/_service b/_service index 2b96a23..6a4a4a3 100644 --- a/_service +++ b/_service @@ -8,7 +8,7 @@ @PARENT_TAG@.@TAG_OFFSET@.%h v(.*) \1 - f291942cf7c995ee2763c03537361232aa9490f3 + 196bad56ed060612e22674b668b5ec3d8659ade3 suse/rdma-core.spec diff --git a/cmake-Make-modprobe.d-path-configurable.patch b/cmake-Make-modprobe.d-path-configurable.patch deleted file mode 100644 index d6dfdd3..0000000 --- a/cmake-Make-modprobe.d-path-configurable.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 942bb1d8657f1ed6f2c122324f2aa5e002f0cd35 -Author: Nicolas Morey-Chaisemartin -Date: Tue Mar 8 11:17:30 2022 +0100 - - cmake: Make modprobe.d path configurable - - Signed-off-by: Nicolas Morey-Chaisemartin - -diff --git CMakeLists.txt CMakeLists.txt -index 29b177abb4d3..ac795c4b04af 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -115,6 +115,8 @@ set(IBDIAG_NODENAME_MAP_PATH "${CMAKE_INSTALL_FULL_SYSCONFDIR}/rdma/ib-node-name - - set(CMAKE_INSTALL_INITDDIR "${CMAKE_INSTALL_SYSCONFDIR}/init.d" - CACHE PATH "Location for init.d files") -+set(CMAKE_INSTALL_MODPROBEDIR "${CMAKE_INSTALL_SYSCONFDIR}/modprobe.d/" -+ CACHE PATH "Location for modprobe.d files") - set(CMAKE_INSTALL_SYSTEMD_SERVICEDIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system" - CACHE PATH "Location for systemd service files") - set(CMAKE_INSTALL_SYSTEMD_BINDIR "/lib/systemd" -diff --git providers/ipathverbs/CMakeLists.txt providers/ipathverbs/CMakeLists.txt -index 9031b86d0461..eaa73a8c6156 100644 ---- providers/ipathverbs/CMakeLists.txt -+++ providers/ipathverbs/CMakeLists.txt -@@ -4,7 +4,7 @@ rdma_provider(ipathverbs - ) - - rdma_subst_install(FILES "truescale.conf.in" -- DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/modprobe.d/" -+ DESTINATION "${CMAKE_INSTALL_MODPROBEDIR}/" - RENAME "truescale.conf") - install(FILES truescale-serdes.cmds - DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}" -diff --git providers/mlx4/CMakeLists.txt providers/mlx4/CMakeLists.txt -index ad849f105231..c989c1d87ad1 100644 ---- providers/mlx4/CMakeLists.txt -+++ providers/mlx4/CMakeLists.txt -@@ -13,6 +13,6 @@ publish_headers(infiniband - mlx4dv.h - ) - --install(FILES "mlx4.conf" DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/modprobe.d/") -+install(FILES "mlx4.conf" DESTINATION "${CMAKE_INSTALL_MODPROBEDIR}/") - - rdma_pkg_config("mlx4" "libibverbs" "${CMAKE_THREAD_LIBS_INIT}") diff --git a/gen-pandoc.sh b/gen-pandoc.sh index ee698c5..f69d43d 100644 --- a/gen-pandoc.sh +++ b/gen-pandoc.sh @@ -3,11 +3,11 @@ TARBALL=$(rpmspec --parse rdma-core.spec | grep Source: | awk '{ print $NF}') OUTDIR=$(tar tf $TARBALL | head -n 1) PATCHES=$(rpmspec --parse rdma-core.spec | egrep '^Patch[0-9]+:' | awk '{ print $NF}') -BUILD_CMDS=$(python -c " +BUILD_CMDS=$(python3 -c " import rpm spec = rpm.spec(\"rdma-core.spec\") -print '%s' % (getattr(spec, \"build\"),) +print('%s' % (getattr(spec, \"build\"),)) ") CMAKE_CMD=$(echo "$BUILD_CMDS" | sed -e :a -e '/\\$/N; s/\\\n//; ta' | grep /bin/cmake | sed -e 's/-GNinja//' -e 's/$OLDPWD\/./../') diff --git a/prebuilt-pandoc.tgz b/prebuilt-pandoc.tgz index bb5b633..174fbfb 100644 --- a/prebuilt-pandoc.tgz +++ b/prebuilt-pandoc.tgz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:69945d81b900eae59351c1a4a3b6302ea54fa312031146d51f136e64cd568787 -size 119071 +oid sha256:ee3382c921b3da13b60f6f58fce3b258b4ab6ce8fe49f9732fc6266046d49965 +size 105144 diff --git a/rdma-core-38.1.0.f291942cf7c9.tar.gz b/rdma-core-38.1.0.f291942cf7c9.tar.gz deleted file mode 100644 index b645d5f..0000000 --- a/rdma-core-38.1.0.f291942cf7c9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a7422251a872115d312f4aacc084004d1d759db6dd0611aabd9a1ed6e23f9f11 -size 1991485 diff --git a/rdma-core-42.0.0.196bad56ed06.tar.gz b/rdma-core-42.0.0.196bad56ed06.tar.gz new file mode 100644 index 0000000..1962ff3 --- /dev/null +++ b/rdma-core-42.0.0.196bad56ed06.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:950394be3005b374c638e0928b6244bd48404cee09c5941b79f8d26c046073fc +size 1854349 diff --git a/rdma-core.changes b/rdma-core.changes index a906356..f46c863 100644 --- a/rdma-core.changes +++ b/rdma-core.changes @@ -1,8 +1,29 @@ +------------------------------------------------------------------- +Tue Sep 13 17:47:24 UTC 2022 - Nicolas Morey-Chaisemartin + +- Update to v42.0 + - Fixes for all providers +- Dropped patches merged upstream: + - util-Add-barriers-support-for-RISC-V.patch + - cmake-Make-modprobe.d-path-configurable.patch +- Update gen-pandoc.sh to support python3 + ------------------------------------------------------------------- Mon Aug 8 16:07:05 UTC 2022 - Dirk Müller - skip valgrind on riscv64 +------------------------------------------------------------------- +Tue Mar 29 07:32:26 UTC 2022 - Nicolas Morey-Chaisemartin + +- Update to v39.1 + - Major fixes for hns provider + - Bug fixes for all providers + - systemd hardening + - NDR rate support +- Dropped srp_daemon-Detect-proper-path-to-systemctl.patch + as it was fixed upstream + ------------------------------------------------------------------- Thu Mar 17 13:41:47 UTC 2022 - Andreas Schwab diff --git a/rdma-core.spec b/rdma-core.spec index 2431b3b..dcf8a1a 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -30,9 +30,9 @@ %define _modprobedir /lib/modprobe.d %endif -%define git_ver .0.f291942cf7c9 +%define git_ver .0.196bad56ed06 Name: rdma-core -Version: 38.1 +Version: 42.0 Release: 0 Summary: RDMA core userspace libraries and daemons License: BSD-2-Clause OR GPL-2.0-only @@ -77,12 +77,13 @@ Patch1: Revert-Update-kernel-headers.patch Patch2: disable-rdma-interface-renaming.patch Patch3: cxgb3-fix-declaration-of-free_context.patch Patch4: cxgb3-fix-support-for-new-uquery-API.patch -Patch5: srp_daemon-Detect-proper-path-to-systemctl.patch -Patch6: cmake-Make-modprobe.d-path-configurable.patch -Patch7: util-Add-barriers-support-for-RISC-V.patch BuildRequires: binutils BuildRequires: cmake >= 2.8.11 BuildRequires: gcc +# perl is needed for the proper rpm macros +%if %{?suse_version} > 1550 +BuildRequires: perl +%endif BuildRequires: pkgconfig BuildRequires: python3-base BuildRequires: pkgconfig(libsystemd) @@ -423,9 +424,6 @@ easy, object-oriented access to IB verbs. %patch2 %patch3 %patch4 -%patch5 -%patch6 -%patch7 -p1 %build @@ -450,7 +448,7 @@ easy, object-oriented access to IB verbs. -DCMAKE_INSTALL_INCLUDEDIR:PATH=include \ -DCMAKE_INSTALL_INFODIR:PATH=%{_infodir} \ -DCMAKE_INSTALL_MANDIR:PATH=%{_mandir} \ - -DCMAKE_INSTALL_MODPROBEDIR:PATH=%{_modprobedir} \ + -DCMAKE_INSTALL_MODPROBEDIR:PATH=%{_modprobedir} \ -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \ -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=%{_unitdir} \ -DCMAKE_INSTALL_SYSTEMD_BINDIR:PATH=%{_prefix}/lib/systemd \ diff --git a/srp_daemon-Detect-proper-path-to-systemctl.patch b/srp_daemon-Detect-proper-path-to-systemctl.patch deleted file mode 100644 index a04fa09..0000000 --- a/srp_daemon-Detect-proper-path-to-systemctl.patch +++ /dev/null @@ -1,78 +0,0 @@ -commit 05a19e050278ed54ce22a560ab62d20a2cf5cb64 -Author: Nicolas Morey-Chaisemartin -Date: Fri Feb 18 08:41:53 2022 +0100 - - srp_daemon: Detect proper path to systemctl - - While debian uses /bin/systemctl, SUSE only supports /usr/bin/systemctl, - causing srp_daemon to fail silently starting on all ports. - Detect at built which path is the right one and use it. - - Fixes: b03beb142e0d ("srp_daemon: Call systemctl properly from udev") - Signed-off-by: Nicolas Morey-Chaisemartin - -diff --git CMakeLists.txt CMakeLists.txt -index e84b0277f362..e5994bd92ace 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -217,6 +217,8 @@ else() - set(CYTHON_EXECUTABLE "") - endif() - -+find_program(SYSTEMCTL_BIN systemctl HINTS "/usr/bin" "/bin") -+ - RDMA_CheckSparse() - - # Require GNU99 mode -diff --git srp_daemon/CMakeLists.txt srp_daemon/CMakeLists.txt -index b253872e69b8..e0647bf1a2b9 100644 ---- srp_daemon/CMakeLists.txt -+++ srp_daemon/CMakeLists.txt -@@ -27,8 +27,9 @@ rdma_subst_install(FILES "srp_daemon.sh.in" - RENAME "srp_daemon.sh" - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) - --install(FILES start_on_all_ports -+rdma_subst_install(FILES start_on_all_ports.in - DESTINATION "${CMAKE_INSTALL_LIBEXECDIR}/srp_daemon" -+ RENAME start_on_all_ports - PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE) - - rdma_subst_install(FILES srp_daemon.service.in -@@ -43,7 +44,7 @@ rdma_subst_install(FILES srp_daemon_port@.service.in - - install(FILES srp_daemon.conf DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}") - --install(FILES "srp_daemon.rules" -+rdma_subst_install(FILES "srp_daemon.rules.in" - RENAME "60-srp_daemon.rules" - DESTINATION "${CMAKE_INSTALL_UDEV_RULESDIR}") - -diff --git srp_daemon/srp_daemon.rules srp_daemon/srp_daemon.rules -deleted file mode 100644 -index b6411dcec724..000000000000 ---- srp_daemon/srp_daemon.rules -+++ /dev/null -@@ -1 +0,0 @@ --SUBSYSTEM=="infiniband_mad", KERNEL=="*umad*", PROGRAM=="/bin/systemctl show srp_daemon -p ActiveState", RESULT=="ActiveState=active", ENV{SYSTEMD_WANTS}+="srp_daemon_port@$attr{ibdev}:$attr{port}.service" -diff --git srp_daemon/srp_daemon.rules.in srp_daemon/srp_daemon.rules.in -new file mode 100644 -index 000000000000..da49d89e3aea ---- /dev/null -+++ srp_daemon/srp_daemon.rules.in -@@ -0,0 +1 @@ -+SUBSYSTEM=="infiniband_mad", KERNEL=="*umad*", PROGRAM=="@SYSTEMCTL_BIN@ show srp_daemon -p ActiveState", RESULT=="ActiveState=active", ENV{SYSTEMD_WANTS}+="srp_daemon_port@$attr{ibdev}:$attr{port}.service" -diff --git srp_daemon/start_on_all_ports srp_daemon/start_on_all_ports.in -similarity index 57% -rename from srp_daemon/start_on_all_ports -rename to srp_daemon/start_on_all_ports.in -index 0a7e72e2631b..209dfc088001 100644 ---- srp_daemon/start_on_all_ports -+++ srp_daemon/start_on_all_ports.in -@@ -3,5 +3,5 @@ - for p in /sys/class/infiniband/*/ports/*; do - [ -e "$p" ] || continue - p=${p#/sys/class/infiniband/} -- nohup /bin/systemctl start "srp_daemon_port@${p/\/ports\//:}" &/dev/null & -+ nohup @SYSTEMCTL_BIN@ start "srp_daemon_port@${p/\/ports\//:}" &/dev/null & - done diff --git a/util-Add-barriers-support-for-RISC-V.patch b/util-Add-barriers-support-for-RISC-V.patch deleted file mode 100644 index 40216db..0000000 --- a/util-Add-barriers-support-for-RISC-V.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 63b41f22a9f5c9aed64f63b1c07a162bcfd21f7f Mon Sep 17 00:00:00 2001 -From: "v.v.mitrofanov" -Date: Fri, 4 Feb 2022 14:57:30 +0300 -Subject: [PATCH] util: Add barriers support for RISC-V - -Add barriers support for RISC-V architecture - -Signed-off-by: v.v.mitrofanov ---- - util/udma_barrier.h | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/util/udma_barrier.h b/util/udma_barrier.h -index 5730576e..ea562b18 100644 ---- a/util/udma_barrier.h -+++ b/util/udma_barrier.h -@@ -98,6 +98,8 @@ - #define udma_to_device_barrier() asm volatile("" ::: "memory") - #elif defined(__loongarch__) - #define udma_to_device_barrier() asm volatile("dbar 0" ::: "memory") -+#elif defined(__riscv) -+#define udma_to_device_barrier() asm volatile("fence ow,ow" ::: "memory") - #else - #error No architecture specific memory barrier defines found! - #endif -@@ -132,6 +134,8 @@ - #define udma_from_device_barrier() asm volatile("" ::: "memory") - #elif defined(__loongarch__) - #define udma_from_device_barrier() asm volatile("dbar 0" ::: "memory") -+#elif defined(__riscv) -+#define udma_from_device_barrier() asm volatile("fence ir,ir" ::: "memory") - #else - #error No architecture specific memory barrier defines found! - #endif -@@ -198,6 +202,8 @@ - #define mmio_flush_writes() asm volatile("" ::: "memory") - #elif defined(__loongarch__) - #define mmio_flush_writes() asm volatile("dbar 0" ::: "memory") -+#elif defined(__riscv) -+#define mmio_flush_writes() asm volatile("fence ow,ow" ::: "memory") - #else - #error No architecture specific memory barrier defines found! - #endif --- -2.35.0 -