Commit 0bf1b4dd authored by Yi Lai's avatar Yi Lai Committed by Leon Romanovsky
Browse files

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.

Fixes: e01027ca ("RDMA/rxe: Add testcase for net namespace rxe")
Signed-off-by: default avatarYi Lai <yi1.lai@intel.com>
Link: https://patch.msgid.link/20260507125106.3114167-1-yi1.lai@intel.com


Reviewed-by: default avatarZhu Yanjun <yanjun.zhu@linux.dev>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
parent 0b28000b

tools/testing/selftests/rdma/rxe_ipv6.sh

+4 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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