[PATCH v29 07/20] nvme-tcp: RX DDGST offload
Aurelien Aptel
aaptel at nvidia.com
Mon Jun 30 07:07:24 PDT 2025
From: Yoray Zack <yorayz at nvidia.com>
Enable rx side of DDGST offload when supported.
At the end of the capsule, check if all the skb bits are on, and if not
recalculate the DDGST in SW and check it.
Signed-off-by: Yoray Zack <yorayz at nvidia.com>
Signed-off-by: Boris Pismenny <borisp at nvidia.com>
Signed-off-by: Ben Ben-Ishay <benishay at nvidia.com>
Signed-off-by: Or Gerlitz <ogerlitz at nvidia.com>
Signed-off-by: Shai Malin <smalin at nvidia.com>
Signed-off-by: Aurelien Aptel <aaptel at nvidia.com>
Reviewed-by: Chaitanya Kulkarni <kch at nvidia.com>
Reviewed-by: Max Gurtovoy <mgurtovoy at nvidia.com>
Reviewed-by: Sagi Grimberg <sagi at grimberg.me>
---
drivers/nvme/host/tcp.c | 117 +++++++++++++++++++++++++++++++++++-----
1 file changed, 105 insertions(+), 12 deletions(-)
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c
index 5ad71185f62f..efea6d782d8a 100644
--- a/drivers/nvme/host/tcp.c
+++ b/drivers/nvme/host/tcp.c
@@ -152,6 +152,7 @@ enum nvme_tcp_queue_flags {
NVME_TCP_Q_POLLING = 2,
NVME_TCP_Q_IO_CPU_SET = 3,
NVME_TCP_Q_OFF_DDP = 4,
+ NVME_TCP_Q_OFF_DDGST_RX = 5,
};
enum nvme_tcp_recv_state {
@@ -189,6 +190,7 @@ struct nvme_tcp_queue {
* is pending (ULP_DDP_RESYNC_PENDING).
*/
atomic64_t resync_tcp_seq;
+ bool ddp_ddgst_valid;
#endif
/* send state */
@@ -378,6 +380,13 @@ static inline size_t nvme_tcp_pdu_last_send(struct nvme_tcp_request *req,
return nvme_tcp_pdu_data_left(req) <= len;
}
+#define NVME_TCP_CRC_SEED (~0)
+
+static inline __le32 nvme_tcp_ddgst_final(u32 crc)
+{
+ return cpu_to_le32(~crc);
+}
+
#ifdef CONFIG_ULP_DDP
static bool nvme_tcp_is_ddp_offloaded(const struct nvme_tcp_request *req)
@@ -433,6 +442,55 @@ nvme_tcp_get_ddp_netdev_with_limits(struct nvme_tcp_ctrl *ctrl)
return NULL;
}
+static bool nvme_tcp_ddp_ddgst_ok(struct nvme_tcp_queue *queue)
+{
+ return queue->ddp_ddgst_valid;
+}
+
+static void nvme_tcp_ddp_ddgst_update(struct nvme_tcp_queue *queue,
+ struct sk_buff *skb)
+{
+ if (queue->ddp_ddgst_valid)
+ queue->ddp_ddgst_valid = skb_is_ulp_crc(skb);
+}
+
+static void nvme_tcp_ddp_ddgst_recalc(struct request *rq,
+ __le32 *ddgst)
+{
+ struct nvme_tcp_request *req;
+ struct scatterlist *sg;
+ u32 crc;
+ int i;
+
+ req = blk_mq_rq_to_pdu(rq);
+ if (!req->offloaded) {
+ /* if we have DDGST_RX offload but DDP was skipped
+ * because it's under the min IO threshold then the
+ * request won't have an SGL, so we need to make it
+ * here
+ */
+ if (nvme_tcp_ddp_alloc_sgl(req, rq))
+ return;
+ }
+
+ crc = NVME_TCP_CRC_SEED;
+ for_each_sg(req->ddp.sg_table.sgl, sg, req->ddp.sg_table.nents, i) {
+ void *vaddr = kmap_local_page(sg_page(sg));
+
+ crc = crc32c(crc, vaddr + sg->offset, sg->length);
+ kunmap_local(vaddr);
+ }
+
+ if (!req->offloaded) {
+ /* without DDP, ddp_teardown() won't be called, so
+ * free the table here
+ */
+ sg_free_table_chained(&req->ddp.sg_table, SG_CHUNK_SIZE);
+ }
+
+ *ddgst = nvme_tcp_ddgst_final(crc);
+}
+
static bool nvme_tcp_resync_request(struct sock *sk, u32 seq, u32 flags);
static void nvme_tcp_ddp_teardown_done(void *ddp_ctx);
static const struct ulp_ddp_ulp_ops nvme_tcp_ddp_ulp_ops = {
@@ -521,6 +579,10 @@ static int nvme_tcp_offload_socket(struct nvme_tcp_queue *queue)
return ret;
set_bit(NVME_TCP_Q_OFF_DDP, &queue->flags);
+ if (queue->data_digest &&
+ ulp_ddp_is_cap_active(queue->ctrl->ddp_netdev,
+ ULP_DDP_CAP_NVME_TCP_DDGST_RX))
+ set_bit(NVME_TCP_Q_OFF_DDGST_RX, &queue->flags);
return 0;
}
@@ -528,6 +590,7 @@ static int nvme_tcp_offload_socket(struct nvme_tcp_queue *queue)
static void nvme_tcp_unoffload_socket(struct nvme_tcp_queue *queue)
{
clear_bit(NVME_TCP_Q_OFF_DDP, &queue->flags);
+ clear_bit(NVME_TCP_Q_OFF_DDGST_RX, &queue->flags);
ulp_ddp_sk_del(queue->ctrl->ddp_netdev,
&queue->ctrl->netdev_ddp_tracker,
queue->sock->sk);
@@ -638,6 +701,19 @@ static void nvme_tcp_resync_response(struct nvme_tcp_queue *queue,
struct sk_buff *skb, unsigned int offset)
{}
+static bool nvme_tcp_ddp_ddgst_ok(struct nvme_tcp_queue *queue)
+{
+ return false;
+}
+
+static void nvme_tcp_ddp_ddgst_update(struct nvme_tcp_queue *queue,
+ struct sk_buff *skb)
+{}
+
+static void nvme_tcp_ddp_ddgst_recalc(struct request *rq,
+ __le32 *ddgst)
+{}
+
#endif
static void nvme_tcp_init_iter(struct nvme_tcp_request *req,
@@ -762,8 +838,6 @@ nvme_tcp_fetch_request(struct nvme_tcp_queue *queue)
return req;
}
-#define NVME_TCP_CRC_SEED (~0)
-
static inline void nvme_tcp_ddgst_update(u32 *crcp,
struct page *page, size_t off, size_t len)
{
@@ -781,11 +855,6 @@ static inline void nvme_tcp_ddgst_update(u32 *crcp,
}
}
-static inline __le32 nvme_tcp_ddgst_final(u32 crc)
-{
- return cpu_to_le32(~crc);
-}
-
static inline __le32 nvme_tcp_hdgst(const void *pdu, size_t len)
{
return cpu_to_le32(~crc32c(NVME_TCP_CRC_SEED, pdu, len));
@@ -912,6 +981,9 @@ static void nvme_tcp_init_recv_ctx(struct nvme_tcp_queue *queue)
queue->pdu_offset = 0;
queue->data_remaining = -1;
queue->ddgst_remaining = 0;
+#ifdef CONFIG_ULP_DDP
+ queue->ddp_ddgst_valid = true;
+#endif
}
static void nvme_tcp_error_recovery(struct nvme_ctrl *ctrl)
@@ -1245,6 +1317,9 @@ static int nvme_tcp_recv_data(struct nvme_tcp_queue *queue, struct sk_buff *skb,
nvme_cid_to_rq(nvme_tcp_tagset(queue), pdu->command_id);
struct nvme_tcp_request *req = blk_mq_rq_to_pdu(rq);
+ if (test_bit(NVME_TCP_Q_OFF_DDGST_RX, &queue->flags))
+ nvme_tcp_ddp_ddgst_update(queue, skb);
+
while (true) {
int recv_len, ret;
@@ -1273,7 +1348,8 @@ static int nvme_tcp_recv_data(struct nvme_tcp_queue *queue, struct sk_buff *skb,
recv_len = min_t(size_t, recv_len,
iov_iter_count(&req->iter));
- if (queue->data_digest)
+ if (queue->data_digest &&
+ !test_bit(NVME_TCP_Q_OFF_DDGST_RX, &queue->flags))
ret = skb_copy_and_crc32c_datagram_iter(skb, *offset,
&req->iter, recv_len, &queue->rcv_crc);
else
@@ -1315,8 +1391,11 @@ static int nvme_tcp_recv_ddgst(struct nvme_tcp_queue *queue,
char *ddgst = (char *)&queue->recv_ddgst;
size_t recv_len = min_t(size_t, *len, queue->ddgst_remaining);
off_t off = NVME_TCP_DIGEST_LENGTH - queue->ddgst_remaining;
+ struct request *rq;
int ret;
+ if (test_bit(NVME_TCP_Q_OFF_DDGST_RX, &queue->flags))
+ nvme_tcp_ddp_ddgst_update(queue, skb);
ret = skb_copy_bits(skb, *offset, &ddgst[off], recv_len);
if (unlikely(ret))
return ret;
@@ -1327,9 +1406,24 @@ static int nvme_tcp_recv_ddgst(struct nvme_tcp_queue *queue,
if (queue->ddgst_remaining)
return 0;
+ rq = nvme_cid_to_rq(nvme_tcp_tagset(queue),
+ pdu->command_id);
+
+ if (test_bit(NVME_TCP_Q_OFF_DDGST_RX, &queue->flags)) {
+ /*
+ * If HW successfully offloaded the digest
+ * verification, we can skip it
+ */
+ if (nvme_tcp_ddp_ddgst_ok(queue))
+ goto ddgst_valid;
+ /*
+ * Otherwise we have to recalculate and verify the
+ * digest with the software-fallback
+ */
+ nvme_tcp_ddp_ddgst_recalc(rq, &queue->exp_ddgst);
+ }
+
if (queue->recv_ddgst != queue->exp_ddgst) {
- struct request *rq = nvme_cid_to_rq(nvme_tcp_tagset(queue),
- pdu->command_id);
struct nvme_tcp_request *req = blk_mq_rq_to_pdu(rq);
req->status = cpu_to_le16(NVME_SC_DATA_XFER_ERROR);
@@ -1340,9 +1434,8 @@ static int nvme_tcp_recv_ddgst(struct nvme_tcp_queue *queue,
le32_to_cpu(queue->exp_ddgst));
}
+ddgst_valid:
if (pdu->hdr.flags & NVME_TCP_F_DATA_SUCCESS) {
- struct request *rq = nvme_cid_to_rq(nvme_tcp_tagset(queue),
- pdu->command_id);
struct nvme_tcp_request *req = blk_mq_rq_to_pdu(rq);
nvme_tcp_end_request(rq, le16_to_cpu(req->status));
--
2.34.1
More information about the Linux-nvme
mailing list