diff --git a/0418-net-hns3-don-t-support-QinQ-insert-for-VF.patch b/0418-net-hns3-don-t-support-QinQ-insert-for-VF.patch new file mode 100644 index 0000000000000000000000000000000000000000..a939673016ce27ddd962d6ce800a4b7b5943249b --- /dev/null +++ b/0418-net-hns3-don-t-support-QinQ-insert-for-VF.patch @@ -0,0 +1,45 @@ +From 283338986c32000d7e145e2fa6e4d9fb2b973cfd Mon Sep 17 00:00:00 2001 +From: Chengwen Feng +Date: Thu, 21 Dec 2023 09:12:26 +0800 +Subject: [PATCH] net/hns3: don't support QinQ insert for VF + +In the HIP08 platform, the PF driver will notify VF driver to update +the PVID state [1], and VF will declare support QinQ insert when PVID +is disabled. + +In the later platform (e.g. HIP09), the hardware has been improved, +so the PF driver will NOT notify VF driver to update the PVID state. + +However, the later platform still have constraint: PVID and QinQ insert +cannot be enabled at the same time, otherwise, the hardware discards +packets and reports an error interrupt. + +Plus, as far as we known, VF driver's users don't use the QinQ insert. + +Therefore, we declare that the VF driver don't support QinQ insert. + +[1] commit b4e4d7ac9f09 ("net/hns3: support setting VF PVID by PF driver") + +Cc: stable@dpdk.org + +Signed-off-by: Chengwen Feng +--- + drivers/net/hns3/hns3_common.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/hns3/hns3_common.c b/drivers/net/hns3/hns3_common.c +index 0d6b2c65af..717649f259 100644 +--- a/drivers/net/hns3/hns3_common.c ++++ b/drivers/net/hns3/hns3_common.c +@@ -85,7 +85,7 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info) + RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE | + RTE_ETH_TX_OFFLOAD_VLAN_INSERT); + +- if (!hw->port_base_vlan_cfg.state) ++ if (!hns->is_vf && !hw->port_base_vlan_cfg.state) + info->tx_offload_capa |= RTE_ETH_TX_OFFLOAD_QINQ_INSERT; + + if (hns3_dev_get_support(hw, OUTER_UDP_CKSUM)) +-- +2.41.0.windows.2 + diff --git a/dpdk.spec b/dpdk.spec index ff8618198a87bc0640d666cead1b9108e6acb9fd..f62ec7aea201cf3ca9d8b86100c6dd2056b76afc 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -1,6 +1,6 @@ Name: dpdk Version: 21.11 -Release: 62 +Release: 63 Packager: packaging@6wind.com URL: http://dpdk.org %global source_version 21.11 @@ -448,6 +448,7 @@ Patch6414: 0414-net-hns3-refactor-handle-mailbox-function.patch Patch6415: 0415-net-hns3-fix-VF-multiple-count-on-one-reset.patch Patch6416: 0416-net-hns3-fix-disable-command-with-firmware.patch Patch6417: 0417-net-hns3-fix-reset-level-comparison.patch +Patch6418: 0418-net-hns3-don-t-support-QinQ-insert-for-VF.patch Summary: Data Plane Development Kit core Group: System Environment/Libraries @@ -462,6 +463,7 @@ BuildRequires: rdma-core-devel BuildRequires: uname-build-checks BuildRequires: chrpath BuildRequires: groff-base +BuildRequires: libibverbs %define kern_devel_ver %(uname -r) %define arch_type %(uname -m) @@ -603,6 +605,9 @@ strip -g $RPM_BUILD_ROOT/lib/modules/%{kern_devel_ver}/extra/dpdk/igb_uio.ko /usr/sbin/depmod %changelog +* Fri Dec 29 2023 huangdengdui - 21.11-63 + The hns3 driver don't support QinQ insert for VF + * Fri Dec 15 2023 huangdengdui - 21.11-62 Sync some patches for hns3 about refactor mailbox and bugfix, modifies are as follow: