From 9884a5e6eba1a4decb305b637df509c7613b2840 Mon Sep 17 00:00:00 2001 From: Sergio Gonzalez Monroy Date: Fri, 12 Jun 2015 16:18:19 +0100 Subject: [PATCH] ixgbevf: fix 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 Acked-by: Konstantin Ananyev --- 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 7414a2ec39..10be88e783 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -2953,6 +2953,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); @@ -2973,6 +2975,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 4f9ab22c57..7cc26efa17 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; } -- 2.20.1