Merge pull request #1481 from cjubran/rdma-in-initrd

Ensure RDMA service loads modules in initrd
linux-rdma · Jul 18, 2024 · f6ff7a3 · f6ff7a3
2 parents ec9fedc + 1a4ab42
commit f6ff7a3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 0 deletions.
diff --git a/kernel-boot/rdma-load-modules@.service.in b/kernel-boot/rdma-load-modules@.service.in
@@ -5,6 +5,9 @@ Documentation=file:@CMAKE_INSTALL_FULL_DOCDIR@/udev.md
 # systemd-modules-load.service
 DefaultDependencies=no
 Before=sysinit.target
+# Kernel modules must load in initrd before initrd.target to avoid being killed
+# when initrd-cleanup.service isolates to initrd-switch-root.target.
+Before=initrd.target
 # Do not execute concurrently with an ongoing shutdown
 Conflicts=shutdown.target
 Before=shutdown.target

diff --git a/redhat/rdma.modules-setup.sh b/redhat/rdma.modules-setup.sh
@@ -25,6 +25,13 @@ install() {
 	inst_multiple -o \
                   $systemdsystemunitdir/rdma-hw.target \
                   $systemdsystemunitdir/rdma-load-modules@.service
+
+	for i in \
+		rdma-load-modules@rdma.service \
+		rdma-load-modules@roce.service \
+		rdma-load-modules@infiniband.service; do
+		$SYSTEMCTL -q --root "$initdir" add-wants initrd.target "$i"
+	done
 }
 
 installkernel() {

diff --git a/suse/module-setup.sh b/suse/module-setup.sh
@@ -23,6 +23,13 @@ install() {
 	inst_multiple -o \
                   $systemdsystemunitdir/rdma-hw.target \
                   $systemdsystemunitdir/rdma-load-modules@.service
+
+	for i in \
+		rdma-load-modules@rdma.service \
+		rdma-load-modules@roce.service \
+		rdma-load-modules@infiniband.service; do
+		$SYSTEMCTL -q --root "$initdir" add-wants initrd.target "$i"
+	done
 }
 
 installkernel() {