From: "Min Hu (Connor)" <humin29@huawei.com>
To: <dev@dpdk.org>
Cc: <ferruh.yigit@intel.com>
Subject: [dpdk-dev] [PATCH 3/6] net/hns3: remove meaningless packet buffer rollback
Date: Sat, 15 May 2021 08:52:35 +0800 [thread overview]
Message-ID: <1621039958-34847-4-git-send-email-humin29@huawei.com> (raw)
In-Reply-To: <1621039958-34847-1-git-send-email-humin29@huawei.com>
From: Huisong Li <lihuisong@huawei.com>
Packet buffer allocation and hardware pause configuration fail normally
when a reset occurs. If the execution fails, rollback of the packet buffer
still fails. So this rollback is meaningless.
Fixes: 62e3ccc2b94c ("net/hns3: support flow control")
Cc: stable@dpdk.org
Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
---
drivers/net/hns3/hns3_dcb.c | 14 +++++---------
1 file changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/net/hns3/hns3_dcb.c b/drivers/net/hns3/hns3_dcb.c
index bea4115..8fcb284 100644
--- a/drivers/net/hns3/hns3_dcb.c
+++ b/drivers/net/hns3/hns3_dcb.c
@@ -1543,7 +1543,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
enum hns3_fc_status fc_status = hw->current_fc_status;
enum hns3_fc_mode requested_fc_mode = hw->requested_fc_mode;
uint8_t hw_pfc_map = hw->dcb_info.hw_pfc_map;
- int ret, status;
+ int ret;
if (pf->tx_sch_mode != HNS3_FLAG_TC_BASE_SCH_MODE &&
pf->tx_sch_mode != HNS3_FLAG_VNET_BASE_SCH_MODE)
@@ -1568,7 +1568,7 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
ret = hns3_buffer_alloc(hw);
if (ret)
- return ret;
+ goto buffer_alloc_fail;
hw->current_fc_status = HNS3_FC_STATUS_PFC;
hw->requested_fc_mode = HNS3_FC_FULL;
@@ -1594,10 +1594,9 @@ hns3_dcb_hw_configure(struct hns3_adapter *hns)
pfc_setup_fail:
hw->requested_fc_mode = requested_fc_mode;
hw->current_fc_status = fc_status;
+
+buffer_alloc_fail:
hw->dcb_info.hw_pfc_map = hw_pfc_map;
- status = hns3_buffer_alloc(hw);
- if (status)
- hns3_err(hw, "recover packet buffer fail! status = %d", status);
return ret;
}
@@ -1801,7 +1800,7 @@ hns3_dcb_pfc_enable(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *pfc_conf)
uint8_t pfc_en = hw->dcb_info.pfc_en;
uint8_t priority = pfc_conf->priority;
uint16_t pause_time = pf->pause_time;
- int ret, status;
+ int ret;
pf->pause_time = pfc_conf->fc.pause_time;
hns3_get_fc_mode(hw, pfc_conf->fc.mode);
@@ -1831,9 +1830,6 @@ hns3_dcb_pfc_enable(struct rte_eth_dev *dev, struct rte_eth_pfc_conf *pfc_conf)
pf->pause_time = pause_time;
hw->dcb_info.pfc_en = pfc_en;
hw->dcb_info.hw_pfc_map = hw_pfc_map;
- status = hns3_buffer_alloc(hw);
- if (status)
- hns3_err(hw, "recover packet buffer fail: %d", status);
return ret;
}
--
2.7.4
next prev parent reply other threads:[~2021-05-15 0:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-15 0:52 [dpdk-dev] [PATCH 0/6] bugfix for hns3 PMD Min Hu (Connor)
2021-05-15 0:52 ` [dpdk-dev] [PATCH 1/6] net/hns3: fix check of Rx/Tx queue numbers Min Hu (Connor)
2021-05-15 0:52 ` [dpdk-dev] [PATCH 2/6] net/hns3: fix requested FC mode roolback Min Hu (Connor)
2021-05-15 0:52 ` Min Hu (Connor) [this message]
2021-05-15 0:52 ` [dpdk-dev] [PATCH 4/6] net/hns3: fix DCB configuration Min Hu (Connor)
2021-05-15 0:52 ` [dpdk-dev] [PATCH 5/6] net/hns3: fix DCB cannot be reconfigured Min Hu (Connor)
2021-05-15 0:52 ` [dpdk-dev] [PATCH 6/6] net/hns3: fix link speed when VF device is down Min Hu (Connor)
2021-05-18 10:41 ` [dpdk-dev] [PATCH 0/6] bugfix for hns3 PMD Ferruh Yigit
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=1621039958-34847-4-git-send-email-humin29@huawei.com \
--to=humin29@huawei.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.