From: Xiaoyun wang <cloud.wangxiaoyun@huawei.com>
To: <stable@dpdk.org>
Cc: <bluca@debian.org>, <yin.yinshi@huawei.com>,
<zhouguoyang@huawei.com>, <luoxianjun@huawei.com>,
Xiaoyun wang <cloud.wangxiaoyun@huawei.com>
Subject: [dpdk-stable] [PATCH 19.11 v1 1/1] net/hinic: fix filters on memory allocation failure
Date: Wed, 4 Nov 2020 16:40:04 +0800 [thread overview]
Message-ID: <57e0ebeab5527f8f936e9511eff88d85c1e0ac99.1604478636.git.cloud.wangxiaoyun@huawei.com> (raw)
In-Reply-To: <cover.1604478636.git.cloud.wangxiaoyun@huawei.com>
[ upstream commit 0c87a15f5f1ccb9eefb6231aea9d095686f2def4 ]
If rte_zmalloc failed, pmd driver should also delete the ntuple
filter or ethertype filter or normal and tcam filter that already
added before.
Fixes: d7964ce192e7 ("net/hinic: check memory allocations in flow creation")
Signed-off-by: Xiaoyun wang <cloud.wangxiaoyun@huawei.com>
---
drivers/net/hinic/hinic_pmd_flow.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/drivers/net/hinic/hinic_pmd_flow.c b/drivers/net/hinic/hinic_pmd_flow.c
index 7bbdcc9..f820be4 100644
--- a/drivers/net/hinic/hinic_pmd_flow.c
+++ b/drivers/net/hinic/hinic_pmd_flow.c
@@ -683,6 +683,7 @@ static int hinic_ntuple_item_check_end(const struct rte_flow_item *item,
item, "Not supported by ntuple filter");
return -rte_errno;
}
+
return 0;
}
@@ -2116,6 +2117,8 @@ static struct rte_flow *hinic_flow_create(struct rte_eth_dev *dev,
sizeof(struct hinic_ntuple_filter_ele), 0);
if (ntuple_filter_ptr == NULL) {
PMD_DRV_LOG(ERR, "Failed to allocate ntuple_filter_ptr");
+ (void)hinic_add_del_ntuple_filter(dev,
+ &ntuple_filter, FALSE);
goto out;
}
rte_memcpy(&ntuple_filter_ptr->filter_info,
@@ -2146,6 +2149,8 @@ static struct rte_flow *hinic_flow_create(struct rte_eth_dev *dev,
sizeof(struct hinic_ethertype_filter_ele), 0);
if (ethertype_filter_ptr == NULL) {
PMD_DRV_LOG(ERR, "Failed to allocate ethertype_filter_ptr");
+ (void)hinic_add_del_ethertype_filter(dev,
+ ðertype_filter, FALSE);
goto out;
}
rte_memcpy(ðertype_filter_ptr->filter_info,
@@ -2174,6 +2179,8 @@ static struct rte_flow *hinic_flow_create(struct rte_eth_dev *dev,
sizeof(struct hinic_fdir_rule_ele), 0);
if (fdir_rule_ptr == NULL) {
PMD_DRV_LOG(ERR, "Failed to allocate fdir_rule_ptr");
+ hinic_add_del_fdir_filter(dev,
+ &fdir_rule, FALSE);
goto out;
}
rte_memcpy(&fdir_rule_ptr->filter_info, &fdir_rule,
--
1.8.3.1
next prev parent reply other threads:[~2020-11-04 8:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-04 8:40 [dpdk-stable] [PATCH 19.11 v1 0/1] " Xiaoyun wang
2020-11-04 8:40 ` Xiaoyun wang [this message]
2020-11-05 9:41 ` [dpdk-stable] [PATCH 19.11 v1 1/1] net/hinic: " Luca Boccassi
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=57e0ebeab5527f8f936e9511eff88d85c1e0ac99.1604478636.git.cloud.wangxiaoyun@huawei.com \
--to=cloud.wangxiaoyun@huawei.com \
--cc=bluca@debian.org \
--cc=luoxianjun@huawei.com \
--cc=stable@dpdk.org \
--cc=yin.yinshi@huawei.com \
--cc=zhouguoyang@huawei.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).