[1/2] eventdev: fix eth Rx adapter hotplug incompatibility
Checks
Commit Message
Use RTE_MAX_ETHPORTS instead of rte_eth_dev_count_total()
when allocating eth Rx adapter's per-eth device data structure
to account for hotplugged devices.
Fixes: 9c38b704d280 ("eventdev: add eth Rx adapter implementation")
Cc: stable@dpdk.org
Signed-off-by: Nikhil Rao <nikhil.rao@intel.com>
---
lib/librte_eventdev/rte_event_eth_rx_adapter.c | 5 ++---
lib/librte_eventdev/rte_event_eth_rx_adapter.h | 4 ----
2 files changed, 2 insertions(+), 7 deletions(-)
Comments
-----Original Message-----
> Date: Thu, 6 Sep 2018 14:41:42 +0530
> From: Nikhil Rao <nikhil.rao@intel.com>
> To: jerin.jacob@caviumnetworks.com
> CC: dev@dpdk.org, Nikhil Rao <nikhil.rao@intel.com>, stable@dpdk.org
> Subject: [PATCH 1/2] eventdev: fix eth Rx adapter hotplug incompatibility
> X-Mailer: git-send-email 1.8.3.1
>
>
> Use RTE_MAX_ETHPORTS instead of rte_eth_dev_count_total()
> when allocating eth Rx adapter's per-eth device data structure
> to account for hotplugged devices.
>
> Fixes: 9c38b704d280 ("eventdev: add eth Rx adapter implementation")
> Cc: stable@dpdk.org
> Signed-off-by: Nikhil Rao <nikhil.rao@intel.com>
Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
> ---
> lib/librte_eventdev/rte_event_eth_rx_adapter.c | 5 ++---
> lib/librte_eventdev/rte_event_eth_rx_adapter.h | 4 ----
> 2 files changed, 2 insertions(+), 7 deletions(-)
>
> diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.c b/lib/librte_eventdev/rte_event_eth_rx_adapter.c
> index f5e5a0b..870ac8c 100644
> --- a/lib/librte_eventdev/rte_event_eth_rx_adapter.c
> +++ b/lib/librte_eventdev/rte_event_eth_rx_adapter.c
> @@ -1998,8 +1998,7 @@ static int rxa_sw_add(struct rte_event_eth_rx_adapter *rx_adapter,
> rx_adapter->id = id;
> strcpy(rx_adapter->mem_name, mem_name);
> rx_adapter->eth_devices = rte_zmalloc_socket(rx_adapter->mem_name,
> - /* FIXME: incompatible with hotplug */
> - rte_eth_dev_count_total() *
> + RTE_MAX_ETHPORTS *
> sizeof(struct eth_device_info), 0,
> socket_id);
> rte_convert_rss_key((const uint32_t *)default_rss_key,
> @@ -2012,7 +2011,7 @@ static int rxa_sw_add(struct rte_event_eth_rx_adapter *rx_adapter,
> return -ENOMEM;
> }
> rte_spinlock_init(&rx_adapter->rx_lock);
> - RTE_ETH_FOREACH_DEV(i)
> + for (i = 0; i < RTE_MAX_ETHPORTS; i++)
> rx_adapter->eth_devices[i].dev = &rte_eth_devices[i];
>
> event_eth_rx_adapter[id] = rx_adapter;
> diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.h b/lib/librte_eventdev/rte_event_eth_rx_adapter.h
> index 332ee21..863b72a 100644
> --- a/lib/librte_eventdev/rte_event_eth_rx_adapter.h
> +++ b/lib/librte_eventdev/rte_event_eth_rx_adapter.h
> @@ -76,10 +76,6 @@
> * rte_event_eth_rx_adapter_cb_register() function allows the
> * application to register a callback that selects which packets to enqueue
> * to the event device.
> - *
> - * Note:
> - * 1) Devices created after an instance of rte_event_eth_rx_adapter_create
> - * should be added to a new instance of the rx adapter.
> */
>
> #ifdef __cplusplus
> --
> 1.8.3.1
>
-----Original Message-----
> Date: Thu, 6 Sep 2018 14:41:42 +0530
> From: Nikhil Rao <nikhil.rao@intel.com>
> To: jerin.jacob@caviumnetworks.com
> CC: dev@dpdk.org, Nikhil Rao <nikhil.rao@intel.com>, stable@dpdk.org
> Subject: [PATCH 1/2] eventdev: fix eth Rx adapter hotplug incompatibility
> X-Mailer: git-send-email 1.8.3.1
>
>
> Use RTE_MAX_ETHPORTS instead of rte_eth_dev_count_total()
> when allocating eth Rx adapter's per-eth device data structure
> to account for hotplugged devices.
>
> Fixes: 9c38b704d280 ("eventdev: add eth Rx adapter implementation")
> Cc: stable@dpdk.org
> Signed-off-by: Nikhil Rao <nikhil.rao@intel.com>
Applied this series to dpdk-next-eventdev/master. Thanks.
@@ -1998,8 +1998,7 @@ static int rxa_sw_add(struct rte_event_eth_rx_adapter *rx_adapter,
rx_adapter->id = id;
strcpy(rx_adapter->mem_name, mem_name);
rx_adapter->eth_devices = rte_zmalloc_socket(rx_adapter->mem_name,
- /* FIXME: incompatible with hotplug */
- rte_eth_dev_count_total() *
+ RTE_MAX_ETHPORTS *
sizeof(struct eth_device_info), 0,
socket_id);
rte_convert_rss_key((const uint32_t *)default_rss_key,
@@ -2012,7 +2011,7 @@ static int rxa_sw_add(struct rte_event_eth_rx_adapter *rx_adapter,
return -ENOMEM;
}
rte_spinlock_init(&rx_adapter->rx_lock);
- RTE_ETH_FOREACH_DEV(i)
+ for (i = 0; i < RTE_MAX_ETHPORTS; i++)
rx_adapter->eth_devices[i].dev = &rte_eth_devices[i];
event_eth_rx_adapter[id] = rx_adapter;
@@ -76,10 +76,6 @@
* rte_event_eth_rx_adapter_cb_register() function allows the
* application to register a callback that selects which packets to enqueue
* to the event device.
- *
- * Note:
- * 1) Devices created after an instance of rte_event_eth_rx_adapter_create
- * should be added to a new instance of the rx adapter.
*/
#ifdef __cplusplus