* [dpdk-stable] [PATCH v2 1/2] net/i40e: fix segmentation fault in close [not found] <1483979366-16914-1-git-send-email-bernard.iremonger@intel.com> @ 2017-01-09 16:29 ` Bernard Iremonger 2017-01-12 13:58 ` [dpdk-stable] [PATCH v3 " Bernard Iremonger 1 sibling, 0 replies; 4+ messages in thread From: Bernard Iremonger @ 2017-01-09 16:29 UTC (permalink / raw) To: dev, wenzhuo.lu, jingjing.wu, helin.zhang; +Cc: Bernard Iremonger, stable 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> --- drivers/net/i40e/i40e_ethdev.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 46def56..3c233e3 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -2066,18 +2066,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); @@ -4335,6 +4334,9 @@ i40e_vsi_release(struct i40e_vsi *vsi) if (!vsi) return I40E_SUCCESS; + if (!vsi->adapter) + return I40E_ERR_BAD_PTR; + user_param = vsi->user_param; pf = I40E_VSI_TO_PF(vsi); -- 2.10.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* [dpdk-stable] [PATCH v3 1/2] net/i40e: fix segmentation fault in close [not found] <1483979366-16914-1-git-send-email-bernard.iremonger@intel.com> 2017-01-09 16:29 ` [dpdk-stable] [PATCH v2 1/2] net/i40e: fix segmentation fault in close Bernard Iremonger @ 2017-01-12 13:58 ` Bernard Iremonger 2017-01-17 14:34 ` Wu, Jingjing 1 sibling, 1 reply; 4+ messages in thread From: Bernard Iremonger @ 2017-01-12 13:58 UTC (permalink / raw) To: dev, wenzhuo.lu, jingjing.wu, helin.zhang; +Cc: Bernard Iremonger, stable 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> --- drivers/net/i40e/i40e_ethdev.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index f13e61b..e8cfec8 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -2068,18 +2068,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); @@ -4342,6 +4341,9 @@ i40e_vsi_release(struct i40e_vsi *vsi) if (!vsi) return I40E_SUCCESS; + if (!vsi->adapter) + return I40E_ERR_BAD_PTR; + user_param = vsi->user_param; pf = I40E_VSI_TO_PF(vsi); -- 2.10.1 ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-stable] [PATCH v3 1/2] net/i40e: fix segmentation fault in close 2017-01-12 13:58 ` [dpdk-stable] [PATCH v3 " Bernard Iremonger @ 2017-01-17 14:34 ` Wu, Jingjing 2017-01-17 16:30 ` Iremonger, Bernard 0 siblings, 1 reply; 4+ messages in thread From: Wu, Jingjing @ 2017-01-17 14:34 UTC (permalink / raw) To: Iremonger, Bernard, dev, Lu, Wenzhuo, Zhang, Helin; +Cc: stable > -----Original Message----- > From: Iremonger, Bernard > Sent: Thursday, January 12, 2017 9:58 PM > To: dev@dpdk.org; Lu, Wenzhuo <wenzhuo.lu@intel.com>; Wu, Jingjing > <jingjing.wu@intel.com>; Zhang, Helin <helin.zhang@intel.com> > Cc: Iremonger, Bernard <bernard.iremonger@intel.com>; stable@dpdk.org > Subject: [PATCH v3 1/2] net/i40e: fix segmentation fault in close > > 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> > --- > drivers/net/i40e/i40e_ethdev.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c > index f13e61b..e8cfec8 100644 > --- a/drivers/net/i40e/i40e_ethdev.c > +++ b/drivers/net/i40e/i40e_ethdev.c > @@ -2068,18 +2068,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); > @@ -4342,6 +4341,9 @@ i40e_vsi_release(struct i40e_vsi *vsi) > if (!vsi) > return I40E_SUCCESS; > > + if (!vsi->adapter) > + return I40E_ERR_BAD_PTR; > + The change looks fine to me. Only minor comments like: The dev_close is ethdev level ops, I40E_XX error code need to be replaced by The error code defined in ethedev level. ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [dpdk-stable] [PATCH v3 1/2] net/i40e: fix segmentation fault in close 2017-01-17 14:34 ` Wu, Jingjing @ 2017-01-17 16:30 ` Iremonger, Bernard 0 siblings, 0 replies; 4+ messages in thread From: Iremonger, Bernard @ 2017-01-17 16:30 UTC (permalink / raw) To: Wu, Jingjing, dev, Lu, Wenzhuo, Zhang, Helin; +Cc: stable Hi Jingjing, <snip> > > Subject: [PATCH v3 1/2] net/i40e: fix segmentation fault in close > > > > 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> > > --- > > drivers/net/i40e/i40e_ethdev.c | 12 +++++++----- > > 1 file changed, 7 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/net/i40e/i40e_ethdev.c > > b/drivers/net/i40e/i40e_ethdev.c index f13e61b..e8cfec8 100644 > > --- a/drivers/net/i40e/i40e_ethdev.c > > +++ b/drivers/net/i40e/i40e_ethdev.c > > @@ -2068,18 +2068,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); > > @@ -4342,6 +4341,9 @@ i40e_vsi_release(struct i40e_vsi *vsi) > > if (!vsi) > > return I40E_SUCCESS; > > > > + if (!vsi->adapter) > > + return I40E_ERR_BAD_PTR; > > + > > The change looks fine to me. > Only minor comments like: > The dev_close is ethdev level ops, I40E_XX error code need to be replaced > by The error code defined in ethedev level. I will replace I40E_ERR_BAD_PTR with -EFAULT in v4. Regards, Bernard. ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-01-17 16:30 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <1483979366-16914-1-git-send-email-bernard.iremonger@intel.com>
2017-01-09 16:29 ` [dpdk-stable] [PATCH v2 1/2] net/i40e: fix segmentation fault in close Bernard Iremonger
2017-01-12 13:58 ` [dpdk-stable] [PATCH v3 " Bernard Iremonger
2017-01-17 14:34 ` Wu, Jingjing
2017-01-17 16:30 ` Iremonger, Bernard
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).