patch 'net/iavf: fix Tx debug' has been queued to stable release 22.11.4

Xueming Li xuemingl at nvidia.com
Sun Oct 22 16:22:00 CEST 2023


Hi,

FYI, your patch has been queued to stable release 22.11.4

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/15/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging

This queued commit can be viewed at:
https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=eec9ac43a7f44c049619078d4a1aed4915167553

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From eec9ac43a7f44c049619078d4a1aed4915167553 Mon Sep 17 00:00:00 2001
From: David Marchand <david.marchand at redhat.com>
Date: Wed, 13 Sep 2023 15:03:27 +0100
Subject: [PATCH] net/iavf: fix Tx debug
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 145b3f04a2971423c483c7f4cc00a7491668a893 ]

Commit 1e728b01120c ("net/iavf: rework Tx path") reintroduced a check on
RTE_LIBRTE_IAVF_DEBUG_TX that has been dropped in favor of
RTE_ETHDEV_DEBUG_TX.

Fixes: 1e728b01120c ("net/iavf: rework Tx path")

Signed-off-by: David Marchand <david.marchand at redhat.com>
Acked-by: Qi Zhang <qi.z.zhang at intel.com>
---
 drivers/net/iavf/iavf_rxtx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 97df9d1699..79da50f273 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -2483,7 +2483,7 @@ iavf_fill_ctx_desc_segmentation_field(volatile uint64_t *field,
 			total_length -= m->outer_l3_len + m->outer_l2_len;
 	}

-#ifdef RTE_LIBRTE_IAVF_DEBUG_TX
+#ifdef RTE_ETHDEV_DEBUG_TX
 	if (!m->l4_len || !m->tso_segsz)
 		PMD_TX_LOG(DEBUG, "L4 length %d, LSO Segment size %d",
 			 m->l4_len, m->tso_segsz);
--
2.25.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2023-10-22 22:17:37.693560000 +0800
+++ 0091-net-iavf-fix-Tx-debug.patch	2023-10-22 22:17:34.346723700 +0800
@@ -1 +1 @@
-From 145b3f04a2971423c483c7f4cc00a7491668a893 Mon Sep 17 00:00:00 2001
+From eec9ac43a7f44c049619078d4a1aed4915167553 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 145b3f04a2971423c483c7f4cc00a7491668a893 ]
@@ -11 +13,0 @@
-Cc: stable at dpdk.org
@@ -20 +22 @@
-index e2d61659cd..72e8ae8aa6 100644
+index 97df9d1699..79da50f273 100644
@@ -23 +25 @@
-@@ -2536,7 +2536,7 @@ iavf_fill_ctx_desc_segmentation_field(volatile uint64_t *field,
+@@ -2483,7 +2483,7 @@ iavf_fill_ctx_desc_segmentation_field(volatile uint64_t *field,


More information about the stable mailing list