From b5aeff1dba06e15dfd80c39a7abe5e04e4f2a0a8 Mon Sep 17 00:00:00 2001 From: MengjinWu Date: Tue, 20 Sep 2022 14:38:56 +0000 Subject: [PATCH] nvmf/tcp: 'nvmf_tcp_send_c2h_term_req' should set fes Set the fes in nvmf_tcp_send_c2h_term_req. Signed-off-by: MengjinWu Change-Id: I457e102d9329e5624c738c5cf2e7fe411106f30b Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/14583 Reviewed-by: Changpeng Liu Reviewed-by: Jim Harris Reviewed-by: Aleksey Marchuk Reviewed-by: Shuhei Matsumoto Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins --- lib/nvmf/tcp.c | 1 + test/unit/lib/nvmf/tcp.c/tcp_ut.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/nvmf/tcp.c b/lib/nvmf/tcp.c index 49febb187..84606b1a8 100644 --- a/lib/nvmf/tcp.c +++ b/lib/nvmf/tcp.c @@ -1464,6 +1464,7 @@ nvmf_tcp_send_c2h_term_req(struct spdk_nvmf_tcp_qpair *tqpair, struct nvme_tcp_p c2h_term_req = &rsp_pdu->hdr.term_req; c2h_term_req->common.pdu_type = SPDK_NVME_TCP_PDU_TYPE_C2H_TERM_REQ; c2h_term_req->common.hlen = c2h_term_req_hdr_len; + c2h_term_req->fes = fes; if ((fes == SPDK_NVME_TCP_TERM_REQ_FES_INVALID_HEADER_FIELD) || (fes == SPDK_NVME_TCP_TERM_REQ_FES_INVALID_DATA_UNSUPPORTED_PARAMETER)) { diff --git a/test/unit/lib/nvmf/tcp.c/tcp_ut.c b/test/unit/lib/nvmf/tcp.c/tcp_ut.c index a9ceca748..d304a03d0 100644 --- a/test/unit/lib/nvmf/tcp.c/tcp_ut.c +++ b/test/unit/lib/nvmf/tcp.c/tcp_ut.c @@ -818,6 +818,7 @@ test_nvmf_tcp_send_c2h_term_req(void) CU_ASSERT(tqpair.mgmt_pdu->hdr.term_req.common.plen == tqpair.mgmt_pdu->hdr.term_req.common.hlen + pdu.hdr.common.hlen); CU_ASSERT(tqpair.mgmt_pdu->hdr.term_req.common.pdu_type == SPDK_NVME_TCP_PDU_TYPE_C2H_TERM_REQ); + CU_ASSERT(tqpair.mgmt_pdu->hdr.term_req.fes == SPDK_NVME_TCP_TERM_REQ_FES_INVALID_HEADER_FIELD); /* case2: hlen > SPDK_NVME_TCP_TERM_REQ_ERROR_DATA_MAX_SIZE, Expect: copy_len == SPDK_NVME_TCP_TERM_REQ_ERROR_DATA_MAX_SIZE */ pdu.hdr.common.hlen = 255; @@ -827,6 +828,7 @@ test_nvmf_tcp_send_c2h_term_req(void) CU_ASSERT(tqpair.mgmt_pdu->hdr.term_req.common.plen == (unsigned) tqpair.mgmt_pdu->hdr.term_req.common.hlen + SPDK_NVME_TCP_TERM_REQ_ERROR_DATA_MAX_SIZE); CU_ASSERT(tqpair.mgmt_pdu->hdr.term_req.common.pdu_type == SPDK_NVME_TCP_PDU_TYPE_C2H_TERM_REQ); + CU_ASSERT(tqpair.mgmt_pdu->hdr.term_req.fes == SPDK_NVME_TCP_TERM_REQ_FES_INVALID_HEADER_FIELD); } static void