[dpdk-dev] net/ixgbe: fix segfault in configuring VF VLAN strip

Message ID 0D300480287911409D9FF92C1FA2A3355B2E8573@SHSMSX104.ccr.corp.intel.com (mailing list archive)
State Rejected, archived
Headers

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/Intel-compilation fail Compilation issues

Commit Message

Lin, Xueqin April 16, 2018, 8:38 a.m. UTC
  Tested-by:  Xueqin Lin

1. Branch: master
2. NIC: Niantic
Steps:
1. Pull branch code to newest and apply the patch
2. Create one VF port using kernel PF 
    echo 1 > /sys/bus/pci/devices/0000\:81\:00.0/sriov_numvfs
3. Bind VF to igb_uio
4. Start testpmd, find VF testpmd could startup successfully.
./x86_64-native-linuxapp-gcc/app/testpmd -c 0x6 -n 4  -- -i

Result: This patch could fix VF can't setup successfully in Niantic NIC.

Best regards,
Xueqin

-----Original Message-----
From: Dai, Wei 
Sent: Monday, April 16, 2018 4:14 PM
To: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Ananyev, Konstantin <konstantin.ananyev@intel.com>; Zhang, Qi Z <qi.z.zhang@intel.com>; Lin, Xueqin <xueqin.lin@intel.com>
Cc: dev@dpdk.org; Dai, Wei <wei.dai@intel.com>; stable@dpdk.org
Subject: [PATCH] net/ixgbe: fix segfault in configuring VF VLAN strip

This patch fixes a segment fault in ixgbevf_vlan_offload_set( ) when a Rx queue with index < max_rx_queues is not setup.
For such queue, rxq = dev->data->rx_queues[i] is null pointer.

Fixes: 860a94d3c692 ("net/ixgbe: support VLAN strip per queue offloading in VF")
Cc: stable@dpdk.org

Signed-off-by: Wei Dai <wei.dai@intel.com>
---
 drivers/net/ixgbe/ixgbe_ethdev.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
  

Patch

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index a5e2fc0..33ee52e 100644
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -5184,15 +5184,13 @@  ixgbevf_vlan_strip_queue_set(struct rte_eth_dev *dev, uint16_t queue, int on)  static int  ixgbevf_vlan_offload_set(struct rte_eth_dev *dev, int mask)  {
-	struct ixgbe_hw *hw =
-		IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 	struct ixgbe_rx_queue *rxq;
 	uint16_t i;
 	int on = 0;
 
 	/* VF function only support hw strip feature, others are not support */
 	if (mask & ETH_VLAN_STRIP_MASK) {
-		for (i = 0; i < hw->mac.max_rx_queues; i++) {
+		for (i = 0; i < dev->data->nb_rx_queues; i++) {
 			rxq = dev->data->rx_queues[i];
 			on = !!(rxq->offloads &	DEV_RX_OFFLOAD_VLAN_STRIP);
 			ixgbevf_vlan_strip_queue_set(dev, i, on);
--
2.7.5