prov/efa: Add unit tests for RDM CQ sread

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

Author: darrylabbate

prov/efa/test/efa_unit_test_cq.c

@@ -1467,6 +1467,7 @@ static void test_efa_cq_data_path_direct_status(
 	efa_cq = container_of(cq, struct efa_cq, util_cq.cq_fid);
 
 	assert_true(efa_cq->ibv_cq.data_path_direct_enabled == data_path_direct_enabled);
+	
 	assert_int_equal(fi_close(&cq->fid), 0);
 
 	/* Recover the mocked vendor_id */
@@ -1732,7 +1733,7 @@ void test_efa_cq_sread_einval(struct efa_resource **state)
 	efa_unit_test_resource_construct(resource, FI_EP_RDM, EFA_DIRECT_FABRIC_NAME);
 	efa_cq = container_of(resource->cq, struct efa_cq, util_cq.cq_fid.fid);
 
-	assert_null(efa_cq->wait_obj);
+	assert_int_equal(efa_cq->wait_obj, FI_WAIT_NONE);
 	assert_null(efa_cq->ibv_cq.channel);
 
 	ret = fi_cq_sread(resource->cq, &cq_entry, 1, NULL, 1);
@@ -2316,4 +2317,48 @@ void test_efa_cq_read_mixed_success_error(struct efa_resource **state)
 	will_return_maybe(efa_mock_efa_ibv_cq_start_poll_return_mock, ENOENT);
 	assert_int_equal(fi_close(&resource->ep->fid), 0);
 	resource->ep = NULL;
-}
+}
+
+
+
+/**
+ * @brief Test fi_cq_sread() with count=0 returns -FI_EINVAL
+ */
+void test_efa_rdm_cq_sread_invalid_count(struct efa_resource **state)
+{
+	struct efa_resource *resource = *state;
+	struct fi_cq_data_entry cq_entry;
+	int ret;
+
+	efa_unit_test_resource_construct(resource, FI_EP_RDM, EFA_FABRIC_NAME);
+
+	ret = fi_cq_sread(resource->cq, &cq_entry, 0, NULL, 0);
+	assert_int_equal(ret, -FI_EINVAL);
+
+	will_return_maybe(efa_mock_efa_ibv_cq_start_poll_return_mock, ENOENT);
+	assert_int_equal(fi_close(&resource->ep->fid), 0);
+	resource->ep = NULL;
+}
+
+/**
+ * @brief Test fi_cq_sread() with wait object disabled returns -FI_EINVAL
+ */
+void test_efa_rdm_cq_sread_no_wait_obj(struct efa_resource **state)
+{
+	struct efa_resource *resource = *state;
+	struct fi_cq_data_entry cq_entry;
+	int ret;
+
+	/* Open a temporary CQ with wait-none so no wait object exists */
+	struct fid_cq *waitless_cq = NULL;
+	efa_unit_test_resource_construct(resource, FI_EP_RDM, EFA_FABRIC_NAME);
+	assert_int_equal(fi_cq_open(resource->domain,
+				   &(struct fi_cq_attr){ .wait_obj = FI_WAIT_NONE },
+				   &waitless_cq, NULL), 0);
+
+	ret = fi_cq_sread(waitless_cq, &cq_entry, 1, NULL, 0);
+	assert_int_equal(ret, -FI_EINVAL);
+
+	assert_int_equal(fi_close(&waitless_cq->fid), 0);
+	will_return_maybe(efa_mock_efa_ibv_cq_start_poll_return_mock, ENOENT);
+}

prov/efa/test/efa_unit_tests.c

@@ -53,6 +53,11 @@ static int efa_unit_test_mocks_teardown(void **state)
 	/* Reset the contents of g_efa_hmem_info from backup */
 	memcpy(g_efa_hmem_info, g_efa_hmem_info_backup, sizeof(g_efa_hmem_info));
 
+	/* Provide default mock return values for CQ operations during teardown */
+	if (g_efa_unit_test_mocks.efa_ibv_cq_start_poll) {
+		will_return_maybe(efa_mock_efa_ibv_cq_start_poll_return_mock, ENOENT);
+	}
+
 	efa_unit_test_resource_destruct(resource);
 
 	efa_ibv_ah_limit_cnt_reset();
@@ -223,6 +228,8 @@ int main(void)
 		cmocka_unit_test_setup_teardown(test_rdm_fallback_to_ibv_create_cq_ex_cq_read_ignore_forgotton_peer, efa_unit_test_mocks_setup, efa_unit_test_mocks_teardown),
 		cmocka_unit_test_setup_teardown(test_ibv_cq_ex_read_ignore_removed_peer, efa_unit_test_mocks_setup, efa_unit_test_mocks_teardown),
 		cmocka_unit_test_setup_teardown(test_efa_rdm_cq_before_ep_enable, efa_unit_test_mocks_setup, efa_unit_test_mocks_teardown),
+		cmocka_unit_test_setup_teardown(test_efa_rdm_cq_sread_invalid_count, efa_unit_test_mocks_setup, efa_unit_test_mocks_teardown),
+		cmocka_unit_test_setup_teardown(test_efa_rdm_cq_sread_no_wait_obj, efa_unit_test_mocks_setup, efa_unit_test_mocks_teardown),
 		cmocka_unit_test_setup_teardown(test_efa_cq_data_path_direct_disabled_by_env, efa_unit_test_mocks_setup, efa_unit_test_mocks_teardown),
 		cmocka_unit_test_setup_teardown(test_efa_cq_data_path_direct_disabled_with_old_device, efa_unit_test_mocks_setup, efa_unit_test_mocks_teardown),
 		cmocka_unit_test_setup_teardown(test_efa_cq_data_path_direct_enabled_with_new_device, efa_unit_test_mocks_setup, efa_unit_test_mocks_teardown),

prov/efa/test/efa_unit_tests.h

@@ -191,6 +191,8 @@ void test_ibv_cq_ex_read_recover_forgotten_peer_ah();
 void test_rdm_fallback_to_ibv_create_cq_ex_cq_read_ignore_forgotton_peer();
 void test_ibv_cq_ex_read_ignore_removed_peer();
 void test_efa_rdm_cq_before_ep_enable();
+void test_efa_rdm_cq_sread_invalid_count();
+void test_efa_rdm_cq_sread_no_wait_obj();
 
 /* begin efa_unit_test_info.c */
 void test_info_open_ep_with_wrong_info();