[PATCH] net/txgbe: keep flow rules per port
Zhang Tengfei
zhtfdev at gmail.com
Sun Nov 8 17:00:21 CET 2026
rte_flow rules for every txgbe port were stored in file-scope lists.
Flushing or closing one port freed the rte_flow handles of the others
while their hardware rules stayed programmed, and probing another port
reinitialized the lists. The same lists are used by the PF and VF flow
operations.
Keep one flow list in struct txgbe_adapter. A port disables flow
director only when its own FDIR rule count reaches zero.
Fixes: 5c2352b9ece6 ("net/txgbe: support creating consistent filter")
Cc: stable at dpdk.org
Signed-off-by: Zhang Tengfei <zhtfdev at gmail.com>
---
drivers/net/txgbe/txgbe_ethdev.c | 5 +-
drivers/net/txgbe/txgbe_ethdev.h | 9 +-
drivers/net/txgbe/txgbe_ethdev_vf.c | 4 +-
drivers/net/txgbe/txgbe_flow.c | 186 ++++++++--------------------
4 files changed, 61 insertions(+), 143 deletions(-)
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 9dbdbfa309..d95f6227e2 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -902,7 +902,7 @@ eth_txgbe_dev_init(struct rte_eth_dev *eth_dev, void *init_params __rte_unused)
txgbe_l2_tn_filter_init(eth_dev);
/* initialize flow filter lists */
- txgbe_filterlist_init();
+ txgbe_filterlist_init(eth_dev);
/* initialize bandwidth configuration info */
memset(bw_conf, 0, sizeof(struct txgbe_bw_conf));
@@ -1014,6 +1014,7 @@ int txgbe_fdir_filter_init(struct rte_eth_dev *eth_dev)
return -ENOMEM;
}
fdir_info->mask_added = FALSE;
+ fdir_info->n_flows = 0;
return 0;
}
@@ -2352,7 +2353,7 @@ txgbe_dev_close(struct rte_eth_dev *dev)
txgbe_ntuple_filter_uninit(dev);
/* clear all the filters list */
- txgbe_filterlist_flush();
+ txgbe_filterlist_flush(dev);
/* Remove all Traffic Manager configuration */
txgbe_tm_conf_uninit(dev);
diff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h
index 28dfa1bc5e..ec3d2b4d7c 100644
--- a/drivers/net/txgbe/txgbe_ethdev.h
+++ b/drivers/net/txgbe/txgbe_ethdev.h
@@ -136,6 +136,7 @@ struct txgbe_hw_fdir_info {
struct txgbe_fdir_filter **hash_map;
struct rte_hash *hash_handle; /* cuckoo hash handler */
bool mask_added; /* If already got mask from consistent filter */
+ uint32_t n_flows; /* rte_flow FDIR rules on this port */
};
struct txgbe_rte_flow_rss_conf {
@@ -337,6 +338,9 @@ struct txgbe_tm_conf {
bool committed;
};
+struct txgbe_flow_mem;
+TAILQ_HEAD(txgbe_flow_mem_list, txgbe_flow_mem);
+
/*
* Structure to store private data for each driver instance (for each port).
*/
@@ -352,6 +356,7 @@ struct txgbe_adapter {
struct txgbe_vf_info *vfdata;
struct txgbe_uta_info uta_info;
struct txgbe_filter_info filter;
+ struct txgbe_flow_mem_list flow_list;
struct txgbe_l2_tn_info l2_tn;
struct txgbe_bw_conf bw_conf;
#ifdef RTE_LIB_SECURITY
@@ -542,8 +547,8 @@ txgbe_dev_l2_tunnel_filter_add(struct rte_eth_dev *dev,
int
txgbe_dev_l2_tunnel_filter_del(struct rte_eth_dev *dev,
struct txgbe_l2_tunnel_conf *l2_tunnel);
-void txgbe_filterlist_init(void);
-void txgbe_filterlist_flush(void);
+void txgbe_filterlist_init(struct rte_eth_dev *dev);
+void txgbe_filterlist_flush(struct rte_eth_dev *dev);
int txgbe_fdir_filter_init(struct rte_eth_dev *eth_dev);
int txgbe_fdir_filter_uninit(struct rte_eth_dev *eth_dev);
diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c
index 3cf33a8bd6..a66897a4fb 100644
--- a/drivers/net/txgbe/txgbe_ethdev_vf.c
+++ b/drivers/net/txgbe/txgbe_ethdev_vf.c
@@ -390,7 +390,7 @@ eth_txgbevf_dev_init(struct rte_eth_dev *eth_dev)
TAILQ_INIT(&filter_info->fivetuple_list);
/* initialize flow filter lists */
- txgbe_filterlist_init();
+ txgbe_filterlist_init(eth_dev);
PMD_INIT_LOG(DEBUG, "port %d vendorID=0x%x deviceID=0x%x mac.type=%s",
eth_dev->data->port_id, pci_dev->id.vendor_id,
@@ -882,7 +882,7 @@ txgbevf_dev_close(struct rte_eth_dev *dev)
txgbe_ntuple_filter_uninit(dev);
/* clear all the filters list */
- txgbe_filterlist_flush();
+ txgbe_filterlist_flush(dev);
return ret;
}
diff --git a/drivers/net/txgbe/txgbe_flow.c b/drivers/net/txgbe/txgbe_flow.c
index 7016fb29d2..1a40c263e3 100644
--- a/drivers/net/txgbe/txgbe_flow.c
+++ b/drivers/net/txgbe/txgbe_flow.c
@@ -18,32 +18,26 @@
/* ntuple filter list structure */
struct txgbe_ntuple_filter_ele {
- TAILQ_ENTRY(txgbe_ntuple_filter_ele) entries;
struct rte_eth_ntuple_filter filter_info;
};
/* ethertype filter list structure */
struct txgbe_ethertype_filter_ele {
- TAILQ_ENTRY(txgbe_ethertype_filter_ele) entries;
struct rte_eth_ethertype_filter filter_info;
};
/* syn filter list structure */
struct txgbe_eth_syn_filter_ele {
- TAILQ_ENTRY(txgbe_eth_syn_filter_ele) entries;
struct rte_eth_syn_filter filter_info;
};
/* fdir filter list structure */
struct txgbe_fdir_rule_ele {
- TAILQ_ENTRY(txgbe_fdir_rule_ele) entries;
struct txgbe_fdir_rule filter_info;
};
/* l2_tunnel filter list structure */
struct txgbe_eth_l2_tunnel_conf_ele {
- TAILQ_ENTRY(txgbe_eth_l2_tunnel_conf_ele) entries;
struct txgbe_l2_tunnel_conf filter_info;
};
/* rss filter list structure */
struct txgbe_rss_conf_ele {
- TAILQ_ENTRY(txgbe_rss_conf_ele) entries;
struct txgbe_rte_flow_rss_conf filter_info;
};
/* txgbe_flow memory list structure */
@@ -52,22 +46,6 @@ struct txgbe_flow_mem {
struct rte_flow *flow;
};
-TAILQ_HEAD(txgbe_ntuple_filter_list, txgbe_ntuple_filter_ele);
-TAILQ_HEAD(txgbe_ethertype_filter_list, txgbe_ethertype_filter_ele);
-TAILQ_HEAD(txgbe_syn_filter_list, txgbe_eth_syn_filter_ele);
-TAILQ_HEAD(txgbe_fdir_rule_filter_list, txgbe_fdir_rule_ele);
-TAILQ_HEAD(txgbe_l2_tunnel_filter_list, txgbe_eth_l2_tunnel_conf_ele);
-TAILQ_HEAD(txgbe_rss_filter_list, txgbe_rss_conf_ele);
-TAILQ_HEAD(txgbe_flow_mem_list, txgbe_flow_mem);
-
-static struct txgbe_ntuple_filter_list filter_ntuple_list;
-static struct txgbe_ethertype_filter_list filter_ethertype_list;
-static struct txgbe_syn_filter_list filter_syn_list;
-static struct txgbe_fdir_rule_filter_list filter_fdir_list;
-static struct txgbe_l2_tunnel_filter_list filter_l2_tunnel_list;
-static struct txgbe_rss_filter_list filter_rss_list;
-static struct txgbe_flow_mem_list txgbe_flow_list;
-
/**
* Endless loop will never happen with below assumption
* 1. there is at least one no-void item(END)
@@ -3112,77 +3090,29 @@ txgbe_clear_rss_filter(struct rte_eth_dev *dev)
}
void
-txgbe_filterlist_init(void)
+txgbe_filterlist_init(struct rte_eth_dev *dev)
{
- TAILQ_INIT(&filter_ntuple_list);
- TAILQ_INIT(&filter_ethertype_list);
- TAILQ_INIT(&filter_syn_list);
- TAILQ_INIT(&filter_fdir_list);
- TAILQ_INIT(&filter_l2_tunnel_list);
- TAILQ_INIT(&filter_rss_list);
- TAILQ_INIT(&txgbe_flow_list);
+ struct txgbe_adapter *adapter = TXGBE_DEV_ADAPTER(dev);
+
+ TAILQ_INIT(&adapter->flow_list);
}
void
-txgbe_filterlist_flush(void)
+txgbe_filterlist_flush(struct rte_eth_dev *dev)
{
- struct txgbe_ntuple_filter_ele *ntuple_filter_ptr;
- struct txgbe_ethertype_filter_ele *ethertype_filter_ptr;
- struct txgbe_eth_syn_filter_ele *syn_filter_ptr;
- struct txgbe_eth_l2_tunnel_conf_ele *l2_tn_filter_ptr;
- struct txgbe_fdir_rule_ele *fdir_rule_ptr;
+ struct txgbe_adapter *adapter = TXGBE_DEV_ADAPTER(dev);
+ struct txgbe_hw_fdir_info *fdir_info = TXGBE_DEV_FDIR(dev);
struct txgbe_flow_mem *txgbe_flow_mem_ptr;
- struct txgbe_rss_conf_ele *rss_filter_ptr;
-
- while ((ntuple_filter_ptr = TAILQ_FIRST(&filter_ntuple_list))) {
- TAILQ_REMOVE(&filter_ntuple_list,
- ntuple_filter_ptr,
- entries);
- rte_free(ntuple_filter_ptr);
- }
- while ((ethertype_filter_ptr = TAILQ_FIRST(&filter_ethertype_list))) {
- TAILQ_REMOVE(&filter_ethertype_list,
- ethertype_filter_ptr,
- entries);
- rte_free(ethertype_filter_ptr);
- }
-
- while ((syn_filter_ptr = TAILQ_FIRST(&filter_syn_list))) {
- TAILQ_REMOVE(&filter_syn_list,
- syn_filter_ptr,
- entries);
- rte_free(syn_filter_ptr);
- }
+ while ((txgbe_flow_mem_ptr = TAILQ_FIRST(&adapter->flow_list))) {
+ struct rte_flow *flow = txgbe_flow_mem_ptr->flow;
- while ((l2_tn_filter_ptr = TAILQ_FIRST(&filter_l2_tunnel_list))) {
- TAILQ_REMOVE(&filter_l2_tunnel_list,
- l2_tn_filter_ptr,
- entries);
- rte_free(l2_tn_filter_ptr);
- }
-
- while ((fdir_rule_ptr = TAILQ_FIRST(&filter_fdir_list))) {
- TAILQ_REMOVE(&filter_fdir_list,
- fdir_rule_ptr,
- entries);
- rte_free(fdir_rule_ptr);
- }
-
- while ((rss_filter_ptr = TAILQ_FIRST(&filter_rss_list))) {
- TAILQ_REMOVE(&filter_rss_list,
- rss_filter_ptr,
- entries);
- rte_free(rss_filter_ptr);
- }
-
- while ((txgbe_flow_mem_ptr = TAILQ_FIRST(&txgbe_flow_list))) {
- TAILQ_REMOVE(&txgbe_flow_list,
- txgbe_flow_mem_ptr,
- entries);
- rte_free(txgbe_flow_mem_ptr->flow);
+ TAILQ_REMOVE(&adapter->flow_list, txgbe_flow_mem_ptr, entries);
+ rte_free(flow->rule);
+ rte_free(flow);
rte_free(txgbe_flow_mem_ptr);
}
+ fdir_info->n_flows = 0;
}
/**
@@ -3215,6 +3145,7 @@ txgbe_flow_create(struct rte_eth_dev *dev,
struct txgbe_fdir_rule_ele *fdir_rule_ptr = NULL;
struct txgbe_rss_conf_ele *rss_filter_ptr;
struct txgbe_flow_mem *txgbe_flow_mem_ptr;
+ struct txgbe_adapter *adapter = TXGBE_DEV_ADAPTER(dev);
struct txgbe_filter_info *filter_info = TXGBE_DEV_FILTER(dev);
uint8_t first_mask = FALSE;
bool fdir_configured = false;
@@ -3232,8 +3163,7 @@ txgbe_flow_create(struct rte_eth_dev *dev,
return NULL;
}
txgbe_flow_mem_ptr->flow = flow;
- TAILQ_INSERT_TAIL(&txgbe_flow_list,
- txgbe_flow_mem_ptr, entries);
+ TAILQ_INSERT_TAIL(&adapter->flow_list, txgbe_flow_mem_ptr, entries);
memset(&ntuple_filter, 0, sizeof(struct rte_eth_ntuple_filter));
ret = txgbe_parse_ntuple_filter(dev, attr, pattern,
@@ -3261,8 +3191,6 @@ txgbe_flow_create(struct rte_eth_dev *dev,
goto next;
goto out;
}
- TAILQ_INSERT_TAIL(&filter_ntuple_list,
- ntuple_filter_ptr, entries);
flow->rule = ntuple_filter_ptr;
flow->filter_type = RTE_ETH_FILTER_NTUPLE;
return flow;
@@ -3287,8 +3215,6 @@ txgbe_flow_create(struct rte_eth_dev *dev,
rte_free(ethertype_filter_ptr);
goto out;
}
- TAILQ_INSERT_TAIL(&filter_ethertype_list,
- ethertype_filter_ptr, entries);
flow->rule = ethertype_filter_ptr;
flow->filter_type = RTE_ETH_FILTER_ETHERTYPE;
return flow;
@@ -3311,8 +3237,6 @@ txgbe_flow_create(struct rte_eth_dev *dev,
rte_free(syn_filter_ptr);
goto out;
}
- TAILQ_INSERT_TAIL(&filter_syn_list,
- syn_filter_ptr, entries);
flow->rule = syn_filter_ptr;
flow->filter_type = RTE_ETH_FILTER_SYN;
return flow;
@@ -3339,10 +3263,9 @@ txgbe_flow_create(struct rte_eth_dev *dev,
}
fdir_rule_ptr->filter_info = fdir_rule;
- TAILQ_INSERT_TAIL(&filter_fdir_list,
- fdir_rule_ptr, entries);
flow->rule = fdir_rule_ptr;
flow->filter_type = RTE_ETH_FILTER_FDIR;
+ fdir_info->n_flows++;
return flow;
}
@@ -3426,10 +3349,9 @@ txgbe_flow_create(struct rte_eth_dev *dev,
goto fdir_out;
fdir_rule_ptr->filter_info = fdir_rule;
- TAILQ_INSERT_TAIL(&filter_fdir_list,
- fdir_rule_ptr, entries);
flow->rule = fdir_rule_ptr;
flow->filter_type = RTE_ETH_FILTER_FDIR;
+ fdir_info->n_flows++;
return flow;
}
@@ -3451,8 +3373,6 @@ txgbe_flow_create(struct rte_eth_dev *dev,
rte_free(l2_tn_filter_ptr);
goto out;
}
- TAILQ_INSERT_TAIL(&filter_l2_tunnel_list,
- l2_tn_filter_ptr, entries);
flow->rule = l2_tn_filter_ptr;
flow->filter_type = RTE_ETH_FILTER_L2_TUNNEL;
return flow;
@@ -3476,8 +3396,6 @@ txgbe_flow_create(struct rte_eth_dev *dev,
}
txgbe_rss_conf_init(&rss_filter_ptr->filter_info,
&rss_conf.conf);
- TAILQ_INSERT_TAIL(&filter_rss_list,
- rss_filter_ptr, entries);
flow->rule = rss_filter_ptr;
flow->filter_type = RTE_ETH_FILTER_HASH;
return flow;
@@ -3492,8 +3410,7 @@ txgbe_flow_create(struct rte_eth_dev *dev,
fdir_conf->mode = RTE_FDIR_MODE_NONE;
}
out:
- TAILQ_REMOVE(&txgbe_flow_list,
- txgbe_flow_mem_ptr, entries);
+ TAILQ_REMOVE(&adapter->flow_list, txgbe_flow_mem_ptr, entries);
rte_flow_error_set(error, -ret,
RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
"Failed to create flow.");
@@ -3567,7 +3484,7 @@ txgbe_flow_destroy(struct rte_eth_dev *dev,
{
int ret = 0;
struct rte_flow *pmd_flow = flow;
- enum rte_filter_type filter_type = pmd_flow->filter_type;
+ enum rte_filter_type filter_type;
struct rte_eth_ntuple_filter ntuple_filter;
struct rte_eth_ethertype_filter ethertype_filter;
struct rte_eth_syn_filter syn_filter;
@@ -3579,10 +3496,25 @@ txgbe_flow_destroy(struct rte_eth_dev *dev,
struct txgbe_eth_l2_tunnel_conf_ele *l2_tn_filter_ptr;
struct txgbe_fdir_rule_ele *fdir_rule_ptr;
struct txgbe_flow_mem *txgbe_flow_mem_ptr;
+ struct txgbe_adapter *adapter = TXGBE_DEV_ADAPTER(dev);
struct txgbe_hw_fdir_info *fdir_info = TXGBE_DEV_FDIR(dev);
struct rte_eth_fdir_conf *fdir_conf = TXGBE_DEV_FDIR_CONF(dev);
struct txgbe_rss_conf_ele *rss_filter_ptr;
+ /*
+ * Confirm the handle is on this port before changing hardware.
+ * A flow created on another port must not be removed here.
+ */
+ TAILQ_FOREACH(txgbe_flow_mem_ptr, &adapter->flow_list, entries) {
+ if (txgbe_flow_mem_ptr->flow == pmd_flow)
+ break;
+ }
+ if (txgbe_flow_mem_ptr == NULL)
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
+ "Flow not found for this port");
+
+ filter_type = pmd_flow->filter_type;
switch (filter_type) {
case RTE_ETH_FILTER_NTUPLE:
ntuple_filter_ptr = (struct txgbe_ntuple_filter_ele *)
@@ -3591,11 +3523,8 @@ txgbe_flow_destroy(struct rte_eth_dev *dev,
&ntuple_filter_ptr->filter_info,
sizeof(struct rte_eth_ntuple_filter));
ret = txgbe_add_del_ntuple_filter(dev, &ntuple_filter, FALSE);
- if (!ret) {
- TAILQ_REMOVE(&filter_ntuple_list,
- ntuple_filter_ptr, entries);
+ if (!ret)
rte_free(ntuple_filter_ptr);
- }
break;
case RTE_ETH_FILTER_ETHERTYPE:
ethertype_filter_ptr = (struct txgbe_ethertype_filter_ele *)
@@ -3605,11 +3534,8 @@ txgbe_flow_destroy(struct rte_eth_dev *dev,
sizeof(struct rte_eth_ethertype_filter));
ret = txgbe_add_del_ethertype_filter(dev,
ðertype_filter, FALSE);
- if (!ret) {
- TAILQ_REMOVE(&filter_ethertype_list,
- ethertype_filter_ptr, entries);
+ if (!ret)
rte_free(ethertype_filter_ptr);
- }
break;
case RTE_ETH_FILTER_SYN:
syn_filter_ptr = (struct txgbe_eth_syn_filter_ele *)
@@ -3618,11 +3544,8 @@ txgbe_flow_destroy(struct rte_eth_dev *dev,
&syn_filter_ptr->filter_info,
sizeof(struct rte_eth_syn_filter));
ret = txgbe_syn_filter_set(dev, &syn_filter, FALSE);
- if (!ret) {
- TAILQ_REMOVE(&filter_syn_list,
- syn_filter_ptr, entries);
+ if (!ret)
rte_free(syn_filter_ptr);
- }
break;
case RTE_ETH_FILTER_FDIR:
fdir_rule_ptr = (struct txgbe_fdir_rule_ele *)pmd_flow->rule;
@@ -3630,14 +3553,16 @@ txgbe_flow_destroy(struct rte_eth_dev *dev,
&fdir_rule_ptr->filter_info,
sizeof(struct txgbe_fdir_rule));
if (txgbe_is_pf(TXGBE_DEV_HW(dev)))
- ret = txgbe_fdir_filter_program(dev, &fdir_rule, TRUE, FALSE);
+ ret = txgbe_fdir_filter_program(dev, &fdir_rule,
+ TRUE, FALSE);
else
- ret = txgbevf_fdir_filter_program(dev, &fdir_rule, TRUE);
+ ret = txgbevf_fdir_filter_program(dev, &fdir_rule,
+ TRUE);
if (!ret) {
- TAILQ_REMOVE(&filter_fdir_list,
- fdir_rule_ptr, entries);
rte_free(fdir_rule_ptr);
- if (TAILQ_EMPTY(&filter_fdir_list)) {
+ if (fdir_info->n_flows > 0)
+ fdir_info->n_flows--;
+ if (fdir_info->n_flows == 0) {
memset(&fdir_info->mask, 0,
sizeof(struct txgbe_hw_fdir_mask));
fdir_info->mask_added = false;
@@ -3656,22 +3581,16 @@ txgbe_flow_destroy(struct rte_eth_dev *dev,
rte_memcpy(&l2_tn_filter, &l2_tn_filter_ptr->filter_info,
sizeof(struct txgbe_l2_tunnel_conf));
ret = txgbe_dev_l2_tunnel_filter_del(dev, &l2_tn_filter);
- if (!ret) {
- TAILQ_REMOVE(&filter_l2_tunnel_list,
- l2_tn_filter_ptr, entries);
+ if (!ret)
rte_free(l2_tn_filter_ptr);
- }
break;
case RTE_ETH_FILTER_HASH:
rss_filter_ptr = (struct txgbe_rss_conf_ele *)
pmd_flow->rule;
ret = txgbe_config_rss_filter(dev,
&rss_filter_ptr->filter_info, FALSE);
- if (!ret) {
- TAILQ_REMOVE(&filter_rss_list,
- rss_filter_ptr, entries);
+ if (!ret)
rte_free(rss_filter_ptr);
- }
break;
default:
PMD_DRV_LOG(WARNING, "Filter type (%d) not supported",
@@ -3687,15 +3606,8 @@ txgbe_flow_destroy(struct rte_eth_dev *dev,
return ret;
}
- TAILQ_FOREACH(txgbe_flow_mem_ptr, &txgbe_flow_list, entries) {
- if (txgbe_flow_mem_ptr->flow == pmd_flow)
- break;
- }
- if (txgbe_flow_mem_ptr != NULL) {
- TAILQ_REMOVE(&txgbe_flow_list,
- txgbe_flow_mem_ptr, entries);
- rte_free(txgbe_flow_mem_ptr);
- }
+ TAILQ_REMOVE(&adapter->flow_list, txgbe_flow_mem_ptr, entries);
+ rte_free(txgbe_flow_mem_ptr);
rte_free(flow);
return ret;
@@ -3733,7 +3645,7 @@ txgbe_flow_flush(struct rte_eth_dev *dev,
txgbe_clear_rss_filter(dev);
out:
- txgbe_filterlist_flush();
+ txgbe_filterlist_flush(dev);
return 0;
}
--
2.53.0
More information about the stable
mailing list