[dpdk-dev] [PATCH] ixgbevf: fix incorrect RX function selection

[dpdk-dev] [PATCH] ixgbevf: fix incorrect RX function selection

[Sergio Gonzalez Monroy]

The logic to select ixgbe VF RX function is different than PF side.

There are a few issues with its current state:
 - it does not allow to select ixgbe_recv_pkts_vec among other options.
 - it can cause memory corruption for scatter mode as it does not allocate
   enough entries in sw_ring.
 - when checksum is enabled, incorrect vector RX function is selected.

To solve above issues, change the VF RX function selection logic to
mimic PF side.

Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c |  9 +++++++++
 drivers/net/ixgbe/ixgbe_rxtx.c   | 11 ++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 0d9f9b2..c1a70a1 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -2947,6 +2947,8 @@ static int
 ixgbevf_dev_configure(struct rte_eth_dev *dev)
 {
 	struct rte_eth_conf* conf = &dev->data->dev_conf;
+	struct ixgbe_adapter *adapter =
+			(struct ixgbe_adapter *)dev->data->dev_private;
 
 	PMD_INIT_LOG(DEBUG, "Configured Virtual Function port id: %d",
 		     dev->data->port_id);
@@ -2967,6 +2969,13 @@ ixgbevf_dev_configure(struct rte_eth_dev *dev)
 	}
 #endif
 
+	/*
+	 * Initialize to TRUE. If any of Rx queues doesn't meet the bulk
+	 * allocation or vector Rx preconditions we will reset it.
+	 */
+	adapter->rx_bulk_alloc_allowed = true;
+	adapter->rx_vec_allowed = true;
+
 	return 0;
 }
 
diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 4f9ab22..7cc26ef 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -4549,7 +4549,6 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev)
 		(uint16_t)dev->data->dev_conf.rxmode.max_rx_pkt_len);
 
 	/* Setup RX queues */
-	dev->rx_pkt_burst = ixgbe_recv_pkts;
 	for (i = 0; i < dev->data->nb_rx_queues; i++) {
 		rxq = dev->data->rx_queues[i];
 
@@ -4615,14 +4614,6 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev)
 			if (!dev->data->scattered_rx)
 				PMD_INIT_LOG(DEBUG, "forcing scatter mode");
 			dev->data->scattered_rx = 1;
-#ifdef RTE_IXGBE_INC_VECTOR
-			if (rte_is_power_of_2(rxq->nb_rx_desc))
-				dev->rx_pkt_burst =
-					ixgbe_recv_scattered_pkts_vec;
-			else
-#endif
-				dev->rx_pkt_burst =
-					ixgbe_recv_pkts_lro_single_alloc;
 		}
 	}
 
@@ -4640,6 +4631,8 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev)
 		IXGBE_PSRTYPE_RQPL_SHIFT;
 	IXGBE_WRITE_REG(hw, IXGBE_VFPSRTYPE, psrtype);
 
+	ixgbe_set_rx_function(dev);
+
 	return 0;
 }
 
-- 
1.9.3

Re: [dpdk-dev] [PATCH] ixgbevf: fix incorrect RX function selection

[Ananyev, Konstantin]

> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Sergio Gonzalez Monroy
> Sent: Friday, June 12, 2015 4:18 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH] ixgbevf: fix incorrect RX function selection
> 
> The logic to select ixgbe VF RX function is different than PF side.
> 
> There are a few issues with its current state:
>  - it does not allow to select ixgbe_recv_pkts_vec among other options.
>  - it can cause memory corruption for scatter mode as it does not allocate
>    enough entries in sw_ring.
>  - when checksum is enabled, incorrect vector RX function is selected.
> 
> To solve above issues, change the VF RX function selection logic to
> mimic PF side.
> 
> Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
> ---
>  drivers/net/ixgbe/ixgbe_ethdev.c |  9 +++++++++
>  drivers/net/ixgbe/ixgbe_rxtx.c   | 11 ++---------
>  2 files changed, 11 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
> index 0d9f9b2..c1a70a1 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> @@ -2947,6 +2947,8 @@ static int
>  ixgbevf_dev_configure(struct rte_eth_dev *dev)
>  {
>  	struct rte_eth_conf* conf = &dev->data->dev_conf;
> +	struct ixgbe_adapter *adapter =
> +			(struct ixgbe_adapter *)dev->data->dev_private;
> 
>  	PMD_INIT_LOG(DEBUG, "Configured Virtual Function port id: %d",
>  		     dev->data->port_id);
> @@ -2967,6 +2969,13 @@ ixgbevf_dev_configure(struct rte_eth_dev *dev)
>  	}
>  #endif
> 
> +	/*
> +	 * Initialize to TRUE. If any of Rx queues doesn't meet the bulk
> +	 * allocation or vector Rx preconditions we will reset it.
> +	 */
> +	adapter->rx_bulk_alloc_allowed = true;
> +	adapter->rx_vec_allowed = true;
> +
>  	return 0;
>  }
> 
> diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
> index 4f9ab22..7cc26ef 100644
> --- a/drivers/net/ixgbe/ixgbe_rxtx.c
> +++ b/drivers/net/ixgbe/ixgbe_rxtx.c
> @@ -4549,7 +4549,6 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev)
>  		(uint16_t)dev->data->dev_conf.rxmode.max_rx_pkt_len);
> 
>  	/* Setup RX queues */
> -	dev->rx_pkt_burst = ixgbe_recv_pkts;
>  	for (i = 0; i < dev->data->nb_rx_queues; i++) {
>  		rxq = dev->data->rx_queues[i];
> 
> @@ -4615,14 +4614,6 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev)
>  			if (!dev->data->scattered_rx)
>  				PMD_INIT_LOG(DEBUG, "forcing scatter mode");
>  			dev->data->scattered_rx = 1;
> -#ifdef RTE_IXGBE_INC_VECTOR
> -			if (rte_is_power_of_2(rxq->nb_rx_desc))
> -				dev->rx_pkt_burst =
> -					ixgbe_recv_scattered_pkts_vec;
> -			else
> -#endif
> -				dev->rx_pkt_burst =
> -					ixgbe_recv_pkts_lro_single_alloc;
>  		}
>  	}
> 
> @@ -4640,6 +4631,8 @@ ixgbevf_dev_rx_init(struct rte_eth_dev *dev)
>  		IXGBE_PSRTYPE_RQPL_SHIFT;
>  	IXGBE_WRITE_REG(hw, IXGBE_VFPSRTYPE, psrtype);
> 
> +	ixgbe_set_rx_function(dev);
> +
>  	return 0;
>  }
> 

Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>

> --
> 1.9.3

Re: [dpdk-dev] [PATCH] ixgbevf: fix incorrect RX function selection

[Thomas Monjalon]

> > The logic to select ixgbe VF RX function is different than PF side.
> > 
> > There are a few issues with its current state:
> >  - it does not allow to select ixgbe_recv_pkts_vec among other options.
> >  - it can cause memory corruption for scatter mode as it does not allocate
> >    enough entries in sw_ring.
> >  - when checksum is enabled, incorrect vector RX function is selected.
> > 
> > To solve above issues, change the VF RX function selection logic to
> > mimic PF side.
> > 
> > Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
> 
> Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>

Applied, thanks