Currently, when the application creates an indirect action,
the hns3 driver allocates a memory for the structure
rte_flow_action_handle and returns this structure pointer to
application. When the application invokes the destroy function
to destroy the indirect action, the driver releases the memory.
However, when the application destroys all flows by using the
flush function before destroying the indirect action, the memory
is not released. This patch fix it by using uint64_t instead of
rte_flow_action_handle* to store indirect action avoids memory
leakage.
Fixes: fdfcb94d8fb3 ("net/hns3: support indirect counter flow action")
Cc: sta...@dpdk.org
Signed-off-by: Dengdui Huang <huangdeng...@huawei.com>
---
drivers/net/hns3/hns3_flow.c | 41 ++++++++++++++++--------------------
drivers/net/hns3/hns3_flow.h | 9 ++++++--
2 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index 266934b45b..c0238d2bfa 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -473,19 +473,20 @@ hns3_handle_action_indirect(struct rte_eth_dev *dev,
struct hns3_fdir_rule *rule,
struct rte_flow_error *error)
{
- const struct rte_flow_action_handle *indir = action->conf;
+ struct rte_flow_action_handle indir;
- if (indir->indirect_type != HNS3_INDIRECT_ACTION_TYPE_COUNT)
+ indir.val64 = (uint64_t)action->conf;
+ if (indir.indirect_type != HNS3_INDIRECT_ACTION_TYPE_COUNT)
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION_CONF,
action, "Invalid indirect type");
- if (hns3_counter_lookup(dev, indir->counter_id) == NULL)
+ if (hns3_counter_lookup(dev, indir.counter_id) == NULL)
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION_CONF,
action, "Counter id not exist");
- rule->act_cnt.id = indir->counter_id;
+ rule->act_cnt.id = indir.counter_id;
rule->flags |= (HNS3_RULE_FLAG_COUNTER | HNS3_RULE_FLAG_COUNTER_INDIR);
return 0;
@@ -2726,20 +2727,12 @@ hns3_flow_action_create(struct rte_eth_dev *dev,
struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct hns3_pf *pf = HNS3_DEV_PRIVATE_TO_PF(dev->data->dev_private);
const struct rte_flow_action_count *act_count;
- struct rte_flow_action_handle *handle = NULL;
+ struct rte_flow_action_handle handle;
struct hns3_flow_counter *counter;
if (hns3_check_indir_action(conf, action, error))
return NULL;
- handle = rte_zmalloc("hns3 action handle",
- sizeof(struct rte_flow_action_handle), 0);
- if (handle == NULL) {
- rte_flow_error_set(error, ENOMEM, RTE_FLOW_ERROR_TYPE_HANDLE,
- NULL, "Failed to allocate action memory");
- return NULL;
- }
-
pthread_mutex_lock(&hw->flows_lock);
act_count = (const struct rte_flow_action_count *)action->conf;
@@ -2762,15 +2755,14 @@ hns3_flow_action_create(struct rte_eth_dev *dev,
}
counter->indirect = true;
- handle->indirect_type = HNS3_INDIRECT_ACTION_TYPE_COUNT;
- handle->counter_id = counter->id;
+ handle.indirect_type = HNS3_INDIRECT_ACTION_TYPE_COUNT;
+ handle.counter_id = counter->id;
pthread_mutex_unlock(&hw->flows_lock);
- return handle;
+ return (struct rte_flow_action_handle *)handle.val64;
err_exit:
pthread_mutex_unlock(&hw->flows_lock);
- rte_free(handle);
return NULL;
}
@@ -2780,18 +2772,20 @@ hns3_flow_action_destroy(struct rte_eth_dev *dev,
struct rte_flow_error *error)
{
struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct rte_flow_action_handle indir;
struct hns3_flow_counter *counter;
pthread_mutex_lock(&hw->flows_lock);
- if (handle->indirect_type != HNS3_INDIRECT_ACTION_TYPE_COUNT) {
+ indir.val64 = (uint64_t)handle;
+ if (indir.indirect_type != HNS3_INDIRECT_ACTION_TYPE_COUNT) {
pthread_mutex_unlock(&hw->flows_lock);
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION_CONF,
handle, "Invalid indirect type");
}
- counter = hns3_counter_lookup(dev, handle->counter_id);
+ counter = hns3_counter_lookup(dev, indir.counter_id);
if (counter == NULL) {
pthread_mutex_unlock(&hw->flows_lock);
return rte_flow_error_set(error, EINVAL,
@@ -2806,8 +2800,7 @@ hns3_flow_action_destroy(struct rte_eth_dev *dev,
handle, "Counter id in use");
}
- (void)hns3_counter_release(dev, handle->counter_id);
- rte_free(handle);
+ (void)hns3_counter_release(dev, indir.counter_id);
pthread_mutex_unlock(&hw->flows_lock);
return 0;
@@ -2820,12 +2813,14 @@ hns3_flow_action_query(struct rte_eth_dev *dev,
struct rte_flow_error *error)
{
struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct rte_flow_action_handle indir;
struct rte_flow flow;
int ret;
pthread_mutex_lock(&hw->flows_lock);
- if (handle->indirect_type != HNS3_INDIRECT_ACTION_TYPE_COUNT) {
+ indir.val64 = (uint64_t)handle;
+ if (indir.indirect_type != HNS3_INDIRECT_ACTION_TYPE_COUNT) {
pthread_mutex_unlock(&hw->flows_lock);
return rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ACTION_CONF,
@@ -2833,7 +2828,7 @@ hns3_flow_action_query(struct rte_eth_dev *dev,
}
memset(&flow, 0, sizeof(flow));
- flow.counter_id = handle->counter_id;
+ flow.counter_id = indir.counter_id;
ret = hns3_counter_query(dev, &flow,
(struct rte_flow_query_count *)data, error);
pthread_mutex_unlock(&hw->flows_lock);
diff --git a/drivers/net/hns3/hns3_flow.h b/drivers/net/hns3/hns3_flow.h
index 1b49673f11..612890391d 100644
--- a/drivers/net/hns3/hns3_flow.h
+++ b/drivers/net/hns3/hns3_flow.h
@@ -50,8 +50,13 @@ enum {
};
struct rte_flow_action_handle {
- int indirect_type;
- uint32_t counter_id;
+ union {
+ uint64_t val64;
+ struct {
+ int indirect_type;
+ uint32_t counter_id;
+ };
+ };
};
union hns3_filter_conf {
--
2.33.0
