Skip to contentSkip to conversation

nvmet-tcp: fix data digest calculation for multiple H2CData PDUs

PATCH Superseded Varun Prakash 3 participants 6 messages Jul 27, 2023 – Aug 1, 2023

Subsystems (2)

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nvmet-tcp: fix data digest calculation for multiple H2CData PDUs

On receiving H2CData PDU current code calculates data digest for the entire transfer length, it works if host sends only one H2CData PDU per cmd, if host sends multiple H2CData PDU per cmd then target reports data digest error.

This issue was fixed in commit fda871c0ba5d ("nvmet-tcp: fix receive data digest calculation for multiple h2cdata PDUs").

commit ed0691cf5514 ("nvmet-tcp: fix regression in data_digest calculation") reverted the fix done in the above commit.

Fixes ed0691cf5514 ("nvmet-tcp: fix regression in data_digest calculation")
---
 drivers/nvme/target/tcp.c | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)
drivers/nvme/target/tcp.c +27 -4
index 05163751f2e5..e5e3498675af 100644
@@ -415,8 +415,8 @@ static int nvmet_tcp_map_data(struct nvmet_tcp_cmd *cmd)
 	return NVME_SC_INTERNAL;
 }
 
-static void nvmet_tcp_calc_ddgst(struct ahash_request *hash,
-		struct nvmet_tcp_cmd *cmd)
+static void nvmet_tcp_send_ddgst(struct ahash_request *hash,
+				 struct nvmet_tcp_cmd *cmd)
 {
 	ahash_request_set_crypt(hash, cmd->req.sg,
 		(void *)&cmd->exp_ddgst, cmd->req.transfer_len);
@@ -447,7 +447,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_calc_ddgst(queue->snd_hash, cmd);
+		nvmet_tcp_send_ddgst(queue->snd_hash, cmd);
 	}
 
 	if (cmd->queue->hdr_digest) {
@@ -1152,11 +1152,34 @@ static int nvmet_tcp_try_recv_pdu(struct nvmet_tcp_queue *queue)
 	return nvmet_tcp_done_recv_pdu(queue);
 }
 
+static void nvmet_tcp_recv_ddgst(struct ahash_request *hash,
+				 struct nvmet_tcp_cmd *cmd)
+{
+	struct bio_vec *iov = cmd->iov;
+	struct scatterlist sg;
+	u32 data_length = cmd->pdu_len;
+
+	sg_init_table(&sg, 1);
+	crypto_ahash_init(hash);
+
+	while (data_length) {
+		sg_set_page(&sg, iov->bv_page, iov->bv_len, iov->bv_offset);
+		ahash_request_set_crypt(hash, &sg, NULL, iov->bv_len);
+		crypto_ahash_update(hash);
+
+		data_length -= iov->bv_len;
+		iov++;
+	}
+
+	ahash_request_set_crypt(hash, NULL, (void *)&cmd->exp_ddgst, 0);
+	crypto_ahash_final(hash);
+}
+
 static void nvmet_tcp_prep_recv_ddgst(struct nvmet_tcp_cmd *cmd)
 {
 	struct nvmet_tcp_queue *queue = cmd->queue;
 
-	nvmet_tcp_calc_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;
Signature · 1 line
2.31.1
#1 lore raw
Quoted 10 lines · Varun Prakash

On receiving H2CData PDU current code calculates data digest for the entire transfer length, it works if host sends only one H2CData PDU per cmd, if host sends multiple H2CData PDU per cmd then target reports data digest error.

This issue was fixed in commit fda871c0ba5d ("nvmet-tcp: fix receive data digest calculation for multiple h2cdata PDUs").

commit ed0691cf5514 ("nvmet-tcp: fix regression in data_digest calculation") reverted the fix done in the above commit.

This simply seems to revert this revert again and not address the reason why it was reverted.

maintainer
#2 lore raw
Quoted 5 lines
Quoted 5 lines

transfer length, it works if host sends only one H2CData PDU per cmd, if host sends multiple H2CData PDU per cmd then target reports data digest error.

Quoted 8 lines
Quoted 5 lines

This issue was fixed in commit fda871c0ba5d ("nvmet-tcp: fix receive data digest calculation for multiple h2cdata PDUs").

commit ed0691cf5514 ("nvmet-tcp: fix regression in data_digest calculation") reverted the fix done in the above commit.

This simply seems to revert this revert again and not address the reason why it was reverted.

We no longer map/unmap per pdu, so the original issue addressed in fda871c0ba5d should no longer exist.

This part is missing from the change log though.

maintainer
#3 lore raw
In reply to Varun Prakash
Quoted 58 lines

On receiving H2CData PDU current code calculates data digest for the entire transfer length, it works if host sends only one H2CData PDU per cmd, if host sends multiple H2CData PDU per cmd then target reports data digest error.

This issue was fixed in commit fda871c0ba5d ("nvmet-tcp: fix receive data digest calculation for multiple h2cdata PDUs").

commit ed0691cf5514 ("nvmet-tcp: fix regression in data_digest calculation") reverted the fix done in the above commit.

Fixes ed0691cf5514 ("nvmet-tcp: fix regression in data_digest calculation")
---
  drivers/nvme/target/tcp.c | 31 +++++++++++++++++++++++++++----
  1 file changed, 27 insertions(+), 4 deletions(-)
drivers/nvme/target/tcp.c +15 -3
index 05163751f2e5..e5e3498675af 100644
@@ -415,8 +415,8 @@ static int nvmet_tcp_map_data(struct nvmet_tcp_cmd *cmd)
  	return NVME_SC_INTERNAL;
  }
 
-static void nvmet_tcp_calc_ddgst(struct ahash_request *hash,
-		struct nvmet_tcp_cmd *cmd)
+static void nvmet_tcp_send_ddgst(struct ahash_request *hash,
+				 struct nvmet_tcp_cmd *cmd)
  {
  	ahash_request_set_crypt(hash, cmd->req.sg,
  		(void *)&cmd->exp_ddgst, cmd->req.transfer_len);
@@ -447,7 +447,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_calc_ddgst(queue->snd_hash, cmd);
+		nvmet_tcp_send_ddgst(queue->snd_hash, cmd);
  	}
 
  	if (cmd->queue->hdr_digest) {
@@ -1152,11 +1152,34 @@ static int nvmet_tcp_try_recv_pdu(struct nvmet_tcp_queue *queue)
  	return nvmet_tcp_done_recv_pdu(queue);
  }
 
+static void nvmet_tcp_recv_ddgst(struct ahash_request *hash,
+				 struct nvmet_tcp_cmd *cmd)
+{
+	struct bio_vec *iov = cmd->iov;
+	struct scatterlist sg;
+	u32 data_length = cmd->pdu_len;
+
+	sg_init_table(&sg, 1);
+	crypto_ahash_init(hash);
+
+	while (data_length) {
+		sg_set_page(&sg, iov->bv_page, iov->bv_len, iov->bv_offset);

drivers/nvme/target/tcp.c static int nvmet_tcp_try_recv_pdu(struct nvmet_tcp_queue *queue) · line 1176

Quoted 10 lines
drivers/nvme/target/tcp.c +10 -0
+		ahash_request_set_crypt(hash, &sg, NULL, iov->bv_len);
+		crypto_ahash_update(hash);
+
+		data_length -= iov->bv_len;
+		iov++;
+	}
+
+	ahash_request_set_crypt(hash, NULL, (void *)&cmd->exp_ddgst, 0);
+	crypto_ahash_final(hash);
+}

Maybe instead of (re)coding crypto_ahash_digest, maybe we can do a little hack to pass the request sg from cmd->sg_idx which is already set when we build the pdu?

Something like:
--
+static void nvmet_tcp_calc_recv_ddgst(struct ahash_request *hash,
+ struct nvmet_tcp_cmd *cmd)
+{
+ struct scatterlist *sg;
+ u32 sg_offset;
+
+ sg = &cmd->req.sg[cmd->sg_idx];
+
+ /*

+        * adjust the offset for the first sg element if the received bytes
+        * is not aligned to page size (and adjust back after the ddgst
+        * calculation). A bit hacky but we don't need to do the hash digest
+        * update per sg entry this way.
+        */
+       sg_offset = cmd->rbytes_done % PAGE_SIZE;
+       sg->offset -= sg_offset;
+       __nvmet_tcp_calc_ddgst(hash, sg, (void *)&cmd->exp_ddgst, cmd->pdu_len);
+       sg->offset += sg_offset;

}
--

untested but I think it should be ok. It's kinda hacky but prevents us from doing it entry by entry. Maybe it's too ugly.

#4 lore raw
Quoted 24 lines

Maybe instead of (re)coding crypto_ahash_digest, maybe we can do a little hack to pass the request sg from cmd->sg_idx which is already set when we build the pdu?

Something like:
--

(quoted diff) +17 -0
+static void nvmet_tcp_calc_recv_ddgst(struct ahash_request *hash,
+               struct nvmet_tcp_cmd *cmd)
+{
+       struct scatterlist *sg;
+       u32 sg_offset;
+
+       sg = &cmd->req.sg[cmd->sg_idx];
+
+       /*
+        * adjust the offset for the first sg element if the received bytes
+        * is not aligned to page size (and adjust back after the ddgst
+        * calculation). A bit hacky but we don't need to do the hash digest
+        * update per sg entry this way.
+        */
+       sg_offset = cmd->rbytes_done % PAGE_SIZE;
+       sg->offset -= sg_offset;
+       __nvmet_tcp_calc_ddgst(hash, sg, (void *)&cmd->exp_ddgst, 
Quoted 4 lines

cmd->pdu_len);
+ sg->offset += sg_offset;
}
--

In case of offset instead of updating sg->offset can we calculate digest for first sg separately by using local sg variable?

maintainer
#5 lore raw
Quoted 23 lines · Varun Prakash
Quoted 23 lines

Maybe instead of (re)coding crypto_ahash_digest, maybe we can do a little hack to pass the request sg from cmd->sg_idx which is already set when we build the pdu?

Something like:
--

(quoted diff) +16 -0
+static void nvmet_tcp_calc_recv_ddgst(struct ahash_request *hash,
+               struct nvmet_tcp_cmd *cmd)
+{
+       struct scatterlist *sg;
+       u32 sg_offset;
+
+       sg = &cmd->req.sg[cmd->sg_idx];
+
+       /*
+        * adjust the offset for the first sg element if the received bytes
+        * is not aligned to page size (and adjust back after the ddgst
+        * calculation). A bit hacky but we don't need to do the hash digest
+        * update per sg entry this way.
+        */
+       sg_offset = cmd->rbytes_done % PAGE_SIZE;
+       sg->offset -= sg_offset;
Quoted 8 lines
Quoted 5 lines

+ __nvmet_tcp_calc_ddgst(hash, sg, (void *)&cmd->exp_ddgst,
cmd->pdu_len);
+ sg->offset += sg_offset;
}
--

In case of offset instead of updating sg->offset can we calculate digest for first sg separately by using local sg variable?

Possible, want to give it a go?