From: Ferruh Yigit <ferruh.yigit@amd.com>
To: "Peng Zhang" <peng.zhang@corigine.com>,
"Niklas Söderlund" <niklas.soderlund@corigine.com>
Cc: <niklas.soderlund@corigine.com>, <stable@dpdk.org>,
Yong Xu <yong.xu@corigine.com>,
Chaoyong He <chaoyong.he@corigine.com>, <dev@dpdk.org>
Subject: Re: [PATCH] net/nfp: fix the issue about set the vlan strip offload off
Date: Tue, 24 May 2022 13:57:22 +0100 [thread overview]
Message-ID: <b43f5bda-751d-3de5-227d-fdcee04e24df@amd.com> (raw)
In-Reply-To: <20220419083857.409261-1-peng.zhang@corigine.com>
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@dpdk.org
>
> Signed-off-by: Peng Zhang <peng.zhang@corigine.com>
> Signed-off-by: Yong Xu <yong.xu@corigine.com>
> Signed-off-by: Chaoyong He <chaoyong.he@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;
next prev parent reply other threads:[~2022-05-24 12:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-19 8:38 Peng Zhang
2022-05-20 15:20 ` Ferruh Yigit
2022-05-23 21:16 ` Niklas Söderlund
2022-05-24 12:57 ` Ferruh Yigit [this message]
2022-05-26 14:34 ` [PATCH v2] net/nfp: fix bug of disable VLAN strip Peng Zhang
2022-05-31 13:27 ` Ferruh Yigit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=b43f5bda-751d-3de5-227d-fdcee04e24df@amd.com \
--to=ferruh.yigit@amd.com \
--cc=chaoyong.he@corigine.com \
--cc=dev@dpdk.org \
--cc=niklas.soderlund@corigine.com \
--cc=peng.zhang@corigine.com \
--cc=stable@dpdk.org \
--cc=yong.xu@corigine.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).