patch 'examples/l3fwd: fix Rx queue configuration' has been queued to stable release 23.11.1

[Xueming Li]

Hi,

FYI, your patch has been queued to stable release 23.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 04/15/24. 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=23.11-staging

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

Thanks.

Xueming Li <xuemingl at nvidia.com>

---
>From 587143897e3f081134d895adb59526e748d8e7f6 Mon Sep 17 00:00:00 2001
From: Kamil Vojanec <vojanec at cesnet.cz>
Date: Fri, 16 Feb 2024 13:02:07 +0100
Subject: [PATCH] examples/l3fwd: fix Rx queue configuration
Cc: Xueming Li <xuemingl at nvidia.com>

[ upstream commit 7015f232adf0e1622822660afc70055bf359bd7a ]

When configuring Rx queues, the default port configuration was used,
even though it was modified before. This results in the
'relax-rx-offload' not being respected for Rx queues.
This commit uses 'rte_eth_dev_conf_get()' to obtain the device
configuration structure instead.

Fixes: 4b01cabfb09b ("examples/l3fwd: add option to relax Rx offload")

Signed-off-by: Kamil Vojanec <vojanec at cesnet.cz>
Acked-by: Konstantin Ananyev <konstantin.ananyev at huawei.com>
Acked-by: Kevin Traynor <ktraynor at redhat.com>
---
 .mailmap              | 2 +-
 examples/l3fwd/main.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index f76fef1c48..debb7beb5f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -723,7 +723,7 @@ Kamalakshitha Aligeri <kamalakshitha.aligeri at arm.com>
 Kamil Bednarczyk <kamil.bednarczyk at intel.com>
 Kamil Chalupnik <kamilx.chalupnik at intel.com>
 Kamil Rytarowski <kamil.rytarowski at caviumnetworks.com>
-Kamil Vojanec <xvojan00 at stud.fit.vutbr.cz>
+Kamil Vojanec <vojanec at cesnet.cz> <xvojan00 at stud.fit.vutbr.cz>
 Kanaka Durga Kotamarthy <kkotamarthy at marvell.com>
 Karen Kelly <karen.kelly at intel.com>
 Karen Sornek <karen.sornek at intel.com>
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index d4fb5d1971..8d32ae1dd5 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -1388,6 +1388,7 @@ l3fwd_poll_resource_setup(void)
 		fflush(stdout);
 		/* init RX queues */
 		for(queue = 0; queue < qconf->n_rx_queue; ++queue) {
+			struct rte_eth_conf local_conf;
 			struct rte_eth_rxconf rxq_conf;
 
 			portid = qconf->rx_queue_list[queue].port_id;
@@ -1408,8 +1409,14 @@ l3fwd_poll_resource_setup(void)
 					"Error during getting device (port %u) info: %s\n",
 					portid, strerror(-ret));
 
+			ret = rte_eth_dev_conf_get(portid, &local_conf);
+			if (ret != 0)
+				rte_exit(EXIT_FAILURE,
+					"Error during getting device (port %u) configuration: %s\n",
+					portid, strerror(-ret));
+
 			rxq_conf = dev_info.default_rxconf;
-			rxq_conf.offloads = port_conf.rxmode.offloads;
+			rxq_conf.offloads = local_conf.rxmode.offloads;
 			if (!per_port_pool)
 				ret = rte_eth_rx_queue_setup(portid, queueid,
 						nb_rxd, socketid,
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2024-04-13 20:43:07.229162617 +0800
+++ 0072-examples-l3fwd-fix-Rx-queue-configuration.patch	2024-04-13 20:43:05.017753905 +0800
@@ -1 +1 @@
-From 7015f232adf0e1622822660afc70055bf359bd7a Mon Sep 17 00:00:00 2001
+From 587143897e3f081134d895adb59526e748d8e7f6 Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl at nvidia.com>
+
+[ upstream commit 7015f232adf0e1622822660afc70055bf359bd7a ]
@@ -13 +15,0 @@
-Cc: stable at dpdk.org
@@ -24 +26 @@
-index 68b4cae8d3..66ebc20666 100644
+index f76fef1c48..debb7beb5f 100644
@@ -27 +29 @@
-@@ -728,7 +728,7 @@ Kamalakshitha Aligeri <kamalakshitha.aligeri at arm.com>
+@@ -723,7 +723,7 @@ Kamalakshitha Aligeri <kamalakshitha.aligeri at arm.com>