patch 'net/mlx5: fix Tx check for hardware descriptor length' has been queued to stable release 21.11.3

Kevin Traynor ktraynor at redhat.com
Tue Oct 25 17:07:04 CEST 2022


Hi,

FYI, your patch has been queued to stable release 21.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/01/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/ccdfdbafa489c31223cdeca4fe160854bf85c0aa

Thanks.

Kevin

---
>From ccdfdbafa489c31223cdeca4fe160854bf85c0aa Mon Sep 17 00:00:00 2001
From: Raja Zidane <rzidane at nvidia.com>
Date: Wed, 17 Aug 2022 17:14:33 +0300
Subject: [PATCH] net/mlx5: fix Tx check for hardware descriptor length

[ upstream commit 130bb7da53ddb9677aa35dcfb2e6f9ddebc014b0 ]

If hardware descriptor (WQE) length exceeds one the HW can handle,
the Tx queue failure occurs. PMD does the length check but there was
a bug - the length limit was expressed in 16B units (WQEBB segments),
while the calculated WQE length and limit were in 64B units (WQEBBs).
Fix the condition to avoid subsequent Tx queue failure.

Fixes: 18a1c20 ("net/mlx5: implement Tx burst template")

Signed-off-by: Raja Zidane <rzidane at nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo at nvidia.com>
---
 drivers/net/mlx5/mlx5_tx.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h
index ba37dc9b66..13d6d434d7 100644
--- a/drivers/net/mlx5/mlx5_tx.h
+++ b/drivers/net/mlx5/mlx5_tx.h
@@ -1732,5 +1732,5 @@ mlx5_tx_packet_multi_tso(struct mlx5_txq_data *__rte_restrict txq,
 		return MLX5_TXCMP_CODE_EXIT;
 	/* Check for maximal WQE size. */
-	if (unlikely((MLX5_WQE_SIZE_MAX / MLX5_WSEG_SIZE) < ((ds + 3) / 4)))
+	if (unlikely((MLX5_WQE_SIZE_MAX / MLX5_WSEG_SIZE) < ds))
 		return MLX5_TXCMP_CODE_ERROR;
 #ifdef MLX5_PMD_SOFT_COUNTERS
@@ -1807,5 +1807,5 @@ mlx5_tx_packet_multi_send(struct mlx5_txq_data *__rte_restrict txq,
 		return MLX5_TXCMP_CODE_EXIT;
 	/* Check for maximal WQE size. */
-	if (unlikely((MLX5_WQE_SIZE_MAX / MLX5_WSEG_SIZE) < ((ds + 3) / 4)))
+	if (unlikely((MLX5_WQE_SIZE_MAX / MLX5_WSEG_SIZE) < ds))
 		return MLX5_TXCMP_CODE_ERROR;
 	/*
-- 
2.37.3

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-10-25 14:19:00.108186804 +0100
+++ 0069-net-mlx5-fix-Tx-check-for-hardware-descriptor-length.patch	2022-10-25 14:18:58.481798342 +0100
@@ -1 +1 @@
-From 130bb7da53ddb9677aa35dcfb2e6f9ddebc014b0 Mon Sep 17 00:00:00 2001
+From ccdfdbafa489c31223cdeca4fe160854bf85c0aa Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 130bb7da53ddb9677aa35dcfb2e6f9ddebc014b0 ]
+
@@ -13 +14,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index 59ebe95032..e0fc1872fe 100644
+index ba37dc9b66..13d6d434d7 100644
@@ -25 +26 @@
-@@ -1784,5 +1784,5 @@ mlx5_tx_packet_multi_tso(struct mlx5_txq_data *__rte_restrict txq,
+@@ -1732,5 +1732,5 @@ mlx5_tx_packet_multi_tso(struct mlx5_txq_data *__rte_restrict txq,
@@ -32 +33 @@
-@@ -1859,5 +1859,5 @@ mlx5_tx_packet_multi_send(struct mlx5_txq_data *__rte_restrict txq,
+@@ -1807,5 +1807,5 @@ mlx5_tx_packet_multi_send(struct mlx5_txq_data *__rte_restrict txq,



More information about the stable mailing list