Commit 89021c6c authored by Darek Stojaczyk's avatar Darek Stojaczyk Committed by Changpeng Liu
Browse files

nvme/rpc: switch to spdk_*malloc(). 



spdk_dma_*malloc() is about to be deprecated.

Change-Id: I6fd1106c2278c2ef8899c822e920252f62266547
Signed-off-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/459550


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
parent fbd2f3fd

lib/bdev/nvme/bdev_nvme_rpc.c

+3 −2
Original line number Diff line number Diff line
@@ -506,7 +506,7 @@ apply_firmware_cleanup(void *cb_arg) 
	}



	if (firm_ctx->fw_image) {

		spdk_dma_free(firm_ctx->fw_image);

		spdk_free(firm_ctx->fw_image);

	}



	if (firm_ctx->req) {
@@ -749,7 +749,8 @@ spdk_rpc_apply_nvme_firmware(struct spdk_jsonrpc_request *request, 
		return;

	}



	firm_ctx->fw_image = spdk_dma_zmalloc(firm_ctx->size, 4096, NULL);

	firm_ctx->fw_image = spdk_zmalloc(firm_ctx->size, 4096, NULL,

					  SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);

	if (!firm_ctx->fw_image) {

		close(fd);

		spdk_jsonrpc_send_error_response(request, SPDK_JSONRPC_ERROR_INTERNAL_ERROR,

lib/bdev/nvme/nvme_rpc.c

+10 −6
Original line number Diff line number Diff line
@@ -81,8 +81,8 @@ free_rpc_send_nvme_cmd_ctx(struct rpc_send_nvme_cmd_ctx *ctx) 


	free(ctx->req.name);

	free(ctx->req.cmdbuf);

	spdk_dma_free(ctx->req.data);

	spdk_dma_free(ctx->req.md);

	spdk_free(ctx->req.data);

	spdk_free(ctx->req.md);

	free(ctx->resp.cpl_text);

	free(ctx->resp.data_text);

	free(ctx->resp.md_text);
@@ -319,7 +319,8 @@ rpc_decode_data(const struct spdk_json_val *val, void *out) 
		}

	} else {

		req->data_len = spdk_base64_get_decoded_len(text_strlen);

		req->data = spdk_dma_malloc(req->data_len > 0x1000 ? req->data_len : 0x1000, 0x1000, NULL);

		req->data = spdk_malloc(req->data_len > 0x1000 ? req->data_len : 0x1000, 0x1000,

					NULL, SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);

		if (!req->data) {

			rc = -ENOMEM;

			goto out;
@@ -352,7 +353,8 @@ rpc_decode_data_len(const struct spdk_json_val *val, void *out) 
		}

	} else {

		req->data_len = data_len;

		req->data = spdk_dma_malloc(req->data_len > 0x1000 ? req->data_len : 0x1000, 0x1000, NULL);

		req->data = spdk_malloc(req->data_len > 0x1000 ? req->data_len : 0x1000, 0x1000,

					NULL, SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);

		if (!req->data) {

			rc = -ENOMEM;

		}
@@ -383,7 +385,8 @@ rpc_decode_metadata(const struct spdk_json_val *val, void *out) 
		}

	} else {

		req->md_len = spdk_base64_get_decoded_len(text_strlen);

		req->md = spdk_dma_malloc(req->md_len, 0x1000, NULL);

		req->md = spdk_malloc(req->md_len, 0x1000, NULL,

				      SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);

		if (!req->md) {

			rc = -ENOMEM;

			goto out;
@@ -416,7 +419,8 @@ rpc_decode_metadata_len(const struct spdk_json_val *val, void *out) 
		}

	} else {

		req->md_len = md_len;

		req->md = spdk_dma_malloc(req->md_len, 0x1000, NULL);

		req->md = spdk_malloc(req->md_len, 0x1000, NULL,

				      SPDK_ENV_LCORE_ID_ANY, SPDK_MALLOC_DMA);

		if (!req->md) {

			rc = -ENOMEM;

		}