3a8995b1ad
Update DPDK version from 19.11 to 20.11 and also support hns3 PMD for Kunpeng 920 and Kunpeng 930. Signed-off-by: speech_white <humin29@huawei.com>
66 lines
2.0 KiB
Diff
66 lines
2.0 KiB
Diff
From 2b24ee3f6acfaa8170a37022aab4b5b93d4dc0ae Mon Sep 17 00:00:00 2001
|
|
From: Chengwen Feng <fengchengwen@huawei.com>
|
|
Date: Wed, 3 Feb 2021 20:23:54 +0800
|
|
Subject: [PATCH 040/189] net/hns3: fix flow director rule residue on malloc
|
|
failure
|
|
|
|
After FD rule config success, driver will malloc fdir_rule to hold the
|
|
rule info, if malloc fail the FD rule in hardware was not cleanup.
|
|
|
|
Fixes: fcba820d9b9e ("net/hns3: support flow director")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
|
|
Signed-off-by: Lijun Ou <oulijun@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_flow.c | 21 +++++++++++----------
|
|
1 file changed, 11 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
|
|
index c484114..a016857 100644
|
|
--- a/drivers/net/hns3/hns3_flow.c
|
|
+++ b/drivers/net/hns3/hns3_flow.c
|
|
@@ -1806,17 +1806,18 @@ hns3_flow_create(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
|
|
|
|
flow->counter_id = fdir_rule.act_cnt.id;
|
|
}
|
|
+
|
|
+ fdir_rule_ptr = rte_zmalloc("hns3 fdir rule",
|
|
+ sizeof(struct hns3_fdir_rule_ele),
|
|
+ 0);
|
|
+ if (fdir_rule_ptr == NULL) {
|
|
+ hns3_err(hw, "failed to allocate fdir_rule memory.");
|
|
+ ret = -ENOMEM;
|
|
+ goto err_fdir;
|
|
+ }
|
|
+
|
|
ret = hns3_fdir_filter_program(hns, &fdir_rule, false);
|
|
if (!ret) {
|
|
- fdir_rule_ptr = rte_zmalloc("hns3 fdir rule",
|
|
- sizeof(struct hns3_fdir_rule_ele),
|
|
- 0);
|
|
- if (fdir_rule_ptr == NULL) {
|
|
- hns3_err(hw, "Failed to allocate fdir_rule memory");
|
|
- ret = -ENOMEM;
|
|
- goto err_fdir;
|
|
- }
|
|
-
|
|
memcpy(&fdir_rule_ptr->fdir_conf, &fdir_rule,
|
|
sizeof(struct hns3_fdir_rule));
|
|
TAILQ_INSERT_TAIL(&process_list->fdir_list,
|
|
@@ -1827,10 +1828,10 @@ hns3_flow_create(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
|
|
return flow;
|
|
}
|
|
|
|
+ rte_free(fdir_rule_ptr);
|
|
err_fdir:
|
|
if (fdir_rule.flags & HNS3_RULE_FLAG_COUNTER)
|
|
hns3_counter_release(dev, fdir_rule.act_cnt.id);
|
|
-
|
|
err:
|
|
rte_flow_error_set(error, -ret, RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
|
|
"Failed to create flow");
|
|
--
|
|
2.7.4
|
|
|