From: "Xueming(Steven) Li" <xuemingl@nvidia.com>
To: "Min Hu (Connor)" <humin29@huawei.com>,
"stable@dpdk.org" <stable@dpdk.org>
Cc: "ferruh.yigit@intel.com" <ferruh.yigit@intel.com>
Subject: Re: [dpdk-stable] [PATCH 20.11] net/hns3: fix mbuf leakage
Date: Mon, 17 May 2021 12:14:37 +0000 [thread overview]
Message-ID: <BY5PR12MB43245A5BB6EC18B8A44C6111A12D9@BY5PR12MB4324.namprd12.prod.outlook.com> (raw)
In-Reply-To: <e06a3ee9-b7da-39c8-c2f8-8623f204bbe1@huawei.com>
Hi Min,
You are browsing official repository which only contains published tags.
I think you are look this one:
> You can find the a temporary work-in-progress branch of the coming
> 20.11.2 release at:
> https://github.com/steevenlee/dpdk
Best Regards,
Xuming
> -----Original Message-----
> From: Min Hu (Connor) <humin29@huawei.com>
> Sent: Monday, May 17, 2021 8:10 PM
> To: Xueming(Steven) Li <xuemingl@nvidia.com>; stable@dpdk.org
> Cc: ferruh.yigit@intel.com
> Subject: Re: [PATCH 20.11] net/hns3: fix mbuf leakage
>
> Hi, Xueming,
> One question:
> This patch has been merged to stable 20.11 as you said.
> But why I cannot get the info when I print"git log". It only
> shows like that:
> b1e71cf version: 20.11.1
> fa27a3c version: 20.11.1-rc1
> 52517bf net/hns3: fix stats flip overflow
> 2f6bb5f net/hns3: fix query order of link status and link info
> 668db47 net/mlx5: fix Tx queue size created with DevX
> 80fd7cc usertools: fix binding built-in kernel driver
> ef01e05 app/testpmd: fix help of metering commands
> .....
>
> The reson I asked the question is that there exits other patch to backport, which relies on the previous patch which has
> merged.
> Hope for your reply.
>
>
> 在 2021/5/17 14:56, Xueming(Steven) Li 写道:
> >
> >
> >> -----Original Message-----
> >> From: Min Hu (Connor) <humin29@huawei.com>
> >> Sent: Saturday, May 15, 2021 5:07 PM
> >> To: stable@dpdk.org
> >> Cc: ferruh.yigit@intel.com; Xueming(Steven) Li <xuemingl@nvidia.com>
> >> Subject: [PATCH 20.11] net/hns3: fix mbuf leakage
> >>
> >> From: Huisong Li <lihuisong@huawei.com>
> >>
> >> [ upstream commit fdfde7a4a0f8be8f79c82ee91da9041acd64a798 ]
> >>
> >> The mbufs of rx queue will be allocated in "hns3_do_start" function.
> >> But these mbufs are not released when "hns3_dev_start" executes failed.
> >>
> >> Fixes: c4ae39b2cfc5 ("net/hns3: fix Rx interrupt after reset")
> >> Cc: stable@dpdk.org
> >>
> >> Signed-off-by: Huisong Li <lihuisong@huawei.com>
> >> Signed-off-by: Lijun Ou <oulijun@huawei.com>
> >> ---
> >> drivers/net/hns3/hns3_ethdev.c | 44 ++++++++++++++++++++++++---------------
> >> drivers/net/hns3/hns3_ethdev_vf.c | 43 +++++++++++++++++++++++---------------
> >> 2 files changed, 53 insertions(+), 34 deletions(-)
> >>
> >> diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index ba7d6e3..123d2bf 100644
> >> --- a/drivers/net/hns3/hns3_ethdev.c
> >> +++ b/drivers/net/hns3/hns3_ethdev.c
> >> @@ -101,6 +101,7 @@ static int hns3_remove_mc_addr(struct hns3_hw *hw,
> >> struct rte_ether_addr *mac_addr); static int hns3_restore_fec(struct hns3_hw *hw); static int
> >> hns3_query_dev_fec_info(struct hns3_hw *hw);
> >> +static int hns3_do_stop(struct hns3_adapter *hns);
> >>
> >> static void
> >> hns3_pf_disable_irq0(struct hns3_hw *hw) @@ -4943,11 +4944,8 @@ hns3_dev_start(struct rte_eth_dev *dev)
> >> return ret;
> >> }
> >> ret = hns3_map_rx_interrupt(dev);
> >> - if (ret) {
> >> - hw->adapter_state = HNS3_NIC_CONFIGURED;
> >> - rte_spinlock_unlock(&hw->lock);
> >> - return ret;
> >> - }
> >> + if (ret)
> >> + goto map_rx_inter_err;
> >>
> >> /*
> >> * There are three register used to control the status of a TQP @@ -4961,19 +4959,12 @@ hns3_dev_start(struct rte_eth_dev
> >> *dev)
> >> * status of queue in the dpdk framework.
> >> */
> >> ret = hns3_start_all_txqs(dev);
> >> - if (ret) {
> >> - hw->adapter_state = HNS3_NIC_CONFIGURED;
> >> - rte_spinlock_unlock(&hw->lock);
> >> - return ret;
> >> - }
> >> + if (ret)
> >> + goto map_rx_inter_err;
> >>
> >> ret = hns3_start_all_rxqs(dev);
> >> - if (ret) {
> >> - hns3_stop_all_txqs(dev);
> >> - hw->adapter_state = HNS3_NIC_CONFIGURED;
> >> - rte_spinlock_unlock(&hw->lock);
> >> - return ret;
> >> - }
> >> + if (ret)
> >> + goto start_all_rxqs_fail;
> >>
> >> hw->adapter_state = HNS3_NIC_STARTED;
> >> rte_spinlock_unlock(&hw->lock);
> >> @@ -4996,6 +4987,15 @@ hns3_dev_start(struct rte_eth_dev *dev)
> >>
> >> hns3_info(hw, "hns3 dev start successful!");
> >> return 0;
> >> +
> >> +start_all_rxqs_fail:
> >> + hns3_stop_all_txqs(dev);
> >> +map_rx_inter_err:
> >> + (void)hns3_do_stop(hns);
> >> + hw->adapter_state = HNS3_NIC_CONFIGURED;
> >> + rte_spinlock_unlock(&hw->lock);
> >> +
> >> + return ret;
> >> }
> >>
> >> static int
> >> @@ -5004,6 +5004,17 @@ hns3_do_stop(struct hns3_adapter *hns)
> >> struct hns3_hw *hw = &hns->hw;
> >> int ret;
> >>
> >> + /*
> >> + * The "hns3_do_stop" function will also be called by .stop_service to
> >> + * prepare reset. At the time of global or IMP reset, the command cannot
> >> + * be sent to stop the tx/rx queues. The mbuf in Tx/Rx queues may be
> >> + * accessed during the reset process. So the mbuf can not be released
> >> + * during reset and is required to be released after the reset is
> >> + * completed.
> >> + */
> >> + if (rte_atomic16_read(&hw->reset.resetting) == 0)
> >> + hns3_dev_release_mbufs(hns);
> >> +
> >> ret = hns3_cfg_mac_mode(hw, false);
> >> if (ret)
> >> return ret;
> >> @@ -5080,7 +5091,6 @@ hns3_dev_stop(struct rte_eth_dev *dev)
> >> hns3_stop_tqps(hw);
> >> hns3_do_stop(hns);
> >> hns3_unmap_rx_interrupt(dev);
> >> - hns3_dev_release_mbufs(hns);
> >> hw->adapter_state = HNS3_NIC_CONFIGURED;
> >> }
> >> hns3_rx_scattered_reset(dev);
> >> diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
> >> index 9c84740..52ad825 100644
> >> --- a/drivers/net/hns3/hns3_ethdev_vf.c
> >> +++ b/drivers/net/hns3/hns3_ethdev_vf.c
> >> @@ -1912,6 +1912,17 @@ hns3vf_do_stop(struct hns3_adapter *hns)
> >>
> >> hw->mac.link_status = ETH_LINK_DOWN;
> >>
> >> + /*
> >> + * The "hns3vf_do_stop" function will also be called by .stop_service to
> >> + * prepare reset. At the time of global or IMP reset, the command cannot
> >> + * be sent to stop the tx/rx queues. The mbuf in Tx/Rx queues may be
> >> + * accessed during the reset process. So the mbuf can not be released
> >> + * during reset and is required to be released after the reset is
> >> + * completed.
> >> + */
> >> + if (rte_atomic16_read(&hw->reset.resetting) == 0)
> >> + hns3_dev_release_mbufs(hns);
> >> +
> >> if (rte_atomic16_read(&hw->reset.disable_cmd) == 0) {
> >> hns3vf_configure_mac_addr(hns, true);
> >> ret = hns3_reset_all_tqps(hns);
> >> @@ -1981,7 +1992,6 @@ hns3vf_dev_stop(struct rte_eth_dev *dev)
> >> hns3_stop_tqps(hw);
> >> hns3vf_do_stop(hns);
> >> hns3vf_unmap_rx_interrupt(dev);
> >> - hns3_dev_release_mbufs(hns);
> >> hw->adapter_state = HNS3_NIC_CONFIGURED;
> >> }
> >> hns3_rx_scattered_reset(dev);
> >> @@ -2223,11 +2233,8 @@ hns3vf_dev_start(struct rte_eth_dev *dev)
> >> return ret;
> >> }
> >> ret = hns3vf_map_rx_interrupt(dev);
> >> - if (ret) {
> >> - hw->adapter_state = HNS3_NIC_CONFIGURED;
> >> - rte_spinlock_unlock(&hw->lock);
> >> - return ret;
> >> - }
> >> + if (ret)
> >> + goto map_rx_inter_err;
> >>
> >> /*
> >> * There are three register used to control the status of a TQP @@ -2241,19 +2248,12 @@ hns3vf_dev_start(struct
> >> rte_eth_dev *dev)
> >> * status of queue in the dpdk framework.
> >> */
> >> ret = hns3_start_all_txqs(dev);
> >> - if (ret) {
> >> - hw->adapter_state = HNS3_NIC_CONFIGURED;
> >> - rte_spinlock_unlock(&hw->lock);
> >> - return ret;
> >> - }
> >> + if (ret)
> >> + goto map_rx_inter_err;
> >>
> >> ret = hns3_start_all_rxqs(dev);
> >> - if (ret) {
> >> - hns3_stop_all_txqs(dev);
> >> - hw->adapter_state = HNS3_NIC_CONFIGURED;
> >> - rte_spinlock_unlock(&hw->lock);
> >> - return ret;
> >> - }
> >> + if (ret)
> >> + goto start_all_rxqs_fail;
> >>
> >> hw->adapter_state = HNS3_NIC_STARTED;
> >> rte_spinlock_unlock(&hw->lock);
> >> @@ -2275,6 +2275,15 @@ hns3vf_dev_start(struct rte_eth_dev *dev)
> >> hns3_start_tqps(hw);
> >>
> >> return ret;
> >> +
> >> +start_all_rxqs_fail:
> >> + hns3_stop_all_txqs(dev);
> >> +map_rx_inter_err:
> >> + (void)hns3vf_do_stop(hns);
> >> + hw->adapter_state = HNS3_NIC_CONFIGURED;
> >> + rte_spinlock_unlock(&hw->lock);
> >> +
> >> + return ret;
> >> }
> >>
> >> static bool
> >> --
> >> 2.7.4
> >
> > Hi Min,
> >
> > Thanks for backporting, merged.
> >
> > Best Regards,
> > Xueming
> > .
> >
prev parent reply other threads:[~2021-05-17 12:14 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-15 9:06 Min Hu (Connor)
2021-05-17 6:56 ` Xueming(Steven) Li
2021-05-17 12:09 ` Min Hu (Connor)
2021-05-17 12:14 ` Xueming(Steven) Li [this message]
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=BY5PR12MB43245A5BB6EC18B8A44C6111A12D9@BY5PR12MB4324.namprd12.prod.outlook.com \
--to=xuemingl@nvidia.com \
--cc=ferruh.yigit@intel.com \
--cc=humin29@huawei.com \
--cc=stable@dpdk.org \
/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).