Skip to content

Commit

Permalink
eventdev/eth_rx: fix queue config query
Browse files Browse the repository at this point in the history
[ upstream commit 9513871 ]

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: da781e6 ("eventdev/eth_rx: support Rx queue config get")

Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com>
Acked-by: Jay Jayatheerthan <jay.jayatheerthan@intel.com>
  • Loading branch information
svnagaha authored and kevintraynor committed Feb 28, 2022
1 parent 529f3a7 commit 7d7a9f1
Showing 1 changed file with 13 additions and 3 deletions.
16 changes: 13 additions & 3 deletions lib/eventdev/rte_event_eth_rx_adapter.c
Expand Up @@ -3198,11 +3198,11 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
uint16_t rx_queue_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;

if (rxa_memzone_lookup())
Expand Down Expand Up @@ -3233,7 +3233,6 @@ 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));
queue_conf->rx_queue_flags = 0;
Expand All @@ -3242,7 +3241,18 @@ rte_event_eth_rx_adapter_queue_conf_get(uint8_t id,
RTE_EVENT_ETH_RX_ADAPTER_QUEUE_FLOW_ID_VALID;
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];
if (dev->dev_ops->eth_rx_adapter_queue_conf_get != NULL) {
Expand Down

0 comments on commit 7d7a9f1

Please sign in to comment.