From 5ac51a3214f3fc56f8b326fa9255d346b7ee943d Mon Sep 17 00:00:00 2001 From: Ben Walker Date: Mon, 10 Feb 2020 14:16:15 -0700 Subject: [PATCH] nvme:Make ctrlr_alloc_cmb_io_buffer optional for transports If the transport doesn't define one, don't call it. Change-Id: I8b83132f9fc0accbd4faa8fa0fc17a6bd11e543e Signed-off-by: Ben Walker Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/783 Tested-by: SPDK CI Jenkins Reviewed-by: Changpeng Liu Reviewed-by: Aleksey Marchuk Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto --- lib/nvme/nvme_rdma.c | 15 --------------- lib/nvme/nvme_tcp.c | 15 --------------- lib/nvme/nvme_transport.c | 12 ++++++++++-- 3 files changed, 10 insertions(+), 32 deletions(-) diff --git a/lib/nvme/nvme_rdma.c b/lib/nvme/nvme_rdma.c index f266bc686..dd1a57641 100644 --- a/lib/nvme/nvme_rdma.c +++ b/lib/nvme/nvme_rdma.c @@ -2097,18 +2097,6 @@ nvme_rdma_ctrlr_get_max_sges(struct spdk_nvme_ctrlr *ctrlr) return rctrlr->max_sge; } -static void * -nvme_rdma_ctrlr_alloc_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, size_t size) -{ - return NULL; -} - -static int -nvme_rdma_ctrlr_free_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, void *buf, size_t size) -{ - return 0; -} - static void nvme_rdma_admin_qpair_abort_aers(struct spdk_nvme_qpair *qpair) { @@ -2154,9 +2142,6 @@ const struct spdk_nvme_transport_ops rdma_ops = { .ctrlr_get_max_xfer_size = nvme_rdma_ctrlr_get_max_xfer_size, .ctrlr_get_max_sges = nvme_rdma_ctrlr_get_max_sges, - .ctrlr_alloc_cmb_io_buffer = nvme_rdma_ctrlr_alloc_cmb_io_buffer, - .ctrlr_free_cmb_io_buffer = nvme_rdma_ctrlr_free_cmb_io_buffer, - .ctrlr_create_io_qpair = nvme_rdma_ctrlr_create_io_qpair, .ctrlr_delete_io_qpair = nvme_rdma_ctrlr_delete_io_qpair, .ctrlr_connect_qpair = nvme_rdma_ctrlr_connect_qpair, diff --git a/lib/nvme/nvme_tcp.c b/lib/nvme/nvme_tcp.c index 3eb44ca9d..f5cb182a0 100644 --- a/lib/nvme/nvme_tcp.c +++ b/lib/nvme/nvme_tcp.c @@ -1677,18 +1677,6 @@ nvme_tcp_ctrlr_get_max_sges(struct spdk_nvme_ctrlr *ctrlr) return 1; } -static void * -nvme_tcp_ctrlr_alloc_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, size_t size) -{ - return NULL; -} - -static int -nvme_tcp_ctrlr_free_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, void *buf, size_t size) -{ - return 0; -} - static void nvme_tcp_admin_qpair_abort_aers(struct spdk_nvme_qpair *qpair) { @@ -1728,9 +1716,6 @@ const struct spdk_nvme_transport_ops tcp_ops = { .ctrlr_get_max_xfer_size = nvme_tcp_ctrlr_get_max_xfer_size, .ctrlr_get_max_sges = nvme_tcp_ctrlr_get_max_sges, - .ctrlr_alloc_cmb_io_buffer = nvme_tcp_ctrlr_alloc_cmb_io_buffer, - .ctrlr_free_cmb_io_buffer = nvme_tcp_ctrlr_free_cmb_io_buffer, - .ctrlr_create_io_qpair = nvme_tcp_ctrlr_create_io_qpair, .ctrlr_delete_io_qpair = nvme_tcp_ctrlr_delete_io_qpair, .ctrlr_connect_qpair = nvme_tcp_ctrlr_connect_qpair, diff --git a/lib/nvme/nvme_transport.c b/lib/nvme/nvme_transport.c index 073d19325..006c982e5 100644 --- a/lib/nvme/nvme_transport.c +++ b/lib/nvme/nvme_transport.c @@ -204,7 +204,11 @@ nvme_transport_ctrlr_alloc_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, size_t s const struct nvme_transport *transport = nvme_get_transport(ctrlr->trid.trstring); assert(transport != NULL); - return transport->ops.ctrlr_alloc_cmb_io_buffer(ctrlr, size); + if (transport->ops.ctrlr_alloc_cmb_io_buffer != NULL) { + return transport->ops.ctrlr_alloc_cmb_io_buffer(ctrlr, size); + } + + return NULL; } int @@ -213,7 +217,11 @@ nvme_transport_ctrlr_free_cmb_io_buffer(struct spdk_nvme_ctrlr *ctrlr, void *buf const struct nvme_transport *transport = nvme_get_transport(ctrlr->trid.trstring); assert(transport != NULL); - return transport->ops.ctrlr_free_cmb_io_buffer(ctrlr, buf, size); + if (transport->ops.ctrlr_free_cmb_io_buffer != NULL) { + return transport->ops.ctrlr_free_cmb_io_buffer(ctrlr, buf, size); + } + + return 0; } struct spdk_nvme_qpair *