Flow uninit skips hardware teardown during a PF-initiated reset, but
only the hash engine provides a callback to free its rule. FDIR, flow
subscription and IPsec rules are therefore leaked. Conversely, hash
destroy removes its rule from hardware but frees only the flow handle.
Free the rule alongside the flow handle in the generic destroy and
uninit paths. Remove the engine-specific rule frees and the redundant
free callback, so both paths have the same software ownership.
Fixes: 7be10c3004be ("net/iavf: add RSS configuration for VF")
Fixes: 4dad1a6815d6 ("net/iavf: skip flow flush during PF-initiated reset")
Cc: [email protected]
Signed-off-by: Anatoly Burakov <[email protected]>
---
drivers/net/intel/iavf/iavf_fdir.c | 3 ---
drivers/net/intel/iavf/iavf_fsub.c | 3 ---
drivers/net/intel/iavf/iavf_generic_flow.c | 4 ++--
drivers/net/intel/iavf/iavf_generic_flow.h | 2 --
drivers/net/intel/iavf/iavf_hash.c | 9 ---------
drivers/net/intel/iavf/iavf_ipsec_crypto.c | 1 -
6 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/drivers/net/intel/iavf/iavf_fdir.c
b/drivers/net/intel/iavf/iavf_fdir.c
index 67003183bbd..c3babed947c 100644
--- a/drivers/net/intel/iavf/iavf_fdir.c
+++ b/drivers/net/intel/iavf/iavf_fdir.c
@@ -406,9 +406,6 @@ iavf_fdir_destroy(struct iavf_adapter *ad,
if (filter->mark_flag == 1)
iavf_fdir_rx_proc_enable(ad, 0);
- flow->rule = NULL;
- rte_free(filter);
-
return 0;
}
diff --git a/drivers/net/intel/iavf/iavf_fsub.c
b/drivers/net/intel/iavf/iavf_fsub.c
index 19ae0e2dc2e..4b2e40af3c0 100644
--- a/drivers/net/intel/iavf/iavf_fsub.c
+++ b/drivers/net/intel/iavf/iavf_fsub.c
@@ -120,9 +120,6 @@ iavf_fsub_destroy(struct iavf_adapter *ad, struct rte_flow
*flow,
return -rte_errno;
}
- flow->rule = NULL;
- rte_free(filter);
-
return ret;
}
diff --git a/drivers/net/intel/iavf/iavf_generic_flow.c
b/drivers/net/intel/iavf/iavf_generic_flow.c
index 92ca20031c0..53a16d13827 100644
--- a/drivers/net/intel/iavf/iavf_generic_flow.c
+++ b/drivers/net/intel/iavf/iavf_generic_flow.c
@@ -1851,8 +1851,7 @@ iavf_flow_uninit(struct iavf_adapter *ad)
/* Remove all flows */
while ((p_flow = TAILQ_FIRST(&vf->flow_list))) {
TAILQ_REMOVE(&vf->flow_list, p_flow, node);
- if (p_flow->engine->free)
- p_flow->engine->free(p_flow);
+ rte_free(p_flow->rule);
rte_free(p_flow);
}
@@ -2301,6 +2300,7 @@ iavf_flow_destroy(struct rte_eth_dev *dev,
if (!ret) {
TAILQ_REMOVE(&vf->flow_list, flow, node);
+ rte_free(flow->rule);
rte_free(flow);
} else {
PMD_DRV_LOG(ERR, "Failed to destroy flow");
diff --git a/drivers/net/intel/iavf/iavf_generic_flow.h
b/drivers/net/intel/iavf/iavf_generic_flow.h
index 6665d688183..3a8f5f92e8b 100644
--- a/drivers/net/intel/iavf/iavf_generic_flow.h
+++ b/drivers/net/intel/iavf/iavf_generic_flow.h
@@ -465,7 +465,6 @@ typedef int (*engine_query_t)(struct iavf_adapter *ad,
struct rte_flow *flow,
struct rte_flow_query_count *count,
struct rte_flow_error *error);
-typedef void (*engine_free_t) (struct rte_flow *flow);
typedef int (*parse_pattern_action_t)(struct iavf_adapter *ad,
struct iavf_pattern_match_item *array,
uint32_t array_len,
@@ -494,7 +493,6 @@ struct iavf_flow_engine {
engine_create_t create;
engine_destroy_t destroy;
engine_query_t query_count;
- engine_free_t free;
const char *name;
enum iavf_flow_engine_type type;
size_t rule_size;
diff --git a/drivers/net/intel/iavf/iavf_hash.c
b/drivers/net/intel/iavf/iavf_hash.c
index 95150944025..cef30cd08e1 100644
--- a/drivers/net/intel/iavf/iavf_hash.c
+++ b/drivers/net/intel/iavf/iavf_hash.c
@@ -79,8 +79,6 @@ iavf_hash_destroy(struct iavf_adapter *ad, struct rte_flow
*flow,
struct rte_flow_error *error);
static void
iavf_hash_uninit_parser(struct iavf_adapter *ad);
-static void
-iavf_hash_free(struct rte_flow *flow);
static int
iavf_hash_parse_pattern_action(struct iavf_adapter *ad,
struct iavf_pattern_match_item *array,
@@ -682,7 +680,6 @@ static struct iavf_flow_engine iavf_hash_engine = {
.create = iavf_hash_create,
.destroy = iavf_hash_destroy,
.uninit = iavf_hash_uninit_parser,
- .free = iavf_hash_free,
.name = "hash",
.type = IAVF_FLOW_ENGINE_HASH,
.rule_size = sizeof(struct virtchnl_rss_cfg),
@@ -1670,9 +1667,3 @@ iavf_hash_uninit(struct iavf_adapter *ad)
if (iavf_rss_hash_set(ad, rss_conf->rss_hf, false))
PMD_DRV_LOG(ERR, "fail to delete default RSS");
}
-
-static void
-iavf_hash_free(struct rte_flow *flow)
-{
- rte_free(flow->rule);
-}
diff --git a/drivers/net/intel/iavf/iavf_ipsec_crypto.c
b/drivers/net/intel/iavf/iavf_ipsec_crypto.c
index 06b51b5e622..2478bdc245d 100644
--- a/drivers/net/intel/iavf/iavf_ipsec_crypto.c
+++ b/drivers/net/intel/iavf/iavf_ipsec_crypto.c
@@ -1919,7 +1919,6 @@ iavf_ipsec_flow_destroy(struct iavf_adapter *ad,
iavf_ipsec_crypto_security_policy_delete(ad,
ipsec_flow->is_ipv4, ipsec_flow->id);
- rte_free(ipsec_flow);
return 0;
}
--
2.52.0
