Commit 2c9b0af2 authored by Shuhei Matsumoto's avatar Shuhei Matsumoto Committed by Darek Stojaczyk
Browse files

nvmf/tcp: Get DIF context when handling capsule command header 



When handling the capsule command header, call spdk_nvmf_request_get_dif_ctx
by passing the NVMf request and the reference to the DIF context, and set
the flag dif_insert_or_strip of the NVMf/TCP request to true.

spdk_nvmf_request_get_dif_ctx returns false immediately when the
corresponding NVMf controller disables DIF insert/strip.

Signed-off-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I16f6b322f2692d5f9653d011a490e7929ec37365
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/458928


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Reviewed-by: default avatarDarek Stojaczyk <dariusz.stojaczyk@intel.com>
parent 1c7f92f0

lib/nvmf/tcp.c

+5 −0
Original line number Diff line number Diff line
@@ -2472,6 +2472,11 @@ spdk_nvmf_tcp_req_process(struct spdk_nvmf_tcp_transport *ttransport, 
			/* copy the cmd from the receive pdu */

			tcp_req->cmd = tqpair->pdu_in_progress.hdr.capsule_cmd.ccsqe;



			if (spdk_unlikely(spdk_nvmf_request_get_dif_ctx(&tcp_req->req, &tcp_req->dif_ctx))) {

				tcp_req->dif_insert_or_strip = true;

				tqpair->pdu_in_progress.dif_ctx = &tcp_req->dif_ctx;

			}



			/* The next state transition depends on the data transfer needs of this request. */

			tcp_req->req.xfer = spdk_nvmf_tcp_req_get_xfer(tcp_req);

test/unit/lib/nvmf/tcp.c/tcp_ut.c

+5 −0
Original line number Diff line number Diff line
@@ -156,6 +156,11 @@ DEFINE_STUB(spdk_nvmf_bdev_ctrlr_nvme_passthru_io, 
	     struct spdk_nvmf_request *req),

	    0);



DEFINE_STUB(spdk_nvmf_bdev_ctrlr_get_dif_ctx,

	    bool,

	    (struct spdk_bdev *bdev, struct spdk_nvme_cmd *cmd, struct spdk_dif_ctx *dif_ctx),

	    false);



DEFINE_STUB(spdk_nvmf_transport_req_complete,

	    int,

	    (struct spdk_nvmf_request *req),