Acked-by: Xiaoyun Li <xiaoyun...@intel.com>
> -----Original Message-----
> From: Steve Yang <stevex.y...@intel.com>
> Sent: Wednesday, December 23, 2020 16:52
> To: dev@dpdk.org
> Cc: Lu, Wenzhuo <wenzhuo...@intel.com>; Xing, Beilei <beilei.x...@intel.com>;
> Iremonger, Bernard <bernard.iremon...@intel.com>; Li, Xiaoyun
> <xiaoyun...@intel.com>; Yang, Qiming <qiming.y...@intel.com>; Yang, SteveX
> <stevex.y...@intel.com>
> Subject: [PATCH v2] app/testpmd: fix dynamic config error
>
> The offloads of 'tx/rx_conf' didn't keep up with the corresponding offloads of
> 'dev_conf', it would cause the configuration invalid.
>
> For example:
> Configuring 'max-pkt-len' would change 'rx_offloads' in dev_conf while
> rx_conf.offloads of each queue still kept the old value.
> It would cause the failure of offloads check in 'rte_eth_rx_queue_setup'.
>
> This patch applied tx/rx offloads configuration for each queue once it
> changed.
>
> Fixes: 5e91aeef218c ("app/testpmd: fix offload flags after port config")
>
> Signed-off-by: Steve Yang <stevex.y...@intel.com>
> ---
> v2:
> * moved the update logic to 'rxtx_port_config';
> * added the 'tx_conf' part;
> * optimized the 'default' assignment;
> ---
> app/test-pmd/testpmd.c | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index
> 33a060dffd..6ee28e3797 100644
> --- a/app/test-pmd/testpmd.c
> +++ b/app/test-pmd/testpmd.c
> @@ -3288,9 +3288,11 @@ rxtx_port_config(struct rte_port *port)
>
> for (qid = 0; qid < nb_rxq; qid++) {
> offloads = port->rx_conf[qid].offloads;
> - port->rx_conf[qid] = port->dev_info.default_rxconf;
> - if (offloads != 0)
> - port->rx_conf[qid].offloads = offloads;
> + if (offloads != port->dev_conf.rxmode.offloads)
> + port->rx_conf[qid].offloads =
> + port->dev_conf.rxmode.offloads;
> + if (!offloads)
> + port->rx_conf[qid] = port->dev_info.default_rxconf;
>
> /* Check if any Rx parameters have been passed */
> if (rx_pthresh != RTE_PMD_PARAM_UNSET) @@ -3313,9
> +3315,11 @@ rxtx_port_config(struct rte_port *port)
>
> for (qid = 0; qid < nb_txq; qid++) {
> offloads = port->tx_conf[qid].offloads;
> - port->tx_conf[qid] = port->dev_info.default_txconf;
> - if (offloads != 0)
> - port->tx_conf[qid].offloads = offloads;
> + if (offloads != port->dev_conf.txmode.offloads)
> + port->tx_conf[qid].offloads =
> + port->dev_conf.txmode.offloads;
> + if (!offloads)
> + port->tx_conf[qid] = port->dev_info.default_txconf;
>
> /* Check if any Tx parameters have been passed */
> if (tx_pthresh != RTE_PMD_PARAM_UNSET)
> --
> 2.17.1
