Thread (3 messages) 3 messages, 2 authors, 2021-06-30

Re: [dpdk-dev] [dpdk-stable] [PATCH] vdpa/mlx5: fix TSO offload without CSUM

From: Xia, Chenbo <hidden>
Date: 2021-06-30 11:55:30

quoted hunk ↗ jump to hunk
-----Original Message-----
From: stable <redacted> On Behalf Of Xueming Li
Sent: Sunday, June 13, 2021 8:52 PM
Cc: dev@dpdk.org; xuemingl@nvidia.com; matan@nvidia.com; stable@dpdk.org;
Viacheslav Ovsiienko [off-list ref]; Maxime Coquelin
[off-list ref]
Subject: [dpdk-stable] [PATCH] vdpa/mlx5: fix TSO offload without CSUM

Packet was corrupted when TSO requested without CSUM update.

Enables CSUM automatically if only TSO requested.

Fixes: 2aa8444b0084 ("vdpa/mlx5: support stateless offloads")
Cc: matan@nvidia.com
Cc: stable@dpdk.org

Signed-off-by: Xueming Li <redacted>
---
 drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 7 +++++++
 1 file changed, 7 insertions(+)
diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c
b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c
index 024c5c4180..f530646058 100644
--- a/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c
+++ b/drivers/vdpa/mlx5/mlx5_vdpa_virtq.c
@@ -442,6 +442,13 @@ mlx5_vdpa_virtqs_prepare(struct mlx5_vdpa_priv *priv)
 		DRV_LOG(ERR, "Failed to configure negotiated features.");
 		return -1;
 	}
+	if ((priv->features & (1ULL << VIRTIO_NET_F_CSUM)) == 0 &&
+	    ((priv->features & (1ULL << VIRTIO_NET_F_HOST_TSO4)) > 0 ||
+	     (priv->features & (1ULL << VIRTIO_NET_F_HOST_TSO6)) > 0)) {
+		/* Packet may be corrupted if TSO is enabled without CSUM. */
+		DRV_LOG(INFO, "TSO is enabled without CSUM, force CSUM.");
+		priv->features |= (1ULL << VIRTIO_NET_F_CSUM);
+	}
 	if (nr_vring > priv->caps.max_num_virtio_queues * 2) {
 		DRV_LOG(ERR, "Do not support more than %d virtqs(%d).",
 			(int)priv->caps.max_num_virtio_queues * 2,
--
2.25.1
Applied to next-virtio/main, thanks!
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help