Skip to contentSkip to conversation

selftests/rdma: explicitly skip tests when required modules are missing

PATCH Applied Yi Lai 3 participants 4 messages May 7 – May 13

Subsystems (3)
lore
Share & tools
lore

Yi Lai

author
#0 lore raw

PATCH 1/1 selftests/rdma: explicitly skip tests when required modules are missing

Currently, the rdma rxe selftests fail with an exit code of 1 when required kernel modules are not present. This causes spurious failures in environments where these modules might not be compiled or available.

Include the standard kselftest 'ktap_helpers.sh' and replace the hardcoded error exits with '$KSFT_SKIP'. This ensures the tests are properly marked as skipped rather than failed.

---
 tools/testing/selftests/rdma/rxe_ipv6.sh                   | 6 ++++--
 tools/testing/selftests/rdma/rxe_rping_between_netns.sh    | 7 +++++++
 tools/testing/selftests/rdma/rxe_socket_with_netns.sh      | 6 ++++++
 tools/testing/selftests/rdma/rxe_test_NETDEV_UNREGISTER.sh | 6 ++++--
 4 files changed, 21 insertions(+), 4 deletions(-)
tools/testing/selftests/rdma/rxe_ipv6.sh +4 -2
index b7059bfd6d7c..32dad687a044 100755
@@ -8,6 +8,8 @@ RXE_NAME="rxe6"
 PORT=4791
 IP6_ADDR="2001:db8::1/64"
 
+source "$(dirname "$0")/../kselftest/ktap_helpers.sh"
+
 exec > /dev/null
 
 # Cleanup function to run on exit (even on failure)
@@ -21,8 +23,8 @@ trap cleanup EXIT
 # 1. Prerequisites check
 for mod in tun veth rdma_rxe; do
     if ! modinfo "$mod" >/dev/null 2>&1; then
-        echo "Error: Kernel module '$mod' not found."
-        exit 1
+        echo "SKIP: Kernel module '$mod' not found." >&2
+        exit $KSFT_SKIP
     fi
 done
 
tools/testing/selftests/rdma/rxe_rping_between_netns.sh +7 -0
index e5b876f58c6e..e7554fbb8951 100755
@@ -8,6 +8,8 @@ IP_A="1.1.1.1"
 IP_B="1.1.1.2"
 PORT=4791
 
+source "$(dirname "$0")/../kselftest/ktap_helpers.sh"
+
 exec > /dev/null
 
 # --- Cleanup Routine ---
@@ -27,6 +29,11 @@ if [[ $EUID -ne 0 ]]; then
    exit 1
 fi
 
+if ! modinfo rdma_rxe >/dev/null 2>&1; then
+    echo "SKIP: Kernel module 'rdma_rxe' not found." >&2
+    exit $KSFT_SKIP
+fi
+
 modprobe rdma_rxe || { echo "Failed to load rdma_rxe"; exit 1; }
 
 # --- Setup Network Topology ---
tools/testing/selftests/rdma/rxe_socket_with_netns.sh +6 -0
index 002e5098f751..9478657c02c1 100755
@@ -4,6 +4,8 @@
 PORT=4791
 MODS=("tun" "rdma_rxe")
 
+source "$(dirname "$0")/../kselftest/ktap_helpers.sh"
+
 exec > /dev/null
 
 # --- Helper: Cleanup Routine ---
@@ -26,6 +28,10 @@ if [[ $EUID -ne 0 ]]; then
 fi
 
 for m in "${MODS[@]}"; do
+    if ! modinfo "$m" >/dev/null 2>&1; then
+        echo "SKIP: Kernel module '$m' not found." >&2
+        exit $KSFT_SKIP
+    fi
     modprobe "$m" || { echo "Error: Failed to load $m"; exit 1; }
 done
 
tools/testing/selftests/rdma/rxe_test_NETDEV_UNREGISTER.sh +4 -2
index 021ca451499d..8c18cea7535c 100755
@@ -5,6 +5,8 @@ DEV_NAME="tun0"
 RXE_NAME="rxe0"
 RDMA_PORT=4791
 
+source "$(dirname "$0")/../kselftest/ktap_helpers.sh"
+
 exec > /dev/null
 
 # --- Cleanup Routine ---
@@ -19,8 +21,8 @@ trap cleanup EXIT
 
 # 1. Dependency Check
 if ! modinfo rdma_rxe >/dev/null 2>&1; then
-    echo "Error: rdma_rxe module not found."
-    exit 1
+    echo "SKIP: rdma_rxe module not found." >&2
+    exit $KSFT_SKIP
 fi
 
 modprobe rdma_rxe
Signature · 1 line
2.43.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Yi Lai

Currently, the rdma rxe selftests fail with an exit code of 1 when required kernel modules are not present. This causes spurious failures in environments where these modules might not be compiled or available.

Include the standard kselftest 'ktap_helpers.sh' and replace the hardcoded error exits with '$KSFT_SKIP'. This ensures the tests are properly marked as skipped rather than failed.

tools/testing/selftests/rdma/rxe_rping_between_netns.sh:30:modprobe rdma_rxe || { echo "Failed to load rdma_rxe"; exit 1; } tools/testing/selftests/rdma/rxe_socket_with_netns.sh:29: modprobe "$m" || { echo "Error: Failed to load $m"; exit 1; }

In the above script files, if modprobe fails, exit 1;

I am wondering if we need to replace error code 1 with $KSFT_SKIP.

Except the above, I am fine with this commit.

Zhu Yanjun

Quoted 106 lines
---
  tools/testing/selftests/rdma/rxe_ipv6.sh                   | 6 ++++--
  tools/testing/selftests/rdma/rxe_rping_between_netns.sh    | 7 +++++++
  tools/testing/selftests/rdma/rxe_socket_with_netns.sh      | 6 ++++++
  tools/testing/selftests/rdma/rxe_test_NETDEV_UNREGISTER.sh | 6 ++++--
  4 files changed, 21 insertions(+), 4 deletions(-)
tools/testing/selftests/rdma/rxe_ipv6.sh +4 -2
index b7059bfd6d7c..32dad687a044 100755
@@ -8,6 +8,8 @@ RXE_NAME="rxe6"
  PORT=4791
  IP6_ADDR="2001:db8::1/64"
 
+source "$(dirname "$0")/../kselftest/ktap_helpers.sh"
+
  exec > /dev/null
 
  # Cleanup function to run on exit (even on failure)
@@ -21,8 +23,8 @@ trap cleanup EXIT
  # 1. Prerequisites check
  for mod in tun veth rdma_rxe; do
      if ! modinfo "$mod" >/dev/null 2>&1; then
-        echo "Error: Kernel module '$mod' not found."
-        exit 1
+        echo "SKIP: Kernel module '$mod' not found." >&2
+        exit $KSFT_SKIP
      fi
  done
 
tools/testing/selftests/rdma/rxe_rping_between_netns.sh +7 -0
index e5b876f58c6e..e7554fbb8951 100755
@@ -8,6 +8,8 @@ IP_A="1.1.1.1"
  IP_B="1.1.1.2"
  PORT=4791
 
+source "$(dirname "$0")/../kselftest/ktap_helpers.sh"
+
  exec > /dev/null
 
  # --- Cleanup Routine ---
@@ -27,6 +29,11 @@ if [[ $EUID -ne 0 ]]; then
     exit 1
  fi
 
+if ! modinfo rdma_rxe >/dev/null 2>&1; then
+    echo "SKIP: Kernel module 'rdma_rxe' not found." >&2
+    exit $KSFT_SKIP
+fi
+
  modprobe rdma_rxe || { echo "Failed to load rdma_rxe"; exit 1; }
 
  # --- Setup Network Topology ---
tools/testing/selftests/rdma/rxe_socket_with_netns.sh +6 -0
index 002e5098f751..9478657c02c1 100755
@@ -4,6 +4,8 @@
  PORT=4791
  MODS=("tun" "rdma_rxe")
 
+source "$(dirname "$0")/../kselftest/ktap_helpers.sh"
+
  exec > /dev/null
 
  # --- Helper: Cleanup Routine ---
@@ -26,6 +28,10 @@ if [[ $EUID -ne 0 ]]; then
  fi
 
  for m in "${MODS[@]}"; do
+    if ! modinfo "$m" >/dev/null 2>&1; then
+        echo "SKIP: Kernel module '$m' not found." >&2
+        exit $KSFT_SKIP
+    fi
      modprobe "$m" || { echo "Error: Failed to load $m"; exit 1; }
  done
 
tools/testing/selftests/rdma/rxe_test_NETDEV_UNREGISTER.sh +4 -2
index 021ca451499d..8c18cea7535c 100755
@@ -5,6 +5,8 @@ DEV_NAME="tun0"
  RXE_NAME="rxe0"
  RDMA_PORT=4791
 
+source "$(dirname "$0")/../kselftest/ktap_helpers.sh"
+
  exec > /dev/null
 
  # --- Cleanup Routine ---
@@ -19,8 +21,8 @@ trap cleanup EXIT
 
  # 1. Dependency Check
  if ! modinfo rdma_rxe >/dev/null 2>&1; then
-    echo "Error: rdma_rxe module not found."
-    exit 1
+    echo "SKIP: rdma_rxe module not found." >&2
+    exit $KSFT_SKIP
  fi
 
  modprobe rdma_rxe
Signature · 2 lines
Best Regards,
Yanjun.Zhu
author
#2 lore raw
Quoted 9 lines · Zhu Yanjun
Quoted 7 lines · Yi Lai

Currently, the rdma rxe selftests fail with an exit code of 1 when required kernel modules are not present. This causes spurious failures in environments where these modules might not be compiled or available.

Include the standard kselftest 'ktap_helpers.sh' and replace the hardcoded error exits with '$KSFT_SKIP'. This ensures the tests are properly marked as skipped rather than failed.

Quoted 9 lines

tools/testing/selftests/rdma/rxe_rping_between_netns.sh:30:modprobe rdma_rxe

|| { echo "Failed to load rdma_rxe"; exit 1; }
tools/testing/selftests/rdma/rxe_socket_with_netns.sh:29: modprobe "$m" || {

echo "Error: Failed to load $m"; exit 1; }

In the above script files, if modprobe fails, exit 1;

I am wondering if we need to replace error code 1 with $KSFT_SKIP.

Thanks for the review.

At this point, the module's existence is already verified using modinfo. In my opinion, a failure at modprobe here implies an active operational error, so returning 1 to highlight the malfunction seems reasonable.

Regards,
Yi Lai

Quoted 102 lines

Except the above, I am fine with this commit.

Zhu Yanjun

Quoted 91 lines
---
  tools/testing/selftests/rdma/rxe_ipv6.sh                   | 6 ++++--
  tools/testing/selftests/rdma/rxe_rping_between_netns.sh    | 7 +++++++
  tools/testing/selftests/rdma/rxe_socket_with_netns.sh      | 6 ++++++
  tools/testing/selftests/rdma/rxe_test_NETDEV_UNREGISTER.sh | 6 ++++--
  4 files changed, 21 insertions(+), 4 deletions(-)
tools/testing/selftests/rdma/rxe_ipv6.sh +4 -2
index b7059bfd6d7c..32dad687a044 100755
@@ -8,6 +8,8 @@ RXE_NAME="rxe6"
  PORT=4791
  IP6_ADDR="2001:db8::1/64"
+source "$(dirname "$0")/../kselftest/ktap_helpers.sh"
+
  exec > /dev/null
  # Cleanup function to run on exit (even on failure)
@@ -21,8 +23,8 @@ trap cleanup EXIT
  # 1. Prerequisites check
  for mod in tun veth rdma_rxe; do
      if ! modinfo "$mod" >/dev/null 2>&1; then
-        echo "Error: Kernel module '$mod' not found."
-        exit 1
+        echo "SKIP: Kernel module '$mod' not found." >&2
+        exit $KSFT_SKIP
      fi
  done
tools/testing/selftests/rdma/rxe_rping_between_netns.sh +7 -0
index e5b876f58c6e..e7554fbb8951 100755
@@ -8,6 +8,8 @@ IP_A="1.1.1.1"
  IP_B="1.1.1.2"
  PORT=4791
+source "$(dirname "$0")/../kselftest/ktap_helpers.sh"
+
  exec > /dev/null
  # --- Cleanup Routine ---
@@ -27,6 +29,11 @@ if [[ $EUID -ne 0 ]]; then
     exit 1
  fi
+if ! modinfo rdma_rxe >/dev/null 2>&1; then
+    echo "SKIP: Kernel module 'rdma_rxe' not found." >&2
+    exit $KSFT_SKIP
+fi
+
  modprobe rdma_rxe || { echo "Failed to load rdma_rxe"; exit 1; }
  # --- Setup Network Topology ---
tools/testing/selftests/rdma/rxe_socket_with_netns.sh +6 -0
index 002e5098f751..9478657c02c1 100755
@@ -4,6 +4,8 @@
  PORT=4791
  MODS=("tun" "rdma_rxe")
+source "$(dirname "$0")/../kselftest/ktap_helpers.sh"
+
  exec > /dev/null
  # --- Helper: Cleanup Routine ---
@@ -26,6 +28,10 @@ if [[ $EUID -ne 0 ]]; then
  fi
  for m in "${MODS[@]}"; do
+    if ! modinfo "$m" >/dev/null 2>&1; then
+        echo "SKIP: Kernel module '$m' not found." >&2
+        exit $KSFT_SKIP
+    fi
      modprobe "$m" || { echo "Error: Failed to load $m"; exit 1; }
  done
tools/testing/selftests/rdma/rxe_test_NETDEV_UNREGISTER.sh +4 -2
index 021ca451499d..8c18cea7535c 100755
@@ -5,6 +5,8 @@ DEV_NAME="tun0"
  RXE_NAME="rxe0"
  RDMA_PORT=4791
+source "$(dirname "$0")/../kselftest/ktap_helpers.sh"
+
  exec > /dev/null
  # --- Cleanup Routine ---
@@ -19,8 +21,8 @@ trap cleanup EXIT
  # 1. Dependency Check
  if ! modinfo rdma_rxe >/dev/null 2>&1; then
-    echo "Error: rdma_rxe module not found."
-    exit 1
+    echo "SKIP: rdma_rxe module not found." >&2
+    exit $KSFT_SKIP
  fi
  modprobe rdma_rxe
Signature · 2 lines
Best Regards,
Yanjun.Zhu
#3 lore raw
In reply to Yi Lai
Quoted 9 lines · Yi Lai

Currently, the rdma rxe selftests fail with an exit code of 1 when required kernel modules are not present. This causes spurious failures in environments where these modules might not be compiled or available.

Include the standard kselftest 'ktap_helpers.sh' and replace the hardcoded error exits with '$KSFT_SKIP'. This ensures the tests are properly marked as skipped rather than failed.

[...]

Applied, thanks!

[1/1] selftests/rdma: explicitly skip tests when required modules are missing

      https://git.kernel.org/rdma/rdma/c/0bf1b4dda2d0c8

Best regards,

Signature · 1 line
Leon Romanovsky <[email protected]>