From: Vanshika Shukla <[email protected]> Add fman_onic MAC type handling to get_rx_port_type() so that ONIC and offline-internal ports are mapped to OH_OFFLINE_PARSING, consistent with how the VSP port configuration handles these types. Without this, ONIC ports used an incorrect port type in flow configuration, leading to failed FMC operations.
Replace the parallel vsp_handle[] and vsp_bpid[] arrays in struct dpaa_if with a single struct dpaa_if_vsp per profile, holding the VSP handle together with the buffer pools it was configured with. Keeping the pool as a dpaa_bp_info pointer rather than a bare BPID lets dpaa_port_vsp_configure() take the pool size from the pool itself instead of receiving an mbuf_data_room_size argument, and leaves room for a profile to carry more than one external pool, so dpaa_port_vsp_update() no longer needs the bpid and size parameters. Bound the VSP ID against DPAA_VSP_PROFILE_MAX_NUM in dpaa_eth_rx_queue_bp_check(), which is the first place the vsp[] array is indexed. The ID comes from the FMC profile IDs and the fallback comes from the DTS vsp-window, so neither is guaranteed to be within the array; only dpaa_port_vsp_configure() checked it, which is too late. Move the shared-MAC base profile special case from dpaa_port_vsp_configure() up into dpaa_port_vsp_update(), so the early return happens before any handle is freed rather than after. Return -EINVAL from dpaa_port_vsp_update() where it previously returned 0 for a port with no profiles or an out-of-range VSP ID. Silently succeeding there left the caller believing the profile had been programmed. Drop the shortcut that skipped reconfiguration when the profile was already bound to the same BPID. The VSP now tracks a pool array rather than a single ID, so the old equality test no longer describes the configuration, and an unconditional reconfigure keeps Rx queue setup and the hardware in step. Skip the BMI statistics and Rx disable in dpaa_eth_dev_stop() for ONIC ports, matching dev_start() which does not enable them: the ONIC port has no MAC of its own to drive. Iterate dpaa_port_vsp_cleanup() over DPAA_VSP_PROFILE_MAX_NUM instead of fif->num_profiles so profiles outside the current window are also released, clear each handle after freeing it so a second call is a no-op, and remove the now-unused fif parameter. Signed-off-by: Vanshika Shukla <[email protected]> --- drivers/net/dpaa/dpaa_ethdev.c | 43 +++++++----- drivers/net/dpaa/dpaa_ethdev.h | 9 ++- drivers/net/dpaa/dpaa_flow.c | 120 ++++++++++++++++++--------------- drivers/net/dpaa/dpaa_flow.h | 7 +- 4 files changed, 103 insertions(+), 76 deletions(-) diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 5fba1fb972..bd3f03f67d 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -524,7 +524,7 @@ static int dpaa_eth_dev_stop(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); dev->data->dev_started = 0; - if (!fif->is_shared_mac) { + if (!fif->is_shared_mac && fif->mac_type != fman_onic) { fman_if_bmi_stats_disable(fif); fman_if_disable_rx(fif); } @@ -649,7 +649,7 @@ static int dpaa_eth_dev_close(struct rte_eth_dev *dev) } } if (fif->num_profiles) { - ret = dpaa_port_vsp_cleanup(dpaa_intf, fif); + ret = dpaa_port_vsp_cleanup(dpaa_intf); if (ret) { DPAA_PMD_WARN("%s: cleanup VSP failed(%d)", dev->data->name, ret); @@ -1164,11 +1164,21 @@ static inline int dpaa_eth_rx_queue_bp_check(struct rte_eth_dev *dev, vsp_id = 0; } - if (dpaa_intf->vsp_bpid[vsp_id] && - bpid != dpaa_intf->vsp_bpid[vsp_id]) { + /* vsp_id originates from the FMC profile IDs, and base_profile_id from + * the DTS vsp-window, so bound it against the array before indexing. + */ + if (vsp_id >= DPAA_VSP_PROFILE_MAX_NUM) { + DPAA_PMD_ERR("Invalid VSP ID(%d) >= max(%d)", + vsp_id, DPAA_VSP_PROFILE_MAX_NUM); + return -EINVAL; + } + + if (dpaa_intf->vsp[vsp_id].vsp_bp[0] && + dpaa_intf->vsp[vsp_id].vsp_bp[0]->bpid && + bpid != dpaa_intf->vsp[vsp_id].vsp_bp[0]->bpid) { DPAA_PMD_ERR("Various MPs are assigned to RXQs with same VSP"); - return -1; + return -EINVAL; } return 0; @@ -1213,10 +1223,10 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, return -EINVAL; } } else { - if (dpaa_eth_rx_queue_bp_check(dev, rxq->vsp_id, - DPAA_MEMPOOL_TO_POOL_INFO(mp)->bpid)) { - return -EINVAL; - } + ret = dpaa_eth_rx_queue_bp_check(dev, rxq->vsp_id, + DPAA_MEMPOOL_TO_POOL_INFO(mp)->bpid); + if (ret) + return ret; } if (dpaa_intf->bp_info && dpaa_intf->bp_info->bp && @@ -1256,9 +1266,9 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, int8_t vsp_id = rxq->vsp_id; if (vsp_id >= 0) { - ret = dpaa_port_vsp_update(dpaa_intf, fmc_q, vsp_id, - DPAA_MEMPOOL_TO_POOL_INFO(mp)->bpid, - fif, buffsz + RTE_PKTMBUF_HEADROOM); + dpaa_intf->vsp[vsp_id].vsp_bp[0] = DPAA_MEMPOOL_TO_POOL_INFO(mp); + dpaa_intf->vsp[vsp_id].bp_num = 1; + ret = dpaa_port_vsp_update(dpaa_intf, fmc_q, vsp_id, fif); if (ret) { DPAA_PMD_ERR("dpaa_port_vsp_update failed"); return ret; @@ -1271,12 +1281,13 @@ int dpaa_eth_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, " to shared interface on DPDK."); return -EINVAL; } - dpaa_intf->vsp_bpid[fif->base_profile_id] = - DPAA_MEMPOOL_TO_POOL_INFO(mp)->bpid; + dpaa_intf->vsp[fif->base_profile_id].vsp_bp[0] = + DPAA_MEMPOOL_TO_POOL_INFO(mp); + dpaa_intf->vsp[fif->base_profile_id].bp_num = 1; } } else { - dpaa_intf->vsp_bpid[0] = - DPAA_MEMPOOL_TO_POOL_INFO(mp)->bpid; + dpaa_intf->vsp[0].vsp_bp[0] = DPAA_MEMPOOL_TO_POOL_INFO(mp); + dpaa_intf->vsp[0].bp_num = 1; } dpaa_intf->valid = 1; diff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h index d342d98f23..1abcb55ca0 100644 --- a/drivers/net/dpaa/dpaa_ethdev.h +++ b/drivers/net/dpaa/dpaa_ethdev.h @@ -118,6 +118,12 @@ enum { #define FMC_FILE "/tmp/fmc.bin" +struct dpaa_if_vsp { + struct dpaa_bp_info *vsp_bp[FMAN_PORT_MAX_EXT_POOLS_NUM]; + uint8_t bp_num; + void *vsp_handle; +}; + extern struct rte_mempool *dpaa_tx_sg_pool; /* PMD related logs */ @@ -164,8 +170,7 @@ struct dpaa_if { */ struct qman_fq *next_tx_conf_queue; - void *vsp_handle[DPAA_VSP_PROFILE_MAX_NUM]; - uint32_t vsp_bpid[DPAA_VSP_PROFILE_MAX_NUM]; + struct dpaa_if_vsp vsp[DPAA_VSP_PROFILE_MAX_NUM]; }; struct dpaa_if_stats { diff --git a/drivers/net/dpaa/dpaa_flow.c b/drivers/net/dpaa/dpaa_flow.c index bfe294d21d..7e287a39a9 100644 --- a/drivers/net/dpaa/dpaa_flow.c +++ b/drivers/net/dpaa/dpaa_flow.c @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2017-2019,2021-2025 NXP + * Copyright 2017-2019,2021-2026 NXP */ /* System headers */ @@ -10,6 +10,7 @@ #include <dpaa_ethdev.h> #include <dpaa_flow.h> +#include <dpaa_mempool.h> #include <rte_dpaa_logs.h> #include <fmlib/fm_port_ext.h> #include <fmlib/fm_vsp_ext.h> @@ -810,8 +811,7 @@ int dpaa_fm_config(struct rte_eth_dev *dev, uint64_t req_dist_set) if (fif->num_profiles) { for (i = 0; i < dev->data->nb_rx_queues; i++) - dpaa_intf->rx_queues[i].vsp_id = - fm_default_vsp_id(fif); + dpaa_intf->rx_queues[i].vsp_id = fm_default_vsp_id(fif); i = 0; } @@ -943,28 +943,23 @@ int dpaa_fm_term(void) } static int dpaa_port_vsp_configure(struct dpaa_if *dpaa_intf, - uint8_t vsp_id, t_handle fman_handle, - struct fman_if *fif, u32 mbuf_data_room_size) + uint8_t vsp_id, t_handle fman_handle, struct fman_if *fif) { + struct dpaa_if_vsp *vsp; t_fm_vsp_params vsp_params; t_fm_buffer_prefix_content buf_prefix_cont; - uint8_t idx = mac_idx[fif->mac_idx]; + uint8_t idx = mac_idx[fif->mac_idx], i; int ret; - - if (vsp_id == fif->base_profile_id && fif->is_shared_mac) { - /* For shared interface, VSP of base - * profile is default pool located in kernel. - */ - dpaa_intf->vsp_bpid[vsp_id] = 0; - return 0; - } + struct t_fm_ext_pools *pools; if (vsp_id >= DPAA_VSP_PROFILE_MAX_NUM) { - DPAA_PMD_ERR("VSP ID %d exceeds MAX number %d", + DPAA_PMD_ERR("Invalid VSP ID(%d) >= max(%d)", vsp_id, DPAA_VSP_PROFILE_MAX_NUM); - return -1; + return -EINVAL; } + vsp = &dpaa_intf->vsp[vsp_id]; + memset(&vsp_params, 0, sizeof(vsp_params)); vsp_params.h_fm = fman_handle; vsp_params.relative_profile_id = vsp_id; @@ -977,17 +972,21 @@ static int dpaa_port_vsp_configure(struct dpaa_if *dpaa_intf, vsp_params.port_params.port_type = get_rx_port_type(fif); if (vsp_params.port_params.port_type == e_FM_PORT_TYPE_DUMMY) { DPAA_PMD_ERR("Mac type %d error", fif->mac_type); - return -1; + return -EINVAL; } - vsp_params.ext_buf_pools.num_of_pools_used = 1; - vsp_params.ext_buf_pools.ext_buf_pool[0].id = dpaa_intf->vsp_bpid[vsp_id]; - vsp_params.ext_buf_pools.ext_buf_pool[0].size = mbuf_data_room_size; + pools = &vsp_params.ext_buf_pools; - dpaa_intf->vsp_handle[vsp_id] = fm_vsp_config(&vsp_params); - if (!dpaa_intf->vsp_handle[vsp_id]) { - DPAA_PMD_ERR("fm_vsp_config error for profile %d", vsp_id); - return -EINVAL; + pools->num_of_pools_used = vsp->bp_num; + for (i = 0; i < vsp->bp_num; i++) { + pools->ext_buf_pool[i].id = vsp->vsp_bp[i]->bpid; + pools->ext_buf_pool[i].size = vsp->vsp_bp[i]->size; + } + + vsp->vsp_handle = fm_vsp_config(&vsp_params); + if (!vsp->vsp_handle) { + DPAA_PMD_ERR("Configure VSP[%d] failed!", vsp_id); + return -EIO; } /* configure the application buffer (structure, size and @@ -1005,19 +1004,18 @@ static int dpaa_port_vsp_configure(struct dpaa_if *dpaa_intf, buf_prefix_cont.manip_ext_space = RTE_PKTMBUF_HEADROOM - DPAA_MBUF_HW_ANNOTATION; - ret = fm_vsp_config_buffer_prefix_content(dpaa_intf->vsp_handle[vsp_id], - &buf_prefix_cont); + ret = fm_vsp_config_buffer_prefix_content(vsp->vsp_handle, + &buf_prefix_cont); if (ret != E_OK) { - DPAA_PMD_ERR("fm_vsp_config_buffer_prefix_content error for profile %d err: %d", - vsp_id, ret); + DPAA_PMD_ERR("Configure VSP[%d]'s buffer prefix failed(%d)!", + vsp_id, ret); return ret; } /* initialize the FM VSP module */ - ret = fm_vsp_init(dpaa_intf->vsp_handle[vsp_id]); + ret = fm_vsp_init(vsp->vsp_handle); if (ret != E_OK) { - DPAA_PMD_ERR("fm_vsp_init error for profile %d err:%d", - vsp_id, ret); + DPAA_PMD_ERR("Init VSP[%d] failed(%d)!", vsp_id, ret); return ret; } @@ -1025,29 +1023,44 @@ static int dpaa_port_vsp_configure(struct dpaa_if *dpaa_intf, } int dpaa_port_vsp_update(struct dpaa_if *dpaa_intf, - bool fmc_mode, uint8_t vsp_id, uint32_t bpid, - struct fman_if *fif, u32 mbuf_data_room_size) + bool fmc_mode, uint8_t vsp_id, struct fman_if *fif) { int ret = 0; t_handle fman_handle; + struct dpaa_if_vsp *vsp; - if (!fif->num_profiles) - return 0; + if (!fif->num_profiles) { + DPAA_PMD_ERR("%s: No multiple VSPs specified!", + dpaa_intf->name); + return -EINVAL; + } - if (vsp_id >= fif->num_profiles) - return 0; + if (vsp_id >= (fif->base_profile_id + fif->num_profiles)) { + DPAA_PMD_ERR("%s: Invalid VSP ID(%d) >= base(%d) + num(%d)", + dpaa_intf->name, vsp_id, fif->base_profile_id, + fif->num_profiles); + return -EINVAL; + } - if (dpaa_intf->vsp_bpid[vsp_id] == bpid) + if (vsp_id == fif->base_profile_id && fif->is_shared_mac) { + /* For shared interface, VSP of base + * profile is default pool located in kernel. + */ + dpaa_intf->vsp[vsp_id].bp_num = 0; + dpaa_intf->vsp[vsp_id].vsp_handle = NULL; return 0; + } - if (dpaa_intf->vsp_handle[vsp_id]) { - ret = fm_vsp_free(dpaa_intf->vsp_handle[vsp_id]); + vsp = &dpaa_intf->vsp[vsp_id]; + + if (vsp->vsp_handle) { + ret = fm_vsp_free(vsp->vsp_handle); if (ret != E_OK) { - DPAA_PMD_ERR("Error fm_vsp_free: err %d vsp_handle[%d]", - ret, vsp_id); + DPAA_PMD_ERR("Free VSP[%d]'s handle failed(%d)", + vsp_id, ret); return ret; } - dpaa_intf->vsp_handle[vsp_id] = 0; + vsp->vsp_handle = NULL; } if (fmc_mode) @@ -1055,24 +1068,23 @@ int dpaa_port_vsp_update(struct dpaa_if *dpaa_intf, else fman_handle = fm_info.fman_handle; - dpaa_intf->vsp_bpid[vsp_id] = bpid; - - return dpaa_port_vsp_configure(dpaa_intf, vsp_id, fman_handle, fif, - mbuf_data_room_size); + return dpaa_port_vsp_configure(dpaa_intf, vsp_id, fman_handle, fif); } -int dpaa_port_vsp_cleanup(struct dpaa_if *dpaa_intf, struct fman_if *fif) +int dpaa_port_vsp_cleanup(struct dpaa_if *dpaa_intf) { - int idx, ret; + int ret; + uint8_t idx; - for (idx = 0; idx < (uint8_t)fif->num_profiles; idx++) { - if (dpaa_intf->vsp_handle[idx]) { - ret = fm_vsp_free(dpaa_intf->vsp_handle[idx]); + for (idx = 0; idx < DPAA_VSP_PROFILE_MAX_NUM; idx++) { + if (dpaa_intf->vsp[idx].vsp_handle) { + ret = fm_vsp_free(dpaa_intf->vsp[idx].vsp_handle); if (ret != E_OK) { - DPAA_PMD_ERR("Error fm_vsp_free: err %d" - " vsp_handle[%d]", ret, idx); + DPAA_PMD_ERR("Free VSP[%d] failed(%d)", + idx, ret); return ret; } + dpaa_intf->vsp[idx].vsp_handle = NULL; } } diff --git a/drivers/net/dpaa/dpaa_flow.h b/drivers/net/dpaa/dpaa_flow.h index 4742b8dd0a..6a949d6dd4 100644 --- a/drivers/net/dpaa/dpaa_flow.h +++ b/drivers/net/dpaa/dpaa_flow.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright 2017,2019,2022 NXP + * Copyright 2017,2019,2022,2026 NXP */ #ifndef __DPAA_FLOW_H__ @@ -11,9 +11,8 @@ int dpaa_fm_config(struct rte_eth_dev *dev, uint64_t req_dist_set); int dpaa_fm_deconfig(struct dpaa_if *dpaa_intf, struct fman_if *fif); void dpaa_write_fm_config_to_file(void); int dpaa_port_vsp_update(struct dpaa_if *dpaa_intf, - bool fmc_mode, uint8_t vsp_id, uint32_t bpid, struct fman_if *fif, - u32 mbuf_data_room_size); -int dpaa_port_vsp_cleanup(struct dpaa_if *dpaa_intf, struct fman_if *fif); + bool fmc_mode, uint8_t vsp_id, struct fman_if *fif); +int dpaa_port_vsp_cleanup(struct dpaa_if *dpaa_intf); int dpaa_port_fmc_init(struct fman_if *fif, uint32_t *fqids, int8_t *vspids, int max_nb_rxq); -- 2.25.1
