From: David Marchand <david.marchand@redhat.com>
To: Haiyue Wang <haiyue.wang@intel.com>
Cc: dev <dev@dpdk.org>, Qi Zhang <qi.z.zhang@intel.com>,
dpdk stable <stable@dpdk.org>,
Qiming Yang <qiming.yang@intel.com>,
Xiaolong Ye <xiaolong.ye@intel.com>,
Beilei Xing <beilei.xing@intel.com>,
Ying A Wang <ying.a.wang@intel.com>
Subject: Re: [dpdk-dev] [PATCH v1] net/ice: fix memzone leak when device init failed
Date: Tue, 17 Aug 2021 11:19:02 +0200 [thread overview]
Message-ID: <CAJFAV8w1S=vzvcU9a8ThPYohMufMV2u=bBOfCPx-gWp+3DT7XA@mail.gmail.com> (raw)
In-Reply-To: <20210813062154.62985-1-haiyue.wang@intel.com>
On Fri, Aug 13, 2021 at 8:45 AM Haiyue Wang <haiyue.wang@intel.com> wrote:
>
> When flow engine initialization or FXP resource reset failed, it needs
> to free the memory zone and unregister the interrupt callback.
>
> Bugzilla ID: 752
> Fixes: 84dc7a95a2d3 ("net/ice: enable flow director engine")
> Fixes: 7615a6895009 ("net/ice: rework for generic flow enabling")
> Fixes: 7edc7158d771 ("net/ice: cleanup RSS/FDIR profile on device init")
> Cc: stable@dpdk.org
>
> Reported-by: David Marchand <david.marchand@redhat.com>
> Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
> ---
> drivers/net/ice/ice_ethdev.c | 10 ++++++++--
> drivers/net/ice/ice_fdir_filter.c | 2 ++
> 2 files changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
> index 64ee569525..8d62b84805 100644
> --- a/drivers/net/ice/ice_ethdev.c
> +++ b/drivers/net/ice/ice_ethdev.c
> @@ -2139,20 +2139,26 @@ ice_dev_init(struct rte_eth_dev *dev)
> ret = ice_flow_init(ad);
> if (ret) {
> PMD_INIT_LOG(ERR, "Failed to initialize flow");
> - return ret;
> + goto err_flow_init;
Is it safe to call flow engine uninit callbacks when ice_flow_init() fails?
> }
> }
>
> ret = ice_reset_fxp_resource(hw);
> if (ret) {
> PMD_INIT_LOG(ERR, "Failed to reset fxp resource");
> - return ret;
> + goto err_flow_init;
> }
>
> pf->supported_rxdid = ice_get_supported_rxdid(hw);
>
> return 0;
>
> +err_flow_init:
> + ice_flow_uninit(ad);
> + rte_intr_disable(intr_handle);
> + ice_pf_disable_irq0(hw);
> + rte_intr_callback_unregister(intr_handle,
> + ice_interrupt_handler, dev);
> err_pf_setup:
> ice_res_pool_destroy(&pf->msix_pool);
> err_msix_pool_init:
--
David Marchand
next prev parent reply other threads:[~2021-08-17 9:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-13 6:21 Haiyue Wang
2021-08-17 9:19 ` David Marchand [this message]
2021-08-18 0:46 ` Wang, Haiyue
2021-08-18 7:07 ` David Marchand
2021-08-29 11:01 ` Zhang, Qi Z
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJFAV8w1S=vzvcU9a8ThPYohMufMV2u=bBOfCPx-gWp+3DT7XA@mail.gmail.com' \
--to=david.marchand@redhat.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=haiyue.wang@intel.com \
--cc=qi.z.zhang@intel.com \
--cc=qiming.yang@intel.com \
--cc=stable@dpdk.org \
--cc=xiaolong.ye@intel.com \
--cc=ying.a.wang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).