diff mbox

[dpdk-dev,v2] ixgbe: fix ixgbevf RX/TX function assignment

Message ID 1457426981-22571-1-git-send-email-zhe.tao@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Bruce Richardson
Headers

Commit Message

Zhe Tao March 8, 2016, 8:49 a.m. UTC 
  For the secondary process of DPDK to initialize ixgbevf, it will always
use the simple RX function or LRO RX function, and this behavior is not
the same RX/TX function selection logic as it is for the primary process,
so use the ixgbe_set_tx_function and ixgbe_set_rx_function to select the
RX/TX function when secondary process call the init function for eth dev.  

Fixes: abf7275bbaa2918 (ixgbe: move to drivers/net/)

V2:add fixes line

Signed-off-by: Zhe Tao <zhe.tao@intel.com>

---
 drivers/net/ixgbe/ixgbe_ethdev.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

Comments

Bruce Richardson March 10, 2016, 3:20 p.m. UTC | #1 
On Tue, Mar 08, 2016 at 04:49:41PM +0800, Zhe Tao wrote:
> For the secondary process of DPDK to initialize ixgbevf, it will always
> use the simple RX function or LRO RX function, and this behavior is not
> the same RX/TX function selection logic as it is for the primary process,
> so use the ixgbe_set_tx_function and ixgbe_set_rx_function to select the
> RX/TX function when secondary process call the init function for eth dev.  
> 
> Fixes: abf7275bbaa2918 (ixgbe: move to drivers/net/)

That doesn't look to be the commit that actually introduced the bug.

> 
> V2:add fixes line
> 
> Signed-off-by: Zhe Tao <zhe.tao@intel.com>
> 

Checkpatch flags two minor issues with this:
CHECK:SPACING: spaces preferred around that '-' (ctx:VxV)
#33: FILE: drivers/net/ixgbe/ixgbe_ethdev.c:1299:
+                       txq = eth_dev->data->tx_queues[eth_dev->data->nb_tx_queues-1];
                                                                                  ^

WARNING:SPLIT_STRING: quoted string split across lines
#38: FILE: drivers/net/ixgbe/ixgbe_ethdev.c:1304:
+                       PMD_INIT_LOG(NOTICE, "No TX queues configured yet. "
+                                            "Using default TX function.");

total: 0 errors, 1 warnings, 1 checks, 23 lines checked

/Bruce
diff mbox

Patch

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 3e6fe86..0f9d048 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -1278,8 +1278,21 @@  eth_ixgbevf_dev_init(struct rte_eth_dev *eth_dev)
 	 * has already done this work. Only check we don't need a different
 	 * RX function */
 	if (rte_eal_process_type() != RTE_PROC_PRIMARY){
-		if (eth_dev->data->scattered_rx)
-			eth_dev->rx_pkt_burst = ixgbe_recv_pkts_lro_single_alloc;
+		struct ixgbe_tx_queue *txq;
+		/* TX queue function in primary, set by last queue initialized
+		 * Tx queue may not initialized by primary process
+		 */
+		if (eth_dev->data->tx_queues) {
+			txq = eth_dev->data->tx_queues[eth_dev->data->nb_tx_queues-1];
+			ixgbe_set_tx_function(eth_dev, txq);
+		} else {
+			/* Use default TX function if we get here */
+			PMD_INIT_LOG(NOTICE, "No TX queues configured yet. "
+					     "Using default TX function.");
+		}
+
+		ixgbe_set_rx_function(eth_dev);
+
 		return 0;
 	}