From: Gagandeep Singh <[email protected]> The flow steering miss flow id was a file-scope global defaulting to 0 and optionally overridden via the DPAA2_FLOW_CONTROL_MISS_FLOW environment variable. Replace it with a per-device default_flow field in dpaa2_dev_priv, initialised to the lowest-priority flow ID (min(fs_entries, dist_queues) - 1) at probe time, so that each device has its own independent miss-flow setting.
The DPAA2_FLOW_CONTROL_MISS_FLOW environment variable is removed. Users who relied on it must use the rte_flow API instead. Signed-off-by: Gagandeep Singh <[email protected]> --- doc/guides/rel_notes/release_26_11.rst | 4 ++++ drivers/net/dpaa2/dpaa2_ethdev.c | 2 ++ drivers/net/dpaa2/dpaa2_ethdev.h | 2 ++ drivers/net/dpaa2/dpaa2_flow.c | 14 +------------- 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/doc/guides/rel_notes/release_26_11.rst b/doc/guides/rel_notes/release_26_11.rst index b1ebd508fd..0035a9d5a1 100644 --- a/doc/guides/rel_notes/release_26_11.rst +++ b/doc/guides/rel_notes/release_26_11.rst @@ -25,6 +25,10 @@ DPDK Release 26.11 * Added Tx queue based flow control and confirmation queue handling. * Added software parser based packet dump for debugging. * Added support for traffic metering and policing (rte_mtr API). + * Removed ``DPAA2_FLOW_CONTROL_MISS_FLOW`` environment variable. The + per-device FS table miss flow id now defaults to the lowest-priority + flow of the device. Users who previously redirected unmatched frames + to a specific queue via this variable must use the rte_flow API instead. New Features ------------ diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 10f9a90639..9878e2b06f 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -3541,6 +3541,8 @@ dpaa2_dev_init(struct rte_eth_dev *eth_dev) priv->dist_queues = attr.num_queues; priv->num_channels = attr.num_channels; priv->channel_inuse = 0; + priv->default_flow = RTE_MAX(RTE_MIN(priv->fs_entries, + priv->dist_queues), 1) - 1; rte_spinlock_init(&priv->lpbk_qp_lock); rte_spinlock_init(&priv->meter_lock); diff --git a/drivers/net/dpaa2/dpaa2_ethdev.h b/drivers/net/dpaa2/dpaa2_ethdev.h index 20817c6b37..2253a27a4b 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.h +++ b/drivers/net/dpaa2/dpaa2_ethdev.h @@ -436,6 +436,8 @@ struct dpaa2_dev_priv { uint8_t max_cgs; uint8_t cgid_in_use[MAX_RX_QUEUES]; rte_spinlock_t meter_lock; + /* Lowest priority FS flow id to receive flow steering miss frames. */ + uint16_t default_flow; /* Current hash distribution size per RX TC, written by * dpaa2_setup_flow_dist_size() and read by reta_query / reta_update. diff --git a/drivers/net/dpaa2/dpaa2_flow.c b/drivers/net/dpaa2/dpaa2_flow.c index f0748081b3..03f9193f51 100644 --- a/drivers/net/dpaa2/dpaa2_flow.c +++ b/drivers/net/dpaa2/dpaa2_flow.c @@ -24,7 +24,6 @@ #include <dpaa2_pmd_logs.h> static char *dpaa2_flow_control_log; -static uint16_t dpaa2_flow_miss_flow_id; /* Default miss flow id is 0. */ static int dpaa2_sp_loaded = -1; enum dpaa2_flow_entry_size { @@ -4590,7 +4589,7 @@ dpaa2_configure_fs_rss_table(struct dpaa2_dev_priv *priv, return 0; tc_cfg.enable = true; - tc_cfg.fs_miss_flow_id = dpaa2_flow_miss_flow_id; + tc_cfg.fs_miss_flow_id = priv->default_flow; ret = dpni_set_rx_fs_dist(dpni, CMD_PRI_LOW, priv->token, &tc_cfg); if (ret < 0) { @@ -5224,17 +5223,6 @@ dpaa2_flow_create(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, dpaa2_flow_control_log = getenv("DPAA2_FLOW_CONTROL_LOG"); - if (getenv("DPAA2_FLOW_CONTROL_MISS_FLOW")) { - dpaa2_flow_miss_flow_id = - (uint16_t)atoi(getenv("DPAA2_FLOW_CONTROL_MISS_FLOW")); - if (dpaa2_flow_miss_flow_id >= priv->dist_queues) { - DPAA2_PMD_ERR("Missed flow ID %d >= dist size(%d)", - dpaa2_flow_miss_flow_id, - priv->dist_queues); - return NULL; - } - } - flow = rte_zmalloc(NULL, sizeof(struct dpaa2_dev_flow), RTE_CACHE_LINE_SIZE); if (!flow) { -- 2.43.0
