[PATCH] net/nfp: fix the issue about set the vlan strip offload off

[Ferruh Yigit]

On 4/19/2022 9:38 AM, Peng Zhang wrote:
> When set the vlan_strip_offload off, it doesn't work.
> Because we can't update the msg in the nic.
> 
> This patch will fix this error.
> 
> Fixes: d4a27a3b092a ("nfp: add basic features")
> Cc: stable at dpdk.org
> 
> Signed-off-by: Peng Zhang <peng.zhang at corigine.com>
> Signed-off-by: Yong Xu <yong.xu at corigine.com>
> Signed-off-by: Chaoyong He <chaoyong.he at corigine.com>
> ---
>   drivers/net/nfp/nfp_common.c | 21 ++++++++++-----------
>   1 file changed, 10 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/net/nfp/nfp_common.c b/drivers/net/nfp/nfp_common.c
> index b26770dbfb..ab4cfda389 100644
> --- a/drivers/net/nfp/nfp_common.c
> +++ b/drivers/net/nfp/nfp_common.c
> @@ -968,19 +968,18 @@ nfp_net_vlan_offload_set(struct rte_eth_dev *dev, int mask)
>   	int ret;
>   
>   	hw = NFP_NET_DEV_PRIVATE_TO_HW(dev->data->dev_private);
> -	new_ctrl = 0;
> +	new_ctrl = hw->ctrl;
>   
> -	/* Enable vlan strip if it is not configured yet */
> -	if ((mask & RTE_ETH_VLAN_STRIP_OFFLOAD) &&
> -	    !(hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN))
> -		new_ctrl = hw->ctrl | NFP_NET_CFG_CTRL_RXVLAN;
> -
> -	/* Disable vlan strip just if it is configured */
> -	if (!(mask & RTE_ETH_VLAN_STRIP_OFFLOAD) &&
> -	    (hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN))
> -		new_ctrl = hw->ctrl & ~NFP_NET_CFG_CTRL_RXVLAN;
> +	if (mask & RTE_ETH_VLAN_STRIP_OFFLOAD) {
> +		/* Disable vlan strip just if it is configured */
> +		if (hw->ctrl & NFP_NET_CFG_CTRL_RXVLAN)
> +			new_ctrl = new_ctrl & ~NFP_NET_CFG_CTRL_RXVLAN;
> +		/* Enable vlan strip if it is not configured yet */
> +		else
> +			new_ctrl = new_ctrl | NFP_NET_CFG_CTRL_RXVLAN;
> +	}

Hi Peng,

I think both old and new implementations are not correct, although new 
one is on the right track to fix.

First 'mask' is filled with ethdev layer and can get one of below values:
RTE_ETH_VLAN_STRIP_MASK
RTE_ETH_VLAN_FILTER_MASK
RTE_ETH_VLAN_EXTEND_MASK
RTE_ETH_QINQ_STRIP_MASK

So PMDs should check 'mask' against those values.
'RTE_ETH_VLAN_*_OFFLOAD' are the values passed by application to the 
ethdev layer. (Why ethdev layer converts them to different set of 
macros, I don't know :/ )

And PMD 'vlan_offload_set()' dev_ops having one of 'RTE_ETH_VLAN_*_MASK' 
macro means that config is changed, this doesn't say yet if it is 
enabled or disabled.
'dev->data->dev_conf.rxmode' needs to be checked to decide to enable or 
disable a config.

Please check 'rte_eth_dev_set_vlan_offload()' API implementation for 
details.


>   
> -	if (new_ctrl == 0)
> +	if (new_ctrl == hw->ctrl)
>   		return 0;
>   
>   	update = NFP_NET_CFG_UPDATE_GEN;