From: Jun Yang <[email protected]> In FMCLESS mode, set the default number of Rx frame queues to the maximum queue number instead of the core count, because multiple queues may be processed on the same core. The value can also be configured per port through the 'drv_fmcless_rxq' device argument.
Signed-off-by: Jun Yang <[email protected]> Signed-off-by: Hemant Agrawal <[email protected]> --- doc/guides/nics/dpaa.rst | 4 ++++ drivers/net/dpaa/dpaa_ethdev.c | 22 +++++++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/doc/guides/nics/dpaa.rst b/doc/guides/nics/dpaa.rst index a65d7d1fb8..5eb235de91 100644 --- a/doc/guides/nics/dpaa.rst +++ b/doc/guides/nics/dpaa.rst @@ -288,6 +288,10 @@ the ``-a`` EAL option (e.g. ``-a dpaa_bus:fm1-mac3,drv_rx_taildrop=64``): Configure the Rx / Tx frame queue taildrop congestion threshold. A value of ``0`` disables taildrop. +* ``drv_fmcless_rxq`` + + In FMCLESS mode, override the number of Rx frame queues to create. + FMAN Config ----------- diff --git a/drivers/net/dpaa/dpaa_ethdev.c b/drivers/net/dpaa/dpaa_ethdev.c index 0ef8fb022e..89d3eb7736 100644 --- a/drivers/net/dpaa/dpaa_ethdev.c +++ b/drivers/net/dpaa/dpaa_ethdev.c @@ -57,6 +57,7 @@ #define DRIVER_RECV_ERR_PKTS "recv_err_pkts" #define DRIVER_RX_TAILDROP "drv_rx_taildrop" #define DRIVER_TX_TAILDROP "drv_tx_taildrop" +#define DRIVER_FMCLESS_RXQ "drv_fmcless_rxq" #define RTE_PRIORITY_103 103 /* Supported Rx offloads */ @@ -2328,8 +2329,22 @@ dpaa_dev_init(struct rte_eth_dev *eth_dev) dpaa_intf->name); } } else { - /* FMCLESS mode, load balance to multiple cores.*/ - num_rx_fqs = rte_lcore_count(); + /* FMCLESS mode, default queue number is max queues + * because multiple queues may be processed on same core. + */ + long fmcless_rxq = 0; + + if (dpaa_get_devargs_int(dev->devargs, DRIVER_FMCLESS_RXQ, + &fmcless_rxq) == 1) { + num_rx_fqs = (int)fmcless_rxq; + if (num_rx_fqs > DPAA_MAX_NUM_PCD_QUEUES) { + DPAA_PMD_WARN("fmcless max rxq number(%d) > %d", + num_rx_fqs, DPAA_MAX_NUM_PCD_QUEUES); + num_rx_fqs = DPAA_MAX_NUM_PCD_QUEUES; + } + } else { + num_rx_fqs = DPAA_MAX_NUM_PCD_QUEUES; + } } /* Each device can not have more than DPAA_MAX_NUM_PCD_QUEUES RX @@ -2770,5 +2785,6 @@ RTE_PMD_REGISTER_DPAA(net_dpaa, rte_dpaa_pmd); RTE_PMD_REGISTER_PARAM_STRING(net_dpaa, DRIVER_RECV_ERR_PKTS "=<int>" DRIVER_RX_TAILDROP "=<int>" - DRIVER_TX_TAILDROP "=<int>"); + DRIVER_TX_TAILDROP "=<int>" + DRIVER_FMCLESS_RXQ "=<int>"); RTE_LOG_REGISTER_DEFAULT(dpaa_logtype_pmd, NOTICE); -- 2.25.1
