From 1c57fa1a95b1df59dde4ebeee4e004e9e5d86b58 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Tue, 11 Oct 2022 13:42:09 +0900 Subject: [PATCH] nvme_rdma: Rename poll_group_set_cq() by qpair_set_poller() In the following patches, nvme_rdma_poll_group_set_cq() will touch not only CQ but also SRQ and receive WR objects. All these resources are of a poller. Hence for clarification, rename nvme_rdma_poll_group_set_cq() by nvme_rdma_qpair_set_poller(). Signed-off-by: Shuhei Matsumoto Change-Id: Ic59ba5a45833e39b1b2647c000c8b953f1031d6b Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14910 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Ben Walker Reviewed-by: Aleksey Marchuk --- lib/nvme/nvme_rdma.c | 4 ++-- test/unit/lib/nvme/nvme_rdma.c/nvme_rdma_ut.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/nvme/nvme_rdma.c b/lib/nvme/nvme_rdma.c index 8177f5195..277448181 100644 --- a/lib/nvme/nvme_rdma.c +++ b/lib/nvme/nvme_rdma.c @@ -678,7 +678,7 @@ nvme_rdma_resize_cq(struct nvme_rdma_qpair *rqpair, struct nvme_rdma_poller *pol } static int -nvme_rdma_poll_group_set_cq(struct spdk_nvme_qpair *qpair) +nvme_rdma_qpair_set_poller(struct spdk_nvme_qpair *qpair) { struct nvme_rdma_qpair *rqpair = nvme_rdma_qpair(qpair); struct nvme_rdma_poll_group *group = nvme_rdma_poll_group(qpair->poll_group); @@ -718,7 +718,7 @@ nvme_rdma_qpair_init(struct nvme_rdma_qpair *rqpair) if (rqpair->qpair.poll_group) { assert(!rqpair->cq); - rc = nvme_rdma_poll_group_set_cq(&rqpair->qpair); + rc = nvme_rdma_qpair_set_poller(&rqpair->qpair); if (rc) { SPDK_ERRLOG("Unable to activate the rdmaqpair.\n"); return -1; diff --git a/test/unit/lib/nvme/nvme_rdma.c/nvme_rdma_ut.c b/test/unit/lib/nvme/nvme_rdma.c/nvme_rdma_ut.c index 0e2f8c41f..e1d9a6245 100644 --- a/test/unit/lib/nvme/nvme_rdma.c/nvme_rdma_ut.c +++ b/test/unit/lib/nvme/nvme_rdma.c/nvme_rdma_ut.c @@ -1354,7 +1354,7 @@ test_nvme_rdma_poll_group_get_stats(void) } static void -test_nvme_rdma_poll_group_set_cq(void) +test_nvme_rdma_qpair_set_poller(void) { int rc = -1; struct nvme_rdma_poll_group *group; @@ -1372,7 +1372,7 @@ test_nvme_rdma_poll_group_set_cq(void) CU_ASSERT(group != NULL); CU_ASSERT(STAILQ_EMPTY(&group->pollers)); - /* Case2: Test function nvme_rdma_poll_group_set_cq */ + /* Case2: Test function nvme_rdma_qpair_set_poller */ rqpair.qpair.poll_group = tgroup; rqpair.qpair.trtype = SPDK_NVME_TRANSPORT_RDMA; rqpair.cm_id = &cm_id; @@ -1381,7 +1381,7 @@ test_nvme_rdma_poll_group_set_cq(void) cm_id.verbs = (void *)0xFEEDBEEF; MOCK_SET(ibv_create_cq, NULL); - rc = nvme_rdma_poll_group_set_cq(&rqpair.qpair); + rc = nvme_rdma_qpair_set_poller(&rqpair.qpair); CU_ASSERT(rc == -EINVAL); CU_ASSERT(rqpair.cq == NULL); CU_ASSERT(STAILQ_EMPTY(&group->pollers)); @@ -1391,7 +1391,7 @@ test_nvme_rdma_poll_group_set_cq(void) /* Test2: Unable to find a cq for qpair on poll group */ cm_id.verbs = NULL; - rc = nvme_rdma_poll_group_set_cq(&rqpair.qpair); + rc = nvme_rdma_qpair_set_poller(&rqpair.qpair); CU_ASSERT(rc == -EINVAL); CU_ASSERT(rqpair.cq == NULL); CU_ASSERT(STAILQ_EMPTY(&group->pollers)); @@ -1402,7 +1402,7 @@ test_nvme_rdma_poll_group_set_cq(void) cm_id.verbs = (void *)0xFEEDBEEF; rqpair.num_entries = 0; - rc = nvme_rdma_poll_group_set_cq(&rqpair.qpair); + rc = nvme_rdma_qpair_set_poller(&rqpair.qpair); CU_ASSERT(rc == 0); CU_ASSERT(rqpair.cq == (void *)0xFEEDBEEF); @@ -1429,14 +1429,14 @@ test_nvme_rdma_poll_group_set_cq(void) rqpair.num_entries = DEFAULT_NVME_RDMA_CQ_SIZE - 1; MOCK_SET(ibv_resize_cq, -1); - rc = nvme_rdma_poll_group_set_cq(&rqpair.qpair); + rc = nvme_rdma_qpair_set_poller(&rqpair.qpair); CU_ASSERT(rc == -EPROTO); CU_ASSERT(STAILQ_EMPTY(&group->pollers)); /* Test5: Current_num_wc is not enough, resize success */ MOCK_SET(ibv_resize_cq, 0); - rc = nvme_rdma_poll_group_set_cq(&rqpair.qpair); + rc = nvme_rdma_qpair_set_poller(&rqpair.qpair); CU_ASSERT(rc == 0); poller = STAILQ_FIRST(&group->pollers); @@ -1487,7 +1487,7 @@ main(int argc, char **argv) CU_ADD_TEST(suite, test_get_rdma_qpair_from_wc); CU_ADD_TEST(suite, test_nvme_rdma_ctrlr_get_max_sges); CU_ADD_TEST(suite, test_nvme_rdma_poll_group_get_stats); - CU_ADD_TEST(suite, test_nvme_rdma_poll_group_set_cq); + CU_ADD_TEST(suite, test_nvme_rdma_qpair_set_poller); CU_basic_set_mode(CU_BRM_VERBOSE); CU_basic_run_tests();