* [PATCH v4 12/26] net/i40e: refactor RSS flow parameter checks
From: Anatoly Burakov @ 2026-05-22 15:14 UTC (permalink / raw)
To: dev, Bruce Richardson
In-Reply-To: <cover.1779462698.git.anatoly.burakov@intel.com>
Currently, the hash parser parameter checks are somewhat confusing as they
have multiple mutually exclusive code paths and requirements, and it's
difficult to reason about them because RSS flow parsing is interspersed
with validation checks.
To address that, refactor hash engine error checking to perform almost all
validation at the beginning, with only happy paths being implemented in
actual parsing functions.
Some parameter combinations that were previously ignored (and perhaps
produced a warning) are now explicitly rejected:
- if no pattern is specified, RSS types are rejected
- for queue lists and regions, RSS key is rejected
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
drivers/net/intel/i40e/i40e_flow.c | 13 +-
drivers/net/intel/i40e/i40e_hash.c | 437 ++++++++++++++++++-----------
drivers/net/intel/i40e/i40e_hash.h | 2 +-
3 files changed, 274 insertions(+), 178 deletions(-)
diff --git a/drivers/net/intel/i40e/i40e_flow.c b/drivers/net/intel/i40e/i40e_flow.c
index 36e816758c..9f1fb7bbc7 100644
--- a/drivers/net/intel/i40e/i40e_flow.c
+++ b/drivers/net/intel/i40e/i40e_flow.c
@@ -3816,6 +3816,7 @@ i40e_flow_check(struct rte_eth_dev *dev,
if (ret) {
return ret;
}
+ /* action and pattern validation will happen in each respective engine */
if (!pattern) {
rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM_NUM,
@@ -3830,13 +3831,11 @@ i40e_flow_check(struct rte_eth_dev *dev,
return -rte_errno;
}
- /* Get the non-void item of action */
- while ((actions + i)->type == RTE_FLOW_ACTION_TYPE_VOID)
- i++;
-
- if ((actions + i)->type == RTE_FLOW_ACTION_TYPE_RSS) {
- filter_ctx->type = RTE_ETH_FILTER_HASH;
- return i40e_hash_parse(dev, pattern, actions + i, &filter_ctx->rss_conf, error);
+ /* try parsing as RSS */
+ filter_ctx->type = RTE_ETH_FILTER_HASH;
+ ret = i40e_hash_parse(dev, pattern, actions, &filter_ctx->rss_conf, error);
+ if (!ret) {
+ return ret;
}
i = 0;
diff --git a/drivers/net/intel/i40e/i40e_hash.c b/drivers/net/intel/i40e/i40e_hash.c
index 5756ebf255..08bef9d60f 100644
--- a/drivers/net/intel/i40e/i40e_hash.c
+++ b/drivers/net/intel/i40e/i40e_hash.c
@@ -16,6 +16,8 @@
#include "i40e_ethdev.h"
#include "i40e_hash.h"
+#include "../common/flow_check.h"
+
#ifndef BIT
#define BIT(n) (1UL << (n))
#endif
@@ -925,12 +927,7 @@ i40e_hash_parse_key(const struct rte_flow_action_rss *rss_act,
{
const uint8_t *key = rss_act->key;
- if (!key || rss_act->key_len != sizeof(rss_conf->key)) {
- if (rss_act->key_len != sizeof(rss_conf->key))
- PMD_DRV_LOG(WARNING,
- "RSS key length invalid, must be %u bytes, now set key to default",
- (uint32_t)sizeof(rss_conf->key));
-
+ if (key == NULL) {
memcpy(rss_conf->key, i40e_rss_key_default, sizeof(rss_conf->key));
} else {
memcpy(rss_conf->key, key, sizeof(rss_conf->key));
@@ -941,45 +938,29 @@ i40e_hash_parse_key(const struct rte_flow_action_rss *rss_act,
}
static int
-i40e_hash_parse_queues(const struct rte_eth_dev *dev,
- const struct rte_flow_action_rss *rss_act,
- struct i40e_rte_flow_rss_conf *rss_conf,
- struct rte_flow_error *error)
+i40e_hash_parse_pattern_act(const struct rte_eth_dev *dev,
+ const struct rte_flow_item pattern[],
+ const struct rte_flow_action_rss *rss_act,
+ struct i40e_rte_flow_rss_conf *rss_conf,
+ struct rte_flow_error *error)
{
- struct i40e_pf *pf;
- struct i40e_hw *hw;
- uint16_t i;
- uint16_t max_queue;
-
- hw = I40E_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- if (!rss_act->queue_num ||
- rss_act->queue_num > hw->func_caps.rss_table_size)
- return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_CONF,
- NULL, "Invalid RSS queue number");
+ rss_conf->symmetric_enable = rss_act->func == RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ;
if (rss_act->key_len)
- PMD_DRV_LOG(WARNING,
- "RSS key is ignored when queues specified");
+ i40e_hash_parse_key(rss_act, rss_conf);
- pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
- if (pf->dev_data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_VMDQ_FLAG)
- max_queue = i40e_pf_calc_configured_queues_num(pf);
- else
- max_queue = pf->dev_data->nb_rx_queues;
+ rss_conf->conf.func = rss_act->func;
+ rss_conf->conf.types = rss_act->types;
+ rss_conf->inset = i40e_hash_get_inset(rss_act->types, rss_conf->symmetric_enable);
- max_queue = RTE_MIN(max_queue, I40E_MAX_Q_PER_TC);
-
- for (i = 0; i < rss_act->queue_num; i++) {
- if (rss_act->queue[i] >= max_queue)
- break;
- }
-
- if (i < rss_act->queue_num)
- return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_CONF,
- NULL, "Invalid RSS queues");
+ return i40e_hash_get_pattern_pctypes(dev, pattern, rss_act,
+ rss_conf, error);
+}
+static int
+i40e_hash_parse_queues(const struct rte_flow_action_rss *rss_act,
+ struct i40e_rte_flow_rss_conf *rss_conf)
+{
memcpy(rss_conf->queue, rss_act->queue,
rss_act->queue_num * sizeof(rss_conf->queue[0]));
rss_conf->conf.queue = rss_conf->queue;
@@ -988,113 +969,38 @@ i40e_hash_parse_queues(const struct rte_eth_dev *dev,
}
static int
-i40e_hash_parse_queue_region(const struct rte_eth_dev *dev,
- const struct rte_flow_item pattern[],
+i40e_hash_parse_queue_region(const struct rte_flow_item pattern[],
const struct rte_flow_action_rss *rss_act,
struct i40e_rte_flow_rss_conf *rss_conf,
struct rte_flow_error *error)
{
- struct i40e_pf *pf;
const struct rte_flow_item_vlan *vlan_spec, *vlan_mask;
- uint64_t hash_queues;
- uint32_t i;
-
- if (pattern[1].type != RTE_FLOW_ITEM_TYPE_END)
- return rte_flow_error_set(error, ENOTSUP,
- RTE_FLOW_ERROR_TYPE_ITEM_NUM,
- &pattern[1],
- "Pattern not supported.");
vlan_spec = pattern->spec;
vlan_mask = pattern->mask;
- if (!vlan_spec || !vlan_mask ||
- (rte_be_to_cpu_16(vlan_mask->hdr.vlan_tci) >> 13) != 7)
- return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ITEM, pattern,
- "Pattern error.");
- if (!rss_act->queue)
+ /* VLAN must have spec and mask */
+ if (vlan_spec == NULL || vlan_mask == NULL) {
return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_CONF,
- NULL, "Queues not specified");
-
- if (rss_act->key_len)
- PMD_DRV_LOG(WARNING,
- "RSS key is ignored when configure queue region");
+ RTE_FLOW_ERROR_TYPE_ITEM, &pattern[0],
+ "VLAN pattern spec and mask required");
+ }
+ /* for mask, VLAN/TCI must be masked appropriately */
+ if ((rte_be_to_cpu_16(vlan_mask->hdr.vlan_tci) >> 13) != 0x7) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM, &pattern[0],
+ "VLAN pattern mask invalid");
+ }
/* Use a 64 bit variable to represent all queues in a region. */
RTE_BUILD_BUG_ON(I40E_MAX_Q_PER_TC > 64);
- if (!rss_act->queue_num ||
- !rte_is_power_of_2(rss_act->queue_num) ||
- rss_act->queue_num + rss_act->queue[0] > I40E_MAX_Q_PER_TC)
- return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_CONF,
- NULL, "Queue number error");
-
- for (i = 1; i < rss_act->queue_num; i++) {
- if (rss_act->queue[i - 1] + 1 != rss_act->queue[i])
- break;
- }
-
- if (i < rss_act->queue_num)
- return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_CONF,
- NULL,
- "Queues must be incremented continuously");
-
- /* Map all queues to bits of uint64_t */
- hash_queues = (BIT_ULL(rss_act->queue[0] + rss_act->queue_num) - 1) &
- ~(BIT_ULL(rss_act->queue[0]) - 1);
-
- pf = I40E_DEV_PRIVATE_TO_PF(dev->data->dev_private);
- if (hash_queues & ~pf->hash_enabled_queues)
- return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_CONF,
- NULL, "Some queues are not in LUT");
-
rss_conf->region_queue_num = (uint8_t)rss_act->queue_num;
rss_conf->region_queue_start = rss_act->queue[0];
rss_conf->region_priority = rte_be_to_cpu_16(vlan_spec->hdr.vlan_tci) >> 13;
return 0;
}
-static int
-i40e_hash_parse_global_conf(const struct rte_eth_dev *dev,
- const struct rte_flow_item pattern[],
- const struct rte_flow_action_rss *rss_act,
- struct i40e_rte_flow_rss_conf *rss_conf,
- struct rte_flow_error *error)
-{
- if (rss_act->func == RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ)
- return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_CONF,
- NULL,
- "Symmetric function should be set with pattern types");
-
- rss_conf->conf.func = rss_act->func;
-
- if (rss_act->types)
- PMD_DRV_LOG(WARNING,
- "RSS types are ignored when no pattern specified");
-
- if (pattern[0].type == RTE_FLOW_ITEM_TYPE_VLAN)
- return i40e_hash_parse_queue_region(dev, pattern, rss_act,
- rss_conf, error);
-
- if (rss_act->queue)
- return i40e_hash_parse_queues(dev, rss_act, rss_conf, error);
-
- if (rss_act->key_len) {
- i40e_hash_parse_key(rss_act, rss_conf);
- return 0;
- }
-
- if (rss_act->func == RTE_ETH_HASH_FUNCTION_DEFAULT)
- PMD_DRV_LOG(WARNING, "Nothing change");
- return 0;
-}
-
static bool
i40e_hash_validate_rss_types(uint64_t rss_types)
{
@@ -1124,83 +1030,274 @@ i40e_hash_validate_rss_types(uint64_t rss_types)
}
static int
-i40e_hash_parse_pattern_act(const struct rte_eth_dev *dev,
- const struct rte_flow_item pattern[],
- const struct rte_flow_action_rss *rss_act,
- struct i40e_rte_flow_rss_conf *rss_conf,
- struct rte_flow_error *error)
+i40e_hash_validate_rss_pattern(const struct ci_flow_actions *actions,
+ const struct ci_flow_actions_check_param *param __rte_unused,
+ struct rte_flow_error *error)
{
- if (rss_act->queue)
+ const struct rte_flow_action_rss *rss_act = actions->actions[0]->conf;
+
+ /* queue list is not supported */
+ if (rss_act->queue_num != 0) {
return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_CONF,
- NULL,
- "RSS Queues not supported when pattern specified");
- rss_conf->symmetric_enable = false; /* by default, symmetric is disabled */
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "RSS queues not supported when pattern specified");
+ }
+ /* disallow unsupported hash functions */
switch (rss_act->func) {
case RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ:
- rss_conf->symmetric_enable = true;
- break;
case RTE_ETH_HASH_FUNCTION_DEFAULT:
case RTE_ETH_HASH_FUNCTION_TOEPLITZ:
case RTE_ETH_HASH_FUNCTION_SIMPLE_XOR:
break;
default:
return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_CONF,
- NULL,
- "RSS hash function not supported "
- "when pattern specified");
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "RSS hash function not supported when pattern specified");
}
if (!i40e_hash_validate_rss_types(rss_act->types))
return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_CONF,
- NULL, "RSS types are invalid");
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF,
+ rss_act, "RSS types are invalid");
- if (rss_act->key_len)
- i40e_hash_parse_key(rss_act, rss_conf);
+ /* check RSS key length if it is specified */
+ if (rss_act->key_len != 0 && rss_act->key_len != I40E_RSS_KEY_LEN) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "RSS key length must be 52 bytes");
+ }
- rss_conf->conf.func = rss_act->func;
- rss_conf->conf.types = rss_act->types;
- rss_conf->inset = i40e_hash_get_inset(rss_act->types, rss_conf->symmetric_enable);
+ return 0;
+}
- return i40e_hash_get_pattern_pctypes(dev, pattern, rss_act,
- rss_conf, error);
+static int
+i40e_hash_validate_rss_common(const struct rte_flow_action_rss *rss_act,
+ struct rte_flow_error *error)
+{
+ /* RSS level is not supported */
+ if (rss_act->level != 0) {
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "RSS level is not supported");
+ }
+
+ /* for empty patterns, symmetric toeplitz is not supported */
+ if (rss_act->func == RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "Symmetric hash function not supported without specific patterns");
+ }
+
+ /* hash types are not supported for global RSS configuration */
+ if (rss_act->types != 0) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "RSS types not supported without a pattern");
+ }
+
+ /* check RSS key length if it is specified */
+ if (rss_act->key_len != 0 && rss_act->key_len != I40E_RSS_KEY_LEN) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "RSS key length must be 52 bytes");
+ }
+
+ return 0;
+}
+
+static int
+i40e_hash_validate_queue_region(const struct ci_flow_actions *actions,
+ const struct ci_flow_actions_check_param *param,
+ struct rte_flow_error *error)
+{
+ const struct rte_flow_action_rss *rss_act = actions->actions[0]->conf;
+ struct i40e_adapter *adapter = I40E_DEV_PRIVATE_TO_ADAPTER(param->driver_ctx);
+ struct i40e_pf *pf = &adapter->pf;
+ uint64_t hash_queues;
+ int ret;
+
+ ret = i40e_hash_validate_rss_common(rss_act, error);
+ if (ret)
+ return ret;
+
+ RTE_BUILD_BUG_ON(sizeof(hash_queues) != sizeof(pf->hash_enabled_queues));
+
+ /* having RSS key is not supported */
+ if (rss_act->key != NULL) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "RSS key not supported");
+ }
+
+ /* queue region must be specified */
+ if (rss_act->queue_num == 0) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "RSS queues missing");
+ }
+
+ /* queue region must be power of two */
+ if (!rte_is_power_of_2(rss_act->queue_num)) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "RSS queue number must be power of two");
+ }
+
+ /* generic checks already filtered out discontiguous/non-unique RSS queues */
+
+ /* queues must not exceed maximum queues per traffic class */
+ if (rss_act->queue[rss_act->queue_num - 1] >= I40E_MAX_Q_PER_TC) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "Invalid RSS queue index");
+ }
+
+ /* queues must be in LUT */
+ hash_queues = (BIT_ULL(rss_act->queue[0] + rss_act->queue_num) - 1) &
+ ~(BIT_ULL(rss_act->queue[0]) - 1);
+
+ if (hash_queues & ~pf->hash_enabled_queues) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF,
+ rss_act, "Some queues are not in LUT");
+ }
+
+ return 0;
+}
+
+static int
+i40e_hash_validate_queue_list(const struct ci_flow_actions *actions,
+ const struct ci_flow_actions_check_param *param,
+ struct rte_flow_error *error)
+{
+ const struct rte_flow_action_rss *rss_act = actions->actions[0]->conf;
+ struct i40e_adapter *adapter = I40E_DEV_PRIVATE_TO_ADAPTER(param->driver_ctx);
+ struct i40e_pf *pf;
+ struct i40e_hw *hw;
+ uint16_t max_queue;
+ bool has_queue, has_key;
+ int ret;
+
+ ret = i40e_hash_validate_rss_common(rss_act, error);
+ if (ret)
+ return ret;
+
+ has_queue = rss_act->queue != NULL;
+ has_key = rss_act->key != NULL;
+
+ /* if we have queues, we must not have key */
+ if (has_queue && has_key) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "RSS key for queue region is not supported");
+ }
+
+ /* if there are no queues, no further checks needed */
+ if (!has_queue)
+ return 0;
+
+ /* check queue number limits */
+ hw = &adapter->hw;
+ if (rss_act->queue_num > hw->func_caps.rss_table_size) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF,
+ rss_act, "Too many RSS queues");
+ }
+
+ pf = &adapter->pf;
+ if (pf->dev_data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_VMDQ_FLAG)
+ max_queue = i40e_pf_calc_configured_queues_num(pf);
+ else
+ max_queue = pf->dev_data->nb_rx_queues;
+
+ max_queue = RTE_MIN(max_queue, I40E_MAX_Q_PER_TC);
+
+ /* we know RSS queues are contiguous so we only need to check last queue */
+ if (rss_act->queue[rss_act->queue_num - 1] >= max_queue) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "Invalid RSS queue");
+ }
+
+ return 0;
}
int
-i40e_hash_parse(const struct rte_eth_dev *dev,
+i40e_hash_parse(struct rte_eth_dev *dev,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct i40e_rte_flow_rss_conf *rss_conf,
struct rte_flow_error *error)
{
+ struct ci_flow_actions parsed_actions;
+ struct ci_flow_actions_check_param ac_param = {
+ .allowed_types = (enum rte_flow_action_type[]) {
+ RTE_FLOW_ACTION_TYPE_RSS,
+ RTE_FLOW_ACTION_TYPE_END
+ },
+ .max_actions = 1,
+ .driver_ctx = dev->data->dev_private
+ /* each pattern type will add specific check function */
+ };
const struct rte_flow_action_rss *rss_act;
+ int ret;
- if (actions[1].type != RTE_FLOW_ACTION_TYPE_END)
- return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- &actions[1],
- "Only support one action for RSS.");
-
- rss_act = (const struct rte_flow_action_rss *)actions[0].conf;
- if (rss_act->level)
- return rte_flow_error_set(error, ENOTSUP,
- RTE_FLOW_ERROR_TYPE_ACTION_CONF,
- actions,
- "RSS level is not supported");
+ /*
+ * We have two possible paths: global RSS configuration, and an RSS pattern action.
+ *
+ * For global patterns, we act on two types of flows:
+ * - Empty pattern ([END])
+ * - VLAN pattern ([VLAN] -> [END])
+ *
+ * Everything else is handled by pattern action parser.
+ */
+ bool is_empty, is_vlan;
while (pattern->type == RTE_FLOW_ITEM_TYPE_VOID)
pattern++;
- if (pattern[0].type == RTE_FLOW_ITEM_TYPE_END ||
- pattern[0].type == RTE_FLOW_ITEM_TYPE_VLAN)
- return i40e_hash_parse_global_conf(dev, pattern, rss_act,
- rss_conf, error);
+ is_empty = pattern[0].type == RTE_FLOW_ITEM_TYPE_END;
+ is_vlan = pattern[0].type == RTE_FLOW_ITEM_TYPE_VLAN &&
+ pattern[1].type == RTE_FLOW_ITEM_TYPE_END;
- return i40e_hash_parse_pattern_act(dev, pattern, rss_act,
- rss_conf, error);
+ /* VLAN path */
+ if (is_vlan) {
+ ac_param.check = i40e_hash_validate_queue_region;
+ ret = ci_flow_check_actions(actions, &ac_param, &parsed_actions, error);
+ if (ret)
+ return ret;
+ rss_act = parsed_actions.actions[0]->conf;
+ /* set up RSS functions */
+ rss_conf->conf.func = rss_act->func;
+ return i40e_hash_parse_queue_region(pattern, rss_act, rss_conf, error);
+ }
+ /* Empty pattern path */
+ if (is_empty) {
+ ac_param.check = i40e_hash_validate_queue_list;
+ ret = ci_flow_check_actions(actions, &ac_param, &parsed_actions, error);
+ if (ret)
+ return ret;
+ rss_act = parsed_actions.actions[0]->conf;
+ rss_conf->conf.func = rss_act->func;
+ /* if there is a queue list, take that path */
+ if (rss_act->queue != NULL) {
+ return i40e_hash_parse_queues(rss_act, rss_conf);
+ }
+ /* otherwise just parse RSS key */
+ if (rss_act->key != NULL) {
+ i40e_hash_parse_key(rss_act, rss_conf);
+ }
+ return 0;
+ }
+ ac_param.check = i40e_hash_validate_rss_pattern;
+ ret = ci_flow_check_actions(actions, &ac_param, &parsed_actions, error);
+ if (ret)
+ return ret;
+ rss_act = parsed_actions.actions[0]->conf;
+
+ /* pattern case */
+ return i40e_hash_parse_pattern_act(dev, pattern, rss_act, rss_conf, error);
}
static void
diff --git a/drivers/net/intel/i40e/i40e_hash.h b/drivers/net/intel/i40e/i40e_hash.h
index 2513d84565..99df4bccd0 100644
--- a/drivers/net/intel/i40e/i40e_hash.h
+++ b/drivers/net/intel/i40e/i40e_hash.h
@@ -13,7 +13,7 @@
extern "C" {
#endif
-int i40e_hash_parse(const struct rte_eth_dev *dev,
+int i40e_hash_parse(struct rte_eth_dev *dev,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct i40e_rte_flow_rss_conf *rss_conf,
--
2.47.3
^ permalink raw reply related
* [PATCH v4 11/26] net/i40e: use common flow attribute checks
From: Anatoly Burakov @ 2026-05-22 15:14 UTC (permalink / raw)
To: dev, Bruce Richardson
In-Reply-To: <cover.1779462698.git.anatoly.burakov@intel.com>
There is no need to call the same attribute checks in multiple places
when there are no cases where we do otherwise. Therefore, remove all the
attribute check calls from all filter call paths and instead check the
attributes once at the very beginning of flow validation, and use common
flow attribute checks instead of driver-local ones.
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
drivers/net/intel/i40e/i40e_ethdev.h | 1 -
drivers/net/intel/i40e/i40e_flow.c | 121 +++------------------------
2 files changed, 10 insertions(+), 112 deletions(-)
diff --git a/drivers/net/intel/i40e/i40e_ethdev.h b/drivers/net/intel/i40e/i40e_ethdev.h
index d57c53f661..91ad0f8d0e 100644
--- a/drivers/net/intel/i40e/i40e_ethdev.h
+++ b/drivers/net/intel/i40e/i40e_ethdev.h
@@ -1315,7 +1315,6 @@ struct i40e_filter_ctx {
};
typedef int (*parse_filter_t)(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
diff --git a/drivers/net/intel/i40e/i40e_flow.c b/drivers/net/intel/i40e/i40e_flow.c
index c8eaa2b2e5..36e816758c 100644
--- a/drivers/net/intel/i40e/i40e_flow.c
+++ b/drivers/net/intel/i40e/i40e_flow.c
@@ -27,6 +27,8 @@
#include "i40e_ethdev.h"
#include "i40e_hash.h"
+#include "../common/flow_check.h"
+
#define I40E_IPV6_TC_MASK (0xFF << I40E_FDIR_IPv6_TC_OFFSET)
#define I40E_IPV6_FRAG_HEADER 44
#define I40E_TENANT_ARRAY_NUM 3
@@ -76,40 +78,32 @@ static int i40e_flow_parse_tunnel_action(struct rte_eth_dev *dev,
const struct rte_flow_action *actions,
struct rte_flow_error *error,
struct i40e_tunnel_filter_conf *filter);
-static int i40e_flow_parse_attr(const struct rte_flow_attr *attr,
- struct rte_flow_error *error);
static int i40e_flow_parse_ethertype_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
struct i40e_filter_ctx *filter);
static int i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
struct i40e_filter_ctx *filter);
static int i40e_flow_parse_vxlan_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
struct i40e_filter_ctx *filter);
static int i40e_flow_parse_nvgre_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
struct i40e_filter_ctx *filter);
static int i40e_flow_parse_mpls_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
struct i40e_filter_ctx *filter);
static int i40e_flow_parse_gtp_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
@@ -123,7 +117,6 @@ static int i40e_flow_flush_ethertype_filter(struct i40e_pf *pf);
static int i40e_flow_flush_tunnel_filter(struct i40e_pf *pf);
static int
i40e_flow_parse_qinq_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
@@ -135,7 +128,6 @@ i40e_flow_parse_qinq_pattern(struct rte_eth_dev *dev,
struct i40e_tunnel_filter_conf *filter);
static int i40e_flow_parse_l4_cloud_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
@@ -1214,54 +1206,6 @@ i40e_find_parse_filter_func(struct rte_flow_item *pattern, uint32_t *idx)
return parse_filter;
}
-/* Parse attributes */
-static int
-i40e_flow_parse_attr(const struct rte_flow_attr *attr,
- struct rte_flow_error *error)
-{
- /* Must be input direction */
- if (!attr->ingress) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
- attr, "Only support ingress.");
- return -rte_errno;
- }
-
- /* Not supported */
- if (attr->egress) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_EGRESS,
- attr, "Not support egress.");
- return -rte_errno;
- }
-
- /* Not supported */
- if (attr->transfer) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER,
- attr, "Not support transfer.");
- return -rte_errno;
- }
-
- /* Not supported */
- if (attr->priority) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY,
- attr, "Not support priority.");
- return -rte_errno;
- }
-
- /* Not supported */
- if (attr->group) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_GROUP,
- attr, "Not support group.");
- return -rte_errno;
- }
-
- return 0;
-}
-
#define I40E_FLOW_DUMP_CHUNK_BYTES 32
static const char *
@@ -1546,7 +1490,6 @@ i40e_flow_parse_ethertype_action(struct rte_eth_dev *dev,
static int
i40e_flow_parse_ethertype_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
@@ -1565,10 +1508,6 @@ i40e_flow_parse_ethertype_filter(struct rte_eth_dev *dev,
if (ret)
return ret;
- ret = i40e_flow_parse_attr(attr, error);
- if (ret)
- return ret;
-
filter->type = RTE_ETH_FILTER_ETHERTYPE;
return ret;
@@ -2654,7 +2593,6 @@ i40e_flow_parse_fdir_action(struct rte_eth_dev *dev,
static int
i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
@@ -2671,10 +2609,6 @@ i40e_flow_parse_fdir_filter(struct rte_eth_dev *dev,
if (ret)
return ret;
- ret = i40e_flow_parse_attr(attr, error);
- if (ret)
- return ret;
-
filter->type = RTE_ETH_FILTER_FDIR;
return 0;
@@ -2939,7 +2873,6 @@ i40e_flow_parse_l4_pattern(const struct rte_flow_item *pattern,
static int
i40e_flow_parse_l4_cloud_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
@@ -2956,10 +2889,6 @@ i40e_flow_parse_l4_cloud_filter(struct rte_eth_dev *dev,
if (ret)
return ret;
- ret = i40e_flow_parse_attr(attr, error);
- if (ret)
- return ret;
-
filter->type = RTE_ETH_FILTER_TUNNEL;
return ret;
@@ -3190,7 +3119,6 @@ i40e_flow_parse_vxlan_pattern(__rte_unused struct rte_eth_dev *dev,
static int
i40e_flow_parse_vxlan_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
@@ -3208,10 +3136,6 @@ i40e_flow_parse_vxlan_filter(struct rte_eth_dev *dev,
if (ret)
return ret;
- ret = i40e_flow_parse_attr(attr, error);
- if (ret)
- return ret;
-
filter->type = RTE_ETH_FILTER_TUNNEL;
return ret;
@@ -3441,7 +3365,6 @@ i40e_flow_parse_nvgre_pattern(__rte_unused struct rte_eth_dev *dev,
static int
i40e_flow_parse_nvgre_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
@@ -3459,10 +3382,6 @@ i40e_flow_parse_nvgre_filter(struct rte_eth_dev *dev,
if (ret)
return ret;
- ret = i40e_flow_parse_attr(attr, error);
- if (ret)
- return ret;
-
filter->type = RTE_ETH_FILTER_TUNNEL;
return ret;
@@ -3597,7 +3516,6 @@ i40e_flow_parse_mpls_pattern(__rte_unused struct rte_eth_dev *dev,
static int
i40e_flow_parse_mpls_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
@@ -3615,10 +3533,6 @@ i40e_flow_parse_mpls_filter(struct rte_eth_dev *dev,
if (ret)
return ret;
- ret = i40e_flow_parse_attr(attr, error);
- if (ret)
- return ret;
-
filter->type = RTE_ETH_FILTER_TUNNEL;
return ret;
@@ -3749,7 +3663,6 @@ i40e_flow_parse_gtp_pattern(struct rte_eth_dev *dev,
static int
i40e_flow_parse_gtp_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
@@ -3767,10 +3680,6 @@ i40e_flow_parse_gtp_filter(struct rte_eth_dev *dev,
if (ret)
return ret;
- ret = i40e_flow_parse_attr(attr, error);
- if (ret)
- return ret;
-
filter->type = RTE_ETH_FILTER_TUNNEL;
return ret;
@@ -3866,7 +3775,6 @@ i40e_flow_parse_qinq_pattern(__rte_unused struct rte_eth_dev *dev,
static int
i40e_flow_parse_qinq_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
const struct rte_flow_action actions[],
struct rte_flow_error *error,
@@ -3884,10 +3792,6 @@ i40e_flow_parse_qinq_filter(struct rte_eth_dev *dev,
if (ret)
return ret;
- ret = i40e_flow_parse_attr(attr, error);
- if (ret)
- return ret;
-
filter->type = RTE_ETH_FILTER_TUNNEL;
return ret;
@@ -3906,7 +3810,12 @@ i40e_flow_check(struct rte_eth_dev *dev,
uint32_t item_num = 0; /* non-void item number of pattern*/
uint32_t i = 0;
bool flag = false;
- int ret = I40E_NOT_SUPPORTED;
+ int ret;
+
+ ret = ci_flow_check_attr(attr, NULL, error);
+ if (ret) {
+ return ret;
+ }
if (!pattern) {
rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ITEM_NUM,
@@ -3921,22 +3830,11 @@ i40e_flow_check(struct rte_eth_dev *dev,
return -rte_errno;
}
- if (!attr) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR,
- NULL, "NULL attribute.");
- return -rte_errno;
- }
-
/* Get the non-void item of action */
while ((actions + i)->type == RTE_FLOW_ACTION_TYPE_VOID)
i++;
if ((actions + i)->type == RTE_FLOW_ACTION_TYPE_RSS) {
- ret = i40e_flow_parse_attr(attr, error);
- if (ret)
- return ret;
-
filter_ctx->type = RTE_ETH_FILTER_HASH;
return i40e_hash_parse(dev, pattern, actions + i, &filter_ctx->rss_conf, error);
}
@@ -3961,6 +3859,7 @@ i40e_flow_check(struct rte_eth_dev *dev,
i40e_pattern_skip_void_item(items, pattern);
i = 0;
+ ret = I40E_NOT_SUPPORTED;
do {
parse_filter = i40e_find_parse_filter_func(items, &i);
if (!parse_filter && !flag) {
@@ -3973,7 +3872,7 @@ i40e_flow_check(struct rte_eth_dev *dev,
}
if (parse_filter)
- ret = parse_filter(dev, attr, items, actions, error, filter_ctx);
+ ret = parse_filter(dev, items, actions, error, filter_ctx);
flag = true;
} while ((ret < 0) && (i < RTE_DIM(i40e_supported_patterns)));
--
2.47.3
^ permalink raw reply related
* [PATCH v4 10/26] net/ixgbe: use common checks in RSS filter
From: Anatoly Burakov @ 2026-05-22 15:14 UTC (permalink / raw)
To: dev, Vladimir Medvedkin
In-Reply-To: <cover.1779462698.git.anatoly.burakov@intel.com>
Use the common attr and action parsing infrastructure in RSS filter. As a
result, some checks have become more stringent, in particular:
- the group attribute is now explicitly rejected instead of being ignored
- the priority attribute was previously allowed but rejected values bigger
than 0xFFFF despite not using priority anywhere - it is now rejected
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
drivers/net/intel/ixgbe/ixgbe_flow.c | 196 +++++++++++----------------
1 file changed, 79 insertions(+), 117 deletions(-)
diff --git a/drivers/net/intel/ixgbe/ixgbe_flow.c b/drivers/net/intel/ixgbe/ixgbe_flow.c
index 887838c4cd..12c7c6404c 100644
--- a/drivers/net/intel/ixgbe/ixgbe_flow.c
+++ b/drivers/net/intel/ixgbe/ixgbe_flow.c
@@ -112,20 +112,6 @@ const struct rte_flow_item *next_no_void_pattern(
}
}
-static inline
-const struct rte_flow_action *next_no_void_action(
- const struct rte_flow_action actions[],
- const struct rte_flow_action *cur)
-{
- const struct rte_flow_action *next =
- cur ? cur + 1 : &actions[0];
- while (1) {
- if (next->type != RTE_FLOW_ACTION_TYPE_VOID)
- return next;
- next++;
- }
-}
-
/*
* All ixgbe engines mostly check the same stuff, so use a common check.
*/
@@ -2693,6 +2679,56 @@ ixgbe_fdir_flow_program(struct rte_eth_dev *dev,
return 0;
}
+/* Flow actions check specific to RSS filter */
+static int
+ixgbe_flow_actions_check_rss(const struct ci_flow_actions *parsed_actions,
+ const struct ci_flow_actions_check_param *param,
+ struct rte_flow_error *error)
+{
+ const struct rte_flow_action *action = parsed_actions->actions[0];
+ const struct rte_flow_action_rss *rss_act = action->conf;
+ struct rte_eth_dev_data *dev_data = param->driver_ctx;
+ const size_t rss_key_len = sizeof(((struct ixgbe_rte_flow_rss_conf *)0)->key);
+ size_t q_idx, q;
+
+ /* check if queue list is not empty */
+ if (rss_act->queue_num == 0) {
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "RSS queue list is empty");
+ }
+
+ /* check if each RSS queue is valid */
+ for (q_idx = 0; q_idx < rss_act->queue_num; q_idx++) {
+ q = rss_act->queue[q_idx];
+ if (q >= dev_data->nb_rx_queues) {
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "Invalid RSS queue specified");
+ }
+ }
+
+ /* only support default hash function */
+ if (rss_act->func != RTE_ETH_HASH_FUNCTION_DEFAULT) {
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "Non-default RSS hash functions are not supported");
+ }
+ /* levels aren't supported */
+ if (rss_act->level) {
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "A nonzero RSS encapsulation level is not supported");
+ }
+ /* check key length */
+ if (rss_act->key_len != 0 && rss_act->key_len != rss_key_len) {
+ return rte_flow_error_set(error, ENOTSUP,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss_act,
+ "RSS key must be exactly 40 bytes long");
+ }
+ return 0;
+}
+
static int
ixgbe_parse_rss_filter(struct rte_eth_dev *dev,
const struct rte_flow_attr *attr,
@@ -2700,109 +2736,35 @@ ixgbe_parse_rss_filter(struct rte_eth_dev *dev,
struct ixgbe_rte_flow_rss_conf *rss_conf,
struct rte_flow_error *error)
{
- const struct rte_flow_action *act;
- const struct rte_flow_action_rss *rss;
- uint16_t n;
-
- /**
- * rss only supports forwarding,
- * check if the first not void action is RSS.
- */
- act = next_no_void_action(actions, NULL);
- if (act->type != RTE_FLOW_ACTION_TYPE_RSS) {
- memset(rss_conf, 0, sizeof(struct ixgbe_rte_flow_rss_conf));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- return -rte_errno;
- }
-
- rss = (const struct rte_flow_action_rss *)act->conf;
-
- if (!rss || !rss->queue_num) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act,
- "no valid queues");
- return -rte_errno;
- }
-
- for (n = 0; n < rss->queue_num; n++) {
- if (rss->queue[n] >= dev->data->nb_rx_queues) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act,
- "queue id > max number of queues");
- return -rte_errno;
- }
- }
-
- if (rss->func != RTE_ETH_HASH_FUNCTION_DEFAULT)
- return rte_flow_error_set
- (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, act,
- "non-default RSS hash functions are not supported");
- if (rss->level)
- return rte_flow_error_set
- (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, act,
- "a nonzero RSS encapsulation level is not supported");
- if (rss->key_len && rss->key_len != RTE_DIM(rss_conf->key))
- return rte_flow_error_set
- (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, act,
- "RSS hash key must be exactly 40 bytes");
- if (rss->queue_num > RTE_DIM(rss_conf->queue))
- return rte_flow_error_set
- (error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, act,
- "too many queues for RSS context");
- if (ixgbe_rss_conf_init(rss_conf, rss))
- return rte_flow_error_set
- (error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION, act,
- "RSS context initialization failure");
-
- /* check if the next not void item is END */
- act = next_no_void_action(actions, act);
- if (act->type != RTE_FLOW_ACTION_TYPE_END) {
- memset(rss_conf, 0, sizeof(struct ixgbe_rte_flow_rss_conf));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- return -rte_errno;
- }
-
- /* parse attr */
- /* must be input direction */
- if (!attr->ingress) {
- memset(rss_conf, 0, sizeof(struct ixgbe_rte_flow_rss_conf));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
- attr, "Only support ingress.");
- return -rte_errno;
- }
-
- /* not supported */
- if (attr->egress) {
- memset(rss_conf, 0, sizeof(struct ixgbe_rte_flow_rss_conf));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_EGRESS,
- attr, "Not support egress.");
- return -rte_errno;
- }
-
- /* not supported */
- if (attr->transfer) {
- memset(rss_conf, 0, sizeof(struct ixgbe_rte_flow_rss_conf));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER,
- attr, "No support for transfer.");
- return -rte_errno;
- }
-
- if (attr->priority > 0xFFFF) {
- memset(rss_conf, 0, sizeof(struct ixgbe_rte_flow_rss_conf));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY,
- attr, "Error priority.");
- return -rte_errno;
- }
+ struct ci_flow_actions parsed_actions;
+ struct ci_flow_actions_check_param ap_param = {
+ .allowed_types = (const enum rte_flow_action_type[]){
+ /* only rss allowed here */
+ RTE_FLOW_ACTION_TYPE_RSS,
+ RTE_FLOW_ACTION_TYPE_END
+ },
+ .driver_ctx = dev->data,
+ .check = ixgbe_flow_actions_check_rss,
+ .max_actions = 1,
+ };
+ int ret;
+ const struct rte_flow_action *action;
+
+ /* validate attributes */
+ ret = ci_flow_check_attr(attr, NULL, error);
+ if (ret)
+ return ret;
+
+ /* parse requested actions */
+ ret = ci_flow_check_actions(actions, &ap_param, &parsed_actions, error);
+ if (ret)
+ return ret;
+ action = parsed_actions.actions[0];
+
+ if (ixgbe_rss_conf_init(rss_conf, action->conf))
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, NULL,
+ "RSS context initialization failure");
return 0;
}
--
2.47.3
^ permalink raw reply related
* [PATCH v4 09/26] net/ixgbe: use common checks in FDIR filters
From: Anatoly Burakov @ 2026-05-22 15:14 UTC (permalink / raw)
To: dev, Vladimir Medvedkin
In-Reply-To: <cover.1779462698.git.anatoly.burakov@intel.com>
Use the common attr and action parsing infrastructure in flow director
filters (both tunnel and normal). As a result, some checks have become
more stringent, in particular group attribute is now explicitly rejected
instead of being ignored.
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
drivers/net/intel/ixgbe/ixgbe_flow.c | 324 ++++++++++++---------------
1 file changed, 147 insertions(+), 177 deletions(-)
diff --git a/drivers/net/intel/ixgbe/ixgbe_flow.c b/drivers/net/intel/ixgbe/ixgbe_flow.c
index cb7dde5a44..887838c4cd 100644
--- a/drivers/net/intel/ixgbe/ixgbe_flow.c
+++ b/drivers/net/intel/ixgbe/ixgbe_flow.c
@@ -1195,111 +1195,6 @@ ixgbe_parse_l2_tn_filter(struct rte_eth_dev *dev,
return ret;
}
-/* Parse to get the attr and action info of flow director rule. */
-static int
-ixgbe_parse_fdir_act_attr(const struct rte_flow_attr *attr,
- const struct rte_flow_action actions[],
- struct ixgbe_fdir_rule *rule,
- struct rte_flow_error *error)
-{
- const struct rte_flow_action *act;
- const struct rte_flow_action_queue *act_q;
- const struct rte_flow_action_mark *mark;
-
- /* parse attr */
- /* must be input direction */
- if (!attr->ingress) {
- memset(rule, 0, sizeof(struct ixgbe_fdir_rule));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
- attr, "Only support ingress.");
- return -rte_errno;
- }
-
- /* not supported */
- if (attr->egress) {
- memset(rule, 0, sizeof(struct ixgbe_fdir_rule));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_EGRESS,
- attr, "Not support egress.");
- return -rte_errno;
- }
-
- /* not supported */
- if (attr->transfer) {
- memset(rule, 0, sizeof(struct ixgbe_fdir_rule));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER,
- attr, "No support for transfer.");
- return -rte_errno;
- }
-
- /* not supported */
- if (attr->priority) {
- memset(rule, 0, sizeof(struct ixgbe_fdir_rule));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY,
- attr, "Not support priority.");
- return -rte_errno;
- }
-
- /* check if the first not void action is QUEUE or DROP. */
- act = next_no_void_action(actions, NULL);
- if (act->type != RTE_FLOW_ACTION_TYPE_QUEUE &&
- act->type != RTE_FLOW_ACTION_TYPE_DROP) {
- memset(rule, 0, sizeof(struct ixgbe_fdir_rule));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- return -rte_errno;
- }
-
- if (act->type == RTE_FLOW_ACTION_TYPE_QUEUE) {
- act_q = (const struct rte_flow_action_queue *)act->conf;
- rule->queue = act_q->index;
- } else { /* drop */
- /* signature mode does not support drop action. */
- if (rule->mode == RTE_FDIR_MODE_SIGNATURE) {
- memset(rule, 0, sizeof(struct ixgbe_fdir_rule));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- return -rte_errno;
- }
- rule->fdirflags = IXGBE_FDIRCMD_DROP;
- }
-
- /* check if the next not void item is MARK */
- act = next_no_void_action(actions, act);
- if ((act->type != RTE_FLOW_ACTION_TYPE_MARK) &&
- (act->type != RTE_FLOW_ACTION_TYPE_END)) {
- memset(rule, 0, sizeof(struct ixgbe_fdir_rule));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- return -rte_errno;
- }
-
- rule->soft_id = 0;
-
- if (act->type == RTE_FLOW_ACTION_TYPE_MARK) {
- mark = (const struct rte_flow_action_mark *)act->conf;
- rule->soft_id = mark->id;
- act = next_no_void_action(actions, act);
- }
-
- /* check if the next not void item is END */
- if (act->type != RTE_FLOW_ACTION_TYPE_END) {
- memset(rule, 0, sizeof(struct ixgbe_fdir_rule));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- return -rte_errno;
- }
-
- return 0;
-}
-
/* search next no void pattern and skip fuzzy */
static inline
const struct rte_flow_item *next_no_fuzzy_pattern(
@@ -1406,9 +1301,8 @@ static inline uint8_t signature_match(const struct rte_flow_item pattern[])
*/
static int
ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
- const struct rte_flow_action actions[],
+ const struct ci_flow_actions *parsed_actions,
struct ixgbe_fdir_rule *rule,
struct rte_flow_error *error)
{
@@ -1429,30 +1323,13 @@ ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev,
const struct rte_flow_item_vlan *vlan_mask;
const struct rte_flow_item_raw *raw_mask;
const struct rte_flow_item_raw *raw_spec;
+ const struct rte_flow_action *fwd_action, *aux_action;
+ struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
uint8_t j;
- struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
-
- if (!pattern) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ITEM_NUM,
- NULL, "NULL pattern.");
- return -rte_errno;
- }
-
- if (!actions) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_NUM,
- NULL, "NULL action.");
- return -rte_errno;
- }
-
- if (!attr) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR,
- NULL, "NULL attribute.");
- return -rte_errno;
- }
+ fwd_action = parsed_actions->actions[0];
+ /* can be NULL */
+ aux_action = parsed_actions->actions[1];
/**
* Some fields may not be provided. Set spec to 0 and mask to default
@@ -1466,29 +1343,51 @@ ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev,
rule->mask.dst_port_mask = 0;
rule->mask.src_port_mask = 0;
- /**
- * The first not void item should be
- * MAC or IPv4 or TCP or UDP or SCTP.
- */
- item = next_no_fuzzy_pattern(pattern, NULL);
- if (item->type != RTE_FLOW_ITEM_TYPE_ETH &&
- item->type != RTE_FLOW_ITEM_TYPE_IPV4 &&
- item->type != RTE_FLOW_ITEM_TYPE_IPV6 &&
- item->type != RTE_FLOW_ITEM_TYPE_TCP &&
- item->type != RTE_FLOW_ITEM_TYPE_UDP &&
- item->type != RTE_FLOW_ITEM_TYPE_SCTP) {
- memset(rule, 0, sizeof(struct ixgbe_fdir_rule));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ITEM,
- item, "Not supported by fdir filter");
- return -rte_errno;
- }
-
+ /* check if this is a signature match */
if (signature_match(pattern))
rule->mode = RTE_FDIR_MODE_SIGNATURE;
else
rule->mode = RTE_FDIR_MODE_PERFECT;
+ /* set up action */
+ if (fwd_action->type == RTE_FLOW_ACTION_TYPE_QUEUE) {
+ const struct rte_flow_action_queue *q_act = fwd_action->conf;
+ rule->queue = q_act->index;
+ } else {
+ /* signature mode does not support drop action. */
+ if (rule->mode == RTE_FDIR_MODE_SIGNATURE) {
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION, fwd_action,
+ "Signature mode does not support drop action.");
+ return -rte_errno;
+ }
+ rule->fdirflags = IXGBE_FDIRCMD_DROP;
+ }
+
+ /* set up mark action */
+ if (aux_action != NULL && aux_action->type == RTE_FLOW_ACTION_TYPE_MARK) {
+ const struct rte_flow_action_mark *m_act = aux_action->conf;
+ rule->soft_id = m_act->id;
+ }
+
+ /**
+ * The first not void item should be
+ * MAC or IPv4 or TCP or UDP or SCTP.
+ */
+ item = next_no_fuzzy_pattern(pattern, NULL);
+ if (item->type != RTE_FLOW_ITEM_TYPE_ETH &&
+ item->type != RTE_FLOW_ITEM_TYPE_IPV4 &&
+ item->type != RTE_FLOW_ITEM_TYPE_IPV6 &&
+ item->type != RTE_FLOW_ITEM_TYPE_TCP &&
+ item->type != RTE_FLOW_ITEM_TYPE_UDP &&
+ item->type != RTE_FLOW_ITEM_TYPE_SCTP) {
+ memset(rule, 0, sizeof(struct ixgbe_fdir_rule));
+ rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ITEM,
+ item, "Not supported by fdir filter");
+ return -rte_errno;
+ }
+
/*Not supported last point for range*/
if (item->last) {
rte_flow_error_set(error, EINVAL,
@@ -2083,7 +1982,7 @@ ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev,
rule->mask.l4_proto_match =
(rule->ixgbe_fdir.formatted.flow_type & IXGBE_ATR_L4TYPE_MASK) != 0;
- return ixgbe_parse_fdir_act_attr(attr, actions, rule, error);
+ return 0;
}
#define NVGRE_PROTOCOL 0x6558
@@ -2126,9 +2025,8 @@ ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev,
* item->last should be NULL.
*/
static int
-ixgbe_parse_fdir_filter_tunnel(const struct rte_flow_attr *attr,
- const struct rte_flow_item pattern[],
- const struct rte_flow_action actions[],
+ixgbe_parse_fdir_filter_tunnel(const struct rte_flow_item pattern[],
+ const struct ci_flow_actions *parsed_actions,
struct ixgbe_fdir_rule *rule,
struct rte_flow_error *error)
{
@@ -2141,27 +2039,25 @@ ixgbe_parse_fdir_filter_tunnel(const struct rte_flow_attr *attr,
const struct rte_flow_item_eth *eth_mask;
const struct rte_flow_item_vlan *vlan_spec;
const struct rte_flow_item_vlan *vlan_mask;
+ const struct rte_flow_action *fwd_action, *aux_action;
uint32_t j;
- if (!pattern) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ITEM_NUM,
- NULL, "NULL pattern.");
- return -rte_errno;
- }
+ fwd_action = parsed_actions->actions[0];
+ /* can be NULL */
+ aux_action = parsed_actions->actions[1];
- if (!actions) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_NUM,
- NULL, "NULL action.");
- return -rte_errno;
+ /* set up queue/drop action */
+ if (fwd_action->type == RTE_FLOW_ACTION_TYPE_QUEUE) {
+ const struct rte_flow_action_queue *q_act = fwd_action->conf;
+ rule->queue = q_act->index;
+ } else {
+ rule->fdirflags = IXGBE_FDIRCMD_DROP;
}
- if (!attr) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR,
- NULL, "NULL attribute.");
- return -rte_errno;
+ /* set up mark action */
+ if (aux_action != NULL && aux_action->type == RTE_FLOW_ACTION_TYPE_MARK) {
+ const struct rte_flow_action_mark *mark = aux_action->conf;
+ rule->soft_id = mark->id;
}
/**
@@ -2572,7 +2468,56 @@ ixgbe_parse_fdir_filter_tunnel(const struct rte_flow_attr *attr,
* Do nothing.
*/
- return ixgbe_parse_fdir_act_attr(attr, actions, rule, error);
+ return 0;
+}
+
+/*
+ * Check flow director actions
+ */
+static int
+ixgbe_fdir_actions_check(const struct ci_flow_actions *parsed_actions,
+ const struct ci_flow_actions_check_param *param __rte_unused,
+ struct rte_flow_error *error)
+{
+ const enum rte_flow_action_type fwd_actions[] = {
+ RTE_FLOW_ACTION_TYPE_QUEUE,
+ RTE_FLOW_ACTION_TYPE_DROP,
+ RTE_FLOW_ACTION_TYPE_END
+ };
+ const struct rte_flow_action *action, *drop_action = NULL;
+
+ /* do the generic checks first */
+ int ret = ixgbe_flow_actions_check(parsed_actions, param, error);
+ if (ret)
+ return ret;
+
+ /* first action must be a forwarding action */
+ action = parsed_actions->actions[0];
+ if (!ci_flow_action_type_in_list(action->type, fwd_actions)) {
+ return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+ action, "First action must be QUEUE or DROP");
+ }
+ /* remember if we have a drop action */
+ if (action->type == RTE_FLOW_ACTION_TYPE_DROP) {
+ drop_action = action;
+ }
+
+ /* second action, if specified, must not be a forwarding action */
+ action = parsed_actions->actions[1];
+ if (action != NULL && ci_flow_action_type_in_list(action->type, fwd_actions)) {
+ return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+ action, "Conflicting actions");
+ }
+ /* if we didn't have a drop action before but now we do, remember that */
+ if (drop_action == NULL && action != NULL && action->type == RTE_FLOW_ACTION_TYPE_DROP) {
+ drop_action = action;
+ }
+ /* drop must be the only action */
+ if (drop_action != NULL && action != NULL) {
+ return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+ action, "Conflicting actions");
+ }
+ return 0;
}
static int
@@ -2585,22 +2530,47 @@ ixgbe_parse_fdir_filter(struct rte_eth_dev *dev,
{
int ret;
struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct ixgbe_adapter *adapter = IXGBE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
+ struct rte_eth_fdir_conf *fdir_conf = IXGBE_DEV_PRIVATE_TO_FDIR_CONF(adapter);
+ struct ci_flow_actions parsed_actions;
+ struct ci_flow_actions_check_param ap_param = {
+ .allowed_types = (const enum rte_flow_action_type[]){
+ /* queue/mark/drop allowed here */
+ RTE_FLOW_ACTION_TYPE_QUEUE,
+ RTE_FLOW_ACTION_TYPE_DROP,
+ RTE_FLOW_ACTION_TYPE_MARK,
+ RTE_FLOW_ACTION_TYPE_END
+ },
+ .driver_ctx = dev->data,
+ .check = ixgbe_fdir_actions_check
+ };
if (hw->mac.type != ixgbe_mac_82599EB &&
- hw->mac.type != ixgbe_mac_X540 &&
- hw->mac.type != ixgbe_mac_X550 &&
- hw->mac.type != ixgbe_mac_X550EM_x &&
- hw->mac.type != ixgbe_mac_X550EM_a &&
- hw->mac.type != ixgbe_mac_E610)
+ hw->mac.type != ixgbe_mac_X540 &&
+ hw->mac.type != ixgbe_mac_X550 &&
+ hw->mac.type != ixgbe_mac_X550EM_x &&
+ hw->mac.type != ixgbe_mac_X550EM_a &&
+ hw->mac.type != ixgbe_mac_E610)
return -ENOTSUP;
- ret = ixgbe_parse_fdir_filter_normal(dev, attr, pattern,
- actions, rule, error);
+ /* validate attributes */
+ ret = ci_flow_check_attr(attr, NULL, error);
+ if (ret)
+ return ret;
+
+ /* parse requested actions */
+ ret = ci_flow_check_actions(actions, &ap_param, &parsed_actions, error);
+ if (ret)
+ return ret;
+
+ fdir_conf->drop_queue = IXGBE_FDIR_DROP_QUEUE;
+
+ ret = ixgbe_parse_fdir_filter_normal(dev, pattern, &parsed_actions, rule, error);
if (!ret)
return 0;
- return ixgbe_parse_fdir_filter_tunnel(attr, pattern,
- actions, rule, error);
+ return ixgbe_parse_fdir_filter_tunnel(pattern, &parsed_actions,
+ rule, error);
}
static int
--
2.47.3
^ permalink raw reply related
* [PATCH v4 08/26] net/ixgbe: use common checks in security filter
From: Anatoly Burakov @ 2026-05-22 15:14 UTC (permalink / raw)
To: dev, Vladimir Medvedkin
In-Reply-To: <cover.1779462698.git.anatoly.burakov@intel.com>
Use the common attr and action parsing infrastructure in security filter.
As a result, some checks have become more stringent. In particular, group
attribute is now explicitly rejected instead of being ignored.
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
drivers/net/intel/ixgbe/ixgbe_flow.c | 62 ++++++++++------------------
1 file changed, 22 insertions(+), 40 deletions(-)
diff --git a/drivers/net/intel/ixgbe/ixgbe_flow.c b/drivers/net/intel/ixgbe/ixgbe_flow.c
index 9b879f718b..cb7dde5a44 100644
--- a/drivers/net/intel/ixgbe/ixgbe_flow.c
+++ b/drivers/net/intel/ixgbe/ixgbe_flow.c
@@ -539,7 +539,16 @@ ixgbe_parse_security_filter(struct rte_eth_dev *dev, const struct rte_flow_attr
const struct rte_flow_action_security *security;
struct rte_security_session *session;
const struct rte_flow_item *item;
- const struct rte_flow_action *act;
+ struct ci_flow_actions parsed_actions;
+ struct ci_flow_actions_check_param ap_param = {
+ .allowed_types = (const enum rte_flow_action_type[]){
+ /* only security is allowed here */
+ RTE_FLOW_ACTION_TYPE_SECURITY,
+ RTE_FLOW_ACTION_TYPE_END
+ },
+ .max_actions = 1,
+ };
+ const struct rte_flow_action *action;
struct ip_spec spec;
int ret;
@@ -551,45 +560,18 @@ ixgbe_parse_security_filter(struct rte_eth_dev *dev, const struct rte_flow_attr
hw->mac.type != ixgbe_mac_E610)
return -ENOTSUP;
- if (pattern == NULL) {
- rte_flow_error_set(error,
- EINVAL, RTE_FLOW_ERROR_TYPE_ITEM_NUM,
- NULL, "NULL pattern.");
- return -rte_errno;
- }
- if (actions == NULL) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_NUM,
- NULL, "NULL action.");
- return -rte_errno;
- }
- if (attr == NULL) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR,
- NULL, "NULL attribute.");
- return -rte_errno;
- }
+ /* validate attributes */
+ ret = ci_flow_check_attr(attr, NULL, error);
+ if (ret)
+ return ret;
- /* check if next non-void action is security */
- act = next_no_void_action(actions, NULL);
- if (act->type != RTE_FLOW_ACTION_TYPE_SECURITY) {
- return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- }
- security = act->conf;
- if (security == NULL) {
- return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION, act,
- "NULL security action config.");
- }
- /* check if the next not void item is END */
- act = next_no_void_action(actions, act);
- if (act->type != RTE_FLOW_ACTION_TYPE_END) {
- return rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- }
+ /* parse requested actions */
+ ret = ci_flow_check_actions(actions, &ap_param, &parsed_actions, error);
+ if (ret)
+ return ret;
+
+ action = parsed_actions.actions[0];
+ security = action->conf;
/* get the IP pattern*/
item = next_no_void_pattern(pattern, NULL);
@@ -629,7 +611,7 @@ ixgbe_parse_security_filter(struct rte_eth_dev *dev, const struct rte_flow_attr
ret = ixgbe_crypto_add_ingress_sa_from_flow(session, &spec);
if (ret) {
rte_flow_error_set(error, -ret,
- RTE_FLOW_ERROR_TYPE_ACTION, act,
+ RTE_FLOW_ERROR_TYPE_ACTION, action,
"Failed to add security session.");
return -rte_errno;
}
--
2.47.3
^ permalink raw reply related
* [PATCH v4 07/26] net/ixgbe: use common checks in ntuple filter
From: Anatoly Burakov @ 2026-05-22 15:14 UTC (permalink / raw)
To: dev, Vladimir Medvedkin
In-Reply-To: <cover.1779462698.git.anatoly.burakov@intel.com>
Use the common attr and action parsing infrastructure in ntuple filter.
As a result, some checks have become more stringent, in particular the
group attribute is now explicitly rejected instead of being ignored.
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
drivers/net/intel/ixgbe/ixgbe_flow.c | 133 ++++++++-------------------
1 file changed, 36 insertions(+), 97 deletions(-)
diff --git a/drivers/net/intel/ixgbe/ixgbe_flow.c b/drivers/net/intel/ixgbe/ixgbe_flow.c
index 1d93717ce8..9b879f718b 100644
--- a/drivers/net/intel/ixgbe/ixgbe_flow.c
+++ b/drivers/net/intel/ixgbe/ixgbe_flow.c
@@ -210,12 +210,11 @@ ixgbe_flow_actions_check(const struct ci_flow_actions *actions,
static int
cons_parse_ntuple_filter(const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
- const struct rte_flow_action actions[],
+ const struct rte_flow_action_queue *q_act,
struct rte_eth_ntuple_filter *filter,
struct rte_flow_error *error)
{
const struct rte_flow_item *item;
- const struct rte_flow_action *act;
const struct rte_flow_item_ipv4 *ipv4_spec;
const struct rte_flow_item_ipv4 *ipv4_mask;
const struct rte_flow_item_tcp *tcp_spec;
@@ -231,24 +230,11 @@ cons_parse_ntuple_filter(const struct rte_flow_attr *attr,
struct rte_flow_item_eth eth_null;
struct rte_flow_item_vlan vlan_null;
- if (!pattern) {
- rte_flow_error_set(error,
- EINVAL, RTE_FLOW_ERROR_TYPE_ITEM_NUM,
- NULL, "NULL pattern.");
- return -rte_errno;
- }
-
- if (!actions) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_NUM,
- NULL, "NULL action.");
- return -rte_errno;
- }
- if (!attr) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR,
- NULL, "NULL attribute.");
- return -rte_errno;
+ /* Priority must be 16-bit */
+ if (attr->priority > UINT16_MAX) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY, attr,
+ "Priority must be 16-bit");
}
memset(ð_null, 0, sizeof(struct rte_flow_item_eth));
@@ -535,70 +521,11 @@ cons_parse_ntuple_filter(const struct rte_flow_attr *attr,
action:
- /**
- * n-tuple only supports forwarding,
- * check if the first not void action is QUEUE.
- */
- act = next_no_void_action(actions, NULL);
- if (act->type != RTE_FLOW_ACTION_TYPE_QUEUE) {
- memset(filter, 0, sizeof(struct rte_eth_ntuple_filter));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- item, "Not supported action.");
- return -rte_errno;
- }
- filter->queue =
- ((const struct rte_flow_action_queue *)act->conf)->index;
+ filter->queue = q_act->index;
- /* check if the next not void item is END */
- act = next_no_void_action(actions, act);
- if (act->type != RTE_FLOW_ACTION_TYPE_END) {
- memset(filter, 0, sizeof(struct rte_eth_ntuple_filter));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- return -rte_errno;
- }
-
- /* parse attr */
- /* must be input direction */
- if (!attr->ingress) {
- memset(filter, 0, sizeof(struct rte_eth_ntuple_filter));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
- attr, "Only support ingress.");
- return -rte_errno;
- }
-
- /* not supported */
- if (attr->egress) {
- memset(filter, 0, sizeof(struct rte_eth_ntuple_filter));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_EGRESS,
- attr, "Not support egress.");
- return -rte_errno;
- }
-
- /* not supported */
- if (attr->transfer) {
- memset(filter, 0, sizeof(struct rte_eth_ntuple_filter));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER,
- attr, "No support for transfer.");
- return -rte_errno;
- }
-
- if (attr->priority > 0xFFFF) {
- memset(filter, 0, sizeof(struct rte_eth_ntuple_filter));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY,
- attr, "Error priority.");
- return -rte_errno;
- }
filter->priority = (uint16_t)attr->priority;
- if (attr->priority < IXGBE_MIN_N_TUPLE_PRIO ||
- attr->priority > IXGBE_MAX_N_TUPLE_PRIO)
- filter->priority = 1;
+ if (attr->priority < IXGBE_MIN_N_TUPLE_PRIO || attr->priority > IXGBE_MAX_N_TUPLE_PRIO)
+ filter->priority = 1;
return 0;
}
@@ -718,15 +645,40 @@ ixgbe_parse_ntuple_filter(struct rte_eth_dev *dev,
struct rte_eth_ntuple_filter *filter,
struct rte_flow_error *error)
{
- int ret;
struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct ci_flow_attr_check_param attr_param = {
+ .allow_priority = true,
+ };
+ struct ci_flow_actions parsed_actions;
+ struct ci_flow_actions_check_param ap_param = {
+ .allowed_types = (const enum rte_flow_action_type[]){
+ /* only queue is allowed here */
+ RTE_FLOW_ACTION_TYPE_QUEUE,
+ RTE_FLOW_ACTION_TYPE_END
+ },
+ .driver_ctx = dev->data,
+ .check = ixgbe_flow_actions_check,
+ .max_actions = 1,
+ };
+ const struct rte_flow_action *action;
+ int ret;
if (hw->mac.type != ixgbe_mac_82599EB &&
hw->mac.type != ixgbe_mac_X540)
return -ENOTSUP;
- ret = cons_parse_ntuple_filter(attr, pattern, actions, filter, error);
+ /* validate attributes */
+ ret = ci_flow_check_attr(attr, &attr_param, error);
+ if (ret)
+ return ret;
+ /* parse requested actions */
+ ret = ci_flow_check_actions(actions, &ap_param, &parsed_actions, error);
+ if (ret)
+ return ret;
+ action = parsed_actions.actions[0];
+
+ ret = cons_parse_ntuple_filter(attr, pattern, action->conf, filter, error);
if (ret)
return ret;
@@ -739,19 +691,6 @@ ixgbe_parse_ntuple_filter(struct rte_eth_dev *dev,
return -rte_errno;
}
- /* Ixgbe doesn't support many priorities. */
- if (filter->priority < IXGBE_MIN_N_TUPLE_PRIO ||
- filter->priority > IXGBE_MAX_N_TUPLE_PRIO) {
- memset(filter, 0, sizeof(struct rte_eth_ntuple_filter));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ITEM,
- NULL, "Priority not supported by ntuple filter");
- return -rte_errno;
- }
-
- if (filter->queue >= dev->data->nb_rx_queues)
- return -rte_errno;
-
/* fixed value for ixgbe */
filter->flags = RTE_5TUPLE_FLAGS;
return 0;
--
2.47.3
^ permalink raw reply related
* [PATCH v4 06/26] net/ixgbe: use common checks in L2 tunnel filter
From: Anatoly Burakov @ 2026-05-22 15:14 UTC (permalink / raw)
To: dev, Vladimir Medvedkin
In-Reply-To: <cover.1779462698.git.anatoly.burakov@intel.com>
Use the common attr and action parsing infrastructure in L2 tunnel filter.
Some checks have become more stringent as a result, in particular, group
attribute is now explicitly rejected instead of being ignored.
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
drivers/net/intel/ixgbe/ixgbe_flow.c | 149 +++++++++------------------
1 file changed, 48 insertions(+), 101 deletions(-)
diff --git a/drivers/net/intel/ixgbe/ixgbe_flow.c b/drivers/net/intel/ixgbe/ixgbe_flow.c
index fe4ef84dda..1d93717ce8 100644
--- a/drivers/net/intel/ixgbe/ixgbe_flow.c
+++ b/drivers/net/intel/ixgbe/ixgbe_flow.c
@@ -136,6 +136,7 @@ ixgbe_flow_actions_check(const struct ci_flow_actions *actions,
{
const struct rte_flow_action *action;
struct rte_eth_dev_data *dev_data = param->driver_ctx;
+ struct ixgbe_adapter *ad = IXGBE_DEV_PRIVATE_TO_ADAPTER(dev_data->dev_private);
size_t idx;
for (idx = 0; idx < actions->count; idx++) {
@@ -153,6 +154,17 @@ ixgbe_flow_actions_check(const struct ci_flow_actions *actions,
}
break;
}
+ case RTE_FLOW_ACTION_TYPE_VF:
+ {
+ const struct rte_flow_action_vf *vf = action->conf;
+ if (vf->id >= ad->max_vfs) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ action,
+ "VF id out of range");
+ }
+ break;
+ }
default:
/* no specific validation */
break;
@@ -882,12 +894,6 @@ ixgbe_parse_ethertype_filter(struct rte_eth_dev *dev, const struct rte_flow_attr
if (ret)
return ret;
- /* only one action is supported */
- if (parsed_actions.count > 1) {
- return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
- parsed_actions.actions[1],
- "Only one action can be specified at a time");
- }
action = parsed_actions.actions[0];
ret = cons_parse_ethertype_filter(pattern, action, filter, error);
@@ -1133,40 +1139,16 @@ ixgbe_parse_syn_filter(struct rte_eth_dev *dev, const struct rte_flow_attr *attr
*/
static int
cons_parse_l2_tn_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
const struct rte_flow_item pattern[],
- const struct rte_flow_action actions[],
+ const struct rte_flow_action *action,
struct ixgbe_l2_tunnel_conf *filter,
struct rte_flow_error *error)
{
const struct rte_flow_item *item;
const struct rte_flow_item_e_tag *e_tag_spec;
const struct rte_flow_item_e_tag *e_tag_mask;
- const struct rte_flow_action *act;
- const struct rte_flow_action_vf *act_vf;
struct ixgbe_adapter *ad = IXGBE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
- if (!pattern) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ITEM_NUM,
- NULL, "NULL pattern.");
- return -rte_errno;
- }
-
- if (!actions) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_NUM,
- NULL, "NULL action.");
- return -rte_errno;
- }
-
- if (!attr) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR,
- NULL, "NULL attribute.");
- return -rte_errno;
- }
-
/* The first not void item should be e-tag. */
item = next_no_void_pattern(pattern, NULL);
if (item->type != RTE_FLOW_ITEM_TYPE_E_TAG) {
@@ -1224,71 +1206,13 @@ cons_parse_l2_tn_filter(struct rte_eth_dev *dev,
return -rte_errno;
}
- /* parse attr */
- /* must be input direction */
- if (!attr->ingress) {
- memset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
- attr, "Only support ingress.");
- return -rte_errno;
- }
-
- /* not supported */
- if (attr->egress) {
- memset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_EGRESS,
- attr, "Not support egress.");
- return -rte_errno;
- }
-
- /* not supported */
- if (attr->transfer) {
- memset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER,
- attr, "No support for transfer.");
- return -rte_errno;
- }
-
- /* not supported */
- if (attr->priority) {
- memset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY,
- attr, "Not support priority.");
- return -rte_errno;
- }
-
- /* check if the first not void action is VF or PF. */
- act = next_no_void_action(actions, NULL);
- if (act->type != RTE_FLOW_ACTION_TYPE_VF &&
- act->type != RTE_FLOW_ACTION_TYPE_PF) {
- memset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- return -rte_errno;
- }
-
- if (act->type == RTE_FLOW_ACTION_TYPE_VF) {
- act_vf = (const struct rte_flow_action_vf *)act->conf;
+ if (action->type == RTE_FLOW_ACTION_TYPE_VF) {
+ const struct rte_flow_action_vf *act_vf = action->conf;
filter->pool = act_vf->id;
} else {
filter->pool = ad->max_vfs;
}
- /* check if the next not void item is END */
- act = next_no_void_action(actions, act);
- if (act->type != RTE_FLOW_ACTION_TYPE_END) {
- memset(filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- return -rte_errno;
- }
-
return 0;
}
@@ -1300,29 +1224,52 @@ ixgbe_parse_l2_tn_filter(struct rte_eth_dev *dev,
struct ixgbe_l2_tunnel_conf *l2_tn_filter,
struct rte_flow_error *error)
{
+ struct rte_eth_dev_data *dev_data = dev->data;
+ struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev_data->dev_private);
+ struct ci_flow_actions parsed_actions;
+ struct ci_flow_actions_check_param ap_param = {
+ .allowed_types = (const enum rte_flow_action_type[]){
+ /* only vf/pf is allowed here */
+ RTE_FLOW_ACTION_TYPE_VF,
+ RTE_FLOW_ACTION_TYPE_PF,
+ RTE_FLOW_ACTION_TYPE_END
+ },
+ .driver_ctx = dev_data,
+ .check = ixgbe_flow_actions_check,
+ .max_actions = 1,
+ };
int ret = 0;
- struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
- struct ixgbe_adapter *ad = IXGBE_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private);
- uint16_t vf_num;
-
- ret = cons_parse_l2_tn_filter(dev, attr, pattern,
- actions, l2_tn_filter, error);
+ const struct rte_flow_action *action;
if (hw->mac.type != ixgbe_mac_X550 &&
hw->mac.type != ixgbe_mac_X550EM_x &&
hw->mac.type != ixgbe_mac_X550EM_a &&
hw->mac.type != ixgbe_mac_E610) {
- memset(l2_tn_filter, 0, sizeof(struct ixgbe_l2_tunnel_conf));
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,
NULL, "Not supported by L2 tunnel filter");
return -rte_errno;
}
- vf_num = ad->max_vfs;
+ /* validate attributes */
+ ret = ci_flow_check_attr(attr, NULL, error);
+ if (ret)
+ return ret;
- if (l2_tn_filter->pool > vf_num)
- return -rte_errno;
+ /* parse requested actions */
+ ret = ci_flow_check_actions(actions, &ap_param, &parsed_actions, error);
+ if (ret)
+ return ret;
+
+ /* only one action is supported */
+ if (parsed_actions.count > 1) {
+ return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+ parsed_actions.actions[1],
+ "Only one action can be specified at a time");
+ }
+ action = parsed_actions.actions[0];
+
+ ret = cons_parse_l2_tn_filter(dev, pattern, action, l2_tn_filter, error);
return ret;
}
--
2.47.3
^ permalink raw reply related
* [PATCH v4 05/26] net/ixgbe: use common checks in syn filter
From: Anatoly Burakov @ 2026-05-22 15:14 UTC (permalink / raw)
To: dev, Vladimir Medvedkin
In-Reply-To: <cover.1779462698.git.anatoly.burakov@intel.com>
Use the common attr and action parsing infrastructure in syn filter. Some
checks have been rearranged or become more stringent due to using common
infrastructure. In particular, group attr was ignored previously but is
now explicitly rejected.
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
drivers/net/intel/ixgbe/ixgbe_flow.c | 130 +++++++--------------------
1 file changed, 32 insertions(+), 98 deletions(-)
diff --git a/drivers/net/intel/ixgbe/ixgbe_flow.c b/drivers/net/intel/ixgbe/ixgbe_flow.c
index 5816b35f55..fe4ef84dda 100644
--- a/drivers/net/intel/ixgbe/ixgbe_flow.c
+++ b/drivers/net/intel/ixgbe/ixgbe_flow.c
@@ -935,38 +935,13 @@ ixgbe_parse_ethertype_filter(struct rte_eth_dev *dev, const struct rte_flow_attr
* item->last should be NULL.
*/
static int
-cons_parse_syn_filter(const struct rte_flow_attr *attr,
- const struct rte_flow_item pattern[],
- const struct rte_flow_action actions[],
- struct rte_eth_syn_filter *filter,
- struct rte_flow_error *error)
+cons_parse_syn_filter(const struct rte_flow_attr *attr, const struct rte_flow_item pattern[],
+ const struct rte_flow_action_queue *q_act, struct rte_eth_syn_filter *filter,
+ struct rte_flow_error *error)
{
const struct rte_flow_item *item;
- const struct rte_flow_action *act;
const struct rte_flow_item_tcp *tcp_spec;
const struct rte_flow_item_tcp *tcp_mask;
- const struct rte_flow_action_queue *act_q;
-
- if (!pattern) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ITEM_NUM,
- NULL, "NULL pattern.");
- return -rte_errno;
- }
-
- if (!actions) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_NUM,
- NULL, "NULL action.");
- return -rte_errno;
- }
-
- if (!attr) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR,
- NULL, "NULL attribute.");
- return -rte_errno;
- }
/* the first not void item should be MAC or IPv4 or IPv6 or TCP */
@@ -1074,63 +1049,7 @@ cons_parse_syn_filter(const struct rte_flow_attr *attr,
return -rte_errno;
}
- /* check if the first not void action is QUEUE. */
- act = next_no_void_action(actions, NULL);
- if (act->type != RTE_FLOW_ACTION_TYPE_QUEUE) {
- memset(filter, 0, sizeof(struct rte_eth_syn_filter));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- return -rte_errno;
- }
-
- act_q = (const struct rte_flow_action_queue *)act->conf;
- filter->queue = act_q->index;
- if (filter->queue >= IXGBE_MAX_RX_QUEUE_NUM) {
- memset(filter, 0, sizeof(struct rte_eth_syn_filter));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- return -rte_errno;
- }
-
- /* check if the next not void item is END */
- act = next_no_void_action(actions, act);
- if (act->type != RTE_FLOW_ACTION_TYPE_END) {
- memset(filter, 0, sizeof(struct rte_eth_syn_filter));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- return -rte_errno;
- }
-
- /* parse attr */
- /* must be input direction */
- if (!attr->ingress) {
- memset(filter, 0, sizeof(struct rte_eth_syn_filter));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
- attr, "Only support ingress.");
- return -rte_errno;
- }
-
- /* not supported */
- if (attr->egress) {
- memset(filter, 0, sizeof(struct rte_eth_syn_filter));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_EGRESS,
- attr, "Not support egress.");
- return -rte_errno;
- }
-
- /* not supported */
- if (attr->transfer) {
- memset(filter, 0, sizeof(struct rte_eth_syn_filter));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER,
- attr, "No support for transfer.");
- return -rte_errno;
- }
+ filter->queue = q_act->index;
/* Support 2 priorities, the lowest or highest. */
if (!attr->priority) {
@@ -1141,7 +1060,7 @@ cons_parse_syn_filter(const struct rte_flow_attr *attr,
memset(filter, 0, sizeof(struct rte_eth_syn_filter));
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY,
- attr, "Not support priority.");
+ attr, "Priority can be 0 or 0xFFFFFFFF");
return -rte_errno;
}
@@ -1149,15 +1068,27 @@ cons_parse_syn_filter(const struct rte_flow_attr *attr,
}
static int
-ixgbe_parse_syn_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
- const struct rte_flow_item pattern[],
- const struct rte_flow_action actions[],
- struct rte_eth_syn_filter *filter,
- struct rte_flow_error *error)
+ixgbe_parse_syn_filter(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+ const struct rte_flow_item pattern[], const struct rte_flow_action actions[],
+ struct rte_eth_syn_filter *filter, struct rte_flow_error *error)
{
int ret;
struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct ci_flow_actions parsed_actions;
+ struct ci_flow_actions_check_param ap_param = {
+ .allowed_types = (const enum rte_flow_action_type[]){
+ /* only queue is allowed here */
+ RTE_FLOW_ACTION_TYPE_QUEUE,
+ RTE_FLOW_ACTION_TYPE_END
+ },
+ .driver_ctx = dev->data,
+ .check = ixgbe_flow_actions_check,
+ .max_actions = 1,
+ };
+ struct ci_flow_attr_check_param attr_param = {
+ .allow_priority = true,
+ };
+ const struct rte_flow_action *action;
if (hw->mac.type != ixgbe_mac_82599EB &&
hw->mac.type != ixgbe_mac_X540 &&
@@ -1167,16 +1098,19 @@ ixgbe_parse_syn_filter(struct rte_eth_dev *dev,
hw->mac.type != ixgbe_mac_E610)
return -ENOTSUP;
- ret = cons_parse_syn_filter(attr, pattern,
- actions, filter, error);
-
- if (filter->queue >= dev->data->nb_rx_queues)
- return -rte_errno;
+ /* validate attributes */
+ ret = ci_flow_check_attr(attr, &attr_param, error);
+ if (ret)
+ return ret;
+ /* parse requested actions */
+ ret = ci_flow_check_actions(actions, &ap_param, &parsed_actions, error);
if (ret)
return ret;
- return 0;
+ action = parsed_actions.actions[0];
+
+ return cons_parse_syn_filter(attr, pattern, action->conf, filter, error);
}
/**
--
2.47.3
^ permalink raw reply related
* [PATCH v4 04/26] net/ixgbe: use common checks in ethertype filter
From: Anatoly Burakov @ 2026-05-22 15:14 UTC (permalink / raw)
To: dev, Vladimir Medvedkin
In-Reply-To: <cover.1779462698.git.anatoly.burakov@intel.com>
Use the common attr and action parsing infrastructure in ethertype. This
allows us to remove some checks as they are no longer necessary (such as
whether DROP flag was set - if we do not accept DROP actions, we do not set
the DROP flag), as well as make some checks more stringent (such as
rejecting more than one action).
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
drivers/net/intel/ixgbe/ixgbe_flow.c | 190 ++++++++++-----------------
1 file changed, 73 insertions(+), 117 deletions(-)
diff --git a/drivers/net/intel/ixgbe/ixgbe_flow.c b/drivers/net/intel/ixgbe/ixgbe_flow.c
index 9038aae001..5816b35f55 100644
--- a/drivers/net/intel/ixgbe/ixgbe_flow.c
+++ b/drivers/net/intel/ixgbe/ixgbe_flow.c
@@ -46,6 +46,8 @@
#include "base/ixgbe_phy.h"
#include "rte_pmd_ixgbe.h"
+#include "../common/flow_check.h"
+
#define IXGBE_MIN_N_TUPLE_PRIO 1
#define IXGBE_MAX_N_TUPLE_PRIO 7
@@ -124,6 +126,41 @@ const struct rte_flow_action *next_no_void_action(
}
}
+/*
+ * All ixgbe engines mostly check the same stuff, so use a common check.
+ */
+static int
+ixgbe_flow_actions_check(const struct ci_flow_actions *actions,
+ const struct ci_flow_actions_check_param *param,
+ struct rte_flow_error *error)
+{
+ const struct rte_flow_action *action;
+ struct rte_eth_dev_data *dev_data = param->driver_ctx;
+ size_t idx;
+
+ for (idx = 0; idx < actions->count; idx++) {
+ action = actions->actions[idx];
+
+ switch (action->type) {
+ case RTE_FLOW_ACTION_TYPE_QUEUE:
+ {
+ const struct rte_flow_action_queue *queue = action->conf;
+ if (queue->index >= dev_data->nb_rx_queues) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION,
+ action,
+ "queue index out of range");
+ }
+ break;
+ }
+ default:
+ /* no specific validation */
+ break;
+ }
+ }
+ return 0;
+}
+
/**
* Please be aware there's an assumption for all the parsers.
* rte_flow_item is using big endian, rte_flow_attr and
@@ -725,38 +762,14 @@ ixgbe_parse_ntuple_filter(struct rte_eth_dev *dev,
* item->last should be NULL.
*/
static int
-cons_parse_ethertype_filter(const struct rte_flow_attr *attr,
- const struct rte_flow_item *pattern,
- const struct rte_flow_action *actions,
- struct rte_eth_ethertype_filter *filter,
- struct rte_flow_error *error)
+cons_parse_ethertype_filter(const struct rte_flow_item *pattern,
+ const struct rte_flow_action *action,
+ struct rte_eth_ethertype_filter *filter,
+ struct rte_flow_error *error)
{
const struct rte_flow_item *item;
- const struct rte_flow_action *act;
const struct rte_flow_item_eth *eth_spec;
const struct rte_flow_item_eth *eth_mask;
- const struct rte_flow_action_queue *act_q;
-
- if (!pattern) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ITEM_NUM,
- NULL, "NULL pattern.");
- return -rte_errno;
- }
-
- if (!actions) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION_NUM,
- NULL, "NULL action.");
- return -rte_errno;
- }
-
- if (!attr) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR,
- NULL, "NULL attribute.");
- return -rte_errno;
- }
item = next_no_void_pattern(pattern, NULL);
/* The first non-void item should be MAC. */
@@ -826,87 +839,30 @@ cons_parse_ethertype_filter(const struct rte_flow_attr *attr,
return -rte_errno;
}
- /* Parse action */
-
- act = next_no_void_action(actions, NULL);
- if (act->type != RTE_FLOW_ACTION_TYPE_QUEUE &&
- act->type != RTE_FLOW_ACTION_TYPE_DROP) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- return -rte_errno;
- }
-
- if (act->type == RTE_FLOW_ACTION_TYPE_QUEUE) {
- act_q = (const struct rte_flow_action_queue *)act->conf;
- filter->queue = act_q->index;
- } else {
- filter->flags |= RTE_ETHTYPE_FLAGS_DROP;
- }
-
- /* Check if the next non-void item is END */
- act = next_no_void_action(actions, act);
- if (act->type != RTE_FLOW_ACTION_TYPE_END) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ACTION,
- act, "Not supported action.");
- return -rte_errno;
- }
-
- /* Parse attr */
- /* Must be input direction */
- if (!attr->ingress) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_INGRESS,
- attr, "Only support ingress.");
- return -rte_errno;
- }
-
- /* Not supported */
- if (attr->egress) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_EGRESS,
- attr, "Not support egress.");
- return -rte_errno;
- }
-
- /* Not supported */
- if (attr->transfer) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER,
- attr, "No support for transfer.");
- return -rte_errno;
- }
-
- /* Not supported */
- if (attr->priority) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY,
- attr, "Not support priority.");
- return -rte_errno;
- }
-
- /* Not supported */
- if (attr->group) {
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ATTR_GROUP,
- attr, "Not support group.");
- return -rte_errno;
- }
+ filter->queue = ((const struct rte_flow_action_queue *)action->conf)->index;
return 0;
}
static int
-ixgbe_parse_ethertype_filter(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
- const struct rte_flow_item pattern[],
- const struct rte_flow_action actions[],
- struct rte_eth_ethertype_filter *filter,
- struct rte_flow_error *error)
+ixgbe_parse_ethertype_filter(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,
+ const struct rte_flow_item pattern[], const struct rte_flow_action actions[],
+ struct rte_eth_ethertype_filter *filter, struct rte_flow_error *error)
{
int ret;
struct ixgbe_hw *hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct ci_flow_actions parsed_actions;
+ struct ci_flow_actions_check_param ap_param = {
+ .allowed_types = (const enum rte_flow_action_type[]){
+ /* only queue is allowed here */
+ RTE_FLOW_ACTION_TYPE_QUEUE,
+ RTE_FLOW_ACTION_TYPE_END
+ },
+ .max_actions = 1,
+ .driver_ctx = dev->data,
+ .check = ixgbe_flow_actions_check
+ };
+ const struct rte_flow_action *action;
if (hw->mac.type != ixgbe_mac_82599EB &&
hw->mac.type != ixgbe_mac_X540 &&
@@ -916,19 +872,27 @@ ixgbe_parse_ethertype_filter(struct rte_eth_dev *dev,
hw->mac.type != ixgbe_mac_E610)
return -ENOTSUP;
- ret = cons_parse_ethertype_filter(attr, pattern,
- actions, filter, error);
+ /* validate attributes */
+ ret = ci_flow_check_attr(attr, NULL, error);
+ if (ret)
+ return ret;
+ /* parse requested actions */
+ ret = ci_flow_check_actions(actions, &ap_param, &parsed_actions, error);
if (ret)
return ret;
- if (filter->queue >= dev->data->nb_rx_queues) {
- memset(filter, 0, sizeof(struct rte_eth_ethertype_filter));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ITEM,
- NULL, "queue index much too big");
- return -rte_errno;
+ /* only one action is supported */
+ if (parsed_actions.count > 1) {
+ return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+ parsed_actions.actions[1],
+ "Only one action can be specified at a time");
}
+ action = parsed_actions.actions[0];
+
+ ret = cons_parse_ethertype_filter(pattern, action, filter, error);
+ if (ret)
+ return ret;
if (filter->ether_type == RTE_ETHER_TYPE_IPV4 ||
filter->ether_type == RTE_ETHER_TYPE_IPV6) {
@@ -947,14 +911,6 @@ ixgbe_parse_ethertype_filter(struct rte_eth_dev *dev,
return -rte_errno;
}
- if (filter->flags & RTE_ETHTYPE_FLAGS_DROP) {
- memset(filter, 0, sizeof(struct rte_eth_ethertype_filter));
- rte_flow_error_set(error, EINVAL,
- RTE_FLOW_ERROR_TYPE_ITEM,
- NULL, "drop option is unsupported");
- return -rte_errno;
- }
-
return 0;
}
--
2.47.3
^ permalink raw reply related
* [PATCH v4 03/26] net/intel/common: add common flow attr validation
From: Anatoly Burakov @ 2026-05-22 15:14 UTC (permalink / raw)
To: dev, Bruce Richardson
In-Reply-To: <cover.1779462698.git.anatoly.burakov@intel.com>
There are a lot of commonalities between what kinds of flow attr each Intel
driver supports. Add a helper function that will validate attr based on
common requirements and (optional) parameter checks.
Things we check for:
- Rejecting NULL attr (obviously)
- Default to ingress flows
- Transfer, group, priority, and egress are not allowed unless requested
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
drivers/net/intel/common/flow_check.h | 69 +++++++++++++++++++++++++++
1 file changed, 69 insertions(+)
diff --git a/drivers/net/intel/common/flow_check.h b/drivers/net/intel/common/flow_check.h
index 74fb28ae3d..0572028664 100644
--- a/drivers/net/intel/common/flow_check.h
+++ b/drivers/net/intel/common/flow_check.h
@@ -54,6 +54,7 @@ ci_flow_action_type_in_list(const enum rte_flow_action_type type,
/* Forward declarations */
struct ci_flow_actions;
struct ci_flow_actions_check_param;
+struct ci_flow_attr_check_param;
static inline const char *
ci_flow_action_type_to_str(enum rte_flow_action_type type)
@@ -271,6 +272,74 @@ ci_flow_check_actions(const struct rte_flow_action *actions,
return parsed_actions->count == 0 ? -EINVAL : 0;
}
+/**
+ * Parameter structure for attr check.
+ */
+struct ci_flow_attr_check_param {
+ bool allow_priority; /**< True if priority attribute is allowed. */
+ bool allow_transfer; /**< True if transfer attribute is allowed. */
+ bool allow_group; /**< True if group attribute is allowed. */
+ bool expect_egress; /**< True if egress attribute is expected. */
+};
+
+/**
+ * Validate rte_flow_attr structure against specified constraints.
+ *
+ * @param attr Pointer to rte_flow_attr structure to validate.
+ * @param attr_param Pointer to ci_flow_attr_check_param structure specifying constraints.
+ * @param error Pointer to rte_flow_error structure for error reporting.
+ *
+ * @return 0 on success, negative errno on failure.
+ */
+static inline int
+ci_flow_check_attr(const struct rte_flow_attr *attr,
+ const struct ci_flow_attr_check_param *attr_param,
+ struct rte_flow_error *error)
+{
+ if (attr == NULL) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR, attr,
+ "NULL attribute");
+ }
+
+ /* Direction must be either ingress or egress */
+ if (attr->ingress == attr->egress) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR, attr,
+ "Either ingress or egress must be set");
+ }
+
+ /* Expect ingress by default */
+ if (attr->egress && (attr_param == NULL || !attr_param->expect_egress)) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR_EGRESS, attr,
+ "Egress not supported");
+ }
+
+ /* May not be supported */
+ if (attr->transfer && (attr_param == NULL || !attr_param->allow_transfer)) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR_TRANSFER, attr,
+ "Transfer not supported");
+ }
+
+ /* May not be supported */
+ if (attr->group && (attr_param == NULL || !attr_param->allow_group)) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR_GROUP, attr,
+ "Group not supported");
+ }
+
+ /* May not be supported */
+ if (attr->priority && (attr_param == NULL || !attr_param->allow_priority)) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ATTR_PRIORITY, attr,
+ "Priority not supported");
+ }
+
+ return 0;
+}
+
#ifdef __cplusplus
}
#endif
--
2.47.3
^ permalink raw reply related
* [PATCH v4 02/26] net/intel/common: add common flow action parsing
From: Anatoly Burakov @ 2026-05-22 15:14 UTC (permalink / raw)
To: dev, Bruce Richardson
In-Reply-To: <cover.1779462698.git.anatoly.burakov@intel.com>
Currently, each driver has their own code for action parsing, which results
in a lot of duplication and subtle mismatches in behavior between drivers.
Add common infrastructure, based on the following assumptions:
- All drivers support at most 4 actions at once, but usually less
- Not every action is supported by all drivers
- We can check a few common things to filter out obviously wrong actions
- Driver performs semantic checks on all valid actions
So, the intention is to reject everything we can reasonably reject at the
outset without knowing anything about the drivers, parametrize what is
trivial to parametrize, and leave the rest for the driver to implement.
While we're at it, also add logging infrastructure for Intel common code,
using the new component name defines that are automatically passed to each
DPDK driver as it is being built.
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
drivers/net/intel/common/flow_check.h | 278 ++++++++++++++++++++++++++
drivers/net/intel/common/log.h | 40 ++++
2 files changed, 318 insertions(+)
create mode 100644 drivers/net/intel/common/flow_check.h
create mode 100644 drivers/net/intel/common/log.h
diff --git a/drivers/net/intel/common/flow_check.h b/drivers/net/intel/common/flow_check.h
new file mode 100644
index 0000000000..74fb28ae3d
--- /dev/null
+++ b/drivers/net/intel/common/flow_check.h
@@ -0,0 +1,278 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2025 Intel Corporation
+ */
+
+#ifndef _COMMON_INTEL_FLOW_CHECK_H_
+#define _COMMON_INTEL_FLOW_CHECK_H_
+
+#include <bus_pci_driver.h>
+#include <ethdev_driver.h>
+
+#include "log.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * Common attr and action validation code for Intel drivers.
+ */
+
+/**
+ * Maximum number of actions that can be stored in a parsed action list.
+ */
+#define CI_FLOW_PARSED_ACTIONS_MAX 4
+
+/* Actions that are reasonably expected to have a conf structure */
+static const enum rte_flow_action_type need_conf[] = {
+ RTE_FLOW_ACTION_TYPE_QUEUE,
+ RTE_FLOW_ACTION_TYPE_RSS,
+ RTE_FLOW_ACTION_TYPE_VF,
+ RTE_FLOW_ACTION_TYPE_PORT_REPRESENTOR,
+ RTE_FLOW_ACTION_TYPE_COUNT,
+ RTE_FLOW_ACTION_TYPE_MARK,
+ RTE_FLOW_ACTION_TYPE_SECURITY,
+ RTE_FLOW_ACTION_TYPE_END
+};
+
+/**
+ * Is action type in this list of action types?
+ */
+static inline bool
+ci_flow_action_type_in_list(const enum rte_flow_action_type type,
+ const enum rte_flow_action_type list[])
+{
+ size_t i = 0;
+ while (list[i] != RTE_FLOW_ACTION_TYPE_END) {
+ if (type == list[i])
+ return true;
+ i++;
+ }
+ return false;
+}
+
+/* Forward declarations */
+struct ci_flow_actions;
+struct ci_flow_actions_check_param;
+
+static inline const char *
+ci_flow_action_type_to_str(enum rte_flow_action_type type)
+{
+ const char *name = NULL;
+ int ret;
+
+ ret = rte_flow_conv(RTE_FLOW_CONV_OP_ACTION_NAME_PTR,
+ &name, sizeof(name), (const void *)(uintptr_t)type, NULL);
+ if (ret < 0 || name == NULL)
+ return "UNKNOWN";
+
+ return name;
+}
+
+/**
+ * Driver-specific action list validation callback.
+ *
+ * Performs driver-specific validation of action parameter list.
+ * Called after all actions have been parsed and added to the list,
+ * allowing validation based on the complete action set.
+ *
+ * @param actions
+ * The complete list of parsed actions (for context-dependent validation).
+ * @param driver_ctx
+ * Opaque driver context (e.g., adapter/queue configuration).
+ * @param error
+ * Pointer to rte_flow_error for reporting failures.
+ * @return
+ * 0 on success, negative errno on failure.
+ */
+typedef int (*ci_flow_actions_check_fn)(const struct ci_flow_actions *actions,
+ const struct ci_flow_actions_check_param *param,
+ struct rte_flow_error *error);
+
+/**
+ * List of actions that we know we've validated.
+ */
+struct ci_flow_actions {
+ /* Number of actions in the list. */
+ uint8_t count;
+ /* Parsed actions array. */
+ struct rte_flow_action const *actions[CI_FLOW_PARSED_ACTIONS_MAX];
+};
+
+/**
+ * Parameters for action list validation. Any element can be NULL/0 as checks are only performed
+ * against constraints specified.
+ */
+struct ci_flow_actions_check_param {
+ /**
+ * Driver-specific context pointer (e.g., adapter/queue configuration). Can be NULL.
+ */
+ void *driver_ctx;
+ /**
+ * Driver-specific action list validation callback. Can be NULL.
+ */
+ ci_flow_actions_check_fn check;
+ /**
+ * Allowed action types for this parse parameter. Must be terminated with
+ * RTE_FLOW_ACTION_TYPE_END. Can be NULL.
+ */
+ const enum rte_flow_action_type *allowed_types;
+ size_t max_actions; /**< Maximum number of actions allowed. */
+ bool rss_queues_contig; /**< If true, RSS queues must be contiguous. */
+};
+
+static inline int
+__flow_action_check_rss(const struct rte_flow_action_rss *rss,
+ const struct ci_flow_actions_check_param *param,
+ struct rte_flow_error *error)
+{
+ uint32_t qnum, q;
+
+ qnum = rss->queue_num;
+
+ /* either we have both queues and queue number, or we have neither */
+ if ((qnum == 0) != (rss->queue == NULL)) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss,
+ "If queue number is specified, queue array must also be specified");
+ }
+ /* check if queues are monotonic */
+ for (q = 1; q < qnum; q++) {
+ if (rss->queue[q] < rss->queue[q - 1]) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss,
+ "RSS queues must be in ascending order");
+ }
+ /* if user has requested contiguousness, check that as well */
+ if (param == NULL || !param->rss_queues_contig)
+ continue;
+ if (rss->queue[q] != rss->queue[0] + q) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss,
+ "RSS queues must be contiguous");
+ }
+ }
+ /* if user has requested to check for queue contiguousness, do it */
+ if (param != NULL && param->rss_queues_contig) {
+ }
+
+ /* either we have both key and key length, or we have neither */
+ if ((rss->key_len == 0) != (rss->key == NULL)) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, rss,
+ "If RSS key is specified, key length must also be specified");
+ }
+ return 0;
+}
+
+static inline int
+__flow_action_check_generic(const struct rte_flow_action *action,
+ const struct ci_flow_actions_check_param *param,
+ struct rte_flow_error *error)
+{
+ /* is this action in our allowed list? */
+ if (param != NULL && param->allowed_types != NULL &&
+ !ci_flow_action_type_in_list(action->type, param->allowed_types)) {
+ return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+ action, "Unsupported action");
+ }
+ /* do we need to validate presence of conf? */
+ if (ci_flow_action_type_in_list(action->type, need_conf)) {
+ if (action->conf == NULL) {
+ return rte_flow_error_set(error, EINVAL,
+ RTE_FLOW_ERROR_TYPE_ACTION_CONF, action,
+ "Action requires configuration");
+ }
+ }
+
+ /* type-specific validation */
+ switch (action->type) {
+ case RTE_FLOW_ACTION_TYPE_RSS:
+ {
+ const struct rte_flow_action_rss *rss =
+ (const struct rte_flow_action_rss *)action->conf;
+ int ret;
+
+ ret = __flow_action_check_rss(rss, param, error);
+ if (ret < 0)
+ return ret;
+ break;
+ }
+ default:
+ /* no specific validation */
+ break;
+ }
+
+ return 0;
+}
+
+/**
+ * Validate and parse a list of rte_flow_action into a parsed action list.
+ *
+ * @param actions pointer to array of rte_flow_action, terminated by RTE_FLOW_ACTION_TYPE_END
+ * @param param pointer to ci_flow_actions_check_param structure (can be NULL)
+ * @param parsed_actions pointer to ci_flow_actions structure to store parsed actions
+ * @param error pointer to rte_flow_error structure for error reporting
+ *
+ * @return 0 on success, negative errno on failure.
+ */
+static inline int
+ci_flow_check_actions(const struct rte_flow_action *actions,
+ const struct ci_flow_actions_check_param *param,
+ struct ci_flow_actions *parsed_actions,
+ struct rte_flow_error *error)
+{
+ size_t i = 0;
+ int ret;
+
+ if (actions == NULL) {
+ return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+ NULL, "Missing actions");
+ }
+
+ /* reset the list */
+ *parsed_actions = (struct ci_flow_actions){0};
+
+ while (actions[i].type != RTE_FLOW_ACTION_TYPE_END) {
+ const struct rte_flow_action *action = &actions[i++];
+
+ /* skip VOID actions */
+ if (action->type == RTE_FLOW_ACTION_TYPE_VOID)
+ continue;
+
+ /* generic validation for actions - this will check against param as well */
+ ret = __flow_action_check_generic(action, param, error);
+ if (ret < 0)
+ return ret;
+
+ /* add action to the list */
+ if (parsed_actions->count >= RTE_DIM(parsed_actions->actions)) {
+ return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+ action, "Too many actions");
+ }
+ /* user may have specified a maximum number of actions */
+ if (param != NULL && param->max_actions != 0 &&
+ parsed_actions->count >= param->max_actions) {
+ return rte_flow_error_set(error, EINVAL, RTE_FLOW_ERROR_TYPE_ACTION,
+ action, "Too many actions");
+ }
+ CI_DRV_LOG(DEBUG, "Parsed action %u: type=%s", parsed_actions->count,
+ ci_flow_action_type_to_str(action->type));
+ parsed_actions->actions[parsed_actions->count++] = action;
+ }
+
+ /* now, call into user validation if specified */
+ if (param != NULL && param->check != NULL) {
+ ret = param->check(parsed_actions, param, error);
+ if (ret < 0)
+ return ret;
+ }
+ /* if we didn't parse anything, valid action list is empty */
+ return parsed_actions->count == 0 ? -EINVAL : 0;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _COMMON_INTEL_FLOW_CHECK_H_ */
diff --git a/drivers/net/intel/common/log.h b/drivers/net/intel/common/log.h
new file mode 100644
index 0000000000..d99e4d1a37
--- /dev/null
+++ b/drivers/net/intel/common/log.h
@@ -0,0 +1,40 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2026 Intel Corporation
+ */
+
+#ifndef _COMMON_INTEL_LOG_H_
+#define _COMMON_INTEL_LOG_H_
+
+#include <rte_log.h>
+
+/*
+ * Common logging for shared Intel driver code.
+ *
+ * This header must only be included from driver translation units, where the
+ * build system has already defined RTE_COMPONENT_NAME (e.g. "iavf"). It uses
+ * that token to reference the per-driver logtype variable that every Intel
+ * driver registers (e.g. iavf_logtype_driver), so no additional setup is
+ * needed beyond what each driver already provides.
+ *
+ * Usage: CI_DRV_LOG(DEBUG, "format %s", arg);
+ */
+
+#ifndef RTE_COMPONENT_NAME
+/* CI_DRV_LOG is a no-op when included outside a driver build context. */
+#define CI_DRV_LOG(level, fmt, ...) do { } while (0)
+#else /* RTE_COMPONENT_NAME */
+
+/* Resolves to the per-driver logtype variable, e.g. iavf_logtype_driver. */
+#define CI_DRV_LOGTYPE RTE_CONCAT(RTE_COMPONENT_NAME, _logtype_driver)
+
+/* Forward-declare the logtype so shared headers need not include driver headers. */
+extern int CI_DRV_LOGTYPE;
+
+#define CI_DRV_LOG(level, fmt, ...) \
+ rte_log(RTE_LOG_##level, CI_DRV_LOGTYPE, \
+ "PMD_INTEL_COMMON: %s(): " fmt "\n", \
+ __func__, ##__VA_ARGS__)
+
+#endif /* RTE_COMPONENT_NAME */
+
+#endif /* _COMMON_INTEL_LOG_H_ */
--
2.47.3
^ permalink raw reply related
* [PATCH v4 01/26] eal/common: add token concatenation macro
From: Anatoly Burakov @ 2026-05-22 15:14 UTC (permalink / raw)
To: dev
In-Reply-To: <cover.1779462698.git.anatoly.burakov@intel.com>
Add `RTE_CONCAT()` macro to enable token concatenation with proper macro
expansion.
Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
---
lib/eal/include/rte_common.h | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/eal/include/rte_common.h b/lib/eal/include/rte_common.h
index 0a356abae2..05e72e500e 100644
--- a/lib/eal/include/rte_common.h
+++ b/lib/eal/include/rte_common.h
@@ -918,6 +918,10 @@ __extension__ typedef uint64_t RTE_MARKER64[0];
/** Take a macro value and get a string version of it */
#define RTE_STR(x) _RTE_STR(x)
+/** Concatenate two tokens after expanding macros in both. */
+#define _RTE_CONCAT2(a, b) a ## b
+#define RTE_CONCAT(a, b) _RTE_CONCAT2(a, b)
+
/**
* ISO C helpers to modify format strings using variadic macros.
* This is a replacement for the ", ## __VA_ARGS__" GNU extension.
--
2.47.3
^ permalink raw reply related
* [PATCH v4 00/26] Add common flow attr/action parsing infrastructure to Intel PMD's
From: Anatoly Burakov @ 2026-05-22 15:14 UTC (permalink / raw)
To: dev
In-Reply-To: <cover.1770819433.git.anatoly.burakov@intel.com>
This patchset introduces common flow attr/action checking infrastructure to
some Intel PMD's (IXGBE, I40E, IAVF, and ICE). The aim is to reduce code
duplication, simplify implementation of new parsers/verification of existing
ones, and make action/attr handling more consistent across drivers.
v4:
- First few commits were integrated as part of a different patchset
- Added more logging to common infrastructure
- RSS validation now allows discontiguous queue lists by default
- Fixed some checks being too stringent and failing common validation
v3:
- Rebase on latest next-net-intel
- Added 4 new commits that have to do with not using `rte_eth_dev` in rte_flow
- Converted the remaining commits to use adapter structures everywhere
- Minor fixes in how return values are handled
- Fixed incorrect check in i40e RSS validation
v2:
- Rebase on latest main
- Now depends on series 37585 [1]
[1] https://patches.dpdk.org/project/dpdk/list/?series=37585
Anatoly Burakov (21):
eal/common: add token concatenation macro
net/intel/common: add common flow action parsing
net/intel/common: add common flow attr validation
net/ixgbe: use common checks in ethertype filter
net/ixgbe: use common checks in syn filter
net/ixgbe: use common checks in L2 tunnel filter
net/ixgbe: use common checks in ntuple filter
net/ixgbe: use common checks in security filter
net/ixgbe: use common checks in FDIR filters
net/ixgbe: use common checks in RSS filter
net/i40e: use common flow attribute checks
net/i40e: refactor RSS flow parameter checks
net/i40e: use common action checks for ethertype
net/i40e: use common action checks for FDIR
net/i40e: use common action checks for tunnel
net/iavf: use common flow attribute checks
net/iavf: use common action checks for IPsec
net/iavf: use common action checks for hash
net/iavf: use common action checks for FDIR
net/iavf: use common action checks for fsub
net/iavf: use common action checks for flow query
Vladimir Medvedkin (5):
net/ice: use common flow attribute checks
net/ice: use common action checks for hash
net/ice: use common action checks for FDIR
net/ice: use common action checks for switch
net/ice: use common action checks for ACL
drivers/net/intel/common/flow_check.h | 347 ++++++
drivers/net/intel/common/log.h | 40 +
drivers/net/intel/i40e/i40e_ethdev.h | 1 -
drivers/net/intel/i40e/i40e_flow.c | 433 +++-----
drivers/net/intel/i40e/i40e_hash.c | 437 +++++---
drivers/net/intel/i40e/i40e_hash.h | 2 +-
drivers/net/intel/iavf/iavf_fdir.c | 367 +++---
drivers/net/intel/iavf/iavf_fsub.c | 261 ++---
drivers/net/intel/iavf/iavf_generic_flow.c | 107 +-
drivers/net/intel/iavf/iavf_generic_flow.h | 2 +-
drivers/net/intel/iavf/iavf_hash.c | 153 +--
drivers/net/intel/iavf/iavf_ipsec_crypto.c | 43 +-
drivers/net/intel/ice/ice_acl_filter.c | 146 ++-
drivers/net/intel/ice/ice_fdir_filter.c | 384 ++++---
drivers/net/intel/ice/ice_generic_flow.c | 59 +-
drivers/net/intel/ice/ice_generic_flow.h | 2 +-
drivers/net/intel/ice/ice_hash.c | 190 ++--
drivers/net/intel/ice/ice_switch_filter.c | 388 +++----
drivers/net/intel/ixgbe/ixgbe_flow.c | 1166 +++++++-------------
lib/eal/include/rte_common.h | 4 +
20 files changed, 2264 insertions(+), 2268 deletions(-)
create mode 100644 drivers/net/intel/common/flow_check.h
create mode 100644 drivers/net/intel/common/log.h
--
2.47.3
^ permalink raw reply
* Re: [PATCH v2 0/2] Update IDPF Base Code
From: Bruce Richardson @ 2026-05-22 15:09 UTC (permalink / raw)
To: Soumyadeep Hore; +Cc: manoj.kumar.subbarao, aman.deep.singh, dev
In-Reply-To: <20260520220306.85273-1-soumyadeep.hore@intel.com>
On Wed, May 20, 2026 at 06:03:04PM -0400, Soumyadeep Hore wrote:
> Update idpf base code with compatible configuration on MEV.
>
> ---
> v2:
> - lists only LTS releases
> - lists releases in descending order, so that latest is on top
> - reworks table to use the new RST table format
> ---
>
> Christopher Pau (1):
> net/idpf/base: add MMG device IDs
>
> Soumyadeep Hore (1):
> doc: update recommended matching versions for cpfl and idpf
>
Applied to next-net-intel.
Thanks,
/Bruce
^ permalink raw reply
* [PATCH v1 5/5] fib6: speed up tbl8 reservation accounting
From: Maxime Leroy @ 2026-05-22 14:58 UTC (permalink / raw)
To: Vladimir Medvedkin; +Cc: dev, stable, Maxime Leroy
In-Reply-To: <20260522145855.1748406-1-maxime@leroys.fr>
Replace the local count_empty_levels() helper, which issued up to 13
rte_rib6_get_nxt() calls each descending the binary tree from root,
with the new __rte_internal rte_rib6_count_empty_supernets(). The
latter descends once and consults the valid_descendants counter
maintained inside rte_rib6, answering all byte boundary questions
in O(tree depth) with O(1) work per boundary.
For a /128 ADD with ancestors at every byte boundary, this reduces
the worst-case query cost from 13 trie descents to 1.
Signed-off-by: Maxime Leroy <maxime@leroys.fr>
---
lib/fib/trie.c | 30 +++---------------------------
1 file changed, 3 insertions(+), 27 deletions(-)
diff --git a/lib/fib/trie.c b/lib/fib/trie.c
index 44b90f72ff..b6ef626fd4 100644
--- a/lib/fib/trie.c
+++ b/lib/fib/trie.c
@@ -13,6 +13,7 @@
#include <rte_rib6.h>
#include <rte_fib6.h>
+#include <rib6_internal.h>
#include "fib_log.h"
#include "trie.h"
@@ -534,31 +535,6 @@ modify_dp(struct rte_trie_tbl *dp, struct rte_rib6 *rib,
return 0;
}
-/*
- * Count byte boundaries between 24 and CEIL(depth, 8) where the
- * supernet of ip has no descendant in the RIB. This is the number of
- * new tbl8 levels an ADD of ip/depth would introduce, or the number
- * to free at DEL once the prefix has been removed from the RIB.
- *
- * A NULL answer at level L propagates upwards: narrower supernets at
- * L+8, L+16, ... are subsets of S_L and cannot contain descendants
- * either. The loop stops at the first NULL and tallies the remaining
- * boundaries in one shot.
- */
-static uint8_t
-count_empty_levels(struct rte_rib6 *rib, const struct rte_ipv6_addr *ip,
- uint8_t depth)
-{
- uint8_t level, top = RTE_ALIGN_CEIL(depth, 8);
-
- for (level = 24; level < top; level += 8) {
- if (rte_rib6_get_nxt(rib, ip, level, NULL,
- RTE_RIB6_GET_NXT_COVER) == NULL)
- return (top - level) >> 3;
- }
- return 0;
-}
-
int
trie_modify(struct rte_fib6 *fib, const struct rte_ipv6_addr *ip,
uint8_t depth, uint64_t next_hop, int op)
@@ -596,7 +572,7 @@ trie_modify(struct rte_fib6 *fib, const struct rte_ipv6_addr *ip,
return 0;
}
- new_levels = count_empty_levels(rib, &ip_masked, depth);
+ new_levels = rte_rib6_count_empty_supernets(rib, &ip_masked, depth);
if (dp->rsvd_tbl8s + new_levels > dp->number_tbl8s)
return -ENOSPC;
@@ -635,7 +611,7 @@ trie_modify(struct rte_fib6 *fib, const struct rte_ipv6_addr *ip,
if (ret != 0)
return ret;
rte_rib6_remove(rib, &ip_masked, depth);
- dp->rsvd_tbl8s -= count_empty_levels(rib, &ip_masked, depth);
+ dp->rsvd_tbl8s -= rte_rib6_count_empty_supernets(rib, &ip_masked, depth);
return 0;
default:
break;
--
2.43.0
^ permalink raw reply related
* [PATCH v1 4/5] rib: track valid descendant count per node
From: Maxime Leroy @ 2026-05-22 14:58 UTC (permalink / raw)
To: Vladimir Medvedkin; +Cc: dev, stable, Maxime Leroy
In-Reply-To: <20260522145855.1748406-1-maxime@leroys.fr>
Add a uint32_t field to struct rte_rib6_node that counts valid prefixes
in the node's subtree (excluding self). Maintained incrementally on
insert (when a node becomes valid) and remove (when a node becomes
invalid), in O(tree depth) per operation.
The field fits in the padding before ext[]; the node size and ext[]
offset are unchanged. uint32_t is required because a single subtree
may hold more than 65535 BGP routes.
Expose an __rte_internal helper rte_rib6_count_empty_supernets()
via a new private header lib/rib/rib6_internal.h that descends the
tree once and reports how many byte boundaries below a given prefix
have no valid descendant. lib/fib uses this to maintain tbl8
reservation accounting in a single tree walk instead of one
rte_rib6_get_nxt() call per byte boundary.
Signed-off-by: Maxime Leroy <maxime@leroys.fr>
---
app/test/test_rib6.c | 92 +++++++++++++++++++++++++++++++++++++++++
lib/rib/rib6_internal.h | 37 +++++++++++++++++
lib/rib/rte_rib6.c | 80 +++++++++++++++++++++++++++++++++++
3 files changed, 209 insertions(+)
create mode 100644 lib/rib/rib6_internal.h
diff --git a/app/test/test_rib6.c b/app/test/test_rib6.c
index 0295a9640c..a1a6ab17f4 100644
--- a/app/test/test_rib6.c
+++ b/app/test/test_rib6.c
@@ -8,6 +8,7 @@
#include <stdlib.h>
#include <rte_ip6.h>
#include <rte_rib6.h>
+#include <rib6_internal.h>
#include "test.h"
@@ -20,6 +21,7 @@ static int32_t test_insert_invalid(void);
static int32_t test_get_fn(void);
static int32_t test_basic(void);
static int32_t test_tree_traversal(void);
+static int32_t test_empty_supernets(void);
#define MAX_DEPTH 128
#define MAX_RULES (1 << 22)
@@ -322,6 +324,95 @@ test_tree_traversal(void)
return TEST_SUCCESS;
}
+/*
+ * Exercise rte_rib6_count_empty_supernets() which depends on the
+ * valid_descendants counter maintained on insert/remove.
+ */
+int32_t
+test_empty_supernets(void)
+{
+ struct rte_rib6 *rib = NULL;
+ struct rte_rib6_conf config;
+ struct rte_ipv6_addr ip = RTE_IPV6(0xfcde, 0, 0, 0, 0, 0, 0, 0);
+ struct rte_ipv6_addr sibling = RTE_IPV6(0xfcde, 0, 0, 0, 0, 0, 0, 1);
+ uint8_t cnt;
+
+ config.max_nodes = 64;
+ config.ext_sz = 0;
+
+ rib = rte_rib6_create(__func__, SOCKET_ID_ANY, &config);
+ RTE_TEST_ASSERT(rib != NULL, "Failed to create RIB\n");
+
+ /* depth <= 24: no byte boundaries above to inspect. */
+ cnt = rte_rib6_count_empty_supernets(rib, &ip, 24);
+ RTE_TEST_ASSERT(cnt == 0, "depth 24 must return 0, got %u\n", cnt);
+
+ /* Empty RIB, /128 query: 13 byte boundaries (24..120) all empty. */
+ cnt = rte_rib6_count_empty_supernets(rib, &ip, 128);
+ RTE_TEST_ASSERT(cnt == 13, "empty RIB /128 must return 13, got %u\n", cnt);
+
+ /* Insert a /32 ancestor: level 24 now has a descendant, levels
+ * 32..120 still empty -> 12.
+ */
+ RTE_TEST_ASSERT(rte_rib6_insert(rib, &ip, 32) != NULL,
+ "Failed to insert /32\n");
+ cnt = rte_rib6_count_empty_supernets(rib, &ip, 128);
+ RTE_TEST_ASSERT(cnt == 12, "after /32 ADD: expected 12, got %u\n", cnt);
+
+ /* Insert a /48 below: levels 24, 32 and 40 see /48 as descendant,
+ * 48..120 empty -> 10.
+ */
+ RTE_TEST_ASSERT(rte_rib6_insert(rib, &ip, 48) != NULL,
+ "Failed to insert /48\n");
+ cnt = rte_rib6_count_empty_supernets(rib, &ip, 128);
+ RTE_TEST_ASSERT(cnt == 10, "after /48 ADD: expected 10, got %u\n", cnt);
+
+ /* Insert a sibling /128 that shares a long common prefix with ip
+ * but differs in the last bits. This forces creation of a
+ * common_node and exercises the inherited valid_descendants of
+ * that synthesized intermediate.
+ */
+ RTE_TEST_ASSERT(rte_rib6_insert(rib, &sibling, 128) != NULL,
+ "Failed to insert sibling /128\n");
+ /* sibling shares prefix with ip down to bit 127; for the query on
+ * ip/128, all byte boundaries 24..120 have descendants (the /32,
+ * /48 and the sibling /128 chain) -> 0 empty levels.
+ */
+ cnt = rte_rib6_count_empty_supernets(rib, &ip, 128);
+ RTE_TEST_ASSERT(cnt == 0, "fully populated chain: expected 0, got %u\n",
+ cnt);
+
+ /* Remove the /32 ancestor: /48 and /128 sibling still cover all
+ * byte boundaries 24..120 -> still 0 empty levels.
+ */
+ rte_rib6_remove(rib, &ip, 32);
+ cnt = rte_rib6_count_empty_supernets(rib, &ip, 128);
+ RTE_TEST_ASSERT(cnt == 0,
+ "after /32 DEL still covered: expected 0, got %u\n", cnt);
+
+ /* Remove the /48: only the /128 sibling remains. For an ip/128
+ * query, levels 24..120 each see the sibling as descendant, so
+ * count is still 0.
+ */
+ rte_rib6_remove(rib, &ip, 48);
+ cnt = rte_rib6_count_empty_supernets(rib, &ip, 128);
+ RTE_TEST_ASSERT(cnt == 0,
+ "after /48 DEL still covered: expected 0, got %u\n", cnt);
+
+ /* Remove the sibling /128: RIB now empty again. */
+ rte_rib6_remove(rib, &sibling, 128);
+ cnt = rte_rib6_count_empty_supernets(rib, &ip, 128);
+ RTE_TEST_ASSERT(cnt == 13,
+ "after final DEL: expected 13, got %u\n", cnt);
+
+ /* Invalid input: NULL rib. */
+ cnt = rte_rib6_count_empty_supernets(NULL, &ip, 128);
+ RTE_TEST_ASSERT(cnt == 0, "NULL rib must return 0, got %u\n", cnt);
+
+ rte_rib6_free(rib);
+ return TEST_SUCCESS;
+}
+
static struct unit_test_suite rib6_tests = {
.suite_name = "rib6 autotest",
.setup = NULL,
@@ -333,6 +424,7 @@ static struct unit_test_suite rib6_tests = {
TEST_CASE(test_get_fn),
TEST_CASE(test_basic),
TEST_CASE(test_tree_traversal),
+ TEST_CASE(test_empty_supernets),
TEST_CASES_END()
}
};
diff --git a/lib/rib/rib6_internal.h b/lib/rib/rib6_internal.h
new file mode 100644
index 0000000000..8246626de9
--- /dev/null
+++ b/lib/rib/rib6_internal.h
@@ -0,0 +1,37 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2026 Maxime Leroy, Free Mobile
+ */
+
+#ifndef _RIB6_INTERNAL_H_
+#define _RIB6_INTERNAL_H_
+
+#include <stdint.h>
+
+#include <rte_compat.h>
+#include <rte_ip6.h>
+
+struct rte_rib6;
+
+/**
+ * @internal
+ * Count byte boundaries L in {24, 32, 40, ..., RTE_ALIGN_CEIL(depth, 8) - 8}
+ * for which the supernet of ip at level L has no valid descendant with
+ * depth > L. Used by lib/fib to maintain tbl8 reservation accounting in
+ * a single descent of the binary tree.
+ *
+ * @param rib
+ * RIB object handle
+ * @param ip
+ * IPv6 prefix address
+ * @param depth
+ * prefix length
+ * @return
+ * number of empty byte boundaries (0 if all levels have descendants
+ * or depth <= 24)
+ */
+__rte_internal
+uint8_t
+rte_rib6_count_empty_supernets(struct rte_rib6 *rib,
+ const struct rte_ipv6_addr *ip, uint8_t depth);
+
+#endif /* _RIB6_INTERNAL_H_ */
diff --git a/lib/rib/rte_rib6.c b/lib/rib/rte_rib6.c
index ec8ff68e87..ae8aba6563 100644
--- a/lib/rib/rte_rib6.c
+++ b/lib/rib/rte_rib6.c
@@ -18,6 +18,7 @@
#include <rte_rib6.h>
+#include "rib6_internal.h"
#include "rib_log.h"
#define RTE_RIB_VALID_NODE 1
@@ -36,6 +37,7 @@ struct rte_rib6_node {
struct rte_rib6_node *parent;
uint64_t nh;
struct rte_ipv6_addr ip;
+ uint32_t valid_descendants;
uint8_t depth;
uint8_t flag;
uint64_t ext[];
@@ -104,10 +106,35 @@ node_alloc(struct rte_rib6 *rib)
ret = rte_mempool_get(rib->node_pool, (void *)&ent);
if (unlikely(ret != 0))
return NULL;
+ ent->valid_descendants = 0;
++rib->cur_nodes;
return ent;
}
+/* Increment valid_descendants along the parent chain when node becomes valid. */
+static inline void
+inc_valid_descendants(struct rte_rib6_node *node)
+{
+ struct rte_rib6_node *p = node->parent;
+
+ while (p != NULL) {
+ p->valid_descendants++;
+ p = p->parent;
+ }
+}
+
+/* Decrement valid_descendants along the parent chain when node becomes invalid. */
+static inline void
+dec_valid_descendants(struct rte_rib6_node *node)
+{
+ struct rte_rib6_node *p = node->parent;
+
+ while (p != NULL) {
+ p->valid_descendants--;
+ p = p->parent;
+ }
+}
+
static void
node_free(struct rte_rib6 *rib, struct rte_rib6_node *ent)
{
@@ -250,6 +277,7 @@ rte_rib6_remove(struct rte_rib6 *rib,
--rib->cur_routes;
cur->flag &= ~RTE_RIB_VALID_NODE;
+ dec_valid_descendants(cur);
while (!is_valid_node(cur)) {
if ((cur->left != NULL) && (cur->right != NULL))
return;
@@ -320,6 +348,7 @@ rte_rib6_insert(struct rte_rib6 *rib,
*tmp = new_node;
new_node->parent = prev;
++rib->cur_routes;
+ inc_valid_descendants(new_node);
return *tmp;
}
/*
@@ -332,6 +361,7 @@ rte_rib6_insert(struct rte_rib6 *rib,
node_free(rib, new_node);
(*tmp)->flag |= RTE_RIB_VALID_NODE;
++rib->cur_routes;
+ inc_valid_descendants(*tmp);
return *tmp;
}
@@ -371,6 +401,9 @@ rte_rib6_insert(struct rte_rib6 *rib,
new_node->left = *tmp;
new_node->parent = (*tmp)->parent;
(*tmp)->parent = new_node;
+ /* new_node inherits *tmp's subtree */
+ new_node->valid_descendants = (is_valid_node(*tmp) ? 1 : 0) +
+ (*tmp)->valid_descendants;
*tmp = new_node;
} else {
/* create intermediate node */
@@ -386,6 +419,11 @@ rte_rib6_insert(struct rte_rib6 *rib,
common_node->parent = (*tmp)->parent;
new_node->parent = common_node;
(*tmp)->parent = common_node;
+ /* common_node inherits *tmp's subtree (new_node will be
+ * counted by inc_valid_descendants below).
+ */
+ common_node->valid_descendants = (is_valid_node(*tmp) ? 1 : 0) +
+ (*tmp)->valid_descendants;
if (get_dir(&(*tmp)->ip, common_depth) == 1) {
common_node->left = new_node;
common_node->right = *tmp;
@@ -396,6 +434,7 @@ rte_rib6_insert(struct rte_rib6 *rib,
*tmp = common_node;
}
++rib->cur_routes;
+ inc_valid_descendants(new_node);
return new_node;
}
@@ -606,3 +645,44 @@ rte_rib6_free(struct rte_rib6 *rib)
rte_free(rib);
rte_free(te);
}
+
+RTE_EXPORT_INTERNAL_SYMBOL(rte_rib6_count_empty_supernets)
+uint8_t
+rte_rib6_count_empty_supernets(struct rte_rib6 *rib,
+ const struct rte_ipv6_addr *ip, uint8_t depth)
+{
+ uint8_t top = RTE_ALIGN_CEIL(depth, 8);
+ struct rte_rib6_node *cur;
+ bool has_descendant;
+ uint8_t level;
+
+ if (unlikely(rib == NULL || ip == NULL || depth > RTE_IPV6_MAX_DEPTH))
+ return 0;
+ if (depth <= 24)
+ return 0;
+
+ cur = rib->tree;
+
+ /* Single descent through the binary tree, checking each byte
+ * boundary on the way. NULL at level L propagates upward, so we
+ * stop at the first empty supernet and tally the remaining levels.
+ */
+ for (level = 24; level < top; level += 8) {
+ while (cur != NULL && cur->depth < level)
+ cur = get_nxt_node(cur, ip);
+
+ if (cur == NULL || !rte_ipv6_addr_eq_prefix(&cur->ip, ip, level))
+ return (top - level) >> 3;
+
+ if (cur->depth > level)
+ has_descendant = is_valid_node(cur) ||
+ cur->valid_descendants > 0;
+ else
+ has_descendant = cur->valid_descendants > 0;
+
+ if (!has_descendant)
+ return (top - level) >> 3;
+ }
+ return 0;
+}
+
--
2.43.0
^ permalink raw reply related
* [PATCH v1 3/5] test/fib6: extended drift test cases
From: Maxime Leroy @ 2026-05-22 14:58 UTC (permalink / raw)
To: Vladimir Medvedkin; +Cc: dev, stable, Maxime Leroy
In-Reply-To: <20260522145855.1748406-1-maxime@leroys.fr>
Four additional test cases exercise scenarios touched by the
multi-level supernet counting:
- test_drift_compression: parent + compressed child, DEL parent
forces decompression, re-ADD ancestor re-compresses.
- test_drift_multilevel: /28 + /48 + /96 chain with mixed
compressed and non-compressed links, then DEL of the middle
prefix.
- test_drift_stress: pseudo-random ADD/DEL sequence checking that
no operation returns -ENOSPC under a leaked rsvd_tbl8s.
- test_drift_tight_pool: pool sized to exactly the legitimate
envelope, re-ADD after decompression must succeed.
Signed-off-by: Maxime Leroy <maxime@leroys.fr>
---
app/test/test_fib6.c | 269 ++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 265 insertions(+), 4 deletions(-)
diff --git a/app/test/test_fib6.c b/app/test/test_fib6.c
index c4283f3f2d..ad68645428 100644
--- a/app/test/test_fib6.c
+++ b/app/test/test_fib6.c
@@ -26,6 +26,10 @@ static int32_t test_lookup(void);
static int32_t test_invalid_rcu(void);
static int32_t test_fib_rcu_sync_rw(void);
static int32_t test_drift(void);
+static int32_t test_drift_compression(void);
+static int32_t test_drift_multilevel(void);
+static int32_t test_drift_stress(void);
+static int32_t test_drift_tight_pool(void);
#define MAX_ROUTES (1 << 16)
/** Maximum number of tbl8 for 2-byte entries */
@@ -601,10 +605,9 @@ test_fib_rcu_sync_rw(void)
}
/*
- * Reproducer for the rsvd_tbl8s drift bug. depth_diff used to maintain
- * rsvd_tbl8s is computed from the current RIB state, so it is not
- * invariant between the ADD of a prefix and its later DEL when a
- * covering parent prefix is removed in between.
+ * Reproducer for the rsvd_tbl8s drift bug. The tbl8 reservation
+ * accounting must remain balanced even when a covering parent prefix
+ * is removed between an ADD and its later matching DEL.
*
* Layout: one /28 parent (fcde::/28) and three /48 siblings under it
* (fcde:0:6000::/48, fcde:1:6000::/48, fcde:2:6000::/48). The second
@@ -672,6 +675,260 @@ test_drift(void)
return TEST_SUCCESS;
}
+/*
+ * Exercise compression (same nh as parent), forced decompression on
+ * DEL parent, then re-compression after re-adding the same ancestor.
+ * The tbl8 reservation accounting must remain balanced even though
+ * the child is physically decompressed/recompressed in the dataplane.
+ *
+ * Layout: parent fcde::/28 and child fcde:0:6000::/48, both nh=1.
+ *
+ * ADD /28 (no ancestor) rsvd_tbl8s += 1
+ * ADD /48 (compressed under /28) rsvd_tbl8s += 2
+ * DEL /28 (decompresses /48) rsvd unchanged (/48 keeps)
+ * re-ADD /28 (re-compresses /48) rsvd unchanged
+ * DEL /48 rsvd_tbl8s -= 2
+ * DEL /28 rsvd_tbl8s -= 1
+ */
+static int32_t
+test_drift_compression(void)
+{
+ struct rte_fib6_conf config = { 0 };
+ struct rte_fib6 *fib;
+ struct rte_ipv6_addr parent = RTE_IPV6(0xfcde, 0, 0, 0, 0, 0, 0, 0);
+ struct rte_ipv6_addr child = RTE_IPV6(0xfcde, 0, 0x6000, 0, 0, 0, 0, 0);
+ int ret;
+
+ config.max_routes = 1024;
+ config.rib_ext_sz = 0;
+ config.default_nh = 0;
+ config.type = RTE_FIB6_TRIE;
+ config.trie.nh_sz = RTE_FIB6_TRIE_2B;
+ config.trie.num_tbl8 = 256;
+
+ fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
+
+ /* Compressed: child shares the parent's nh, modify_dp is skipped */
+ ret = rte_fib6_add(fib, &parent, 28, 1);
+ RTE_TEST_ASSERT(ret == 0, "ADD /28 failed\n");
+ ret = rte_fib6_add(fib, &child, 48, 1);
+ RTE_TEST_ASSERT(ret == 0, "ADD /48 (compressed) failed\n");
+
+ /* DEL parent forces decompression: child must be materialized */
+ ret = rte_fib6_delete(fib, &parent, 28);
+ RTE_TEST_ASSERT(ret == 0, "DEL /28 (decompression) failed\n");
+
+ /* Re-add parent with same nh: child becomes compressed again */
+ ret = rte_fib6_add(fib, &parent, 28, 1);
+ RTE_TEST_ASSERT(ret == 0, "Re-ADD /28 failed\n");
+
+ ret = rte_fib6_delete(fib, &child, 48);
+ RTE_TEST_ASSERT(ret == 0, "DEL /48 failed\n");
+ ret = rte_fib6_delete(fib, &parent, 28);
+ RTE_TEST_ASSERT(ret == 0, "DEL /28 final failed\n");
+
+ rte_fib6_free(fib);
+ return TEST_SUCCESS;
+}
+
+/*
+ * Three-level nesting with compressed and non-compressed paths, then
+ * DEL of the middle prefix. The byte-boundary supernet accounting
+ * must remain balanced through the chain.
+ *
+ * Layout: grand fcde::/28 nh=1, mid fcde:0:6000::/48 nh=1 (compressed
+ * under grand), leaf fcde:0:6000::4000::/96 nh=2 (not compressed).
+ *
+ * ADD /28 (no ancestor) rsvd_tbl8s += 1
+ * ADD /48 (compressed under /28) rsvd_tbl8s += 2
+ * ADD /96 (not compressed under /48) rsvd_tbl8s += 6
+ * DEL /48 (leaf /96 still covers 32, 40) rsvd_tbl8s -= 0
+ * DEL /28 (only level 24 was solely /28's) rsvd_tbl8s -= 0
+ * DEL /96 (last route gone, all freed) rsvd_tbl8s -= 9
+ *
+ * Boundaries get refunded only on the DEL that makes them empty;
+ * intermediate DELs that leave a covering descendant are refund-free.
+ */
+static int32_t
+test_drift_multilevel(void)
+{
+ struct rte_fib6_conf config = { 0 };
+ struct rte_fib6 *fib;
+ struct rte_ipv6_addr grand = RTE_IPV6(0xfcde, 0, 0, 0, 0, 0, 0, 0);
+ struct rte_ipv6_addr mid = RTE_IPV6(0xfcde, 0, 0x6000, 0, 0, 0, 0, 0);
+ struct rte_ipv6_addr leaf = RTE_IPV6(0xfcde, 0, 0x6000, 0, 0, 0x4000, 0, 0);
+ int ret;
+
+ config.max_routes = 1024;
+ config.rib_ext_sz = 0;
+ config.default_nh = 0;
+ config.type = RTE_FIB6_TRIE;
+ config.trie.nh_sz = RTE_FIB6_TRIE_2B;
+ config.trie.num_tbl8 = 256;
+
+ fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
+
+ ret = rte_fib6_add(fib, &grand, 28, 1);
+ RTE_TEST_ASSERT(ret == 0, "ADD /28 failed\n");
+ ret = rte_fib6_add(fib, &mid, 48, 1); /* compressed under /28 */
+ RTE_TEST_ASSERT(ret == 0, "ADD /48 failed\n");
+ ret = rte_fib6_add(fib, &leaf, 96, 2); /* non-compressed under /48 */
+ RTE_TEST_ASSERT(ret == 0, "ADD /96 failed\n");
+
+ /* DEL the middle prefix: byte-boundary accounting must stay
+ * coherent so the subsequent operations succeed.
+ */
+ ret = rte_fib6_delete(fib, &mid, 48);
+ RTE_TEST_ASSERT(ret == 0, "DEL /48 failed\n");
+
+ ret = rte_fib6_delete(fib, &grand, 28);
+ RTE_TEST_ASSERT(ret == 0, "DEL /28 failed\n");
+ ret = rte_fib6_delete(fib, &leaf, 96);
+ RTE_TEST_ASSERT(ret == 0, "DEL /96 failed\n");
+
+ rte_fib6_free(fib);
+ return TEST_SUCCESS;
+}
+
+/*
+ * Pseudo-random ADD/DEL sequence over 8 prefixes with varying depths
+ * and next-hops. A hand-rolled LCG (not rte_rand) makes the sequence
+ * reproducible across runs and DPDK versions. After all prefixes are
+ * removed, a final ADD/DEL pair must succeed - it would fail under a
+ * leaked rsvd_tbl8s.
+ *
+ * depths[1] and depths[6] both use /36 on purpose: ips[1] and ips[6]
+ * are distinct prefixes, so this exercises two parallel /36 ADD/DEL
+ * paths that share byte boundaries 24 and 32.
+ */
+static int32_t
+test_drift_stress(void)
+{
+ uint8_t depths[8] = { 28, 36, 40, 48, 64, 80, 36, 128 };
+ struct rte_fib6_conf config = { 0 };
+ struct rte_ipv6_addr ips[8] = {
+ RTE_IPV6(0xfcde, 0, 0, 0, 0, 0, 0, 0),
+ RTE_IPV6(0xfcde, 0x1, 0, 0, 0, 0, 0, 0),
+ RTE_IPV6(0xfcde, 0x2, 0, 0, 0, 0, 0, 0),
+ RTE_IPV6(0xfcde, 0x2, 0x4000, 0, 0, 0, 0, 0),
+ RTE_IPV6(0xfcde, 0x2, 0x4000, 0x1000, 0, 0, 0, 0),
+ RTE_IPV6(0xfcde, 0x2, 0x4000, 0x1000, 0x1, 0, 0, 0),
+ RTE_IPV6(0xfcde, 0x3, 0, 0, 0, 0, 0, 0),
+ RTE_IPV6(0xfcde, 0x3, 0, 0, 0, 0, 0, 0x1),
+ };
+ uint8_t live[8] = { 0 };
+ struct rte_fib6 *fib;
+ uint32_t seed = 0x4242;
+ unsigned int i, idx;
+ int ret;
+
+ config.max_routes = 64;
+ config.rib_ext_sz = 0;
+ config.default_nh = 0;
+ config.type = RTE_FIB6_TRIE;
+ config.trie.nh_sz = RTE_FIB6_TRIE_2B;
+ config.trie.num_tbl8 = 256;
+
+ fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
+
+ for (i = 0; i < 2000; i++) {
+ seed = seed * 1103515245u + 12345u;
+ idx = (seed >> 8) & 7;
+ if (live[idx]) {
+ ret = rte_fib6_delete(fib, &ips[idx], depths[idx]);
+ RTE_TEST_ASSERT(ret == 0,
+ "DEL idx %u (depth /%u) failed (ret=%d)\n",
+ idx, depths[idx], ret);
+ live[idx] = 0;
+ } else {
+ uint64_t nh = ((seed >> 16) & 0xff) + 1;
+ ret = rte_fib6_add(fib, &ips[idx], depths[idx], nh);
+ RTE_TEST_ASSERT(ret == 0,
+ "ADD idx %u (depth /%u nh=%" PRIu64 ") failed (ret=%d)\n",
+ idx, depths[idx], nh, ret);
+ live[idx] = 1;
+ }
+ }
+
+ /* Drain everything */
+ for (i = 0; i < RTE_DIM(live); i++) {
+ if (live[i]) {
+ ret = rte_fib6_delete(fib, &ips[i], depths[i]);
+ RTE_TEST_ASSERT(ret == 0,
+ "final drain DEL idx %u failed (ret=%d)\n",
+ i, ret);
+ }
+ }
+
+ /* If rsvd_tbl8s had leaked, this fresh ADD would fail */
+ ret = rte_fib6_add(fib, &ips[0], depths[0], 0xff);
+ RTE_TEST_ASSERT(ret == 0,
+ "post-drain ADD failed (rsvd leaked?) (ret=%d)\n", ret);
+ ret = rte_fib6_delete(fib, &ips[0], depths[0]);
+ RTE_TEST_ASSERT(ret == 0, "post-drain DEL failed\n");
+
+ rte_fib6_free(fib);
+ return TEST_SUCCESS;
+}
+
+/* Tight-pool re-compression scenario. Pool sized to exactly the
+ * highest legitimate envelope: an ADD that becomes a closer ancestor
+ * of an existing descendant must succeed because the byte-boundary
+ * supernet accounting reports the same envelope post-operation.
+ *
+ * num_tbl8 = 3
+ * ADD /28 nh=1 rsvd = 1
+ * ADD /48 nh=1 (compr.) rsvd = 3 (/48 reserves 2 new boundaries)
+ * DEL /28 rsvd unchanged (/48 still holds them)
+ * RE-ADD /28 nh=1 rsvd unchanged (already reserved)
+ * (pre-fix: pre-check rejects)
+ */
+static int32_t
+test_drift_tight_pool(void)
+{
+ struct rte_fib6_conf config = { 0 };
+ struct rte_fib6 *fib;
+ struct rte_ipv6_addr parent = RTE_IPV6(0xfcde, 0, 0, 0, 0, 0, 0, 0);
+ struct rte_ipv6_addr child = RTE_IPV6(0xfcde, 0, 0x6000, 0, 0, 0, 0, 0);
+ int ret;
+
+ config.max_routes = 16;
+ config.rib_ext_sz = 0;
+ config.default_nh = 0;
+ config.type = RTE_FIB6_TRIE;
+ config.trie.nh_sz = RTE_FIB6_TRIE_2B;
+ config.trie.num_tbl8 = 3;
+
+ fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
+
+ ret = rte_fib6_add(fib, &parent, 28, 1);
+ RTE_TEST_ASSERT(ret == 0, "ADD /28 failed (ret=%d)\n", ret);
+ ret = rte_fib6_add(fib, &child, 48, 1);
+ RTE_TEST_ASSERT(ret == 0, "ADD /48 failed (ret=%d)\n", ret);
+ ret = rte_fib6_delete(fib, &parent, 28);
+ RTE_TEST_ASSERT(ret == 0, "DEL /28 failed (ret=%d)\n", ret);
+
+ /* Re-add /28: byte boundary 24 is already occupied by the /48,
+ * so the re-added /28 introduces no new reservation. The
+ * envelope stays at 3 and still fits the pool of 3.
+ */
+ ret = rte_fib6_add(fib, &parent, 28, 1);
+ RTE_TEST_ASSERT(ret == 0,
+ "Re-ADD /28 spuriously failed (ret=%d)\n", ret);
+
+ ret = rte_fib6_delete(fib, &child, 48);
+ RTE_TEST_ASSERT(ret == 0, "DEL /48 failed (ret=%d)\n", ret);
+ ret = rte_fib6_delete(fib, &parent, 28);
+ RTE_TEST_ASSERT(ret == 0, "Final DEL /28 failed (ret=%d)\n", ret);
+
+ rte_fib6_free(fib);
+ return TEST_SUCCESS;
+}
+
static struct unit_test_suite fib6_fast_tests = {
.suite_name = "fib6 autotest",
.setup = NULL,
@@ -685,6 +942,10 @@ static struct unit_test_suite fib6_fast_tests = {
TEST_CASE(test_invalid_rcu),
TEST_CASE(test_fib_rcu_sync_rw),
TEST_CASE(test_drift),
+ TEST_CASE(test_drift_compression),
+ TEST_CASE(test_drift_multilevel),
+ TEST_CASE(test_drift_stress),
+ TEST_CASE(test_drift_tight_pool),
TEST_CASES_END()
}
};
--
2.43.0
^ permalink raw reply related
* [PATCH v1 2/5] test/fib6: add reproducer for tbl8 reservation drift
From: Maxime Leroy @ 2026-05-22 14:58 UTC (permalink / raw)
To: Vladimir Medvedkin; +Cc: dev, stable, Maxime Leroy
In-Reply-To: <20260522145855.1748406-1-maxime@leroys.fr>
test_drift covers the asymmetric ADD parent / ADD children / DEL
parent / DEL children sequence that wraps rsvd_tbl8s past zero in a
single iteration. After the wrap the next /25+ ADD is rejected with
-ENOSPC even though the tbl8 pool is empty. With the preceding fix
in place the final ADD succeeds.
Signed-off-by: Maxime Leroy <maxime@leroys.fr>
---
app/test/test_fib6.c | 74 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
diff --git a/app/test/test_fib6.c b/app/test/test_fib6.c
index fffb590dbf..c4283f3f2d 100644
--- a/app/test/test_fib6.c
+++ b/app/test/test_fib6.c
@@ -25,6 +25,7 @@ static int32_t test_get_invalid(void);
static int32_t test_lookup(void);
static int32_t test_invalid_rcu(void);
static int32_t test_fib_rcu_sync_rw(void);
+static int32_t test_drift(void);
#define MAX_ROUTES (1 << 16)
/** Maximum number of tbl8 for 2-byte entries */
@@ -599,6 +600,78 @@ test_fib_rcu_sync_rw(void)
return status == 0 ? TEST_SUCCESS : TEST_FAILED;
}
+/*
+ * Reproducer for the rsvd_tbl8s drift bug. depth_diff used to maintain
+ * rsvd_tbl8s is computed from the current RIB state, so it is not
+ * invariant between the ADD of a prefix and its later DEL when a
+ * covering parent prefix is removed in between.
+ *
+ * Layout: one /28 parent (fcde::/28) and three /48 siblings under it
+ * (fcde:0:6000::/48, fcde:1:6000::/48, fcde:2:6000::/48). The second
+ * hextet's high 12 bits are zero, so the three /48 IPs all fall inside
+ * the /28.
+ *
+ * One asymmetric sequence is enough to wrap the counter:
+ * ADD /28 rsvd_tbl8s += 1
+ * ADD /48 child_0,1,2 (with /28 parent) rsvd_tbl8s += 2 each (+6)
+ * DEL /28 (sibling /48 found) rsvd_tbl8s -= 0
+ * DEL /48 child_0,1,2 (no parent left) rsvd_tbl8s -= 3 each (-9)
+ */
+static int32_t
+test_drift(void)
+{
+ struct rte_fib6_conf config = { 0 };
+ struct rte_fib6 *fib;
+ struct rte_ipv6_addr parent =
+ RTE_IPV6(0xfcde, 0, 0, 0, 0, 0, 0, 0);
+ struct rte_ipv6_addr child[3] = {
+ RTE_IPV6(0xfcde, 0, 0x6000, 0, 0, 0, 0, 0),
+ RTE_IPV6(0xfcde, 1, 0x6000, 0, 0, 0, 0, 0),
+ RTE_IPV6(0xfcde, 2, 0x6000, 0, 0, 0, 0, 0),
+ };
+ unsigned int c;
+ int ret;
+
+ config.max_routes = 1024;
+ config.rib_ext_sz = 0;
+ config.default_nh = 0;
+ config.type = RTE_FIB6_TRIE;
+ config.trie.nh_sz = RTE_FIB6_TRIE_2B;
+ config.trie.num_tbl8 = 256;
+
+ fib = rte_fib6_create(__func__, SOCKET_ID_ANY, &config);
+ RTE_TEST_ASSERT(fib != NULL, "Failed to create FIB\n");
+
+ ret = rte_fib6_add(fib, &parent, 28, 0xa);
+ RTE_TEST_ASSERT(ret == 0, "ADD /28 failed (ret=%d)\n", ret);
+
+ for (c = 0; c < 3; c++) {
+ ret = rte_fib6_add(fib, &child[c], 48, 0xb + c);
+ RTE_TEST_ASSERT(ret == 0,
+ "ADD /48 child %u failed (ret=%d)\n", c, ret);
+ }
+
+ ret = rte_fib6_delete(fib, &parent, 28);
+ RTE_TEST_ASSERT(ret == 0, "DEL /28 failed (ret=%d)\n", ret);
+
+ for (c = 0; c < 3; c++) {
+ ret = rte_fib6_delete(fib, &child[c], 48);
+ RTE_TEST_ASSERT(ret == 0,
+ "DEL /48 child %u failed (ret=%d)\n", c, ret);
+ }
+
+ /* Pre-fix: -ENOSPC. Post-fix: succeeds. */
+ ret = rte_fib6_add(fib, &parent, 28, 0xe);
+ RTE_TEST_ASSERT(ret == 0,
+ "Fresh ADD /28 spuriously failed (ret=%d)\n", ret);
+
+ ret = rte_fib6_delete(fib, &parent, 28);
+ RTE_TEST_ASSERT(ret == 0, "Final DEL /28 failed (ret=%d)\n", ret);
+
+ rte_fib6_free(fib);
+ return TEST_SUCCESS;
+}
+
static struct unit_test_suite fib6_fast_tests = {
.suite_name = "fib6 autotest",
.setup = NULL,
@@ -611,6 +684,7 @@ static struct unit_test_suite fib6_fast_tests = {
TEST_CASE(test_lookup),
TEST_CASE(test_invalid_rcu),
TEST_CASE(test_fib_rcu_sync_rw),
+ TEST_CASE(test_drift),
TEST_CASES_END()
}
};
--
2.43.0
^ permalink raw reply related
* [PATCH v1 1/5] fib6: fix tbl8 reservation drift in trie
From: Maxime Leroy @ 2026-05-22 14:58 UTC (permalink / raw)
To: Vladimir Medvedkin; +Cc: dev, stable, Maxime Leroy
In-Reply-To: <20260522145855.1748406-1-maxime@leroys.fr>
trie_modify() maintained rsvd_tbl8s by computing a depth_diff from
the current RIB topology at both ADD and DEL. The two values diverge
when the RIB changes between an ADD and its later DEL (a covering
parent added or removed), and rsvd_tbl8s eventually wraps to
UINT32_MAX, rejecting all subsequent /25+ ADDs with -ENOSPC.
Replace the depth_diff arithmetic with the dir24_8 approach
generalised to multiple byte boundaries: for each byte boundary L
below depth, the supernet at level L needs a tbl8 if and only if at
least one prefix with depth > L exists in that supernet. The supernet
identity at level L is stable across unrelated RIB modifications, so
ADD/DEL pairs are symmetric by construction.
A helper count_empty_levels() scans byte boundaries from 24 upward,
stopping at the first level where the supernet has no descendant. A
NULL answer at level L propagates upward because narrower supernets
are subsets, so the remaining boundaries can be tallied in one shot
without further queries.
- On ADD, count the empty levels and increment rsvd_tbl8s by that
count. The capacity pre-check uses the exact post-operation
envelope.
- On DEL, after removing the prefix, count the levels that became
empty and decrement.
Fixes: c3e12e0f0354 ("fib: add dataplane algorithm for IPv6")
Cc: stable@dpdk.org
Signed-off-by: Maxime Leroy <maxime@leroys.fr>
---
lib/fib/trie.c | 71 +++++++++++++++++++++++---------------------------
1 file changed, 32 insertions(+), 39 deletions(-)
diff --git a/lib/fib/trie.c b/lib/fib/trie.c
index fa5d9ec6b0..44b90f72ff 100644
--- a/lib/fib/trie.c
+++ b/lib/fib/trie.c
@@ -534,19 +534,43 @@ modify_dp(struct rte_trie_tbl *dp, struct rte_rib6 *rib,
return 0;
}
+/*
+ * Count byte boundaries between 24 and CEIL(depth, 8) where the
+ * supernet of ip has no descendant in the RIB. This is the number of
+ * new tbl8 levels an ADD of ip/depth would introduce, or the number
+ * to free at DEL once the prefix has been removed from the RIB.
+ *
+ * A NULL answer at level L propagates upwards: narrower supernets at
+ * L+8, L+16, ... are subsets of S_L and cannot contain descendants
+ * either. The loop stops at the first NULL and tallies the remaining
+ * boundaries in one shot.
+ */
+static uint8_t
+count_empty_levels(struct rte_rib6 *rib, const struct rte_ipv6_addr *ip,
+ uint8_t depth)
+{
+ uint8_t level, top = RTE_ALIGN_CEIL(depth, 8);
+
+ for (level = 24; level < top; level += 8) {
+ if (rte_rib6_get_nxt(rib, ip, level, NULL,
+ RTE_RIB6_GET_NXT_COVER) == NULL)
+ return (top - level) >> 3;
+ }
+ return 0;
+}
+
int
trie_modify(struct rte_fib6 *fib, const struct rte_ipv6_addr *ip,
uint8_t depth, uint64_t next_hop, int op)
{
struct rte_trie_tbl *dp;
struct rte_rib6 *rib;
- struct rte_rib6_node *tmp = NULL;
struct rte_rib6_node *node;
struct rte_rib6_node *parent;
- struct rte_ipv6_addr ip_masked, tmp_ip;
+ struct rte_ipv6_addr ip_masked;
int ret = 0;
uint64_t par_nh, node_nh;
- uint8_t tmp_depth, depth_diff = 0, parent_depth = 24;
+ uint8_t new_levels;
if ((fib == NULL) || (ip == NULL) || (depth > RTE_IPV6_MAX_DEPTH))
return -EINVAL;
@@ -559,37 +583,6 @@ trie_modify(struct rte_fib6 *fib, const struct rte_ipv6_addr *ip,
ip_masked = *ip;
rte_ipv6_addr_mask(&ip_masked, depth);
- if (depth > 24) {
- tmp = rte_rib6_get_nxt(rib, &ip_masked,
- RTE_ALIGN_FLOOR(depth, 8), NULL,
- RTE_RIB6_GET_NXT_ALL);
- if (tmp && op == RTE_FIB6_DEL) {
- /* in case of delete operation, skip the prefix we are going to delete */
- rte_rib6_get_ip(tmp, &tmp_ip);
- rte_rib6_get_depth(tmp, &tmp_depth);
- if (rte_ipv6_addr_eq(&ip_masked, &tmp_ip) && depth == tmp_depth)
- tmp = rte_rib6_get_nxt(rib, &ip_masked,
- RTE_ALIGN_FLOOR(depth, 8), tmp, RTE_RIB6_GET_NXT_ALL);
- }
-
- if (tmp == NULL) {
- tmp = rte_rib6_lookup(rib, ip);
- /**
- * in case of delete operation, lookup returns the prefix
- * we are going to delete. Find the parent.
- */
- if (tmp && op == RTE_FIB6_DEL)
- tmp = rte_rib6_lookup_parent(tmp);
-
- if (tmp != NULL) {
- rte_rib6_get_depth(tmp, &tmp_depth);
- parent_depth = RTE_MAX(tmp_depth, 24);
- }
- depth_diff = RTE_ALIGN_CEIL(depth, 8) -
- RTE_ALIGN_CEIL(parent_depth, 8);
- depth_diff = depth_diff >> 3;
- }
- }
node = rte_rib6_lookup_exact(rib, &ip_masked, depth);
switch (op) {
case RTE_FIB6_ADD:
@@ -603,7 +596,8 @@ trie_modify(struct rte_fib6 *fib, const struct rte_ipv6_addr *ip,
return 0;
}
- if ((depth > 24) && (dp->rsvd_tbl8s + depth_diff > dp->number_tbl8s))
+ new_levels = count_empty_levels(rib, &ip_masked, depth);
+ if (dp->rsvd_tbl8s + new_levels > dp->number_tbl8s)
return -ENOSPC;
node = rte_rib6_insert(rib, &ip_masked, depth);
@@ -622,7 +616,7 @@ trie_modify(struct rte_fib6 *fib, const struct rte_ipv6_addr *ip,
return ret;
}
successfully_added:
- dp->rsvd_tbl8s += depth_diff;
+ dp->rsvd_tbl8s += new_levels;
return 0;
case RTE_FIB6_DEL:
if (node == NULL)
@@ -640,9 +634,8 @@ trie_modify(struct rte_fib6 *fib, const struct rte_ipv6_addr *ip,
if (ret != 0)
return ret;
- rte_rib6_remove(rib, ip, depth);
-
- dp->rsvd_tbl8s -= depth_diff;
+ rte_rib6_remove(rib, &ip_masked, depth);
+ dp->rsvd_tbl8s -= count_empty_levels(rib, &ip_masked, depth);
return 0;
default:
break;
--
2.43.0
^ permalink raw reply related
* [PATCH v1 0/5] fib6: fix tbl8 reservation drift
From: Maxime Leroy @ 2026-05-22 14:58 UTC (permalink / raw)
To: Vladimir Medvedkin; +Cc: dev, stable, Maxime Leroy
In-Reply-To: <cover.1778146229.git.maxime@leroys.fr>
This v1 supersedes the earlier RFC. The RFC dropped rsvd_tbl8s and
used tbl8_pool_pos in the pre-check, which loses the worst-case
envelope: a compressed /48 under a /28 allocates zero tbl8s but must
reserve the boundaries the /48 would need if the /28 is later
removed (DEL forces mid-flight decompression in modify_dp() with no
rollback).
This v1 keeps rsvd_tbl8s and computes it the way dir24_8 already
does for IPv4. dir24_8 counts /24 supernets that contain at least
one /25..32 prefix: that count is invariant under unrelated RIB
changes, so the counter cannot drift. trie6 has the same need at
13 levels instead of 1 (byte boundaries 24, 32, ..., 120), so v1
counts, for each L in that set, the /L supernets containing at
least one prefix with depth > L. ADD/DEL pairs are symmetric by
construction.
Patch 1 is the minimal self-contained fix (Fixes: + Cc: stable).
Patches 2-3 add the reproducer and extended regression tests.
Patches 4-5 are an optimization (not for stable): valid_descendants
in rte_rib6 + single-descent helper, so trie_modify() walks once
instead of up to 13 times per ADD/DEL.
Validated on a live BGP router (grout + FRR, 127 IPv6 prefixes):
RSVD_TBL8 returned to its pre-cycle value after a zebra-kill /
reconverge cycle.
Maxime Leroy (5):
fib6: fix tbl8 reservation drift in trie
test/fib6: add reproducer for tbl8 reservation drift
test/fib6: extended drift test cases
rib: track valid descendant count per node
fib6: speed up tbl8 reservation accounting
app/test/test_fib6.c | 335 ++++++++++++++++++++++++++++++++++++++++
app/test/test_rib6.c | 92 +++++++++++
lib/fib/trie.c | 47 +-----
lib/rib/rib6_internal.h | 37 +++++
lib/rib/rte_rib6.c | 80 ++++++++++
5 files changed, 552 insertions(+), 39 deletions(-)
create mode 100644 lib/rib/rib6_internal.h
---
v1:
* Keep rsvd_tbl8s; recompute it via topology-stable empty-supernet
count (dir24_8 pattern at 13 levels) instead of RIB-derived
depth_diff.
* Drop RFC patch 3/3 (no longer needed).
* Add extended regression tests.
* Add patches 4-5: RIB valid_descendants + single-descent helper
(optional perf optimization; not for stable).
* Production-validated on a live BGP router.
--
2.43.0
^ permalink raw reply
* Re: [PATCH v2] net/ice: fix TM node ID validation against configured queues
From: Bruce Richardson @ 2026-05-22 14:57 UTC (permalink / raw)
To: Ciara Loftus; +Cc: dev, stable
In-Reply-To: <ag3SIFeXpwhWKocg@bricha3-mobl1.ger.corp.intel.com>
On Wed, May 20, 2026 at 04:24:16PM +0100, Bruce Richardson wrote:
> On Wed, May 20, 2026 at 03:07:16PM +0000, Ciara Loftus wrote:
> > The leaf node ID boundary is checked against the compile-time constant
> > `RTE_MAX_QUEUES_PER_PORT` (1024) rather than the number of configured Tx
> > queues. The rte_tm specification reserves IDs 0 to N-1 for leaf nodes
> > where N is the configured queue count, so using the constant produces
> > wrong results whenever N is less than 1024.
> >
> > Fix by using `nb_tx_queues` as the boundary when queues have been
> > configured, falling back to `RTE_MAX_QUEUES_PER_PORT` when `nb_tx_queues`
> > is zero. The zero case arises when the TM hierarchy is built before port
> > queue configuration, which is required to support queue counts beyond
> > the hardware default.
> >
> > Also add an explicit check in the non-leaf validation path that rejects
> > IDs in the leaf-reserved range. This condition can be triggered two ways:
> > adding a leaf node before its parent chain is complete (the node resolves
> > to a non-leaf level), or assigning a leaf-range ID to a node intended
> > as non-leaf.
> >
> > Fixes: 715d449a965b ("net/ice: enhance Tx scheduler hierarchy support")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Ciara Loftus <ciara.loftus@intel.com>
> > ---
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Applied to dpdk-next-net-intel.
Thanks,
/Bruce
^ permalink raw reply
* Re: [PATCH] net/ice: improve log messages for DDP loading
From: Bruce Richardson @ 2026-05-22 14:53 UTC (permalink / raw)
To: David Marchand; +Cc: dev, patrick.mahan, Anatoly Burakov
In-Reply-To: <ag3Y1401SlX2hcTm@bricha3-mobl1.ger.corp.intel.com>
On Wed, May 20, 2026 at 04:52:55PM +0100, Bruce Richardson wrote:
> On Sat, May 16, 2026 at 12:19:41PM +0200, David Marchand wrote:
> > Some nics may not provide a serial number (PCI capability
> > RTE_PCI_EXT_CAP_ID_DSN).
> >
> > This results in a confusing ERROR log:
> > ICE_INIT: ice_dev_init(): Failed to read device serial number
> >
> > This is confusing as DDP loading does *not* require the serial number to
> > be present for the port to be functional afterwards.
> >
> > Besides, after trying various path, if the default DDP is not present on
> > the runtime system, the port initialisation ends up with a vague error:
> > ICE_INIT: ice_load_pkg(): failed to search file path
> >
> > Improve the situation with adjusting the log level when reading the
> > SN fails, then add more debug context to DDP file loading and end up
> > with a ERROR log mentioning the expected file.
> >
> > ICE_INIT: ice_firmware_read(): Cannot read DDP file
> > /lib/firmware/updates/intel/ice/ddp/ice-b49691ffffe6e69c.pkg
> > ICE_INIT: ice_firmware_read(): Cannot read DDP file
> > /lib/firmware/intel/ice/ddp/ice-b49691ffffe6e69c.pkg
> > ICE_INIT: ice_firmware_read(): Cannot read DDP file
> > /lib/firmware/updates/intel/ice/ddp/ice.pkg
> > ICE_INIT: ice_firmware_read(): Cannot read DDP file
> > /lib/firmware/intel/ice/ddp/ice.pkg
> > ICE_INIT: ice_load_pkg(): Failed to load default DDP package
> > /lib/firmware/intel/ice/ddp/ice.pkg
> >
> > Signed-off-by: David Marchand <david.marchand@redhat.com>
> > ---
> > drivers/net/intel/ice/ice_ethdev.c | 31 ++++++++++++++++++++----------
> > 1 file changed, 21 insertions(+), 10 deletions(-)
> >
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Applied to dpdk-next-net-intel.
Thanks,
/Bruce
^ permalink raw reply
* Re: [PATCH] FIX: excessive logging in I40E driver
From: Bruce Richardson @ 2026-05-22 14:49 UTC (permalink / raw)
To: Arin Kharkar; +Cc: dev
In-Reply-To: <20260512234227.218761-1-arinkharkar@gmail.com>
On Tue, May 12, 2026 at 04:42:27PM -0700, Arin Kharkar wrote:
> Resolved bug #1936 by changing the log level in i40e_set_tx_function from NOTICE to DEBUG
> ---
> drivers/net/intel/i40e/i40e_rxtx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/intel/i40e/i40e_rxtx.c b/drivers/net/intel/i40e/i40e_rxtx.c
> index c5ac75e0f0..bc48303a25 100644
> --- a/drivers/net/intel/i40e/i40e_rxtx.c
> +++ b/drivers/net/intel/i40e/i40e_rxtx.c
> @@ -3124,7 +3124,7 @@ i40e_set_tx_function(struct rte_eth_dev *dev)
> i40e_tx_path_infos[ad->tx_func_type].pkt_burst;
> dev->tx_pkt_prepare = i40e_tx_path_infos[ad->tx_func_type].pkt_prep;
>
> - PMD_DRV_LOG(NOTICE, "Using %s (port %d).",
> + PMD_DRV_LOG(DEBUG, "Using %s (port %d).",
> i40e_tx_path_infos[ad->tx_func_type].info, dev->data->port_id);
>
> if (ad->tx_func_type == I40E_TX_SCALAR_SIMPLE ||
Hi, thanks for the fix.
Unfortunately, with the recent changes in the drivers to use a different
path selection mechanism, this patch is no longer relevant, I believe. The
log messages for path selection in the driver on "next-net-intel" tree are
now all at DEBUG level.
Marking as not-applicable in patchwork.
Thanks,
/Bruce
^ permalink raw reply
* Re: [RFC v2 00/11] prepare deprecation of rte_atomicNN_*() family
From: Stephen Hemminger @ 2026-05-22 14:45 UTC (permalink / raw)
To: Bruce Richardson; +Cc: dev
In-Reply-To: <ahBl1GytfB3f17hV@bricha3-mobl1.ger.corp.intel.com>
On Fri, 22 May 2026 15:19:00 +0100
Bruce Richardson <bruce.richardson@intel.com> wrote:
> >
> I decided to test this patchset with the ring_perf_autotest (using only two
> cores on same socket) to see how performance may be affected on x86 with
> this change. On an initial once-off test to compare performance
> with/without this patchset for MP/MC cases, it looks like smaller enq/deq
> burst e.g. 8/32 are slower after this set, while larger bursts e.g. 128/256
> are slightly faster.
>
> I then ran two more tests with the patches applied and again without, and
> got AI to analyse the set of 6 results to come up with more meaningful
> conclusions after a little bit more numeric analysis. Below is some of the
> summary.
>
> While not necessarily a deal-breaker, the regressions seen are cause for
> pause. We probably want to benchmark on a few other x86 (both Intel and
> AMD) systems to see if this is a consistent picture.
>
> /Bruce
Could you see if problem is the use of intrinsics on x86 or the
changes to rte_ring_pvt?
I am not convinced that deprecation of these function is hard requirement.
This patchset is more of a what-if experiment.
The other alternative is remove the deprecation notice and just leave
well enough alone.
But some of the places actually benefit from the change over because
the are using flags as lock and using other memory orders should
be faster on Arm.
^ permalink raw reply
* Re: [PATCH v1 1/1] net/iavf: fix large VF IRQ mapping
From: Bruce Richardson @ 2026-05-22 14:34 UTC (permalink / raw)
To: Anatoly Burakov; +Cc: dev, Vladimir Medvedkin, david.marchand, mb
In-Reply-To: <agyL7MGOLfl-GdIr@bricha3-mobl1.ger.corp.intel.com>
On Tue, May 19, 2026 at 05:12:28PM +0100, Bruce Richardson wrote:
> On Wed, May 06, 2026 at 03:07:03PM +0100, Anatoly Burakov wrote:
> > The PF will check buffer size for being too big, and the chunk sizing code
> > correctly calls that out. However, the size was actually still too big
> > because `struct virtchnl_queue_vector_maps` already had one queue vector
> > as part of its definition, so `chunk_sz` was too big by 1.
> >
> > Fixes: 292d3b781ac4 ("net/iavf: replace unnecessary hugepage memory allocations")
> >
> > Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com>
> > ---
>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
>
Applied to next-net-intel.
Thanks,
/Bruce
^ permalink raw reply
page: next (older) | prev (newer) | latest
- recent:[subjects (threaded)|topics (new)|topics (active)]
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox