[dpdk-dev,v6,1/3] net/i40e: fix segmentation fault in close
diff mbox

Message ID 1485512567-16668-1-git-send-email-bernard.iremonger@intel.com
State Accepted, archived
Delegated to: Ferruh Yigit
Headers show

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel compilation success Compilation OK

Commit Message

Bernard Iremonger Jan. 27, 2017, 10:22 a.m. UTC
Change the order of releasing the vsi's.
Release the vmdq vsi's first, then release the main vsi.

Fixes: 4861cde46116 ("i40e: new poll mode driver")

CC: stable@dpdk.org

Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
Acked-by: Jingjing Wu <jingjing.wu@intel.com>
---
Changes in v6:
Rebased to latest dpdk-next-net
This was previously part of a patchset with testpmd patches.
Sending seperately as the testpmd patches have not been acked yet.

 drivers/net/i40e/i40e_ethdev.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

Comments

Ferruh Yigit Jan. 27, 2017, 1:21 p.m. UTC | #1
On 1/27/2017 10:22 AM, Bernard Iremonger wrote:
> Change the order of releasing the vsi's.
> Release the vmdq vsi's first, then release the main vsi.
> 
> Fixes: 4861cde46116 ("i40e: new poll mode driver")
> 
> CC: stable@dpdk.org
> 
> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
> Acked-by: Jingjing Wu <jingjing.wu@intel.com>

    Fixes: 3cb446b4aeb2 ("i40e: free vmdq vsi when closing")
    Cc: stable@dpdk.org

Applied to dpdk-next-net/master, thanks.

Patch
diff mbox

diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
index a818998..0937dc4 100644
--- a/drivers/net/i40e/i40e_ethdev.c
+++ b/drivers/net/i40e/i40e_ethdev.c
@@ -1,7 +1,7 @@ 
 /*-
  *   BSD LICENSE
  *
- *   Copyright(c) 2010-2016 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2017 Intel Corporation. All rights reserved.
  *   All rights reserved.
  *
  *   Redistribution and use in source and binary forms, with or without
@@ -2072,18 +2072,17 @@  i40e_dev_close(struct rte_eth_dev *dev)
 	/* shutdown and destroy the HMC */
 	i40e_shutdown_lan_hmc(hw);
 
-	/* release all the existing VSIs and VEBs */
-	i40e_fdir_teardown(pf);
-	i40e_vsi_release(pf->main_vsi);
-
 	for (i = 0; i < pf->nb_cfg_vmdq_vsi; i++) {
 		i40e_vsi_release(pf->vmdq[i].vsi);
 		pf->vmdq[i].vsi = NULL;
 	}
-
 	rte_free(pf->vmdq);
 	pf->vmdq = NULL;
 
+	/* release all the existing VSIs and VEBs */
+	i40e_fdir_teardown(pf);
+	i40e_vsi_release(pf->main_vsi);
+
 	/* shutdown the adminq */
 	i40e_aq_queue_shutdown(hw, true);
 	i40e_shutdown_adminq(hw);
@@ -4374,6 +4373,9 @@  i40e_vsi_release(struct i40e_vsi *vsi)
 	if (!vsi)
 		return I40E_SUCCESS;
 
+	if (!vsi->adapter)
+		return -EFAULT;
+
 	user_param = vsi->user_param;
 
 	pf = I40E_VSI_TO_PF(vsi);