diff mbox series

vdpa/mlx5: fix TSO offload without CSUM

Message ID 20210613125139.17998-1-xuemingl@nvidia.com (mailing list archive)
State Accepted, archived
Delegated to: Maxime Coquelin
Headers show
Series vdpa/mlx5: fix TSO offload without CSUM | expand

Checks

Context Check Description
ci/iol-mellanox-Functional fail Functional Testing issues
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/iol-abi-testing success Testing PASS
ci/github-robot success github build: passed
ci/intel-Testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Xueming(Steven) Li June 13, 2021, 12:51 p.m. UTC
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 <xuemingl@nvidia.com>
---
 drivers/vdpa/mlx5/mlx5_vdpa_virtq.c | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Chenbo Xia June 25, 2021, 7:35 a.m. UTC | #1
> -----Original Message-----
> From: stable <stable-bounces@dpdk.org> 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 <viacheslavo@nvidia.com>; Maxime Coquelin
> <maxime.coquelin@redhat.com>
> 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 <xuemingl@nvidia.com>
> ---
>  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

Reviewed-by: Chenbo Xia <chenbo.xia@intel.com>
Chenbo Xia June 30, 2021, 11:55 a.m. UTC | #2
> -----Original Message-----
> From: stable <stable-bounces@dpdk.org> 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 <viacheslavo@nvidia.com>; Maxime Coquelin
> <maxime.coquelin@redhat.com>
> 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 <xuemingl@nvidia.com>
> ---
>  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!
diff mbox series

Patch

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,