From: "Zhang, Yuying" <yuying.zhang@intel.com>
To: "Liu, KevinX" <kevinx.liu@intel.com>, "dev@dpdk.org" <dev@dpdk.org>
Cc: "Xing, Beilei" <beilei.xing@intel.com>,
"Yang, SteveX" <stevex.yang@intel.com>,
"Zhang, RobinX" <robinx.zhang@intel.com>
Subject: RE: [PATCH v7] net/i40e: add outer VLAN processing
Date: Tue, 14 Jun 2022 02:43:30 +0000 [thread overview]
Message-ID: <DM6PR11MB35166699C4C2640B496EC1AB8EAA9@DM6PR11MB3516.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20220610162944.99526-1-kevinx.liu@intel.com>
Hi Kevin,
> -----Original Message-----
> From: Liu, KevinX <kevinx.liu@intel.com>
> Sent: Saturday, June 11, 2022 12:30 AM
> To: dev@dpdk.org
> Cc: Zhang, Yuying <yuying.zhang@intel.com>; Xing, Beilei
> <beilei.xing@intel.com>; Yang, SteveX <stevex.yang@intel.com>; Zhang,
> RobinX <robinx.zhang@intel.com>; Liu, KevinX <kevinx.liu@intel.com>
> Subject: [PATCH v7] net/i40e: add outer VLAN processing
>
> From: Robin Zhang <robinx.zhang@intel.com>
>
> Outer VLAN processing is supported after firmware v8.4, kernel driver also
Since this patch can only be enabled with firmware v8.6, should you sync with dpdk here?
> change the default behavior to support this feature. To align with kernel
> driver, add support for outer VLAN processing in DPDK.
>
> But it is forbidden for firmware to change the Inner/Outer VLAN
> configuration while there are MAC/VLAN filters in the switch table.
> Therefore, we need to clear the MAC table before setting config, and then
> restore the MAC table after setting.
>
> This will not impact on an old firmware.
>
> Signed-off-by: Robin Zhang <robinx.zhang@intel.com>
> Signed-off-by: Kevin Liu <kevinx.liu@intel.com>
> ---
> drivers/net/i40e/i40e_ethdev.c | 94 ++++++++++++++++++++++++++++++++--
> drivers/net/i40e/i40e_ethdev.h | 3 ++
> 2 files changed, 92 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 755786dc10..4cae163cb9 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -2575,6 +2575,7 @@ i40e_dev_close(struct rte_eth_dev *dev)
> struct i40e_hw *hw = I40E_DEV_PRIVATE_TO_HW(dev->data-
> >dev_private);
> struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(dev);
> struct rte_intr_handle *intr_handle = pci_dev->intr_handle;
> + struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
> struct i40e_filter_control_settings settings;
> struct rte_flow *p_flow;
> uint32_t reg;
> @@ -2587,6 +2588,18 @@ i40e_dev_close(struct rte_eth_dev *dev)
> if (rte_eal_process_type() != RTE_PROC_PRIMARY)
> return 0;
>
> + /*
> + * It is a workaround, if the double VLAN is disabled when
> + * the program exits, an abnormal error will occur on the
> + * NIC. Need to enable double VLAN when dev is closed.
> + */
What is the root cause of this error, I suggest finding a true fix instead of adding
additonal process here.
> + if (pf->fw8_3gt) {
> + if (!(rxmode->offloads &
> RTE_ETH_RX_OFFLOAD_VLAN_EXTEND)) {
> + rxmode->offloads |=
> RTE_ETH_RX_OFFLOAD_VLAN_EXTEND;
> + i40e_vlan_offload_set(dev,
> RTE_ETH_VLAN_EXTEND_MASK);
> + }
> + }
> +
> ret = rte_eth_switch_domain_free(pf->switch_domain_id);
> if (ret)
> PMD_INIT_LOG(WARNING, "failed to free switch
> domain: %d", ret); @@ -3909,6 +3922,7 @@ i40e_vlan_tpid_set(struct
> rte_eth_dev *dev,
> struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data-
> >dev_private);
> int qinq = dev->data->dev_conf.rxmode.offloads &
> RTE_ETH_RX_OFFLOAD_VLAN_EXTEND;
> + u16 sw_flags = 0, valid_flags = 0;
> int ret = 0;
>
> if ((vlan_type != RTE_ETH_VLAN_TYPE_INNER && @@ -3927,15
> +3941,32 @@ i40e_vlan_tpid_set(struct rte_eth_dev *dev,
> /* 802.1ad frames ability is added in NVM API 1.7*/
> if (hw->flags & I40E_HW_FLAG_802_1AD_CAPABLE) {
> if (qinq) {
> + if (pf->fw8_3gt) {
> + sw_flags =
> I40E_AQ_SET_SWITCH_CFG_OUTER_VLAN;
> + valid_flags =
> I40E_AQ_SET_SWITCH_CFG_OUTER_VLAN;
> + }
> if (vlan_type == RTE_ETH_VLAN_TYPE_OUTER)
> hw->first_tag = rte_cpu_to_le_16(tpid);
> else if (vlan_type == RTE_ETH_VLAN_TYPE_INNER)
> hw->second_tag = rte_cpu_to_le_16(tpid);
> } else {
> - if (vlan_type == RTE_ETH_VLAN_TYPE_OUTER)
> - hw->second_tag = rte_cpu_to_le_16(tpid);
> + /*
> + * If tpid is equal to 0x88A8, indicates that the
> + * disable double VLAN operation is in progress.
> + * Need set switch configuration back to default.
> + */
I don't suppose we need to set qinq tpid in vlan case. Please explain this situation in details.
> + if (pf->fw8_3gt && tpid == RTE_ETHER_TYPE_QINQ) {
> + sw_flags = 0;
> + valid_flags =
> I40E_AQ_SET_SWITCH_CFG_OUTER_VLAN;
> + if (vlan_type == RTE_ETH_VLAN_TYPE_OUTER)
> + hw->first_tag =
> rte_cpu_to_le_16(tpid);
> + } else {
> + if (vlan_type == RTE_ETH_VLAN_TYPE_OUTER)
> + hw->second_tag =
> rte_cpu_to_le_16(tpid);
> + }
> }
> - ret = i40e_aq_set_switch_config(hw, 0, 0, 0, NULL);
> + ret = i40e_aq_set_switch_config(hw, sw_flags,
> + valid_flags, 0, NULL);
> if (ret != I40E_SUCCESS) {
> PMD_DRV_LOG(ERR,
> "Set switch config failed aq_err: %d", @@ -
> 3987,8 +4018,13 @@ static int i40e_vlan_offload_set(struct rte_eth_dev
> *dev, int mask) {
> struct i40e_pf *pf = I40E_DEV_PRIVATE_TO_PF(dev->data-
> >dev_private);
> + struct i40e_mac_filter_info *mac_filter;
> struct i40e_vsi *vsi = pf->main_vsi;
> struct rte_eth_rxmode *rxmode;
> + struct i40e_mac_filter *f;
> + int i, num;
> + void *temp;
> + int ret;
>
> rxmode = &dev->data->dev_conf.rxmode;
> if (mask & RTE_ETH_VLAN_FILTER_MASK) { @@ -4007,6 +4043,33
> @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
> }
>
> if (mask & RTE_ETH_VLAN_EXTEND_MASK) {
> + i = 0;
> + num = vsi->mac_num;
> + mac_filter = rte_zmalloc("mac_filter_info_data",
> + num * sizeof(*mac_filter), 0);
> + if (mac_filter == NULL) {
> + PMD_DRV_LOG(ERR, "failed to allocate memory");
> + return I40E_ERR_NO_MEMORY;
> + }
> +
> + /*
> + * Outer VLAN processing is supported after firmware v8.4,
> kernel driver
> + * also change the default behavior to support this feature.
> To align with
> + * kernel driver, set switch config in 'i40e_vlan_tpie_set' to
> support for
> + * outer VLAN processing. But it is forbidden for firmware to
> change the
> + * Inner/Outer VLAN configuration while there are
> MAC/VLAN filters in the
> + * switch table. Therefore, we need to clear the MAC table
> before setting
> + * config, and then restore the MAC table after setting. This
> feature is
> + * recommended to be used in firmware v8.6.
> + */
> + /* Remove all existing mac */
> + RTE_TAILQ_FOREACH_SAFE(f, &vsi->mac_list, next, temp) {
> + mac_filter[i] = f->mac_info;
> + ret = i40e_vsi_delete_mac(vsi, &f-
> >mac_info.mac_addr);
> + if (ret)
> + PMD_DRV_LOG(ERR, "i40e vsi delete mac
> fail.");
> + i++;
> + }
> if (rxmode->offloads &
> RTE_ETH_RX_OFFLOAD_VLAN_EXTEND) {
> i40e_vsi_config_double_vlan(vsi, TRUE);
> /* Set global registers with default ethertype. */ @@
> -4014,9 +4077,19 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int
> mask)
> RTE_ETHER_TYPE_VLAN);
> i40e_vlan_tpid_set(dev, RTE_ETH_VLAN_TYPE_INNER,
> RTE_ETHER_TYPE_VLAN);
> - }
> - else
> + } else {
> + if (pf->fw8_3gt)
> + i40e_vlan_tpid_set(dev,
> RTE_ETH_VLAN_TYPE_OUTER,
> + RTE_ETHER_TYPE_QINQ);
> i40e_vsi_config_double_vlan(vsi, FALSE);
> + }
> + /* Restore all mac */
> + for (i = 0; i < num; i++) {
> + ret = i40e_vsi_add_mac(vsi, &mac_filter[i]);
> + if (ret)
> + PMD_DRV_LOG(ERR, "i40e vsi add mac fail.");
> + }
> + rte_free(mac_filter);
> }
>
> if (mask & RTE_ETH_QINQ_STRIP_MASK) {
> @@ -4846,6 +4919,17 @@ i40e_pf_parameter_init(struct rte_eth_dev *dev)
> return -EINVAL;
> }
>
> + /**
> + * Enable outer VLAN processing if firmware version is greater
> + * than v8.3
> + */
> + if (hw->aq.fw_maj_ver > 8 ||
> + (hw->aq.fw_maj_ver == 8 && hw->aq.fw_min_ver > 3)) {
> + pf->fw8_3gt = true;
> + } else {
> + pf->fw8_3gt = false;
> + }
> +
> return 0;
> }
>
> diff --git a/drivers/net/i40e/i40e_ethdev.h b/drivers/net/i40e/i40e_ethdev.h
> index a1ebdc093c..fe943a45ff 100644
> --- a/drivers/net/i40e/i40e_ethdev.h
> +++ b/drivers/net/i40e/i40e_ethdev.h
> @@ -1188,6 +1188,9 @@ struct i40e_pf {
> /* Switch Domain Id */
> uint16_t switch_domain_id;
>
> + /* When firmware > 8.3, the enable flag for outer VLAN processing */
> + bool fw8_3gt;
> +
> struct i40e_vf_msg_cfg vf_msg_cfg;
> uint64_t prev_rx_bytes;
> uint64_t prev_tx_bytes;
> --
> 2.34.1
next prev parent reply other threads:[~2022-06-14 2:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-18 9:39 [PATCH] " Robin Zhang
2022-05-19 6:18 ` [PATCH v2] " Robin Zhang
2022-06-09 11:26 ` [PATCH v3] " Kevin Liu
2022-06-09 14:43 ` [PATCH v4] " Kevin Liu
2022-04-07 20:01 ` [PATCH v5] " Kevin Liu
2022-06-10 15:52 ` [PATCH v6] " Kevin Liu
2022-06-10 8:06 ` Zhang, Qi Z
2022-06-10 8:14 ` Liu, KevinX
2022-06-10 16:29 ` [PATCH v7] " Kevin Liu
2022-06-10 14:27 ` Ben Magistro
2022-06-13 2:14 ` Liu, KevinX
2022-06-13 15:01 ` Ben Magistro
2022-06-14 2:43 ` Zhang, Yuying [this message]
2022-06-14 3:06 ` Liu, KevinX
2022-06-14 8:39 ` Zhang, Yuying
2022-06-14 8:43 ` Liu, KevinX
2022-06-15 12:12 ` Zhang, Qi Z
2022-06-10 1:01 ` [PATCH v4] " Zhang, Qi Z
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=DM6PR11MB35166699C4C2640B496EC1AB8EAA9@DM6PR11MB3516.namprd11.prod.outlook.com \
--to=yuying.zhang@intel.com \
--cc=beilei.xing@intel.com \
--cc=dev@dpdk.org \
--cc=kevinx.liu@intel.com \
--cc=robinx.zhang@intel.com \
--cc=stevex.yang@intel.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).