fabtests/efa: Enable sread tests for efa fabric

Signed-off-by: Darryl Abbate <[email protected]>

Author: darrylabbate

fabtests/pytest/efa/test_rdm.py

@@ -162,12 +162,16 @@ def test_rdm_bw_zcpy_recv_use_fi_more(cmdline_args, memory_type, zcpy_recv_max_m
 
 @pytest.mark.functional
 @pytest.mark.parametrize("comp_method", ["sread", "fd"])
-def test_rdm_pingpong_sread(cmdline_args, completion_semantic, memory_type_bi_dir, direct_message_size, support_sread, comp_method):
+@pytest.mark.parametrize("fabric", ["efa", "efa-direct"])
+def test_rdm_pingpong_sread(cmdline_args, completion_semantic, memory_type_bi_dir,
+                            direct_message_size, support_sread, comp_method, fabric):
     if not support_sread:
         pytest.skip("sread not supported by efa device.")
+    if fabric == "efa" and comp_method == "sread" and completion_semantic == "delivery_complete":
+        pytest.skip("Skip delivery-complete with sread to avoid manual-progress deadlock.")
     efa_run_client_server_test(cmdline_args, f"fi_rdm_pingpong -c {comp_method}", "short",
                                completion_semantic, memory_type_bi_dir,
-                               direct_message_size, fabric="efa-direct")
+                               direct_message_size if fabric == "efa-direct" else "all", fabric=fabric)
 
 
 # These tests skip efa-direct because efa-direct does not

fabtests/pytest/efa/test_rma_bw.py

@@ -91,12 +91,12 @@ def test_rma_bw_sread(cmdline_args, rma_operation_type, rma_bw_completion_semant
                       direct_rma_size, rma_bw_memory_type, support_sread, comp_method, rma_fabric):
     if not support_sread:
         pytest.skip("sread not supported by efa device.")
-    if rma_fabric == "efa":
-        pytest.skip("sread not implemented in efa fabric yet.")
+    if rma_fabric == "efa" and comp_method == "sread" and rma_bw_completion_semantic == "delivery_complete":
+        pytest.skip("Skip delivery-complete with sread to avoid manual-progress deadlock.")
     command = f"fi_rma_bw -e rdm -c {comp_method}"
     command = command + " -o " + rma_operation_type
     # rma_bw test with data verification takes longer to finish
     timeout = max(1080, cmdline_args.timeout)
     efa_run_client_server_test(cmdline_args, command, "short", rma_bw_completion_semantic,
-                               rma_bw_memory_type, direct_rma_size,
+                               rma_bw_memory_type, direct_rma_size if rma_fabric == "efa-direct" else "all",
                                timeout=timeout, fabric=rma_fabric)