ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nvmf/tcp: Return DIF error to initiator instead of severe disconnection

Browse Source 
On a DIF verification error, fail the read command with a status code
of APPLICATION_TAG_CHECK_ERROR, GUARD_CHECK_ERROR, or
REFERENCE_TAG_CHECK_ERROR and a status code type of SCT_MEDIA_ERROR.

The state of the request is TCP_REQUEST_STATE_TRANSFERRING_CONTROLLER_TO_HOST
when a DIF verification error is detected. So dequeue the request
from C2H data queue, return the response PDU, and then send the command
response.

This was an item on the TODO list. RDMA transport do this right
behavior from the start and so TCP transport follows it by this patch.

Signed-off-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Change-Id: I102bbd253cc8c1379d0937c9536bf2bfe04cbf6a
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/468911
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom SPDK FC-NVMe CI <spdk-ci.pdl@broadcom.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Shuhei Matsumoto 2019-09-20 10:44:11 +09:00 committed by Jim Harris
parent ddd97a8b3b
commit 34a0d851f6
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
lib/nvmf/tcp.c
View File

@ -46,6 +46,7 @@
#include "nvmf_internal.h"
#include "transport.h"
#include "spdk_internal/assert.h"
#include "spdk_internal/log.h"
#include "spdk_internal/nvme_tcp.h"
@ -2312,21 +2313,27 @@ spdk_nvmf_tcp_req_parse_sgl(struct spdk_nvmf_tcp_transport *ttransport,
return -1;
}
static int
nvmf_tcp_pdu_verify_dif(struct nvme_tcp_pdu *pdu,
const struct spdk_dif_ctx *dif_ctx)
{
struct spdk_dif_error err_blk = {};
int rc;
static inline enum spdk_nvme_media_error_status_code
nvmf_tcp_dif_error_to_compl_status(uint8_t err_type) {
enum spdk_nvme_media_error_status_code result;
rc = spdk_dif_verify_stream(pdu->data_iov, pdu->data_iovcnt,
0, pdu->data_len, pdu->dif_ctx, &err_blk);
if (rc != 0) {
SPDK_ERRLOG("DIF error detected. type=%d, offset=%" PRIu32 "\n",
err_blk.err_type, err_blk.err_offset);
switch (err_type)
{
case SPDK_DIF_REFTAG_ERROR:
result = SPDK_NVME_SC_REFERENCE_TAG_CHECK_ERROR;
break;
case SPDK_DIF_APPTAG_ERROR:
result = SPDK_NVME_SC_APPLICATION_TAG_CHECK_ERROR;
break;
case SPDK_DIF_GUARD_ERROR:
result = SPDK_NVME_SC_GUARD_CHECK_ERROR;
break;
default:
SPDK_UNREACHABLE();
break;
}
return rc;
return result;
}
static void
@ -2388,16 +2395,19 @@ spdk_nvmf_tcp_send_c2h_data(struct spdk_nvmf_tcp_qpair *tqpair,
c2h_data->datao, c2h_data->datal);
if (spdk_unlikely(tcp_req->dif_insert_or_strip)) {
rc = nvmf_tcp_pdu_verify_dif(rsp_pdu, rsp_pdu->dif_ctx);
struct spdk_nvme_cpl *rsp = &tcp_req->req.rsp->nvme_cpl;
struct spdk_dif_error err_blk = {};
rc = spdk_dif_verify_stream(rsp_pdu->data_iov, rsp_pdu->data_iovcnt,
0, rsp_pdu->data_len, rsp_pdu->dif_ctx, &err_blk);
if (rc != 0) {
/* Data digest error detected by the NVMe/TCP target is treated as non-fatal
* transport error because the cause will be outside the NVMe/TCP target.
*
* On the other hand, treat DIF check error as fatal transport error here
* here because the error is caused by the target itself. Fatal NVMe/TCP
* transport error is handled by terminating the connection.
*/
tqpair->state = NVME_TCP_QPAIR_STATE_EXITING;
SPDK_ERRLOG("DIF error detected. type=%d, offset=%" PRIu32 "\n",
err_blk.err_type, err_blk.err_offset);
rsp->status.sct = SPDK_NVME_SCT_MEDIA_ERROR;
rsp->status.sc = nvmf_tcp_dif_error_to_compl_status(err_blk.err_type);
STAILQ_REMOVE_HEAD(&tqpair->queued_c2h_data_tcp_req, link);
spdk_nvmf_tcp_pdu_put(tqpair, rsp_pdu);
spdk_nvmf_tcp_send_capsule_resp_pdu(tcp_req, tqpair);
return;
}
}