[dpdk-stable] [PATCH] eventdev: fix internal event port logic in Rx event adapter

[dpdk-stable] [PATCH] eventdev: fix internal event port logic in Rx event adapter

[Nikhil Rao]

Set the internal_event_port flag when the ethdev-eventdev
packet transfer is implemented in hardware and add a check
for the flag to ignore the connection when setting up the
WRR polling sequence.

Fixes: 9c38b704d280 ("eventdev: add eth Rx adapter implementation")
Signed-off-by: Nikhil Rao <nikhil.rao@intel.com>
CC: stable@dpdk.org
---
 lib/librte_eventdev/rte_event_eth_rx_adapter.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.c b/lib/librte_eventdev/rte_event_eth_rx_adapter.c
index 3a70058..d03f870 100644
--- a/lib/librte_eventdev/rte_event_eth_rx_adapter.c
+++ b/lib/librte_eventdev/rte_event_eth_rx_adapter.c
@@ -224,6 +224,8 @@ static uint16_t gcd_u16(uint16_t a, uint16_t b)
 			nb_rx_queues = dev_info->dev->data->nb_rx_queues;
 			if (dev_info->rx_queue == NULL)
 				continue;
+			if (dev_info->internal_event_port)
+				continue;
 			for (q = 0; q < nb_rx_queues; q++) {
 				struct eth_rx_queue_info *queue_info =
 					&dev_info->rx_queue[q];
@@ -1050,6 +1052,7 @@ static int add_rx_queue(struct rte_event_eth_rx_adapter *rx_adapter,
 				&rte_eth_devices[eth_dev_id],
 				rx_queue_id, queue_conf);
 		if (ret == 0) {
+			dev_info->internal_event_port = 1;
 			update_queue_info(rx_adapter,
 					&rx_adapter->eth_devices[eth_dev_id],
 					rx_queue_id,
@@ -1057,6 +1060,7 @@ static int add_rx_queue(struct rte_event_eth_rx_adapter *rx_adapter,
 		}
 	} else {
 		rte_spinlock_lock(&rx_adapter->rx_lock);
+		dev_info->internal_event_port = 0;
 		ret = init_service(rx_adapter, id);
 		if (ret == 0)
 			ret = add_rx_queue(rx_adapter, eth_dev_id, rx_queue_id,
-- 
1.8.3.1

Re: [dpdk-stable] [PATCH] eventdev: fix internal event port logic in Rx event adapter

[Jerin Jacob]

-----Original Message-----
> Date: Sun, 3 Jun 2018 19:40:46 +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] eventdev: fix internal event port logic in Rx event adapter
> X-Mailer: git-send-email 1.8.3.1
> 
> Set the internal_event_port flag when the ethdev-eventdev
> packet transfer is implemented in hardware and add a check
> for the flag to ignore the connection when setting up the
> WRR polling sequence.
> 
> Fixes: 9c38b704d280 ("eventdev: add eth Rx adapter implementation")
> Signed-off-by: Nikhil Rao <nikhil.rao@intel.com>
> CC: stable@dpdk.org

Acked-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>

Applied to dpdk-next-eventdev/master. Thanks.


> ---
>  lib/librte_eventdev/rte_event_eth_rx_adapter.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/lib/librte_eventdev/rte_event_eth_rx_adapter.c b/lib/librte_eventdev/rte_event_eth_rx_adapter.c
> index 3a70058..d03f870 100644
> --- a/lib/librte_eventdev/rte_event_eth_rx_adapter.c
> +++ b/lib/librte_eventdev/rte_event_eth_rx_adapter.c
> @@ -224,6 +224,8 @@ static uint16_t gcd_u16(uint16_t a, uint16_t b)
>  			nb_rx_queues = dev_info->dev->data->nb_rx_queues;
>  			if (dev_info->rx_queue == NULL)
>  				continue;
> +			if (dev_info->internal_event_port)
> +				continue;
>  			for (q = 0; q < nb_rx_queues; q++) {
>  				struct eth_rx_queue_info *queue_info =
>  					&dev_info->rx_queue[q];
> @@ -1050,6 +1052,7 @@ static int add_rx_queue(struct rte_event_eth_rx_adapter *rx_adapter,
>  				&rte_eth_devices[eth_dev_id],
>  				rx_queue_id, queue_conf);
>  		if (ret == 0) {
> +			dev_info->internal_event_port = 1;
>  			update_queue_info(rx_adapter,
>  					&rx_adapter->eth_devices[eth_dev_id],
>  					rx_queue_id,
> @@ -1057,6 +1060,7 @@ static int add_rx_queue(struct rte_event_eth_rx_adapter *rx_adapter,
>  		}
>  	} else {
>  		rte_spinlock_lock(&rx_adapter->rx_lock);
> +		dev_info->internal_event_port = 0;
>  		ret = init_service(rx_adapter, id);
>  		if (ret == 0)
>  			ret = add_rx_queue(rx_adapter, eth_dev_id, rx_queue_id,
> -- 
> 1.8.3.1
>