nvme tcp receive errors

Sagi Grimberg sagi at grimberg.me
Sat May 1 00:42:14 BST 2021


> You are exactly right, I think this should do the trick:

Hey Keith,

Did this resolve the issues?

> -- 
> diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
> index 8e55d8bc0c50..eb1feaacd11a 100644
> --- a/drivers/nvme/host/tcp.c
> +++ b/drivers/nvme/host/tcp.c
> @@ -55,6 +55,7 @@ struct nvme_tcp_request {
>          /* send state */
>          size_t                  offset;
>          size_t                  data_sent;
> +       size_t                  data_received;
>          enum nvme_tcp_send_state state;
>   };
> 
> @@ -751,9 +752,12 @@ static int nvme_tcp_recv_data(struct nvme_tcp_queue 
> *queue, struct sk_buff *skb,
>                  *len -= recv_len;
>                  *offset += recv_len;
>                  queue->data_remaining -= recv_len;
> +               req->data_received += recv_len;
>          }
> 
>          if (!queue->data_remaining) {
> +               if (req->data_received < req->data_len)
> +                       return 0;
>                  if (queue->data_digest) {
>                          nvme_tcp_ddgst_final(queue->rcv_hash, 
> &queue->exp_ddgst);
>                          queue->ddgst_remaining = NVME_TCP_DIGEST_LENGTH;
> @@ -2274,6 +2278,7 @@ static blk_status_t nvme_tcp_setup_cmd_pdu(struct 
> nvme_ns *ns,
>          req->state = NVME_TCP_SEND_CMD_PDU;
>          req->offset = 0;
>          req->data_sent = 0;
> +       req->data_received = 0;
>          req->pdu_len = 0;
>          req->pdu_sent = 0;
>          req->data_len = blk_rq_nr_phys_segments(rq) ?
> -- 



More information about the Linux-nvme mailing list