patch 'eventdev/eth_rx: fix queue config query' has been queued to stable release 21.11.1

[Kevin Traynor]

Hi,

FYI, your patch has been queued to stable release 21.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 03/06/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/7d7a9f161d0d95c8d241c574e901826ad3a8c4be

Thanks.

Kevin

---
>From 7d7a9f161d0d95c8d241c574e901826ad3a8c4be Mon Sep 17 00:00:00 2001
From: Naga Harish K S V <s.v.naga.harish.k at intel.com>
Date: Mon, 14 Feb 2022 11:10:16 -0600
Subject: [PATCH] eventdev/eth_rx: fix queue config query

[ upstream commit 95138712c5e76e43c6268835342ab7ca9ac3692e ]

Remove the memcpy usage in queue config get function for
`event` variable which is 8 byte size and use direct copy.
Also provide vector information and event buffer size in the
queue config info.

Fixes: da781e6488 ("eventdev/eth_rx: support Rx queue config get")

Signed-off-by: Naga Harish K S V <s.v.naga.harish.k at intel.com>
Acked-by: Jay Jayatheerthan <jay.jayatheerthan at intel.com>
---
 lib/eventdev/rte_event_eth_rx_adapter.c | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c
index ce94999738..4b46e9b6c6 100644
--- a/lib/eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/eventdev/rte_event_eth_rx_adapter.c
@@ -3199,9 +3199,9 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
 			struct rte_event_eth_rx_adapter_queue_conf *queue_conf)
 {
+#define TICK2NSEC(_ticks, _freq) (((_ticks) * (1E9)) / (_freq))
 	struct rte_eventdev *dev;
 	struct event_eth_rx_adapter *rx_adapter;
 	struct eth_device_info *dev_info;
 	struct eth_rx_queue_info *queue_info;
-	struct rte_event *qi_ev;
 	int ret;
 
@@ -3234,5 +3234,4 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
 
 	queue_info = &dev_info->rx_queue[rx_queue_id];
-	qi_ev = (struct rte_event *)&queue_info->event;
 
 	memset(queue_conf, 0, sizeof(*queue_conf));
@@ -3243,5 +3242,16 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
 	queue_conf->servicing_weight = queue_info->wt;
 
-	memcpy(&queue_conf->ev, qi_ev, sizeof(*qi_ev));
+	queue_conf->ev.event = queue_info->event;
+
+	queue_conf->vector_sz = queue_info->vector_data.max_vector_count;
+	queue_conf->vector_mp = queue_info->vector_data.vector_pool;
+	/* need to be converted from ticks to ns */
+	queue_conf->vector_timeout_ns = TICK2NSEC(
+		queue_info->vector_data.vector_timeout_ticks, rte_get_timer_hz());
+
+	if (queue_info->event_buf != NULL)
+		queue_conf->event_buf_size = queue_info->event_buf->events_size;
+	else
+		queue_conf->event_buf_size = 0;
 
 	dev = &rte_eventdevs[rx_adapter->eventdev_id];
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-01 10:41:01.932555403 +0000
+++ 0020-eventdev-eth_rx-fix-queue-config-query.patch	2022-03-01 10:41:01.260244089 +0000
@@ -1 +1 @@
-From 95138712c5e76e43c6268835342ab7ca9ac3692e Mon Sep 17 00:00:00 2001
+From 7d7a9f161d0d95c8d241c574e901826ad3a8c4be Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 95138712c5e76e43c6268835342ab7ca9ac3692e ]
+
@@ -12 +13,0 @@
-Cc: stable at dpdk.org
@@ -21 +22 @@
-index 4da6f1ff90..ff83ce8b67 100644
+index ce94999738..4b46e9b6c6 100644
@@ -24 +25 @@
-@@ -3219,9 +3219,9 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
+@@ -3199,9 +3199,9 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
@@ -35 +36 @@
-@@ -3254,5 +3254,4 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
+@@ -3234,5 +3234,4 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
@@ -41 +42 @@
-@@ -3263,5 +3262,16 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
+@@ -3243,5 +3242,16 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,