nvmet-tcp: Fix receive data digest calculation for multiple h2cdata PDUs
Subsystems (2)
Sagi Grimberg
maintainerPATCH 1/1 nvmet-tcp: Fix receive data digest calculation for multiple h2cdata PDUs
When a host sends multiple h2cdata PDUs for a single command, we should verify the data digest calculation per PDU and not per command.
--- drivers/nvme/target/tcp.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-)
drivers/nvme/target/tcp.c +24 -7
@@ -379,7 +379,7 @@ static int nvmet_tcp_map_data(struct nvmet_tcp_cmd *cmd)return NVME_SC_INTERNAL ; } -static void nvmet_tcp_ddgst (struct ahash_request *hash, +static void nvmet_tcp_send_ddgst (struct ahash_request *hash,struct nvmet_tcp_cmd *cmd) { ahash_request_set_crypt(hash, cmd->req.sg,
@@ -387,6 +387,23 @@ static void nvmet_tcp_ddgst(struct ahash_request *hash,crypto_ahash_digest (hash); } +static void nvmet_tcp_recv_ddgst (struct ahash_request *hash, +struct nvmet_tcp_cmd *cmd) +{ +struct scatterlist sg; +struct kvec *iov; +int i; + +crypto_ahash_init (hash); +for (i =0 , iov = cmd->iov; i < cmd->nr_mapped; i++, iov++) { +sg_init_one (&sg, iov->iov_base, iov->iov_len); +ahash_request_set_crypt (hash, &sg,NULL , iov->iov_len); +crypto_ahash_update (hash); + } +ahash_request_set_crypt (hash,NULL , (void *)&cmd->exp_ddgst,0 ); +crypto_ahash_final (hash); +} +static void nvmet_setup_c2h_data_pdu (struct nvmet_tcp_cmd *cmd) {struct nvme_tcp_data_pdu *pdu = cmd->data_pdu;
@@ -411,7 +428,7 @@ static void nvmet_setup_c2h_data_pdu(struct nvmet_tcp_cmd *cmd)if (queue->data_digest) { pdu->hdr.flags |=NVME_TCP_F_DDGST ; -nvmet_tcp_ddgst (queue->snd_hash, cmd); +nvmet_tcp_send_ddgst (queue->snd_hash, cmd); }if (cmd->queue->hdr_digest) {
@@ -1060,7 +1077,7 @@ static void nvmet_tcp_prep_recv_ddgst(struct nvmet_tcp_cmd *cmd) {struct nvmet_tcp_queue *queue = cmd->queue; -nvmet_tcp_ddgst (queue->rcv_hash, cmd); +nvmet_tcp_recv_ddgst (queue->rcv_hash, cmd); queue->offset =0 ; queue->left =NVME_TCP_DIGEST_LENGTH ; queue->rcv_state =NVMET_TCP_RECV_DDGST ;
@@ -1081,14 +1098,14 @@ static int nvmet_tcp_try_recv_data(struct nvmet_tcp_queue *queue) cmd->rbytes_done += ret; } +if (queue->data_digest) { +nvmet_tcp_prep_recv_ddgst (cmd); +return 0 ; + }nvmet_tcp_unmap_pdu_iovec (cmd);if (!(cmd->flags &NVMET_TCP_F_INIT_FAILED ) && cmd->rbytes_done == cmd->req.transfer_len) { -if (queue->data_digest) { -nvmet_tcp_prep_recv_ddgst (cmd); -return 0 ; - } cmd->req.execute (&cmd->req); }
Signature · 7 lines
2.27.0 _______________________________________________ Linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Thanks,
applied to nvme-5.12.
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Hi Sagi,
Can you please explain why you avoid calling nvmet_tcp_unmap_pdu_iovec on data_digest PDU? I don't recall any other case that unmap is being called on good path.
Regards,
Elad
-----Original Message-----
From: Linux-nvme <[email protected]> On Behalf Of Sagi Grimberg
Sent: Thursday, 4 February 2021 1:00
To: [email protected]; Christoph Hellwig; Keith Busch; Chaitanya Kulkarni
Subject: [PATCH] nvmet-tcp: Fix receive data digest calculation for multiple h2cdata PDUs
[EXTERNAL EMAIL]
When a host sends multiple h2cdata PDUs for a single command, we should verify the data digest calculation per PDU and not per command.
--- drivers/nvme/target/tcp.c | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-)
drivers/nvme/target/tcp.c +1 -1
@@ -379,7 +379,7 @@ static int nvmet_tcp_map_data(struct nvmet_tcp_cmd *cmd)return NVME_SC_INTERNAL ; } -static void nvmet_tcp_ddgst (struct ahash_request *hash, +static void nvmet_tcp_send_ddgst (struct ahash_request *hash,struct nvmet_tcp_cmd *cmd) { ahash_request_set_crypt(hash, cmd->req.sg, @@ -387,6 +387,23 @@ static void nvmet_tcp_ddgst(struct ahash_request *hash,
crypto_ahash_digest(hash);
}
+static void nvmet_tcp_recv_ddgst(struct ahash_request *hash,
+ struct nvmet_tcp_cmd *cmd)
+{
+ struct scatterlist sg;
+ struct kvec *iov;
+ int i;
+
+ crypto_ahash_init(hash);
+ for (i = 0, iov = cmd->iov; i < cmd->nr_mapped; i++, iov++) {
+ sg_init_one(&sg, iov->iov_base, iov->iov_len);
+ ahash_request_set_crypt(hash, &sg, NULL, iov->iov_len);
+ crypto_ahash_update(hash);
+ }
+ ahash_request_set_crypt(hash, NULL, (void *)&cmd->exp_ddgst, 0);
+ crypto_ahash_final(hash);
+}
+
static void nvmet_setup_c2h_data_pdu(struct nvmet_tcp_cmd *cmd) {
struct nvme_tcp_data_pdu *pdu = cmd->data_pdu; @@ -411,7 +428,7 @@ static void nvmet_setup_c2h_data_pdu(struct nvmet_tcp_cmd *cmd)
if (queue->data_digest) {
pdu->hdr.flags |= NVME_TCP_F_DDGST;
- nvmet_tcp_ddgst(queue->snd_hash, cmd);
+ nvmet_tcp_send_ddgst(queue->snd_hash, cmd);
}
if (cmd->queue->hdr_digest) {
@@ -1060,7 +1077,7 @@ static void nvmet_tcp_prep_recv_ddgst(struct nvmet_tcp_cmd *cmd) {
struct nvmet_tcp_queue *queue = cmd->queue;
- nvmet_tcp_ddgst(queue->rcv_hash, cmd);
+ nvmet_tcp_recv_ddgst(queue->rcv_hash, cmd);
queue->offset = 0;
queue->left = NVME_TCP_DIGEST_LENGTH;
queue->rcv_state = NVMET_TCP_RECV_DDGST; @@ -1081,14 +1098,14 @@ static int nvmet_tcp_try_recv_data(struct nvmet_tcp_queue *queue)
cmd->rbytes_done += ret;
}
+ if (queue->data_digest) {
+ nvmet_tcp_prep_recv_ddgst(cmd);
+ return 0;
+ }
nvmet_tcp_unmap_pdu_iovec(cmd);
if (!(cmd->flags & NVMET_TCP_F_INIT_FAILED) &&
cmd->rbytes_done == cmd->req.transfer_len) {
- if (queue->data_digest) {
- nvmet_tcp_prep_recv_ddgst(cmd);
- return 0;
- }
cmd->req.execute(&cmd->req);
}
--
2.27.0
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Sagi Grimberg
maintainerQuoted 2 lines
Hi Sagi,
Hey Elad,
Quoted 2 lines
Can you please explain why you avoid calling
nvmet_tcp_unmap_pdu_iovecondata_digestPDU? I don't recall any other case that unmap is being called on good path.
You are correct. We need to either add unmap in the data_digest path here or when completing the data digest reception.. Probably better here.
Care to send a patch or should I?
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme
Sure. I will send new patch shortly.
Elad
-----Original Message-----
From: Sagi Grimberg <[email protected]>
Sent: Tuesday, 16 March 2021 8:30
To: Grupi, Elad; [email protected]; Christoph Hellwig; Keith Busch; Chaitanya Kulkarni
Subject: Re: [PATCH] nvmet-tcp: Fix receive data digest calculation for multiple h2cdata PDUs
[EXTERNAL EMAIL]
Quoted 1 line
Hi Sagi,
Hey Elad,
Quoted 2 lines
Can you please explain why you avoid calling
nvmet_tcp_unmap_pdu_iovecondata_digestPDU? I don't recall any other case that unmap is being called on good path.
You are correct. We need to either add unmap in the data_digest path here or when completing the data digest reception.. Probably better here.
Care to send a patch or should I?
_______________________________________________
Linux-nvme mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-nvme