Re: [dpdk-dev] [PATCH v17 4/8] eal/arm: update CPU flags
> -Original Message-
> From: Juraj Linkeš
> Sent: Thursday, April 22, 2021 8:49 PM
> To: tho...@monjalon.net; david.march...@redhat.com;
> bruce.richard...@intel.com; acon...@redhat.com;
> maicolgabr...@hotmail.com; Honnappa Nagarahalli
> ; Ruifeng Wang
> ; jer...@marvell.com; vikto...@rehivetech.com;
> Ajit Khaparde (ajit.khapa...@broadcom.com)
>
> Cc: juraj.lin...@pantheon.tech; dev@dpdk.org
> Subject: [PATCH v17 4/8] eal/arm: update CPU flags
>
> There are two execution states on armv8 architecture, aarch64 and aarch32.
> Add PLATFORM_STR for the latter and update RTE_ARCH_* flags according
> to e9b97392640.
>
> Signed-off-by: Juraj Linkeš
> ---
> lib/eal/arm/include/rte_cpuflags_32.h | 1 +
> lib/eal/arm/rte_cpuflags.c| 10 +-
> 2 files changed, 10 insertions(+), 1 deletion(-)
>
> diff --git a/lib/eal/arm/include/rte_cpuflags_32.h
> b/lib/eal/arm/include/rte_cpuflags_32.h
> index b5347be1ec..4e254428a2 100644
> --- a/lib/eal/arm/include/rte_cpuflags_32.h
> +++ b/lib/eal/arm/include/rte_cpuflags_32.h
> @@ -41,6 +41,7 @@ enum rte_cpu_flag_t {
> RTE_CPUFLAG_SHA2,
> RTE_CPUFLAG_CRC32,
> RTE_CPUFLAG_V7L,
> + RTE_CPUFLAG_V8L,
> /* The last item */
> RTE_CPUFLAG_NUMFLAGS,/**< This should always be the last! */ };
> diff --git a/lib/eal/arm/rte_cpuflags.c b/lib/eal/arm/rte_cpuflags.c index
> e3a53bcece..9e5b68b066 100644
> --- a/lib/eal/arm/rte_cpuflags.c
> +++ b/lib/eal/arm/rte_cpuflags.c
> @@ -46,8 +46,12 @@ struct feature_entry { #define FEAT_DEF(name, reg,
> bit) \
> [RTE_CPUFLAG_##name] = {reg, bit, #name},
>
> +#ifdef RTE_ARCH_32
> #ifdef RTE_ARCH_ARMv7
> #define PLATFORM_STR "v7l"
> +#elif defined RTE_ARCH_ARMv8_AARCH32
> +#define PLATFORM_STR "v8l"
> +#endif
> typedef Elf32_auxv_t _Elfx_auxv_t;
>
> const struct feature_entry rte_cpu_feature_table[] = { @@ -78,10 +82,14
> @@ const struct feature_entry rte_cpu_feature_table[] = {
> FEAT_DEF(SHA1, REG_HWCAP2, 2)
> FEAT_DEF(SHA2, REG_HWCAP2, 3)
> FEAT_DEF(CRC32, REG_HWCAP2, 4)
> + #ifdef RTE_ARCH_ARMv7
> FEAT_DEF(V7L, REG_PLATFORM, 0)
> + #elif defined RTE_ARCH_ARMv8_AARCH32
> + FEAT_DEF(V8L, REG_PLATFORM, 0)
> + #endif
> };
>
> -#elif defined RTE_ARCH_ARM64
> +#elif defined RTE_ARCH_64
> #define PLATFORM_STR "aarch64"
> typedef Elf64_auxv_t _Elfx_auxv_t;
>
> --
> 2.20.1
Acked-by: Ruifeng Wang
[dpdk-dev] [Bug 688] [dpdk-21.05]metering_and_policing: Failed to add policy actions
https://bugs.dpdk.org/show_bug.cgi?id=688 Bug ID: 688 Summary: [dpdk-21.05]metering_and_policing: Failed to add policy actions Product: DPDK Version: unspecified Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: Normal Component: core Assignee: dev@dpdk.org Reporter: longfengx.li...@intel.com Target Milestone: --- Environment DPDK version: Use make showversion or for a non-released version: git remote -v && git show-ref --heads version: 21.05-rc1:1b593b9c832e9b284cc59665fe662242a3fc1daf Other software versions: name/version for QEMU, OVS, etc. Repeat as required. OS: Fedora 33 5.9.10-200.fc33.x86_64 Compiler: gcc (GCC) 10.2.1 20201016 (Red Hat 10.2.1-6) Hardware platform: Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz NIC hardware: XL710 for 40GbE QSFP+ Driver version: 2.15.9 NIC firmware: 8.30 0x8000a4ae 1.2926.0 Test Setup Steps to reproduce List the steps to reproduce the issue. 1. build dpdk # rm -rf x86_64-native-linuxapp-clang # CC=gcc meson --werror -Denable_kmods=True -Dlibdir=lib -Dc_args='-DRTE_EAL_IGB_UIO=1' --default-library=static x86_64-native-linuxapp-clang # ninja -C x86_64-native-linuxapp-clang 2. tester preparation # scp -v ./dep/meter_and_policy_config.tar.gz root@10.240.183.141:/tmp 3. DUT preparation # ./usertools/dpdk-devbind.py -b vfio-pci :84:00.0 :84:00.1 # tar xf /tmp/meter_and_policy_config.tar.gz -C /root/dpdk/drivers/net/softnic # cp /root/dpdk/drivers/net/softnic/meter_and_policing_firmware.cli /root/dpdk/drivers/net/softnic/meter_and_policing_firmware.cli-5 # sed -i -e 's/^.*link LINK0 dev.*$/link LINK0 dev :84:00.0/g' /root/dpdk/drivers/net/softnic/meter_and_policing_firmware.cli-5 # sed -i -e 's/^.*link LINK1 dev.*$/link LINK1 dev :84:00.1/g' /root/dpdk/drivers/net/softnic/meter_and_policing_firmware.cli-5 # sed -i -e 's/^.*table action profile AP0.*$/table action profile AP0 ipv4 offset 270 fwd meter trtcm tc 1 stats pkts/g' /root/dpdk/drivers/net/softnic/meter_and_policing_firmware.cli-5 # sed -i -e 's/^.*pipeline RX table match.*$/pipeline RX table match acl ipv4 offset 270 size 4K action AP0/g' /root/dpdk/drivers/net/softnic/meter_and_policing_firmware.cli-5 # sed -i -e 's/thread 5 pipeline RX enable/thread 2 pipeline RX enable/g' /root/dpdk/drivers/net/softnic/meter_and_policing_firmware.cli-5 # sed -i -e 's/thread 5 pipeline TX enable/thread 2 pipeline TX enable/g' /root/dpdk/drivers/net/softnic/meter_and_policing_firmware.cli-5 4. lanch app # x86_64-native-linuxapp-clang/app/dpdk-testpmd -l 0,1,2 -n 4 -a :84:00.0 -a :84:00.1 --file-prefix=dpdk_20927_20210425061914 -s 0x4 --vdev 'net_softnic0,firmware=/root/dpdk/drivers/net/softnic/meter_and_policing_firmware.cli-5' -- -i --rxq=2 --txq=2 --portmask=0x4 --disable-rss # add port meter profile trtcm_rfc2698 2 0 312500 312500 400 500 0 # add port meter policy 0 1 g_actions rss / end y_actions end Show the output from the previous commands. # #testpmd> add port meter profile trtcm_rfc2698 2 0 312500 312500 400 500 0 #testpmd> add port meter policy 0 1 g_actions rss / end y_actions end Bad arguments Expected Result Add policy actions successfully Regression Is this issue a regression: (Y/N) Y [root@localhost dpdk]# git show f29fa2c59b858dc725c3d8486eddb59797bbb6dc commit f29fa2c59b858dc725c3d8486eddb59797bbb6dc Author: Haifei Luo Date: Tue Apr 20 17:04:50 2021 +0300 app/testpmd: support policy actions per color Add the create/del policy CLIs to support actions per color. The CLIs are: Create: add port meter policy (port_id) (policy_id) g_actions (actions) y_actions (actions) r_actions (actions) Delete: del port meter policy (port_id) (policy_id) Examples: testpmd> add port meter policy 0 1 g_actions rss / end y_actions end r_actions drop / end testpmd> del port meter policy 0 1 Signed-off-by: Haifei Luo Acked-by: Matan Azrad Acked-by: Ajit Khaparde -- You are receiving this mail because: You are the assignee for the bug.
[dpdk-dev] [PATCH v2] net/iavf: fix PF returning error
When the command sent by VF to PF fails, iavf may need to run
different code paths according to the specific reason of the
failure (not supported or other reasons).
This patch adds support of identifying PF return error type.
Fixes: 22b123a36d07 ("net/avf: initialize PMD")
Cc: sta...@dpdk.org
Signed-off-by: Alvin Zhang
---
v2: Refine codes according to comments.
---
drivers/net/iavf/iavf.h | 4 ++--
drivers/net/iavf/iavf_vchnl.c | 18 --
2 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
index d1ae5a3..4a2e203 100644
--- a/drivers/net/iavf/iavf.h
+++ b/drivers/net/iavf/iavf.h
@@ -144,7 +144,7 @@ struct iavf_info {
uint64_t supported_rxdid;
uint8_t *proto_xtr; /* proto xtr type for all queues */
volatile enum virtchnl_ops pend_cmd; /* pending command not finished */
- uint32_t cmd_retval; /* return value of the cmd response from PF */
+ int cmd_retval; /* return value of the cmd response from PF */
uint8_t *aq_resp; /* buffer to store the adminq response from PF */
/* Event from pf */
@@ -264,7 +264,7 @@ struct iavf_cmd_info {
* _atomic_set_cmd successfully.
*/
static inline void
-_notify_cmd(struct iavf_info *vf, uint32_t msg_ret)
+_notify_cmd(struct iavf_info *vf, int msg_ret)
{
vf->cmd_retval = msg_ret;
rte_wmb();
diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index 45096cb..f2b46f1 100644
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -228,13 +228,19 @@
rte_delay_ms(ASQ_DELAY_MS);
/* If don't read msg or read sys event, continue */
} while (i++ < MAX_TRY_TIMES);
- /* If there's no response is received, clear command */
- if (i >= MAX_TRY_TIMES ||
- vf->cmd_retval != VIRTCHNL_STATUS_SUCCESS) {
- err = -1;
- PMD_DRV_LOG(ERR, "No response or return failure (%d)"
- " for cmd %d", vf->cmd_retval, args->ops);
+
+ if (i >= MAX_TRY_TIMES) {
+ PMD_DRV_LOG(ERR, "No response for cmd %d", args->ops);
_clear_cmd(vf);
+ err = -EIO;
+ } else if (vf->cmd_retval ==
+ VIRTCHNL_STATUS_ERR_NOT_SUPPORTED) {
+ PMD_DRV_LOG(ERR, "Cmd %d not supported", args->ops);
+ err = -ENOTSUP;
+ } else if (vf->cmd_retval != VIRTCHNL_STATUS_SUCCESS) {
+ PMD_DRV_LOG(ERR, "Return failure %d for cmd %d",
+ vf->cmd_retval, args->ops);
+ err = -EINVAL;
}
break;
}
--
1.8.3.1
Re: [dpdk-dev] [PATCH v2] net/i40e: extend VF reset waiting time
> -Original Message- > From: dev On Behalf Of Wenjun Wu > Sent: Sunday, April 25, 2021 10:03 AM > To: dev@dpdk.org; Xing, Beilei > Cc: Wu, Wenjun1 > Subject: [dpdk-dev] [PATCH v2] net/i40e: extend VF reset waiting time Tested-by: Zhou, Jun
[dpdk-dev] Recall: [PATCH v2] net/i40e: extend VF reset waiting time
Zhou, JunX W would like to recall the message, "[dpdk-dev] [PATCH v2] net/i40e: extend VF reset waiting time".
[dpdk-dev] [PATCH 0/4] Fixes for txgbe
Fix some bugs, remove redundant code, add copyright. Jiawen Wu (4): net/txgbe: fix RSS in double VALN net/txgbe: fix VF MTU limit setting net/txgbe: remove port representor net/txgbe: add copyright owner doc/guides/nics/txgbe.rst | 2 +- drivers/net/txgbe/base/meson.build| 2 +- drivers/net/txgbe/base/txgbe.h| 2 +- drivers/net/txgbe/base/txgbe_dcb.c| 3 ++- drivers/net/txgbe/base/txgbe_dcb.h| 3 ++- drivers/net/txgbe/base/txgbe_dcb_hw.c | 3 ++- drivers/net/txgbe/base/txgbe_dcb_hw.h | 3 ++- drivers/net/txgbe/base/txgbe_devids.h | 2 +- drivers/net/txgbe/base/txgbe_dummy.h | 2 +- drivers/net/txgbe/base/txgbe_eeprom.c | 3 ++- drivers/net/txgbe/base/txgbe_eeprom.h | 3 ++- drivers/net/txgbe/base/txgbe_hw.c | 3 ++- drivers/net/txgbe/base/txgbe_hw.h | 3 ++- drivers/net/txgbe/base/txgbe_mbx.c| 3 ++- drivers/net/txgbe/base/txgbe_mbx.h| 3 ++- drivers/net/txgbe/base/txgbe_mng.c| 3 ++- drivers/net/txgbe/base/txgbe_mng.h| 3 ++- drivers/net/txgbe/base/txgbe_osdep.h | 3 ++- drivers/net/txgbe/base/txgbe_phy.c| 3 ++- drivers/net/txgbe/base/txgbe_phy.h| 3 ++- drivers/net/txgbe/base/txgbe_regs.h | 3 ++- drivers/net/txgbe/base/txgbe_status.h | 3 ++- drivers/net/txgbe/base/txgbe_type.h | 3 ++- drivers/net/txgbe/base/txgbe_vf.c | 3 ++- drivers/net/txgbe/base/txgbe_vf.h | 3 ++- drivers/net/txgbe/meson.build | 2 +- drivers/net/txgbe/rte_pmd_txgbe.h | 3 ++- drivers/net/txgbe/txgbe_ethdev.c | 36 ++- drivers/net/txgbe/txgbe_ethdev.h | 3 ++- drivers/net/txgbe/txgbe_ethdev_vf.c | 15 ++- drivers/net/txgbe/txgbe_fdir.c| 3 ++- drivers/net/txgbe/txgbe_flow.c| 3 ++- drivers/net/txgbe/txgbe_ipsec.c | 3 ++- drivers/net/txgbe/txgbe_ipsec.h | 3 ++- drivers/net/txgbe/txgbe_logs.h| 3 ++- drivers/net/txgbe/txgbe_pf.c | 3 ++- drivers/net/txgbe/txgbe_ptypes.c | 2 +- drivers/net/txgbe/txgbe_ptypes.h | 2 +- drivers/net/txgbe/txgbe_regs_group.h | 3 ++- drivers/net/txgbe/txgbe_rxtx.c| 3 ++- drivers/net/txgbe/txgbe_rxtx.h| 3 ++- drivers/net/txgbe/txgbe_tm.c | 3 ++- 42 files changed, 89 insertions(+), 74 deletions(-) -- 2.21.0.windows.1
[dpdk-dev] [PATCH 3/4] net/txgbe: remove port representor
Remove port representor in device probe process.
Signed-off-by: Jiawen Wu
---
drivers/net/txgbe/txgbe_ethdev.c | 21 ++---
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 87c041c2ec..afb25fb8a0 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -930,32 +930,15 @@ static int
eth_txgbe_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
struct rte_pci_device *pci_dev)
{
- struct rte_eth_dev *pf_ethdev;
- struct rte_eth_devargs eth_da;
int retval;
- if (pci_dev->device.devargs) {
- retval = rte_eth_devargs_parse(pci_dev->device.devargs->args,
- ð_da);
- if (retval)
- return retval;
- } else {
- memset(ð_da, 0, sizeof(eth_da));
- }
-
retval = rte_eth_dev_create(&pci_dev->device, pci_dev->device.name,
sizeof(struct txgbe_adapter),
eth_dev_pci_specific_init, pci_dev,
eth_txgbe_dev_init, NULL);
- if (retval || eth_da.nb_representor_ports < 1)
+ if (retval)
return retval;
- if (eth_da.type != RTE_ETH_REPRESENTOR_VF)
- return -ENOTSUP;
-
- pf_ethdev = rte_eth_dev_allocated(pci_dev->device.name);
- if (pf_ethdev == NULL)
- return -ENODEV;
return 0;
}
@@ -966,7 +949,7 @@ static int eth_txgbe_pci_remove(struct rte_pci_device
*pci_dev)
ethdev = rte_eth_dev_allocated(pci_dev->device.name);
if (!ethdev)
- return -ENODEV;
+ return 0;
return rte_eth_dev_destroy(ethdev, eth_txgbe_dev_uninit);
}
--
2.21.0.windows.1
[dpdk-dev] [PATCH 1/4] net/txgbe: fix RSS in double VALN
Regard QINQ as one case of extend VLAN, and always enable QINQ mode when
double VLAN is set, to avoid RSS does not work for QINQ packets.
Fixes: 220b0e49bc47 ("net/txgbe: support VLAN")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/txgbe/txgbe_ethdev.c | 12
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 97796f040b..87c041c2ec 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -1217,17 +1217,12 @@ static void
txgbe_vlan_hw_extend_enable(struct rte_eth_dev *dev)
{
struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
- struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
- struct rte_eth_txmode *txmode = &dev->data->dev_conf.txmode;
uint32_t ctrl;
PMD_INIT_FUNC_TRACE();
ctrl = rd32(hw, TXGBE_PORTCTL);
- ctrl |= TXGBE_PORTCTL_VLANEXT;
- if (rxmode->offloads & DEV_RX_OFFLOAD_QINQ_STRIP ||
- txmode->offloads & DEV_TX_OFFLOAD_QINQ_INSERT)
- ctrl |= TXGBE_PORTCTL_QINQ;
+ ctrl |= TXGBE_PORTCTL_VLANEXT | TXGBE_PORTCTL_QINQ;
wr32(hw, TXGBE_PORTCTL, ctrl);
}
@@ -1287,8 +1282,9 @@ txgbe_vlan_offload_config(struct rte_eth_dev *dev, int
mask)
txgbe_vlan_hw_filter_disable(dev);
}
- if (mask & ETH_VLAN_EXTEND_MASK) {
- if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_EXTEND)
+ if (mask & (ETH_VLAN_EXTEND_MASK | ETH_QINQ_STRIP_MASK)) {
+ if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_EXTEND ||
+ rxmode->offloads & DEV_RX_OFFLOAD_QINQ_STRIP)
txgbe_vlan_hw_extend_enable(dev);
else
txgbe_vlan_hw_extend_disable(dev);
--
2.21.0.windows.1
[dpdk-dev] [PATCH 4/4] net/txgbe: add copyright owner
All rights reserved by Beijing Wangxun Technology Co., Ltd. Part of the code references Intel. Signed-off-by: Jiawen Wu --- doc/guides/nics/txgbe.rst | 2 +- drivers/net/txgbe/base/meson.build| 2 +- drivers/net/txgbe/base/txgbe.h| 2 +- drivers/net/txgbe/base/txgbe_dcb.c| 3 ++- drivers/net/txgbe/base/txgbe_dcb.h| 3 ++- drivers/net/txgbe/base/txgbe_dcb_hw.c | 3 ++- drivers/net/txgbe/base/txgbe_dcb_hw.h | 3 ++- drivers/net/txgbe/base/txgbe_devids.h | 2 +- drivers/net/txgbe/base/txgbe_dummy.h | 2 +- drivers/net/txgbe/base/txgbe_eeprom.c | 3 ++- drivers/net/txgbe/base/txgbe_eeprom.h | 3 ++- drivers/net/txgbe/base/txgbe_hw.c | 3 ++- drivers/net/txgbe/base/txgbe_hw.h | 3 ++- drivers/net/txgbe/base/txgbe_mbx.c| 3 ++- drivers/net/txgbe/base/txgbe_mbx.h| 3 ++- drivers/net/txgbe/base/txgbe_mng.c| 3 ++- drivers/net/txgbe/base/txgbe_mng.h| 3 ++- drivers/net/txgbe/base/txgbe_osdep.h | 3 ++- drivers/net/txgbe/base/txgbe_phy.c| 3 ++- drivers/net/txgbe/base/txgbe_phy.h| 3 ++- drivers/net/txgbe/base/txgbe_regs.h | 3 ++- drivers/net/txgbe/base/txgbe_status.h | 3 ++- drivers/net/txgbe/base/txgbe_type.h | 3 ++- drivers/net/txgbe/base/txgbe_vf.c | 3 ++- drivers/net/txgbe/base/txgbe_vf.h | 3 ++- drivers/net/txgbe/meson.build | 2 +- drivers/net/txgbe/rte_pmd_txgbe.h | 3 ++- drivers/net/txgbe/txgbe_ethdev.c | 3 ++- drivers/net/txgbe/txgbe_ethdev.h | 3 ++- drivers/net/txgbe/txgbe_ethdev_vf.c | 3 ++- drivers/net/txgbe/txgbe_fdir.c| 3 ++- drivers/net/txgbe/txgbe_flow.c| 3 ++- drivers/net/txgbe/txgbe_ipsec.c | 3 ++- drivers/net/txgbe/txgbe_ipsec.h | 3 ++- drivers/net/txgbe/txgbe_logs.h| 3 ++- drivers/net/txgbe/txgbe_pf.c | 3 ++- drivers/net/txgbe/txgbe_ptypes.c | 2 +- drivers/net/txgbe/txgbe_ptypes.h | 2 +- drivers/net/txgbe/txgbe_regs_group.h | 3 ++- drivers/net/txgbe/txgbe_rxtx.c| 3 ++- drivers/net/txgbe/txgbe_rxtx.h| 3 ++- drivers/net/txgbe/txgbe_tm.c | 3 ++- 42 files changed, 76 insertions(+), 42 deletions(-) diff --git a/doc/guides/nics/txgbe.rst b/doc/guides/nics/txgbe.rst index 39a157eb87..2c2b6549f1 100644 --- a/doc/guides/nics/txgbe.rst +++ b/doc/guides/nics/txgbe.rst @@ -1,5 +1,5 @@ .. SPDX-License-Identifier: BSD-3-Clause -Copyright(c) 2015-2020. +Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd. TXGBE Poll Mode Driver == diff --git a/drivers/net/txgbe/base/meson.build b/drivers/net/txgbe/base/meson.build index 94db39ce2e..c6816b4279 100644 --- a/drivers/net/txgbe/base/meson.build +++ b/drivers/net/txgbe/base/meson.build @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2015-2020 +# Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd. sources = [ 'txgbe_dcb_hw.c', diff --git a/drivers/net/txgbe/base/txgbe.h b/drivers/net/txgbe/base/txgbe.h index d7199512b8..673a299860 100644 --- a/drivers/net/txgbe/base/txgbe.h +++ b/drivers/net/txgbe/base/txgbe.h @@ -1,5 +1,5 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2015-2020 + * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd. */ #ifndef _TXGBE_H_ diff --git a/drivers/net/txgbe/base/txgbe_dcb.c b/drivers/net/txgbe/base/txgbe_dcb.c index 7e9a16cfe9..cb6fb76146 100644 --- a/drivers/net/txgbe/base/txgbe_dcb.c +++ b/drivers/net/txgbe/base/txgbe_dcb.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2015-2020 + * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd. + * Copyright(c) 2010-2017 Intel Corporation */ #include "txgbe_type.h" diff --git a/drivers/net/txgbe/base/txgbe_dcb.h b/drivers/net/txgbe/base/txgbe_dcb.h index cd87cf305b..6aa575c30c 100644 --- a/drivers/net/txgbe/base/txgbe_dcb.h +++ b/drivers/net/txgbe/base/txgbe_dcb.h @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2015-2020 + * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd. + * Copyright(c) 2010-2017 Intel Corporation */ #ifndef _TXGBE_DCB_H_ diff --git a/drivers/net/txgbe/base/txgbe_dcb_hw.c b/drivers/net/txgbe/base/txgbe_dcb_hw.c index 42742d04f7..25273d2391 100644 --- a/drivers/net/txgbe/base/txgbe_dcb_hw.c +++ b/drivers/net/txgbe/base/txgbe_dcb_hw.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2015-2020 + * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd. + * Copyright(c) 2010-2017 Intel Corporation */ #include "txgbe_type.h" diff --git a/drivers/net/txgbe/base/txgbe_dcb_hw.h b/drivers/net/txgbe/base/txgbe_dcb_hw.h index a365d596e3..ecdb38e1e8 100644 --- a/drivers/net/txgbe/base/txgbe_dcb_hw.h +++ b/drivers/net/txgbe/base/txgbe_dcb_hw.h @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2015-2020 + * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd. + * Copyright(c) 2010-2017 Intel Corporation */ #ifndef _TX
[dpdk-dev] [PATCH 2/4] net/txgbe: fix VF MTU limit setting
Fix to set MTU bigger than mbuf size when device is stopped, scattered
rx may be enabled in next starting, exempt from setting in EAL parameters.
Fixes: a2beaa4a769e ("net/txgbe: support VF MTU update")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/txgbe/txgbe_ethdev_vf.c | 12 +++-
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c
b/drivers/net/txgbe/txgbe_ethdev_vf.c
index 3a5123733e..5597968e18 100644
--- a/drivers/net/txgbe/txgbe_ethdev_vf.c
+++ b/drivers/net/txgbe/txgbe_ethdev_vf.c
@@ -1115,7 +1115,7 @@ txgbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
{
struct txgbe_hw *hw;
uint32_t max_frame = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN;
- struct rte_eth_rxmode *rx_conf = &dev->data->dev_conf.rxmode;
+ struct rte_eth_dev_data *dev_data = dev->data;
hw = TXGBE_DEV_HW(dev);
@@ -1123,13 +1123,15 @@ txgbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t
mtu)
max_frame > RTE_ETHER_MAX_JUMBO_FRAME_LEN)
return -EINVAL;
- /* refuse mtu that requires the support of scattered packets when this
-* feature has not been enabled before.
+ /* If device is started, refuse mtu that requires the support of
+* scattered packets when this feature has not been enabled before.
*/
- if (!(rx_conf->offloads & DEV_RX_OFFLOAD_SCATTER) &&
+ if (dev_data->dev_started && !dev_data->scattered_rx &&
(max_frame + 2 * TXGBE_VLAN_TAG_SIZE >
-dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM))
+dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM)) {
+ PMD_INIT_LOG(ERR, "Stop port first.");
return -EINVAL;
+ }
/*
* When supported by the underlying PF driver, use the TXGBE_VF_SET_MTU
--
2.21.0.windows.1
[dpdk-dev] [PATCH] net/iavf: fix incomplete rss initiation
When the default RSS is disabled during initialization, the RSS should
be turned on when creating RSS rule.
This patch adds support to configure rss key and lookup table even
when the default RSS is disabled.
Fixes: c678299594a8 ("net/iavf: fix default RSS configuration")
Cc: sta...@dpdk.org
Signed-off-by: Xuan Ding
---
drivers/net/iavf/iavf_ethdev.c | 8
1 file changed, 8 deletions(-)
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 97a2dc7d76..c06873d26f 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -362,14 +362,6 @@ iavf_init_rss(struct iavf_adapter *adapter)
PMD_DRV_LOG(DEBUG, "RSS is not supported");
return -ENOTSUP;
}
- if (adapter->eth_dev->data->dev_conf.rxmode.mq_mode != ETH_MQ_RX_RSS) {
- PMD_DRV_LOG(WARNING, "RSS is enabled by PF by default");
- /* set all lut items to default queue */
- for (i = 0; i < vf->vf_res->rss_lut_size; i++)
- vf->rss_lut[i] = 0;
- ret = iavf_configure_rss_lut(adapter);
- return ret;
- }
/* configure RSS key */
if (!rss_conf->rss_key) {
--
2.17.1
Re: [dpdk-dev] [PATCH v3 0/7] test: refactor crypto unit test framework
> -Original Message- > From: Ciara Power > Sent: Saturday, April 24, 2021 12:18 AM > To: dev@dpdk.org > Cc: tho...@monjalon.net; declan.dohe...@intel.com; gak...@marvell.com; > acon...@redhat.com; hemant.agra...@nxp.com; ano...@marvell.com; > Ruifeng Wang ; asoma...@amd.com; Ajit > Khaparde (ajit.khapa...@broadcom.com) ; > g.si...@nxp.com; Ciara Power > Subject: [PATCH v3 0/7] test: refactor crypto unit test framework > > The current crypto unit test framework is not granular enough to accurately > track unit test results. This is caused by one testcase in a suite actually > running multiple testcases, but only returning one result. > > The approach taken in this patchset allows a test suite have a list of sub- > testsuites, and/or a list of testcases as previously used. > The unit test suite runner can then recursively iterate and run the sub- > testsuites, until it reaches a suite with testcases, and it then runs each > testcase as it had done previously. > In the case of a testsuite with both testcases and sub-testsuites, the > testcases are executed first before iterating through the sub-testsuites. > > By allowing this further breakdown into sub-testsuites, a refactor of the > crypto unit tests solves the issue of inaccurate reporting, as sub-testsuites > can be used in place of the testcases that had multiple testcases hidden on a > sub level. > The blockcipher tests previously had these hidden testcases, but are now > sub-testsuites that are dynamically created and added to a parent test suite, > allowing for each testcase status to be reported directly to the runner. > The cryptodev test suite is broken down into smaller suites that are used as > sub-testsuites, which allows for more flexibility choosing which sub- > testsuites should run for the current device. > The introduction of sub-testsuites also allows for more precise > setup/teardown functions, that can check the capabilities required to run its > testcases. > > For example, when running the cryptodev_aesni_mb_autotest, the parent > Cryptodev Test Suite is executed. > Various sub-testsuites are added to the parent test suite, such as the static > suites of testcases that were once in the cryptodev_testsuite, and > blockcipher suites. > The unit test runner can then run the Cryptodev parent test suite, which in > turn will run the sub-testsuites. > > The user is now required to create vdevs via EAL commandline args, this is no > longer done within the test app for crypto autotests. > > Documentation will need to be added at a later stage, adding to the test > document that isn't yet merged. [1] > > [1] > https://patchwork.dpdk.org/project/dpdk/patch/20210309155757.615536-1- > acon...@redhat.com/ > > > v3: > - Added support for a testsuite having both a list of testcases, > and a list of sub-testsuites. > - Replaced PMD based parent testsuites with a cryptodev testsuite > used by all autotests, with the exception of scheduler autotest. > - Setup functions were added for all sub-testsuites, within which > required capability support is checked. > - The setup functions no longer create vdevs if needed, > this must be done by the user when running the test. > - Patch added to standardise return values for skipped testcases. > v2: > - Added macro in place of testcase/testsuite loops. > - Added more detail in the summary output. > - Moved testcase counts to the testsuite structure. > - Flattened testsuite structure to remove union. > - Added patch for fix of blockcipher test return value. > - Squashed release note into last patch. > > > Ciara Power (7): > app/test: refactor of unit test suite runner > test: introduce parent testsuite format > test/crypto: refactor to use sub-testsuites > test/crypto: replace unsupported with skipped > test/crypto: move testsuite params to header file > test/crypto: fix return value on test skipped > test/crypto: dynamically build blockcipher suite > > app/test/test.c| 176 +- > app/test/test.h| 23 +- > app/test/test_cryptodev.c | 2324 ++-- > app/test/test_cryptodev.h | 32 + > app/test/test_cryptodev_asym.c | 111 +- > app/test/test_cryptodev_blockcipher.c | 423 - > app/test/test_cryptodev_blockcipher.h | 12 +- > app/test/test_ipsec.c | 32 +- > doc/guides/rel_notes/release_21_05.rst |5 + > 9 files changed, 2000 insertions(+), 1138 deletions(-) > > -- > 2.25.1 Tested armv8 cryptodev, and result looks good. Tested-by: Ruifeng Wang
[dpdk-dev] [DPDK] net/ice: fix txq mbuf release mode
In some cases, it seems that the txq mbuf vector release mode
is enabled first, and then it is confirmed that the conditions
for using the vector mode are not met.
This patch puts the txq vector mode startup process after the
condition detection.
Fixes: 28f9002ab67f ("net/ice: add Tx AVX512 offload path")
Cc: sta...@dpdk.org
Signed-off-by: Alvin Zhang
---
drivers/net/ice/ice_rxtx.c | 16 +---
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index 92fbbc1..49abcb2 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -3303,13 +3303,6 @@
if (tx_check_ret >= 0 &&
rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) {
ad->tx_vec_allowed = true;
- for (i = 0; i < dev->data->nb_tx_queues; i++) {
- txq = dev->data->tx_queues[i];
- if (txq && ice_txq_vec_setup(txq)) {
- ad->tx_vec_allowed = false;
- break;
- }
- }
if (rte_vect_get_max_simd_bitwidth() >=
RTE_VECT_SIMD_512 &&
rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1 &&
@@ -3329,6 +3322,15 @@
if (!use_avx512 && tx_check_ret ==
ICE_VECTOR_OFFLOAD_PATH)
ad->tx_vec_allowed = false;
+ if (ad->tx_vec_allowed) {
+ for (i = 0; i < dev->data->nb_tx_queues; i++) {
+ txq = dev->data->tx_queues[i];
+ if (txq && ice_txq_vec_setup(txq)) {
+ ad->tx_vec_allowed = false;
+ break;
+ }
+ }
+ }
} else {
ad->tx_vec_allowed = false;
}
--
1.8.3.1
Re: [dpdk-dev] [dpdk-announce] release candidate 21.05-rc1
All, Update the test status for Intel part. Till now 80% is executed, 80% is debuged and no critical issue blocked the test. # Basic Intel(R) NIC testing * Build or compile: *Build: cover the build test combination with latest GCC/Clang/ICC version and the popular OS revision such as Ubuntu20.04, CentOS Stream 8, etc. - All passed. *Compile: cover the CFLAGES(O0/O1/O2/O3) with popular OS such as Ubuntu20.04 and CentOS Stream 8. - All passed. * PF(i40e, ixgbe and igb): test scenarios including RTE_FLOW/TSO/Jumboframe/checksum offload/VLAN/VXLAN, etc. - Execution rate: 100%, debug rate: 80%. - 5 new bugs are found, > 2 bugs are reported in bugzilla: https://bugs.dpdk.org/show_bug.cgi?id=688 & > https://bugs.dpdk.org/show_bug.cgi?id=687 > Other bugs are about csum fwd mode can not transmit packet, i40e ddp_ gtp > flow_director_filter take no effect, etc. Intel Dev. are working on them. * VF(i40e, ixgbe and igb): test scenarios including VF-RTE_FLOW/TSO/Jumboframe/checksum offload/VLAN/VXLAN, etc. - Execution rate: 100%, debug rate: 80%. No new issue is found except known issue. * PF/VF(ICE): test scenarios including /Switch features/Package Management/Flow Director/Advanced Tx/Advanced RSS/ACL/DCF/Share code update/Flexible Descriptor, etc. - Execution rate: 90%, debug rate: 70%. - 3 new bugs are found about QinQ&DCF issues, Others are known issues. * Intel NIC single core/NIC performance: test scenarios including PF/VF single core performance test, RFC2544 Zero packet loss performance test, etc. - Execution rate: 70%, debug rate: 70%. 1 new issue is found about perf drops about 20% when use iavf to test multi-queue single core performance. Intel Dev. are working on them. * Power and IPsec: * Power: test scenarios including bi-direction/Telemetry/Empty Poll Lib/Priority Base Frequency and so on. - Execution rate: 100%, debug rate: 70%. 2 issues are under debugging, Intel member is working on them. * IPsec: Not test yet. # Basic cryptodev and virtio testing * Virtio: both function and performance test are covered. Such as PVP/Virtio_loopback/virtio-user loopback/virtio-net VM2VM perf testing/VMAWARE ESXI 7.0u2, etc. - Execution rate: 80%, debug rate: 80%. No new issue is found currently, except known issue. * Cryptodev: *Function test: test scenarios including Cryptodev API testing/CompressDev ISA-L/QAT/ZLIB PMD Testing/FIPS, etc. - Execution rate: 100%, debug rate: 100%. No new issue is found. *Performance test: test scenarios including Thoughput Performance /Cryptodev Latency, etc. - Execution rate: 50%, debug rate: 50%. No new issue is found currently. Best regards, Jiang, Yu -Original Message- From: dev On Behalf Of Thomas Monjalon Sent: Thursday, April 22, 2021 7:02 AM To: annou...@dpdk.org Subject: [dpdk-dev] [dpdk-announce] release candidate 21.05-rc1 A new DPDK release candidate is ready for testing: https://git.dpdk.org/dpdk/tag/?id=v21.05-rc1 There are 879 new patches in this snapshot. Release notes: https://doc.dpdk.org/guides/rel_notes/release_21_05.html Highlights of 21.05-rc1, grouped by category: * General - Alpine Linux support - mass renaming of lib directories - allow disabling some libraries - log names alignment and help command - phase-fair lock - Marvell CN10K SoC support * Networking - predictable RSS - port representor syntax for sub-function and multi-host - packet integrity in flow rule matching - metering using flow actions - TCP connection tracking offload - Windows support of ice, pcap and vmxnet3 drivers Please test and report issues on bugs.dpdk.org. DPDK 21.05-rc2 is expected in two weeks. Thank you everyone
[dpdk-dev] [PATCH 2/2] net/hns3: fix link speed when port is down
From: Huisong Li
When the port is link down state, it is meaningless to display the
port link speed. It should be an undefined state.
Fixes: 59fad0f32135 ("net/hns3: support link update operation")
Cc: sta...@dpdk.org
Signed-off-by: Huisong Li
Signed-off-by: Min Hu (Connor)
---
drivers/net/hns3/hns3_ethdev.c | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 1496bb0..5f7b4ab 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2867,16 +2867,18 @@ hns3_setup_linkstatus(struct rte_eth_dev *eth_dev,
case ETH_SPEED_NUM_50G:
case ETH_SPEED_NUM_100G:
case ETH_SPEED_NUM_200G:
- new_link->link_speed = mac->link_speed;
+ if (mac->link_status)
+ new_link->link_speed = mac->link_speed;
break;
default:
if (mac->link_status)
new_link->link_speed = ETH_SPEED_NUM_UNKNOWN;
- else
- new_link->link_speed = ETH_SPEED_NUM_NONE;
break;
}
+ if (!mac->link_status)
+ new_link->link_speed = ETH_SPEED_NUM_NONE;
+
new_link->link_duplex = mac->link_duplex;
new_link->link_status = mac->link_status ? ETH_LINK_UP : ETH_LINK_DOWN;
new_link->link_autoneg = mac->link_autoneg;
--
2.7.4
[dpdk-dev] [PATCH 0/2] bugfix for link for hns3 PMD
This patch set contains two bugfixes for hns3 PMD. Huisong Li (2): net/hns3: fix link status when port is stopped net/hns3: fix link speed when port is down drivers/net/hns3/hns3_ethdev.c | 18 +++--- 1 file changed, 15 insertions(+), 3 deletions(-) -- 2.7.4
[dpdk-dev] [PATCH 1/2] net/hns3: fix link status when port is stopped
From: Huisong Li
When port is stopped, link down should be reported to user. For HNS3
PF driver, link status comes from link status of hardware. If the port
supports NCSI feature, hardware MAC will not be disabled. At this case,
even if the port is stopped, the link status is still Up. So driver
should set link down when the port is stopped.
Fixes: 59fad0f32135 ("net/hns3: support link update operation")
Cc: sta...@dpdk.org
Signed-off-by: Huisong Li
Signed-off-by: Min Hu (Connor)
---
drivers/net/hns3/hns3_ethdev.c | 10 ++
1 file changed, 10 insertions(+)
diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 60267e1..1496bb0 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2894,6 +2894,15 @@ hns3_dev_link_update(struct rte_eth_dev *eth_dev, int
wait_to_complete)
struct rte_eth_link new_link;
int ret;
+ /* When port is stopped, report link down. */
+ if (eth_dev->data->dev_started == 0) {
+ new_link.link_autoneg = mac->link_autoneg;
+ new_link.link_duplex = mac->link_duplex;
+ new_link.link_speed = ETH_SPEED_NUM_NONE;
+ new_link.link_status = ETH_LINK_DOWN;
+ goto out;
+ }
+
do {
ret = hns3_update_port_link_info(eth_dev);
if (ret) {
@@ -2911,6 +2920,7 @@ hns3_dev_link_update(struct rte_eth_dev *eth_dev, int
wait_to_complete)
memset(&new_link, 0, sizeof(new_link));
hns3_setup_linkstatus(eth_dev, &new_link);
+out:
return rte_eth_linkstatus_set(eth_dev, &new_link);
}
--
2.7.4
[dpdk-dev] [PATCH] net/txgbe: fix null pointer check problem
From: HongBo Zheng
In function cons_parse_ntuple_filter, item->spec and item->mask
should be confirmed not null before use memcmp on it, current
judgement (item->spec || item->mask) just can confirm item->spec
or item->mask is not null, and cause null pointer be used in
memcmp.
This patch fix this problem.
Fixes: b7eeecb17556 ("net/txgbe: parse n-tuple filter")
Cc: sta...@dpdk.org
Signed-off-by: HongBo Zheng
Signed-off-by: Min Hu (Connor)
---
drivers/net/txgbe/txgbe_flow.c | 18 --
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/drivers/net/txgbe/txgbe_flow.c b/drivers/net/txgbe/txgbe_flow.c
index 57a4f2e..35026ee 100644
--- a/drivers/net/txgbe/txgbe_flow.c
+++ b/drivers/net/txgbe/txgbe_flow.c
@@ -240,11 +240,10 @@ cons_parse_ntuple_filter(const struct rte_flow_attr *attr,
return -rte_errno;
}
/* if the first item is MAC, the content should be NULL */
- if ((item->spec || item->mask) &&
- (memcmp(eth_spec, ð_null,
- sizeof(struct rte_flow_item_eth)) ||
-memcmp(eth_mask, ð_null,
- sizeof(struct rte_flow_item_eth {
+ if ((item->spec && memcmp(eth_spec, ð_null,
+ sizeof(struct rte_flow_item_eth))) ||
+ (item->mask && memcmp(eth_mask, ð_null,
+ sizeof(struct rte_flow_item_eth {
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,
item, "Not supported by ntuple filter");
@@ -272,11 +271,10 @@ cons_parse_ntuple_filter(const struct rte_flow_attr *attr,
return -rte_errno;
}
/* the content should be NULL */
- if ((item->spec || item->mask) &&
- (memcmp(vlan_spec, &vlan_null,
- sizeof(struct rte_flow_item_vlan)) ||
-memcmp(vlan_mask, &vlan_null,
- sizeof(struct rte_flow_item_vlan {
+ if ((item->spec && memcmp(vlan_spec, &vlan_null,
+ sizeof(struct rte_flow_item_vlan))) ||
+ (item->mask && memcmp(vlan_mask, &vlan_null,
+ sizeof(struct rte_flow_item_vlan {
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,
item, "Not supported by ntuple filter");
--
2.7.4
[dpdk-dev] [PATCH] common/sfc_efx/base: fix the problem of using null pointer
From: HongBo Zheng
In function efx_pci_xilinx_cap_tbl_find, pointer entry_offsetp is used
before null pointer check, which may cause access to null pointer.
This patch fix this problem.
Fixes: ba9568b8b4b7 ("common/sfc_efx/base: add Xilinx capabilities table
lookup")
Cc: sta...@dpdk.org
Signed-off-by: HongBo Zheng
Signed-off-by: Min Hu (Connor)
---
drivers/common/sfc_efx/base/efx_pci.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/common/sfc_efx/base/efx_pci.c
b/drivers/common/sfc_efx/base/efx_pci.c
index 8a26da6..9c7cacb 100644
--- a/drivers/common/sfc_efx/base/efx_pci.c
+++ b/drivers/common/sfc_efx/base/efx_pci.c
@@ -310,7 +310,7 @@ efx_pci_xilinx_cap_tbl_find(
__inboolean_t skip_first,
__inout efsys_dma_addr_t *entry_offsetp)
{
- efsys_dma_addr_t offset = *entry_offsetp;
+ efsys_dma_addr_t offset;
boolean_t skip = skip_first;
efx_qword_t header;
uint32_t format;
@@ -322,6 +322,7 @@ efx_pci_xilinx_cap_tbl_find(
goto fail1;
}
+ offset = *entry_offsetp;
rc = ENOENT;
/*
* SF-119689-TC Riverhead Host Interface section 4.2.2.
--
2.7.4
[dpdk-dev] [PATCH] lib/librte_power: fix using variables before validity check
From: HongBo Zheng
In function power_guest_channel_read_msg, 'lcore_id' is used before
validity check, which may cause buffer 'global_fds' accessed by index
'lcore_id' overflow.
This patch moves the validity check of 'lcore_id' before the 'lcore_id'
being used for the first time.
Fixes: 9dc843eb273b ("power: extend guest channel API for reading")
Cc: sta...@dpdk.org
Signed-off-by: HongBo Zheng
Signed-off-by: Min Hu (Connor)
---
lib/power/guest_channel.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/power/guest_channel.c b/lib/power/guest_channel.c
index 2f7507a..d3de3f1 100644
--- a/lib/power/guest_channel.c
+++ b/lib/power/guest_channel.c
@@ -166,6 +166,12 @@ int power_guest_channel_read_msg(void *pkt,
if (pkt_len == 0 || pkt == NULL)
return -1;
+ if (lcore_id >= RTE_MAX_LCORE) {
+ RTE_LOG(ERR, GUEST_CHANNEL, "Channel(%u) is out of range
0...%d\n",
+ lcore_id, RTE_MAX_LCORE-1);
+ return -1;
+ }
+
fds.fd = global_fds[lcore_id];
fds.events = POLLIN;
@@ -179,12 +185,6 @@ int power_guest_channel_read_msg(void *pkt,
return -1;
}
- if (lcore_id >= RTE_MAX_LCORE) {
- RTE_LOG(ERR, GUEST_CHANNEL, "Channel(%u) is out of range
0...%d\n",
- lcore_id, RTE_MAX_LCORE-1);
- return -1;
- }
-
if (global_fds[lcore_id] < 0) {
RTE_LOG(ERR, GUEST_CHANNEL, "Channel is not connected\n");
return -1;
--
2.7.4
[dpdk-dev] [PATCH] app/procinfo: add device registers dump
From: Chengchang Tang
This patch add support for dump the device registers from a running
application. It can help developers locate the problem.
Signed-off-by: Chengchang Tang
Signed-off-by: Min Hu (Connor)
---
app/proc-info/main.c | 92 +++-
1 file changed, 91 insertions(+), 1 deletion(-)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index b9587f7..c555be5 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -94,6 +94,9 @@ static char *mempool_name;
/**< Enable iter mempool. */
static uint32_t enable_iter_mempool;
static char *mempool_iter_name;
+/**< Enable dump regs. */
+static uint32_t enable_dump_regs;
+static char *dump_regs_file_prefix;
/**< display usage */
static void
@@ -119,7 +122,8 @@ proc_info_usage(const char *prgname)
" --show-crypto: to display crypto information\n"
" --show-ring[=name]: to display ring information\n"
" --show-mempool[=name]: to display mempool information\n"
- " --iter-mempool=name: iterate mempool elements to display
content\n",
+ " --iter-mempool=name: iterate mempool elements to display
content\n"
+ " --dump-regs=file-prefix: dump reg to file with the
file-prefix\n",
prgname);
}
@@ -226,6 +230,7 @@ proc_info_parse_args(int argc, char **argv)
{"show-ring", optional_argument, NULL, 0},
{"show-mempool", optional_argument, NULL, 0},
{"iter-mempool", required_argument, NULL, 0},
+ {"dump-regs", required_argument, NULL, 0},
{NULL, 0, 0, 0}
};
@@ -288,6 +293,10 @@ proc_info_parse_args(int argc, char **argv)
"iter-mempool", MAX_LONG_OPT_SZ)) {
enable_iter_mempool = 1;
mempool_iter_name = optarg;
+ } else if (!strncmp(long_option[option_index].name,
+ "dump-regs", MAX_LONG_OPT_SZ)) {
+ enable_dump_regs = 1;
+ dump_regs_file_prefix = optarg;
}
break;
case 1:
@@ -1349,6 +1358,85 @@ iter_mempool(char *name)
}
}
+static void
+dump_regs(char *file_prefix)
+{
+#define MAX_FILE_NAME_SZ (MAX_LONG_OPT_SZ + 10)
+ char file_name[MAX_FILE_NAME_SZ];
+ struct rte_dev_reg_info reg_info;
+ struct rte_eth_dev_info dev_info;
+ unsigned char *buf_data;
+ FILE *fp_regs;
+ int buf_size;
+ uint16_t i;
+ int ret;
+
+ snprintf(bdr_str, MAX_STRING_LEN, " dump - Port REG");
+ STATS_BDR_STR(10, bdr_str);
+
+ RTE_ETH_FOREACH_DEV(i) {
+ /* Skip if port is not in mask */
+ if ((enabled_port_mask & (1ul << i)) == 0)
+ continue;
+
+ snprintf(bdr_str, MAX_STRING_LEN, " Port (%u)", i);
+ STATS_BDR_STR(5, bdr_str);
+
+ memset(®_info, 0, sizeof(reg_info));
+ memset(&dev_info, 0, sizeof(dev_info));
+
+ ret = rte_eth_dev_info_get(i, &dev_info);
+ if (ret) {
+ printf("Error getting device info: %d\n", ret);
+ continue;
+ }
+
+ ret = rte_eth_dev_get_reg_info(i, ®_info);
+ if (ret) {
+ printf("Error getting device reg info: %d\n", ret);
+ continue;
+ }
+
+ buf_size = reg_info.length * reg_info.width;
+ buf_data = malloc(buf_size);
+ if (buf_data == NULL) {
+ printf("Error allocating %d bytes buffer\n", buf_size);
+ continue;
+ }
+
+ reg_info.data = buf_data;
+ reg_info.length = 0;
+ ret = rte_eth_dev_get_reg_info(i, ®_info);
+ if (ret) {
+ printf("Error getting regs from device: %d\n", ret);
+ free(buf_data);
+ continue;
+ }
+
+ snprintf(file_name, MAX_FILE_NAME_SZ, "%s-port%u",
+ file_prefix, i);
+ fp_regs = fopen(file_name, "wb");
+ if (fp_regs == NULL) {
+ printf("Error during opening '%s' for writing\n",
+ file_name);
+ } else {
+ if ((int)fwrite(buf_data, 1, buf_size, fp_regs) !=
+ buf_size)
+ printf("Error during writing %s\n",
+ file_prefix);
+ else
+ printf("dump device (%s) regs successfully, "
+ "
[dpdk-dev] [PATCH v3 1/2] net/ice: clean redundant macro definition of filters
The input set has been divided into two parts to distinguish
inner and outer field. ICE_INSET_TUN_* is the same as non tunnel
macro definition. Clean redundant ICE_INSET_TUN_* codes.
Signed-off-by: Yuying Zhang
---
drivers/net/ice/ice_fdir_filter.c | 22 ++---
drivers/net/ice/ice_generic_flow.h | 61 +
drivers/net/ice/ice_switch_filter.c | 128 ++--
3 files changed, 78 insertions(+), 133 deletions(-)
diff --git a/drivers/net/ice/ice_fdir_filter.c
b/drivers/net/ice/ice_fdir_filter.c
index 3b8ea32b1a..ad2dc40815 100644
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -72,7 +72,7 @@
#define ICE_FDIR_INSET_ETH_IPV4_VXLAN (\
ICE_FDIR_INSET_ETH | ICE_FDIR_INSET_ETH_IPV4 | \
- ICE_INSET_TUN_VXLAN_VNI)
+ ICE_INSET_VXLAN_VNI)
#define ICE_FDIR_INSET_IPV4_GTPU (\
ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_GTPU_TEID)
@@ -893,17 +893,17 @@ ice_fdir_input_set_parse(uint64_t inset, enum
ice_flow_field *field)
{ICE_INSET_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT},
{ICE_INSET_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},
{ICE_INSET_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},
- {ICE_INSET_TUN_IPV4_SRC, ICE_FLOW_FIELD_IDX_IPV4_SA},
- {ICE_INSET_TUN_IPV4_DST, ICE_FLOW_FIELD_IDX_IPV4_DA},
- {ICE_INSET_TUN_TCP_SRC_PORT, ICE_FLOW_FIELD_IDX_TCP_SRC_PORT},
- {ICE_INSET_TUN_TCP_DST_PORT, ICE_FLOW_FIELD_IDX_TCP_DST_PORT},
- {ICE_INSET_TUN_UDP_SRC_PORT, ICE_FLOW_FIELD_IDX_UDP_SRC_PORT},
- {ICE_INSET_TUN_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT},
- {ICE_INSET_TUN_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},
- {ICE_INSET_TUN_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},
+ {ICE_INSET_IPV4_SRC, ICE_FLOW_FIELD_IDX_IPV4_SA},
+ {ICE_INSET_IPV4_DST, ICE_FLOW_FIELD_IDX_IPV4_DA},
+ {ICE_INSET_TCP_SRC_PORT, ICE_FLOW_FIELD_IDX_TCP_SRC_PORT},
+ {ICE_INSET_TCP_DST_PORT, ICE_FLOW_FIELD_IDX_TCP_DST_PORT},
+ {ICE_INSET_UDP_SRC_PORT, ICE_FLOW_FIELD_IDX_UDP_SRC_PORT},
+ {ICE_INSET_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT},
+ {ICE_INSET_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},
+ {ICE_INSET_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},
{ICE_INSET_GTPU_TEID, ICE_FLOW_FIELD_IDX_GTPU_IP_TEID},
{ICE_INSET_GTPU_QFI, ICE_FLOW_FIELD_IDX_GTPU_EH_QFI},
- {ICE_INSET_TUN_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI},
+ {ICE_INSET_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI},
};
for (i = 0, j = 0; i < RTE_DIM(ice_inset_map); i++) {
@@ -1916,7 +1916,7 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter
*ad,
}
if (vxlan_mask->hdr.vx_vni)
- *input_set |= ICE_INSET_TUN_VXLAN_VNI;
+ *input_set |= ICE_INSET_VXLAN_VNI;
filter->input.vxlan_data.vni = vxlan_spec->hdr.vx_vni;
diff --git a/drivers/net/ice/ice_generic_flow.h
b/drivers/net/ice/ice_generic_flow.h
index a4d0b6671d..b7634b9662 100644
--- a/drivers/net/ice/ice_generic_flow.h
+++ b/drivers/net/ice/ice_generic_flow.h
@@ -92,64 +92,9 @@
/* tunnel */
-#define ICE_INSET_TUN_SMAC \
- (ICE_PROT_MAC | ICE_SMAC)
-#define ICE_INSET_TUN_DMAC \
- (ICE_PROT_MAC | ICE_DMAC)
-
-#define ICE_INSET_TUN_IPV4_SRC \
- (ICE_PROT_IPV4 | ICE_IP_SRC)
-#define ICE_INSET_TUN_IPV4_DST \
- (ICE_PROT_IPV4 | ICE_IP_DST)
-#define ICE_INSET_TUN_IPV4_TTL \
- (ICE_PROT_IPV4 | ICE_IP_TTL)
-#define ICE_INSET_TUN_IPV4_PROTO \
- (ICE_PROT_IPV4 | ICE_IP_PROTO)
-#define ICE_INSET_TUN_IPV4_TOS \
- (ICE_PROT_IPV4 | ICE_IP_TOS)
-#define ICE_INSET_TUN_IPV6_SRC \
- (ICE_PROT_IPV6 | ICE_IP_SRC)
-#define ICE_INSET_TUN_IPV6_DST \
- (ICE_PROT_IPV6 | ICE_IP_DST)
-#define ICE_INSET_TUN_IPV6_HOP_LIMIT \
- (ICE_PROT_IPV6 | ICE_IP_TTL)
-#define ICE_INSET_TUN_IPV6_NEXT_HDR \
- (ICE_PROT_IPV6 | ICE_IP_PROTO)
-#define ICE_INSET_TUN_IPV6_TC \
- (ICE_PROT_IPV6 | ICE_IP_TOS)
-
-#define ICE_INSET_TUN_TCP_SRC_PORT \
- (ICE_PROT_TCP | ICE_SPORT)
-#define ICE_INSET_TUN_TCP_DST_PORT \
- (ICE_PROT_TCP | ICE_DPORT)
-#define ICE_INSET_TUN_UDP_SRC_PORT \
- (ICE_PROT_UDP | ICE_SPORT)
-#define ICE_INSET_TUN_UDP_DST_PORT \
- (ICE_PROT_UDP | ICE_DPORT)
-#define ICE_INSET_TUN_SCTP_SRC_PORT \
- (ICE_PROT_SCTP | ICE_SPORT)
-#define ICE_INSET_TUN_SCTP_DST_PORT \
- (ICE_PROT_SCTP | ICE_DPORT)
-#define ICE_INSET_TUN_ICMP4_SRC_PORT \
- (ICE_PROT_ICMP4 | ICE_SPORT)
-#define ICE_INSET_TUN_ICMP4_DST_PORT \
- (ICE_PROT_ICMP4 | ICE_DPORT)
-#define ICE_INSET_TUN_ICMP6_SRC_PORT \
- (ICE_PROT_ICMP6 | ICE_SPORT)
-#define ICE_INSET_
[dpdk-dev] [PATCH v3 2/2] net/ice: refactor input set fields for switch filter
Input set has been divided into inner and outer part to distinguish different fields. However, the parse method of switch filter doesn't match this update. Refactor switch filter to distingush inner and outer input set in the same way as other filters. Signed-off-by: Yuying Zhang --- drivers/net/ice/ice_switch_filter.c | 746 1 file changed, 323 insertions(+), 423 deletions(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index aa395094ca..9603103b88 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -35,8 +35,7 @@ #define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE) #define ICE_SW_INSET_MAC_VLAN ( \ - ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE | \ - ICE_INSET_VLAN_INNER) + ICE_SW_INSET_ETHER | ICE_INSET_VLAN_INNER) #define ICE_SW_INSET_MAC_QINQ ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_VLAN_INNER | \ ICE_INSET_VLAN_OUTER) @@ -68,27 +67,27 @@ ICE_INSET_IPV6_HOP_LIMIT | ICE_INSET_IPV6_TC | \ ICE_INSET_UDP_DST_PORT | ICE_INSET_UDP_SRC_PORT) #define ICE_SW_INSET_DIST_NVGRE_IPV4 ( \ - ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ - ICE_INSET_DMAC | ICE_INSET_NVGRE_TNI | ICE_INSET_IPV4_DST) + ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_DMAC | \ + ICE_INSET_NVGRE_TNI) #define ICE_SW_INSET_DIST_VXLAN_IPV4 ( \ - ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ - ICE_INSET_DMAC | ICE_INSET_VXLAN_VNI | ICE_INSET_IPV4_DST) + ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_DMAC | \ + ICE_INSET_VXLAN_VNI) #define ICE_SW_INSET_DIST_NVGRE_IPV4_TCP ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT | \ - ICE_INSET_DMAC | ICE_INSET_NVGRE_TNI | ICE_INSET_IPV4_DST) + ICE_INSET_DMAC | ICE_INSET_NVGRE_TNI) #define ICE_SW_INSET_DIST_NVGRE_IPV4_UDP ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT | \ - ICE_INSET_DMAC | ICE_INSET_NVGRE_TNI | ICE_INSET_IPV4_DST) + ICE_INSET_DMAC | ICE_INSET_NVGRE_TNI) #define ICE_SW_INSET_DIST_VXLAN_IPV4_TCP ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT | \ - ICE_INSET_DMAC | ICE_INSET_VXLAN_VNI | ICE_INSET_IPV4_DST) + ICE_INSET_DMAC | ICE_INSET_VXLAN_VNI) #define ICE_SW_INSET_DIST_VXLAN_IPV4_UDP ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT | \ - ICE_INSET_DMAC | ICE_INSET_VXLAN_VNI | ICE_INSET_IPV4_DST) + ICE_INSET_DMAC | ICE_INSET_VXLAN_VNI) #define ICE_SW_INSET_PERM_TUNNEL_IPV4 ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_IPV4_PROTO | ICE_INSET_IPV4_TOS) @@ -141,74 +140,26 @@ ICE_SW_INSET_MAC_IPV4 | ICE_INSET_GTPU_TEID) #define ICE_SW_INSET_MAC_IPV6_GTPU ( \ ICE_SW_INSET_MAC_IPV6 | ICE_INSET_GTPU_TEID) -#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV4 ( \ - ICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \ - ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST) -#define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4 ( \ - ICE_SW_INSET_MAC_IPV4_GTPU_IPV4 | ICE_INSET_GTPU_QFI) -#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV6 ( \ - ICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \ - ICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST) -#define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6 ( \ - ICE_SW_INSET_MAC_IPV4_GTPU_IPV6 | ICE_INSET_GTPU_QFI) -#define ICE_SW_INSET_MAC_IPV6_GTPU_IPV4 ( \ - ICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \ +#define ICE_SW_INSET_MAC_GTPU_OUTER ( \ + ICE_INSET_DMAC | ICE_INSET_GTPU_TEID) +#define ICE_SW_INSET_MAC_GTPU_EH_OUTER ( \ + ICE_SW_INSET_MAC_GTPU_OUTER | ICE_INSET_GTPU_QFI) +#define ICE_SW_INSET_GTPU_IPV4 ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST) -#define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4 ( \ - ICE_SW_INSET_MAC_IPV6_GTPU_IPV4 | ICE_INSET_GTPU_QFI) -#define ICE_SW_INSET_MAC_IPV6_GTPU_IPV6 ( \ - ICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \ +#define ICE_SW_INSET_GTPU_IPV6 ( \ ICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST) -#define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6 ( \ - ICE_SW_INSET_MAC_IPV6_GTPU_IPV6 | ICE_INSET_GTPU_QFI) -#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV4_UDP ( \ - ICE_SW_INSET_MAC_IPV4_GTPU_IPV4 | \ - ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT) -#define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4_UDP ( \ - ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4 | \ - ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT) -#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV4_TCP ( \ - ICE_SW_INSET_MAC_IPV4_GTPU_IPV4 | \ - ICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT) -#define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4_TCP ( \ - ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4 | \ - ICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT) -#define ICE_SW
Re: [dpdk-dev] [PATCH] usertools/devbind: add dlb
Timothy McDaniel:
> --- a/usertools/dpdk-devbind.py
> +++ b/usertools/dpdk-devbind.py
> @@ -59,11 +59,13 @@
> 'SVendor': None, 'SDevice': None}
> intel_ntb_icx = {'Class': '06', 'Vendor': '8086', 'Device': '347e',
> 'SVendor': None, 'SDevice': None}
> +intel_dlb = {'Class': '0b', 'Vendor': '8086', 'Device': '270b,2710,2714',
> + 'SVendor': None, 'SDevice': None}
>
> network_devices = [network_class, cavium_pkx, avp_vnic, ifpga_class]
> baseband_devices = [acceleration_class]
> crypto_devices = [encryption_class, intel_processor_class]
> -eventdev_devices = [cavium_sso, cavium_tim, octeontx2_sso]
> +eventdev_devices = [cavium_sso, cavium_tim, octeontx2_sso, intel_dlb]
Please try to insert new items in alphabetical order.
Re: [dpdk-dev] [PATCH v2 0/2] Use WFE for spinlock and ring
Ruifeng Wang: > From: David Marchand > > Any update? > > I suppose this would need some rebasing after the ring library changes. > > Sorry for the late response. > This series has been rebased and v3 posted. > I have problem to mark v2 as superseded. I did change v2 as superseded.
[dpdk-dev] [PATCH v2 1/2] net/mlx5: fix tunnel offload private items location
Tunnel offload API requires application to query PMD for specific flow
items and actions. Application uses these PMD specific elements to
build flow rules according to the tunnel offload model.
The model does not restrict private elements location in a flow rule,
but the current MLX5 PMD implementation expects that tunnel offload
rule will begin with PMD specific elements.
The patch removes that placement limitation in MLX5 PMD.
Cc: sta...@dpdk.org
Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload")
Signed-off-by: Gregory Etelson
Acked-by: Viacheslav Ovsiienko
---
drivers/net/mlx5/mlx5_flow.c| 48 ++-
drivers/net/mlx5/mlx5_flow.h| 44 ++---
drivers/net/mlx5/mlx5_flow_dv.c | 58 +++--
3 files changed, 90 insertions(+), 60 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 84463074a5..fcc82ce9d4 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -51,6 +51,7 @@ flow_tunnel_add_default_miss(struct rte_eth_dev *dev,
const struct rte_flow_attr *attr,
const struct rte_flow_action *app_actions,
uint32_t flow_idx,
+const struct mlx5_flow_tunnel *tunnel,
struct tunnel_default_miss_ctx *ctx,
struct rte_flow_error *error);
static struct mlx5_flow_tunnel *
@@ -5463,22 +5464,14 @@ flow_create_split_outer(struct rte_eth_dev *dev,
return ret;
}
-static struct mlx5_flow_tunnel *
-flow_tunnel_from_rule(struct rte_eth_dev *dev,
- const struct rte_flow_attr *attr,
- const struct rte_flow_item items[],
- const struct rte_flow_action actions[])
+static inline struct mlx5_flow_tunnel *
+flow_tunnel_from_rule(const struct mlx5_flow *flow)
{
struct mlx5_flow_tunnel *tunnel;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wcast-qual"
- if (is_flow_tunnel_match_rule(dev, attr, items, actions))
- tunnel = (struct mlx5_flow_tunnel *)items[0].spec;
- else if (is_flow_tunnel_steer_rule(dev, attr, items, actions))
- tunnel = (struct mlx5_flow_tunnel *)actions[0].conf;
- else
- tunnel = NULL;
+ tunnel = (typeof(tunnel))flow->tunnel;
#pragma GCC diagnostic pop
return tunnel;
@@ -5672,12 +5665,11 @@ flow_list_create(struct rte_eth_dev *dev, uint32_t
*list,
error);
if (ret < 0)
goto error;
- if (is_flow_tunnel_steer_rule(dev, attr,
- buf->entry[i].pattern,
- p_actions_rx)) {
+ if (is_flow_tunnel_steer_rule(wks->flows[0].tof_type)) {
ret = flow_tunnel_add_default_miss(dev, flow, attr,
p_actions_rx,
idx,
+ wks->flows[0].tunnel,
&default_miss_ctx,
error);
if (ret < 0) {
@@ -5741,7 +5733,7 @@ flow_list_create(struct rte_eth_dev *dev, uint32_t *list,
}
flow_rxq_flags_set(dev, flow);
rte_free(translated_actions);
- tunnel = flow_tunnel_from_rule(dev, attr, items, actions);
+ tunnel = flow_tunnel_from_rule(wks->flows);
if (tunnel) {
flow->tunnel = 1;
flow->tunnel_id = tunnel->tunnel_id;
@@ -7459,6 +7451,28 @@ int rte_pmd_mlx5_sync_flow(uint16_t port_id, uint32_t
domains)
return ret;
}
+const struct mlx5_flow_tunnel *
+mlx5_get_tof(const struct rte_flow_item *item,
+const struct rte_flow_action *action,
+enum mlx5_tof_rule_type *rule_type)
+{
+ for (; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
+ if (item->type == (typeof(item->type))
+ MLX5_RTE_FLOW_ITEM_TYPE_TUNNEL) {
+ *rule_type = MLX5_TUNNEL_OFFLOAD_MATCH_RULE;
+ return flow_items_to_tunnel(item);
+ }
+ }
+ for (; action->conf != RTE_FLOW_ACTION_TYPE_END; action++) {
+ if (action->type == (typeof(action->type))
+ MLX5_RTE_FLOW_ACTION_TYPE_TUNNEL_SET) {
+ *rule_type = MLX5_TUNNEL_OFFLOAD_SET_RULE;
+ return flow_actions_to_tunnel(action);
+ }
+ }
+ return NULL;
+}
+
/**
* tunnel offload functionalilty is defined for DV environment only
*/
@@ -7489,13 +7503,13 @@ flow_tunnel_add_default_miss(struct rte_eth_d
[dpdk-dev] [PATCH v2 2/2] app/testpmd: fix tunnel offload private items location
Tunnel offload API requires application to query PMD for specific flow
items and actions. Application uses these PMD specific elements to
build flow rules according to the tunnel offload model.
The model does not restrict private elements location in a flow rule,
but the current MLX5 PMD implementation expected that tunnel offload
rule will begin with PMD specific elements.
The patch places tunnel offload private PMD flow elements between
general RTE flow elements in a rule.
Cc: sta...@dpdk.org
Fixes: 1b9f274623b8 ("app/testpmd: add commands for tunnel offload")
Signed-off-by: Gregory Etelson
Acked-by: Viacheslav Ovsiienko
---
app/test-pmd/config.c | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 40b2b29725..1520b8193f 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1664,7 +1664,7 @@ port_flow_tunnel_offload_cmd_prep(portid_t port_id,
aptr->type != RTE_FLOW_ACTION_TYPE_END;
aptr++, num_actions++);
pft->actions = malloc(
- (num_actions + pft->num_pmd_actions) *
+ (num_actions + pft->num_pmd_actions + 1) *
sizeof(actions[0]));
if (!pft->actions) {
rte_flow_tunnel_action_decap_release(
@@ -1672,9 +1672,10 @@ port_flow_tunnel_offload_cmd_prep(portid_t port_id,
pft->num_pmd_actions, &error);
return NULL;
}
- rte_memcpy(pft->actions, pft->pmd_actions,
+ pft->actions[0].type = RTE_FLOW_ACTION_TYPE_VOID;
+ rte_memcpy(pft->actions + 1, pft->pmd_actions,
pft->num_pmd_actions * sizeof(actions[0]));
- rte_memcpy(pft->actions + pft->num_pmd_actions, actions,
+ rte_memcpy(pft->actions + pft->num_pmd_actions + 1, actions,
num_actions * sizeof(actions[0]));
}
if (tunnel_ops->items) {
@@ -1692,7 +1693,7 @@ port_flow_tunnel_offload_cmd_prep(portid_t port_id,
for (iptr = pattern, num_items = 1;
iptr->type != RTE_FLOW_ITEM_TYPE_END;
iptr++, num_items++);
- pft->items = malloc((num_items + pft->num_pmd_items) *
+ pft->items = malloc((num_items + pft->num_pmd_items + 1) *
sizeof(pattern[0]));
if (!pft->items) {
rte_flow_tunnel_item_release(
@@ -1700,9 +1701,10 @@ port_flow_tunnel_offload_cmd_prep(portid_t port_id,
pft->num_pmd_items, &error);
return NULL;
}
- rte_memcpy(pft->items, pft->pmd_items,
+ pft->items[0].type = RTE_FLOW_ITEM_TYPE_VOID;
+ rte_memcpy(pft->items + 1, pft->pmd_items,
pft->num_pmd_items * sizeof(pattern[0]));
- rte_memcpy(pft->items + pft->num_pmd_items, pattern,
+ rte_memcpy(pft->items + pft->num_pmd_items + 1, pattern,
num_items * sizeof(pattern[0]));
}
--
2.31.1
Re: [dpdk-dev] [PATCH v4 1/8] bbdev: add network order data capability
Sam 24 avr 2021, à 23:59, Chautru, Nicolas a écrit : > + Thomas, Akhil > > In case this is for release 21.05 isn't it a bit late for introducing a > new API change? Yes API change should be in -rc1. Of course there is a bit of flexibility if you are sure an exception can be done without hurting other drivers, testing, etc.
Re: [dpdk-dev] [PATCH v2 1/2] net/mlx5: fix tunnel offload private items location
Dim 25 avr 2021, à 17:57, Gregory Etelson a écrit :
> Tunnel offload API requires application to query PMD for specific flow
> items and actions. Application uses these PMD specific elements to
> build flow rules according to the tunnel offload model.
> The model does not restrict private elements location in a flow rule,
> but the current MLX5 PMD implementation expects that tunnel offload
> rule will begin with PMD specific elements.
> The patch removes that placement limitation in MLX5 PMD.
>
> Cc: sta...@dpdk.org
>
> Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload")
Cc: stable must be just after the Fixes line.
There is a testpmd patch in the same series, is it OK to be merged in mlx tree?
Re: [dpdk-dev] [PATCH] app/bbdev: fix wrong variable
Chautru, Nicolas:
> From: Min Hu (Connor)
> >
> > This patch corrected misused variable.
> >
> > Fixes: d819c08327f3 ("app/bbdev: update for 5GNR")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Min Hu (Connor)
>
> Thanks
>
> Acked-by: Nicolas Chautru
It is not enough. The commit log must described what was broken in which case.
Re: [dpdk-dev] [PATCH V4] ethdev: add queue state when retrieve queue information
Kinsella, Ray: > On 16/04/2021 10:57, Thomas Monjalon wrote: > > 16/04/2021 11:41, Ferruh Yigit: > >> On 4/16/2021 9:58 AM, Thomas Monjalon wrote: > >>> 16/04/2021 10:46, Lijun Ou: > Currently, upper-layer application could get queue state only > through pointers such as dev->data->tx_queue_state[queue_id], > this is not the recommended way to access it. So this patch > add get queue state when call rte_eth_rx_queue_info_get and > rte_eth_tx_queue_info_get API. > > Note: After add queue_state field, the 'struct rte_eth_rxq_info' size > remains 128B, and the 'struct rte_eth_txq_info' size remains 64B, so > it could be ABI compatible. > >>> [...] > --- a/doc/guides/rel_notes/release_21_05.rst > +++ b/doc/guides/rel_notes/release_21_05.rst > @@ -251,6 +251,12 @@ ABI Changes > function was already marked as internal in the API documentation for > it, > and was not for use by external applications. > > +* Added new field ``queue_state`` to ``rte_eth_rxq_info`` structure > + to provide indicated rxq queue state. > + > +* Added new field ``queue_state`` to ``rte_eth_txq_info`` structure > + to provide indicated txq queue state. > >>> > >>> Not sure we should add a note here for additions which > >>> do not break ABI compatibility. > >>> It may be confusing. > >>> > >> > >> Hi Thomas, > >> > >> What do about adding the documentation to "API Changes" section? > >> Since 'rte_eth_rx_queue_info_get()'/'rte_eth_tx_queue_info_get()' can get > >> 'queue_state' now, which may taken as API change. > > > > That's an addition. > > The users have nothing to change in their existing code, > > so I think we don't need a note in API or ABI change. > > The only required note would be in the "New Features". > > Well it definitely isn't an ABI change, however it still is an API addition. > I don't know, if additions qualify as changes. Additions are already notified in the section "New Features" in general. The purpose of the API section in the release notes is for app developers to be warned of changes requiring attention in their maintenance.
Re: [dpdk-dev] [PATCH v2 1/2] net/mlx5: fix tunnel offload private items location
Hello Thomas,
> Dim 25 avr 2021, à 17:57, Gregory Etelson a écrit :
> > Tunnel offload API requires application to query PMD for specific flow
> > items and actions. Application uses these PMD specific elements to
> > build flow rules according to the tunnel offload model.
> > The model does not restrict private elements location in a flow rule,
> > but the current MLX5 PMD implementation expects that tunnel offload
> > rule will begin with PMD specific elements.
> > The patch removes that placement limitation in MLX5 PMD.
> >
> > Cc: sta...@dpdk.org
> >
> > Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload")
>
> Cc: stable must be just after the Fixes line.
>
> There is a testpmd patch in the same series, is it OK to be merged in mlx
> tree?
The tunnel offload model can be complicated.
The testpmd patch that comes with this one emphasizes how application
can construct a flow rule without placement restrictions.
I think that both patches should be merged.
Regards,
Gregory
Re: [dpdk-dev] [PATCH v2 1/2] net/mlx5: fix tunnel offload private items location
Dim 25 avr 2021, à 19:01, Gregory Etelson a écrit :
> Hello Thomas,
>
> > Dim 25 avr 2021, à 17:57, Gregory Etelson a écrit :
> > > Tunnel offload API requires application to query PMD for specific flow
> > > items and actions. Application uses these PMD specific elements to
> > > build flow rules according to the tunnel offload model.
> > > The model does not restrict private elements location in a flow rule,
> > > but the current MLX5 PMD implementation expects that tunnel offload
> > > rule will begin with PMD specific elements.
> > > The patch removes that placement limitation in MLX5 PMD.
> > >
> > > Cc: sta...@dpdk.org
> > >
> > > Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload")
> >
> > Cc: stable must be just after the Fixes line.
> >
> > There is a testpmd patch in the same series, is it OK to be merged in mlx
> > tree?
>
> The tunnel offload model can be complicated.
> The testpmd patch that comes with this one emphasizes how application
> can construct a flow rule without placement restrictions.
> I think that both patches should be merged.
That's not the question.
One patch should be merged in mlx tree, while the other one should target
next-net.
In such a situation, quite often we split in different series.
For this case, it's up to Raslan and Ferruh to agree on how to proceed.
[dpdk-dev] [PATCH v2] app/bbdev: fix wrong variable
The logging should show context by printing the two variable which
compared to each other. 'nb_harq_inputs', not 'nb_hard_outputs';
'nb_harq_outputs', not 'nb_hard_outputs'.
This patch corrected misused variable.
Fixes: d819c08327f3 ("app/bbdev: update for 5GNR")
Cc: sta...@dpdk.org
Signed-off-by: Min Hu (Connor)
Acked-by: Nicolas Chautru
---
app/test-bbdev/test_bbdev_perf.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c
index 45b85b9..b8bf512 100644
--- a/app/test-bbdev/test_bbdev_perf.c
+++ b/app/test-bbdev/test_bbdev_perf.c
@@ -372,14 +372,14 @@ check_dev_cap(const struct rte_bbdev_info *dev_info)
if (nb_harq_inputs > cap->num_buffers_hard_out) {
printf(
"Too many HARQ inputs defined: %u, max:
%u\n",
- nb_hard_outputs,
+ nb_harq_inputs,
cap->num_buffers_hard_out);
return TEST_FAILED;
}
if (nb_harq_outputs > cap->num_buffers_hard_out) {
printf(
"Too many HARQ outputs defined: %u,
max: %u\n",
- nb_hard_outputs,
+ nb_harq_outputs,
cap->num_buffers_hard_out);
return TEST_FAILED;
}
--
2.7.4
Re: [dpdk-dev] [PATCH] app/bbdev: fix wrong variable
在 2021/4/26 0:30, Thomas Monjalon 写道:
Chautru, Nicolas:
From: Min Hu (Connor)
This patch corrected misused variable.
Fixes: d819c08327f3 ("app/bbdev: update for 5GNR")
Cc: sta...@dpdk.org
Signed-off-by: Min Hu (Connor)
Thanks
Acked-by: Nicolas Chautru
It is not enough. The commit log must described what was broken in which case.
Hi, fixed in v2, thanks.
Re: [dpdk-dev] [PATCH] net/iavf: fix incomplete rss initiation
> -Original Message-
> From: Ding, Xuan
> Sent: Sunday, April 25, 2021 4:06 PM
> To: Zhang, Qi Z ; Wu, Jingjing ;
> Xing, Beilei
> Cc: dev@dpdk.org; Ding, Xuan ; sta...@dpdk.org
> Subject: [PATCH] net/iavf: fix incomplete rss initiation
>
> When the default RSS is disabled during initialization, the RSS should be
> turned
> on when creating RSS rule.
>
> This patch adds support to configure rss key and lookup table even when the
> default RSS is disabled.
>
> Fixes: c678299594a8 ("net/iavf: fix default RSS configuration")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Xuan Ding
Acked-by: Qi Zhang
Applied to dpdk-next-net-intel.
Thanks
Qi
Re: [dpdk-dev] [PATCH v2] net/iavf: fix PF returning error
> -Original Message-
> From: Zhang, AlvinX
> Sent: Sunday, April 25, 2021 3:40 PM
> To: Wu, Jingjing ; Xing, Beilei
> Cc: dev@dpdk.org; Zhang, AlvinX ; sta...@dpdk.org
> Subject: [PATCH v2] net/iavf: fix PF returning error
>
> When the command sent by VF to PF fails, iavf may need to run different code
> paths according to the specific reason of the failure (not supported or other
> reasons).
>
> This patch adds support of identifying PF return error type.
>
> Fixes: 22b123a36d07 ("net/avf: initialize PMD")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Alvin Zhang
> ---
>
> v2: Refine codes according to comments.
> ---
> drivers/net/iavf/iavf.h | 4 ++--
> drivers/net/iavf/iavf_vchnl.c | 18 --
> 2 files changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h index
> d1ae5a3..4a2e203 100644
> --- a/drivers/net/iavf/iavf.h
> +++ b/drivers/net/iavf/iavf.h
> @@ -144,7 +144,7 @@ struct iavf_info {
> uint64_t supported_rxdid;
> uint8_t *proto_xtr; /* proto xtr type for all queues */
> volatile enum virtchnl_ops pend_cmd; /* pending command not
> finished */
> - uint32_t cmd_retval; /* return value of the cmd response from PF */
> + int cmd_retval; /* return value of the cmd response from PF */
> uint8_t *aq_resp; /* buffer to store the adminq response from PF */
>
> /* Event from pf */
> @@ -264,7 +264,7 @@ struct iavf_cmd_info {
> * _atomic_set_cmd successfully.
> */
> static inline void
> -_notify_cmd(struct iavf_info *vf, uint32_t msg_ret)
> +_notify_cmd(struct iavf_info *vf, int msg_ret)
> {
> vf->cmd_retval = msg_ret;
> rte_wmb();
> diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
> index
> 45096cb..f2b46f1 100644
> --- a/drivers/net/iavf/iavf_vchnl.c
> +++ b/drivers/net/iavf/iavf_vchnl.c
> @@ -228,13 +228,19 @@
> rte_delay_ms(ASQ_DELAY_MS);
> /* If don't read msg or read sys event, continue */
> } while (i++ < MAX_TRY_TIMES);
> - /* If there's no response is received, clear command */
> - if (i >= MAX_TRY_TIMES ||
> - vf->cmd_retval != VIRTCHNL_STATUS_SUCCESS) {
> - err = -1;
> - PMD_DRV_LOG(ERR, "No response or return failure
> (%d)"
> - " for cmd %d", vf->cmd_retval, args->ops);
> +
> + if (i >= MAX_TRY_TIMES) {
> + PMD_DRV_LOG(ERR, "No response for cmd %d", args-
> >ops);
> _clear_cmd(vf);
> + err = -EIO;
> + } else if (vf->cmd_retval ==
> +VIRTCHNL_STATUS_ERR_NOT_SUPPORTED) {
> + PMD_DRV_LOG(ERR, "Cmd %d not supported", args-
> >ops);
> + err = -ENOTSUP;
> + } else if (vf->cmd_retval != VIRTCHNL_STATUS_SUCCESS) {
> + PMD_DRV_LOG(ERR, "Return failure %d for cmd %d",
> + vf->cmd_retval, args->ops);
> + err = -EINVAL;
> }
> break;
> }
> --
> 1.8.3.1
Acked-by: Beilei Xing
Re: [dpdk-dev] [PATCH v3 2/2] net/ice: refactor input set fields for switch filter
> -Original Message-
> From: Zhang, Yuying
> Sent: Sunday, April 25, 2021 9:29 PM
> To: dev@dpdk.org; Zhang, Qi Z ; Wang, Haiyue
>
> Cc: Yan, Zhirun ; Guo, Junfeng
> ; Zhang, Yuying
> Subject: [PATCH v3 2/2] net/ice: refactor input set fields for switch filter
>
> Input set has been divided into inner and outer part to distinguish
> different fields. However, the parse method of switch filter doesn't
> match this update. Refactor switch filter to distingush inner and outer
> input set in the same way as other filters.
>
> Signed-off-by: Yuying Zhang
> ---
> drivers/net/ice/ice_switch_filter.c | 746
> 1 file changed, 323 insertions(+), 423 deletions(-)
>
>
..
>
> -static uint64_t
> -ice_switch_inset_get(const struct rte_flow_item pattern[],
> +static bool
> +ice_switch_parse_pattern(const struct rte_flow_item pattern[],
> struct rte_flow_error *error,
> struct ice_adv_lkup_elem *list,
> uint16_t *lkups_num,
> - enum ice_sw_tunnel_type *tun_type)
> + enum ice_sw_tunnel_type *tun_type,
> + const struct ice_pattern_match_item pattern_match_item)
Better to parse const pointer, but not struct value
const struct ice_pattern_match_item *pattern_match_item
> {
> const struct rte_flow_item *item = pattern;
> enum rte_flow_item_type item_type;
> @@ -504,7 +456,9 @@ ice_switch_inset_get(const struct rte_flow_item
> pattern[],
> const struct rte_flow_item_pfcp *pfcp_spec, *pfcp_mask;
> const struct rte_flow_item_gtp *gtp_spec, *gtp_mask;
> const struct rte_flow_item_gtp_psc *gtp_psc_spec, *gtp_psc_mask;
> - uint64_t input_set = ICE_INSET_NONE;
> + uint64_t outer_input_set = ICE_INSET_NONE;
> + uint64_t inner_input_set = ICE_INSET_NONE;
> + uint64_t *input = NULL;
Why we need pointer here?
Can we:
if (tunnel_valid) {
...
input_set = inner_input_set;
} else {
...
input_set = outer_input_set;
}
...
>
> - inputset = ice_switch_inset_get
> - (pattern, error, list, &lkups_num, &tun_type);
> - if ((!inputset && !ice_is_prof_rule(tun_type)) ||
> - (inputset & ~pattern_match_item->input_set_mask_o)) {
> + if (ice_switch_parse_pattern(pattern, error, list, &lkups_num,
> +&tun_type, *pattern_match_item) == false) {
No need "==false", use ! for Boolean.
> rte_flow_error_set(error, EINVAL,
> RTE_FLOW_ERROR_TYPE_ITEM_SPEC,
> pattern,
> --
> 2.25.1
Re: [dpdk-dev] [PATCH v3 2/2] net/ice: refactor input set fields for switch filter
> -Original Message-
> From: Zhang, Qi Z
> Sent: Monday, April 26, 2021 9:48 AM
> To: Zhang, Yuying ; dev@dpdk.org; Wang, Haiyue
>
> Cc: Yan, Zhirun ; Guo, Junfeng
> Subject: RE: [PATCH v3 2/2] net/ice: refactor input set fields for switch
> filter
>
>
>
> > -Original Message-
> > From: Zhang, Yuying
> > Sent: Sunday, April 25, 2021 9:29 PM
> > To: dev@dpdk.org; Zhang, Qi Z ; Wang, Haiyue
> >
> > Cc: Yan, Zhirun ; Guo, Junfeng
> > ; Zhang, Yuying
> > Subject: [PATCH v3 2/2] net/ice: refactor input set fields for switch
> > filter
> >
> > Input set has been divided into inner and outer part to distinguish
> > different fields. However, the parse method of switch filter doesn't
> > match this update. Refactor switch filter to distingush inner and
> > outer input set in the same way as other filters.
> >
> > Signed-off-by: Yuying Zhang
> > ---
> > drivers/net/ice/ice_switch_filter.c | 746
> >
> > 1 file changed, 323 insertions(+), 423 deletions(-)
> >
> >
>
> ..
> >
> > -static uint64_t
> > -ice_switch_inset_get(const struct rte_flow_item pattern[],
> > +static bool
> > +ice_switch_parse_pattern(const struct rte_flow_item pattern[],
> > struct rte_flow_error *error,
> > struct ice_adv_lkup_elem *list,
> > uint16_t *lkups_num,
> > -enum ice_sw_tunnel_type *tun_type)
> > +enum ice_sw_tunnel_type *tun_type,
> > +const struct ice_pattern_match_item pattern_match_item)
>
> Better to parse const pointer, but not struct value
>
> const struct ice_pattern_match_item *pattern_match_item
>
> > {
> > const struct rte_flow_item *item = pattern; enum rte_flow_item_type
> > item_type; @@ -504,7 +456,9 @@ ice_switch_inset_get(const struct
> > rte_flow_item pattern[], const struct rte_flow_item_pfcp *pfcp_spec,
> > *pfcp_mask; const struct rte_flow_item_gtp *gtp_spec, *gtp_mask;
> > const struct rte_flow_item_gtp_psc *gtp_psc_spec, *gtp_psc_mask;
> > -uint64_t input_set = ICE_INSET_NONE;
> > +uint64_t outer_input_set = ICE_INSET_NONE; uint64_t inner_input_set =
> > +ICE_INSET_NONE; uint64_t *input = NULL;
>
> Why we need pointer here?
>
> Can we:
>
> if (tunnel_valid) {
> ...
> input_set = inner_input_set;
> } else {
> ...
> input_set = outer_input_set;
> }
>
We need to change the value of inner_input_set and outer_input_set
according to actual input set of the rule to be created. Pointer is used to
distinguish which one need to be changed.
> ...
> >
> > -inputset = ice_switch_inset_get
> > -(pattern, error, list, &lkups_num, &tun_type); -if ((!inputset &&
> > !ice_is_prof_rule(tun_type)) || -(inputset &
> > ~pattern_match_item->input_set_mask_o)) {
> > +if (ice_switch_parse_pattern(pattern, error, list, &lkups_num,
> > + &tun_type, *pattern_match_item) == false) {
>
> No need "==false", use ! for Boolean.
>
> > rte_flow_error_set(error, EINVAL,
> > RTE_FLOW_ERROR_TYPE_ITEM_SPEC,
> > pattern,
> > --
> > 2.25.1
>
[dpdk-dev] [PATCH 2/6] net/hns3: modify write reg opt API impl
From: Chengwen Feng
This patch modifies hns3_write_reg_opt() API implementation because
the rte_write32() already uses rte_io_wmb().
Signed-off-by: Chengwen Feng
Signed-off-by: Min Hu (Connor)
---
drivers/net/hns3/hns3_ethdev.h | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index de17878..68541df 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -983,13 +983,13 @@ static inline void hns3_write_reg(void *base, uint32_t
reg, uint32_t value)
}
/*
- * The optimized function for writing registers used in the '.rx_pkt_burst' and
- * '.tx_pkt_burst' ops implementation function.
+ * The optimized function for writing registers reduces one address addition
+ * calculation, it was used in the '.rx_pkt_burst' and '.tx_pkt_burst' ops
+ * implementation function.
*/
static inline void hns3_write_reg_opt(volatile void *addr, uint32_t value)
{
- rte_io_wmb();
- rte_write32_relaxed(rte_cpu_to_le_32(value), addr);
+ rte_write32(rte_cpu_to_le_32(value), addr);
}
static inline uint32_t hns3_read_reg(void *base, uint32_t reg)
--
2.7.4
[dpdk-dev] [PATCH 1/6] net/hns3: delete some unused capabilities
From: Chengwen Feng
This patch deletes some unused capabilities, include:
1. Delete some unused firmware capabilities definition.
2. Delete some unused driver capabilities definition.
Signed-off-by: Chengwen Feng
Signed-off-by: Min Hu (Connor)
---
drivers/net/hns3/hns3_cmd.c| 7 ---
drivers/net/hns3/hns3_cmd.h| 15 +++
drivers/net/hns3/hns3_ethdev.h | 29 ++---
3 files changed, 21 insertions(+), 30 deletions(-)
diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c
index 62dfc19..4651d5b 100644
--- a/drivers/net/hns3/hns3_cmd.c
+++ b/drivers/net/hns3/hns3_cmd.c
@@ -423,11 +423,8 @@ hns3_get_caps_name(uint32_t caps_id)
enum HNS3_CAPS_BITS caps;
const char *name;
} dev_caps[] = {
- { HNS3_CAPS_UDP_GSO_B, "udp_gso" },
- { HNS3_CAPS_ATR_B, "atr" },
{ HNS3_CAPS_FD_QUEUE_REGION_B, "fd_queue_region" },
{ HNS3_CAPS_PTP_B, "ptp" },
- { HNS3_CAPS_INT_QL_B, "int_ql" },
{ HNS3_CAPS_SIMPLE_BD_B, "simple_bd" },
{ HNS3_CAPS_TX_PUSH_B, "tx_push" },
{ HNS3_CAPS_PHY_IMP_B, "phy_imp" },
@@ -436,8 +433,6 @@ hns3_get_caps_name(uint32_t caps_id)
{ HNS3_CAPS_STASH_B, "stash" },
{ HNS3_CAPS_UDP_TUNNEL_CSUM_B, "udp_tunnel_csum" },
{ HNS3_CAPS_RAS_IMP_B, "ras_imp" },
- { HNS3_CAPS_FEC_B, "fec" },
- { HNS3_CAPS_PAUSE_B, "pause" },
{ HNS3_CAPS_RXD_ADV_LAYOUT_B, "rxd_adv_layout" }
};
uint32_t i;
@@ -484,8 +479,6 @@ hns3_parse_capability(struct hns3_hw *hw,
{
uint32_t caps = rte_le_to_cpu_32(cmd->caps[0]);
- if (hns3_get_bit(caps, HNS3_CAPS_UDP_GSO_B))
- hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_UDP_GSO_B, 1);
if (hns3_get_bit(caps, HNS3_CAPS_FD_QUEUE_REGION_B))
hns3_set_bit(hw->capability, HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B,
1);
diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h
index bf1772d..984f2a9 100644
--- a/drivers/net/hns3/hns3_cmd.h
+++ b/drivers/net/hns3/hns3_cmd.h
@@ -306,12 +306,13 @@ struct hns3_rx_priv_buff_cmd {
#define HNS3_FW_VERSION_BYTE0_MGENMASK(7, 0)
enum HNS3_CAPS_BITS {
- HNS3_CAPS_UDP_GSO_B,
- HNS3_CAPS_ATR_B,
- HNS3_CAPS_FD_QUEUE_REGION_B,
+ /*
+* The following capability index definitions must be the same as those
+* of the firmware.
+*/
+ HNS3_CAPS_FD_QUEUE_REGION_B = 2,
HNS3_CAPS_PTP_B,
- HNS3_CAPS_INT_QL_B,
- HNS3_CAPS_SIMPLE_BD_B,
+ HNS3_CAPS_SIMPLE_BD_B = 5,
HNS3_CAPS_TX_PUSH_B,
HNS3_CAPS_PHY_IMP_B,
HNS3_CAPS_TQP_TXRX_INDEP_B,
@@ -319,9 +320,7 @@ enum HNS3_CAPS_BITS {
HNS3_CAPS_STASH_B,
HNS3_CAPS_UDP_TUNNEL_CSUM_B,
HNS3_CAPS_RAS_IMP_B,
- HNS3_CAPS_FEC_B,
- HNS3_CAPS_PAUSE_B,
- HNS3_CAPS_RXD_ADV_LAYOUT_B,
+ HNS3_CAPS_RXD_ADV_LAYOUT_B = 15,
};
enum HNS3_API_CAP_BITS {
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index d27c725..de17878 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -855,17 +855,20 @@ enum {
#define HNS3_DEVARG_DEV_CAPS_MASK "dev_caps_mask"
-#define HNS3_DEV_SUPPORT_DCB_B 0x0
-#define HNS3_DEV_SUPPORT_COPPER_B 0x1
-#define HNS3_DEV_SUPPORT_UDP_GSO_B 0x2
-#define HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B 0x3
-#define HNS3_DEV_SUPPORT_PTP_B 0x4
-#define HNS3_DEV_SUPPORT_TX_PUSH_B 0x5
-#define HNS3_DEV_SUPPORT_INDEP_TXRX_B 0x6
-#define HNS3_DEV_SUPPORT_STASH_B 0x7
-#define HNS3_DEV_SUPPORT_RXD_ADV_LAYOUT_B 0x9
-#define HNS3_DEV_SUPPORT_OUTER_UDP_CKSUM_B 0xA
-#define HNS3_DEV_SUPPORT_RAS_IMP_B 0xB
+enum {
+ HNS3_DEV_SUPPORT_DCB_B,
+ HNS3_DEV_SUPPORT_COPPER_B,
+ HNS3_DEV_SUPPORT_FD_QUEUE_REGION_B,
+ HNS3_DEV_SUPPORT_PTP_B,
+ HNS3_DEV_SUPPORT_TX_PUSH_B,
+ HNS3_DEV_SUPPORT_INDEP_TXRX_B,
+ HNS3_DEV_SUPPORT_STASH_B,
+ HNS3_DEV_SUPPORT_SIMPLE_BD_B,
+ HNS3_DEV_SUPPORT_RXD_ADV_LAYOUT_B,
+ HNS3_DEV_SUPPORT_OUTER_UDP_CKSUM_B,
+ HNS3_DEV_SUPPORT_RAS_IMP_B,
+ HNS3_DEV_SUPPORT_TM_B,
+};
#define hns3_dev_dcb_supported(hw) \
hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_DCB_B)
@@ -874,10 +877,6 @@ enum {
#define hns3_dev_copper_supported(hw) \
hns3_get_bit((hw)->capability, HNS3_DEV_SUPPORT_COPPER_B)
-/* Support UDP GSO offload */
-#define hns3_dev_udp_gso_supported(hw) \
- hns3_get_bit((hw)->capability, HN
[dpdk-dev] [PATCH 3/6] net/hns3: use RTE DIM instead of ARRAY SIZE
From: Chengwen Feng
This patch uses RTE_DIM() instead of ARRAY_SIZE().
Signed-off-by: Chengwen Feng
Signed-off-by: Min Hu (Connor)
---
drivers/net/hns3/hns3_cmd.c| 4 ++--
drivers/net/hns3/hns3_ethdev.h | 2 --
drivers/net/hns3/hns3_flow.c | 18 +-
drivers/net/hns3/hns3_intr.c | 4 ++--
4 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/drivers/net/hns3/hns3_cmd.c b/drivers/net/hns3/hns3_cmd.c
index 4651d5b..2eec895 100644
--- a/drivers/net/hns3/hns3_cmd.c
+++ b/drivers/net/hns3/hns3_cmd.c
@@ -245,7 +245,7 @@ hns3_is_special_opcode(uint16_t opcode)
HNS3_OPC_QUERY_ALL_ERR_INFO,};
uint32_t i;
- for (i = 0; i < ARRAY_SIZE(spec_opcode); i++)
+ for (i = 0; i < RTE_DIM(spec_opcode); i++)
if (spec_opcode[i] == opcode)
return true;
@@ -276,7 +276,7 @@ hns3_cmd_convert_err_code(uint16_t desc_ret)
uint32_t i;
- for (i = 0; i < ARRAY_SIZE(hns3_cmdq_status); i++)
+ for (i = 0; i < RTE_DIM(hns3_cmdq_status); i++)
if (hns3_cmdq_status[i].imp_errcode == desc_ret)
return hns3_cmdq_status[i].linux_errcode;
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 68541df..258e26d 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -1004,8 +1004,6 @@ static inline uint32_t hns3_read_reg(void *base, uint32_t
reg)
#define hns3_read_dev(a, reg) \
hns3_read_reg((a)->io_base, (reg))
-#define ARRAY_SIZE(x) RTE_DIM(x)
-
#define NEXT_ITEM_OF_ACTION(act, actions, index)\
do {\
act = (actions) + (index); \
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index 4511a49..49d6568 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -1054,37 +1054,37 @@ hns3_parse_normal(const struct rte_flow_item *item,
struct hns3_fdir_rule *rule,
case RTE_FLOW_ITEM_TYPE_ETH:
ret = hns3_parse_eth(item, rule, error);
step_mngr->items = L2_next_items;
- step_mngr->count = ARRAY_SIZE(L2_next_items);
+ step_mngr->count = RTE_DIM(L2_next_items);
break;
case RTE_FLOW_ITEM_TYPE_VLAN:
ret = hns3_parse_vlan(item, rule, error);
step_mngr->items = L2_next_items;
- step_mngr->count = ARRAY_SIZE(L2_next_items);
+ step_mngr->count = RTE_DIM(L2_next_items);
break;
case RTE_FLOW_ITEM_TYPE_IPV4:
ret = hns3_parse_ipv4(item, rule, error);
step_mngr->items = L3_next_items;
- step_mngr->count = ARRAY_SIZE(L3_next_items);
+ step_mngr->count = RTE_DIM(L3_next_items);
break;
case RTE_FLOW_ITEM_TYPE_IPV6:
ret = hns3_parse_ipv6(item, rule, error);
step_mngr->items = L3_next_items;
- step_mngr->count = ARRAY_SIZE(L3_next_items);
+ step_mngr->count = RTE_DIM(L3_next_items);
break;
case RTE_FLOW_ITEM_TYPE_TCP:
ret = hns3_parse_tcp(item, rule, error);
step_mngr->items = L4_next_items;
- step_mngr->count = ARRAY_SIZE(L4_next_items);
+ step_mngr->count = RTE_DIM(L4_next_items);
break;
case RTE_FLOW_ITEM_TYPE_UDP:
ret = hns3_parse_udp(item, rule, error);
step_mngr->items = L4_next_items;
- step_mngr->count = ARRAY_SIZE(L4_next_items);
+ step_mngr->count = RTE_DIM(L4_next_items);
break;
case RTE_FLOW_ITEM_TYPE_SCTP:
ret = hns3_parse_sctp(item, rule, error);
step_mngr->items = L4_next_items;
- step_mngr->count = ARRAY_SIZE(L4_next_items);
+ step_mngr->count = RTE_DIM(L4_next_items);
break;
default:
return rte_flow_error_set(error, ENOTSUP,
@@ -1188,7 +1188,7 @@ hns3_parse_fdir_filter(struct rte_eth_dev *dev,
"Fdir not supported in VF");
step_mngr.items = first_items;
- step_mngr.count = ARRAY_SIZE(first_items);
+ step_mngr.count = RTE_DIM(first_items);
for (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
if (item->type == RTE_FLOW_ITEM_TYPE_VOID)
continue;
@@ -1202,7 +1202,7 @@ hns3_parse_fdir_filter(struct rte_eth_dev *dev,
if (ret)
return ret;
step_mngr.items = tunnel_next_items;
- step_mngr.count = ARRAY_SIZE(tunnel_next_items);
+ step_mngr.count = RTE_DIM(tunnel_next_items);
[dpdk-dev] [PATCH 0/6] optimization and bugfix for hns3 PMD
This patch set contains one patch for performance optimization, this is: 'net/hns3: improve IO path data cache usage'. The others are bugfixes for hns3 PMD. Chengwen Feng (6): net/hns3: delete some unused capabilities net/hns3: modify write reg opt API impl net/hns3: use RTE DIM instead of ARRAY SIZE net/hns3: improve IO path data cache usage net/hns3: log fdir configuration net/hns3: fix vector Rx burst default value drivers/net/hns3/hns3_cmd.c| 11 +--- drivers/net/hns3/hns3_cmd.h| 15 +++-- drivers/net/hns3/hns3_ethdev.h | 43 +++--- drivers/net/hns3/hns3_fdir.c | 13 + drivers/net/hns3/hns3_flow.c | 18 +++--- drivers/net/hns3/hns3_intr.c | 4 +- drivers/net/hns3/hns3_rxtx.h | 128 - 7 files changed, 129 insertions(+), 103 deletions(-) -- 2.7.4
[dpdk-dev] [PATCH 5/6] net/hns3: log fdir configuration
From: Chengwen Feng
The rte flow interface does not support the API of the capability
set. Therefore, fdir configuration logs are added to facilitate
debugging.
Signed-off-by: Chengwen Feng
Signed-off-by: Min Hu (Connor)
---
drivers/net/hns3/hns3_fdir.c | 13 +
1 file changed, 13 insertions(+)
diff --git a/drivers/net/hns3/hns3_fdir.c b/drivers/net/hns3/hns3_fdir.c
index 87c1aef..8b14219 100644
--- a/drivers/net/hns3/hns3_fdir.c
+++ b/drivers/net/hns3/hns3_fdir.c
@@ -336,6 +336,8 @@ int hns3_init_fd_config(struct hns3_adapter *hns)
BIT(INNER_IP_PROTO) | BIT(INNER_IP_TOS) |
BIT(INNER_SRC_IP) | BIT(INNER_DST_IP) |
BIT(INNER_SRC_PORT) | BIT(INNER_DST_PORT);
+ hns3_info(hw, "fdir tuple: inner");
/* If use max 400bit key, we can support tuples for ether type */
if (pf->fdir.fd_cfg.max_key_length == MAX_KEY_LENGTH) {
@@ -345,6 +347,9 @@ int hns3_init_fd_config(struct hns3_adapter *hns)
BIT(OUTER_DST_PORT) | BIT(INNER_VLAN_TAG2) |
BIT(OUTER_TUN_VNI) | BIT(OUTER_TUN_FLOW_ID) |
BIT(OUTER_ETH_TYPE) | BIT(OUTER_IP_PROTO);
+ hns3_info(hw, "fdir tuple more: inner outer");
}
/* roce_type is used to filter roce frames
@@ -352,6 +357,7 @@ int hns3_init_fd_config(struct hns3_adapter *hns)
*/
key_cfg->meta_data_active = BIT(DST_VPORT) | BIT(TUNNEL_PACKET) |
BIT(VLAN_NUMBER);
+ hns3_info(hw, "fdir meta data: dst_vport tunnel_packet vlan_number");
ret = hns3_get_fd_allocation(hw,
&pf->fdir.fd_cfg.rule_num[HNS3_FD_STAGE_1],
@@ -361,6 +367,13 @@ int hns3_init_fd_config(struct hns3_adapter *hns)
if (ret)
return ret;
+ hns3_info(hw, "fdir: stage1 stage2",
+ pf->fdir.fd_cfg.rule_num[HNS3_FD_STAGE_1],
+ pf->fdir.fd_cfg.cnt_num[HNS3_FD_STAGE_1],
+ pf->fdir.fd_cfg.rule_num[HNS3_FD_STAGE_2],
+ pf->fdir.fd_cfg.cnt_num[HNS3_FD_STAGE_2]);
+
return hns3_set_fd_key_config(hns);
}
--
2.7.4
[dpdk-dev] [PATCH 4/6] net/hns3: improve IO path data cache usage
From: Chengwen Feng
This patch improves data cache usage by:
1. Rearrange the rxq frequency accessed fields in the IO path to the
first 128B.
2. Rearrange the txq frequency accessed fields in the IO path to the
first 64B.
3. Make sure ptype table align cacheline size which is 128B instead of
min cacheline size which is 64B because the L1/L2 is 64B and L3 is
128B on Kunpeng ARM platform.
The performance gains are 1.5% in 64B packet macfwd scenarios.
Signed-off-by: Chengwen Feng
Signed-off-by: Min Hu (Connor)
---
drivers/net/hns3/hns3_ethdev.h | 4 +-
drivers/net/hns3/hns3_rxtx.h | 126 -
2 files changed, 77 insertions(+), 53 deletions(-)
diff --git a/drivers/net/hns3/hns3_ethdev.h b/drivers/net/hns3/hns3_ethdev.h
index 258e26d..5f860ee 100644
--- a/drivers/net/hns3/hns3_ethdev.h
+++ b/drivers/net/hns3/hns3_ethdev.h
@@ -735,7 +735,7 @@ struct hns3_ptype_table {
* descriptor, it functions only when firmware report the capability of
* HNS3_CAPS_RXD_ADV_LAYOUT_B and driver enabled it.
*/
- uint32_t ptype[HNS3_PTYPE_NUM] __rte_cache_min_aligned;
+ uint32_t ptype[HNS3_PTYPE_NUM] __rte_cache_aligned;
};
#define HNS3_FIXED_MAX_TQP_NUM_MODE0
@@ -839,7 +839,7 @@ struct hns3_adapter {
uint64_t dev_caps_mask;
- struct hns3_ptype_table ptype_tbl __rte_cache_min_aligned;
+ struct hns3_ptype_table ptype_tbl __rte_cache_aligned;
};
enum {
diff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h
index 703c4b7..1e2e994 100644
--- a/drivers/net/hns3/hns3_rxtx.h
+++ b/drivers/net/hns3/hns3_rxtx.h
@@ -289,22 +289,14 @@ struct hns3_rx_bd_errors_stats {
};
struct hns3_rx_queue {
- void *io_base;
volatile void *io_head_reg;
- struct hns3_adapter *hns;
struct hns3_ptype_table *ptype_tbl;
struct rte_mempool *mb_pool;
struct hns3_desc *rx_ring;
- uint64_t rx_ring_phys_addr; /* RX ring DMA address */
- const struct rte_memzone *mz;
struct hns3_entry *sw_ring;
- struct rte_mbuf *pkt_first_seg;
- struct rte_mbuf *pkt_last_seg;
- uint16_t queue_id;
uint16_t port_id;
uint16_t nb_rx_desc;
- uint16_t rx_buf_len;
/*
* threshold for the number of BDs waited to passed to hardware. If the
* number exceeds the threshold, driver will pass these BDs to hardware.
@@ -318,8 +310,6 @@ struct hns3_rx_queue {
/* 4 if DEV_RX_OFFLOAD_KEEP_CRC offload set, 0 otherwise */
uint8_t crc_len;
- bool rx_deferred_start; /* don't start this queue in dev start */
- bool configured;/* indicate if rx queue has been configured */
/*
* Indicate whether ignore the outer VLAN field in the Rx BD reported
* by the Hardware. Because the outer VLAN is the PVID if the PVID is
@@ -331,23 +321,45 @@ struct hns3_rx_queue {
* driver does not need to perform PVID-related operation in Rx. At this
* point, the pvid_sw_discard_en will be false.
*/
- bool pvid_sw_discard_en;
- bool ptype_en; /* indicate if the ptype field enabled */
- bool enabled; /* indicate if Rx queue has been enabled */
+ uint8_t pvid_sw_discard_en:1;
+ uint8_t ptype_en:1; /* indicate if the ptype field enabled */
+
+ uint64_t mbuf_initializer; /* value to init mbufs used with vector rx */
+ /* offset_table: used for vector, to solve execute re-order problem */
+ uint8_t offset_table[HNS3_VECTOR_RX_OFFSET_TABLE_LEN + 1];
+
+ uint16_t bulk_mbuf_num; /* indicate bulk_mbuf valid nums */
struct hns3_rx_basic_stats basic_stats;
+
+ struct rte_mbuf *pkt_first_seg;
+ struct rte_mbuf *pkt_last_seg;
+
+ struct rte_mbuf *bulk_mbuf[HNS3_BULK_ALLOC_MBUF_NUM];
+
/* DFX statistics that driver does not need to discard packets */
struct hns3_rx_dfx_stats dfx_stats;
/* Error statistics that driver needs to discard packets */
struct hns3_rx_bd_errors_stats err_stats;
- struct rte_mbuf *bulk_mbuf[HNS3_BULK_ALLOC_MBUF_NUM];
- uint16_t bulk_mbuf_num;
-
- /* offset_table: used for vector, to solve execute re-order problem */
- uint8_t offset_table[HNS3_VECTOR_RX_OFFSET_TABLE_LEN + 1];
- uint64_t mbuf_initializer; /* value to init mbufs used with vector rx */
struct rte_mbuf fake_mbuf; /* fake mbuf used with vector rx */
+
+
+ /*
+* The following fields are not accessed in the I/O path, so they are
+* placed at the end.
+*/
+ void *io_base;
+ struct hns3_adapter *hns;
+ uint64_t rx_ring_phys_addr; /* RX ring DMA address */
+ const struct rte_memzone *mz;
+
+ uint16_t queue_id;
+ uint16_t rx_buf_len;
+
+ bool configured;/* indicate if rx queue has been configured */
+ bool rx_deferred_start; /* don't s
[dpdk-dev] [PATCH 6/6] net/hns3: fix vector Rx burst default value
From: Chengwen Feng
Currently, driver uses the macro HNS3_DEFAULT_RX_BURST whose value is
32 to limit the vector Rx burst size, as a result, the burst size user
configure can't exceed 32.
This patch fixes this problem by defining the macro
HNS3_DEFAULT_RX_BURST as 64.
Fixes: a3d4f4d291d7 ("net/hns3: support NEON Rx")
Cc: sta...@dpdk.org
Signed-off-by: Chengwen Feng
Signed-off-by: Min Hu (Connor)
---
drivers/net/hns3/hns3_rxtx.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/hns3/hns3_rxtx.h b/drivers/net/hns3/hns3_rxtx.h
index 1e2e994..ba24e00 100644
--- a/drivers/net/hns3/hns3_rxtx.h
+++ b/drivers/net/hns3/hns3_rxtx.h
@@ -20,7 +20,7 @@
#define HNS3_DEFAULT_TX_RS_THRESH 32
#define HNS3_TX_FAST_FREE_AHEAD64
-#define HNS3_DEFAULT_RX_BURST 32
+#define HNS3_DEFAULT_RX_BURST 64
#if (HNS3_DEFAULT_RX_BURST > 64)
#error "PMD HNS3: HNS3_DEFAULT_RX_BURST must <= 64\n"
#endif
--
2.7.4
Re: [dpdk-dev] [PATCH v2] net/iavf: fix PF returning error
> -Original Message-
> From: dev On Behalf Of Xing, Beilei
> Sent: Monday, April 26, 2021 9:34 AM
> To: Zhang, AlvinX ; Wu, Jingjing
>
> Cc: dev@dpdk.org; sta...@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v2] net/iavf: fix PF returning error
>
>
>
> > -Original Message-
> > From: Zhang, AlvinX
> > Sent: Sunday, April 25, 2021 3:40 PM
> > To: Wu, Jingjing ; Xing, Beilei
> >
> > Cc: dev@dpdk.org; Zhang, AlvinX ;
> > sta...@dpdk.org
> > Subject: [PATCH v2] net/iavf: fix PF returning error
> >
> > When the command sent by VF to PF fails, iavf may need to run
> > different code paths according to the specific reason of the failure
> > (not supported or other reasons).
> >
> > This patch adds support of identifying PF return error type.
> >
> > Fixes: 22b123a36d07 ("net/avf: initialize PMD")
> > Cc: sta...@dpdk.org
> >
> > Signed-off-by: Alvin Zhang
> > ---
> >
> > v2: Refine codes according to comments.
> > ---
> > drivers/net/iavf/iavf.h | 4 ++--
> > drivers/net/iavf/iavf_vchnl.c | 18 --
> > 2 files changed, 14 insertions(+), 8 deletions(-)
> >
> > diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h index
> > d1ae5a3..4a2e203 100644
> > --- a/drivers/net/iavf/iavf.h
> > +++ b/drivers/net/iavf/iavf.h
> > @@ -144,7 +144,7 @@ struct iavf_info {
> > uint64_t supported_rxdid;
> > uint8_t *proto_xtr; /* proto xtr type for all queues */
> > volatile enum virtchnl_ops pend_cmd; /* pending command not finished
> > */
> > - uint32_t cmd_retval; /* return value of the cmd response from PF */
> > + int cmd_retval; /* return value of the cmd response from PF */
> > uint8_t *aq_resp; /* buffer to store the adminq response from PF */
> >
> > /* Event from pf */
> > @@ -264,7 +264,7 @@ struct iavf_cmd_info {
> > * _atomic_set_cmd successfully.
> > */
> > static inline void
> > -_notify_cmd(struct iavf_info *vf, uint32_t msg_ret)
> > +_notify_cmd(struct iavf_info *vf, int msg_ret)
> > {
> > vf->cmd_retval = msg_ret;
> > rte_wmb();
> > diff --git a/drivers/net/iavf/iavf_vchnl.c
> > b/drivers/net/iavf/iavf_vchnl.c index
> > 45096cb..f2b46f1 100644
> > --- a/drivers/net/iavf/iavf_vchnl.c
> > +++ b/drivers/net/iavf/iavf_vchnl.c
> > @@ -228,13 +228,19 @@
> > rte_delay_ms(ASQ_DELAY_MS);
> > /* If don't read msg or read sys event, continue */
> > } while (i++ < MAX_TRY_TIMES);
> > - /* If there's no response is received, clear command */
> > - if (i >= MAX_TRY_TIMES ||
> > - vf->cmd_retval != VIRTCHNL_STATUS_SUCCESS) {
> > - err = -1;
> > - PMD_DRV_LOG(ERR, "No response or return failure
> > (%d)"
> > - " for cmd %d", vf->cmd_retval, args->ops);
> > +
> > + if (i >= MAX_TRY_TIMES) {
> > + PMD_DRV_LOG(ERR, "No response for cmd %d", args-
> > >ops);
> > _clear_cmd(vf);
> > + err = -EIO;
> > + } else if (vf->cmd_retval ==
> > + VIRTCHNL_STATUS_ERR_NOT_SUPPORTED) {
> > + PMD_DRV_LOG(ERR, "Cmd %d not supported", args-
> > >ops);
> > + err = -ENOTSUP;
> > + } else if (vf->cmd_retval != VIRTCHNL_STATUS_SUCCESS) {
> > + PMD_DRV_LOG(ERR, "Return failure %d for cmd %d",
> > + vf->cmd_retval, args->ops);
> > + err = -EINVAL;
> > }
> > break;
> > }
> > --
> > 1.8.3.1
>
> Acked-by: Beilei Xing
Applied to dpdk-next-net-intel.
Thanks
Qi
Re: [dpdk-dev] [PATCH] vdpa/mlx5: improve portability of thread naming
> -Original Message-
> From: dev On Behalf Of Thomas Monjalon
> Sent: Thursday, April 22, 2021 1:59 AM
> To: dev@dpdk.org
> Cc: Matan Azrad ; Viacheslav Ovsiienko
>
> Subject: [dpdk-dev] [PATCH] vdpa/mlx5: improve portability of thread naming
>
> The function pthread_setname_np is non-portable,
> so it may be unavailable in old glibc or other systems.
> The function rte_thread_setname is workarounding portability issues.
>
> Signed-off-by: Thomas Monjalon
> ---
> drivers/vdpa/mlx5/mlx5_vdpa_event.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/vdpa/mlx5/mlx5_vdpa_event.c
> b/drivers/vdpa/mlx5/mlx5_vdpa_event.c
> index 404e135d5c..ca6e985336 100644
> --- a/drivers/vdpa/mlx5/mlx5_vdpa_event.c
> +++ b/drivers/vdpa/mlx5/mlx5_vdpa_event.c
> @@ -544,7 +544,7 @@ mlx5_vdpa_cqe_event_setup(struct mlx5_vdpa_priv *priv)
> goto error;
> }
> snprintf(name, sizeof(name), "vDPA-mlx5-%d", priv->vid);
> - ret = pthread_setname_np(priv->timer_tid, name);
> + ret = rte_thread_setname(priv->timer_tid, name);
> if (ret) {
> DRV_LOG(ERR, "Failed to set timer thread name.");
> return -1;
> --
> 2.31.1
Reviewed-by: Chenbo Xia
[dpdk-dev] [PATCH] net/iavf: fix performance drop
AVX2 and SSE don't have the offload path.
Not necessary doing any check. Or the scalar path
will be chosen.
Fixes: eff56a7b9f97 ("net/iavf: add offload path for Rx AVX512")
Signed-off-by: Wenzhuo Lu
---
drivers/net/iavf/iavf_rxtx.c | 12 +---
1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 3f3cf63..0ba19dbf 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -2401,13 +2401,11 @@
check_ret = iavf_rx_vec_dev_check(dev);
if (check_ret >= 0 &&
rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128) {
- if (check_ret == IAVF_VECTOR_PATH) {
- use_sse = true;
- if ((rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) == 1 ||
-rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) ==
1) &&
- rte_vect_get_max_simd_bitwidth() >=
RTE_VECT_SIMD_256)
- use_avx2 = true;
- }
+ use_sse = true;
+ if ((rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2) == 1 ||
+rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1) &&
+ rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_256)
+ use_avx2 = true;
#ifdef CC_AVX512_SUPPORT
if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX512F) == 1 &&
--
1.9.3
Re: [dpdk-dev] [PATCH v3 2/2] ring: use wfe to wait for ring tail update on aarch64
On Sun, Apr 25, 2021 at 11:27 AM Ruifeng Wang wrote: > > Instead of polling for tail to be updated, use wfe instruction. > > Signed-off-by: Gavin Hu > Signed-off-by: Ruifeng Wang > Reviewed-by: Steve Capper > Reviewed-by: Ola Liljedahl > Reviewed-by: Honnappa Nagarahalli > Acked-by: Konstantin Ananyev Acked-by: Jerin Jacob > --- > lib/ring/rte_ring_c11_pvt.h | 4 ++-- > lib/ring/rte_ring_generic_pvt.h | 3 +-- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/lib/ring/rte_ring_c11_pvt.h b/lib/ring/rte_ring_c11_pvt.h > index 759192f4c4..37e0b2afd6 100644 > --- a/lib/ring/rte_ring_c11_pvt.h > +++ b/lib/ring/rte_ring_c11_pvt.h > @@ -2,6 +2,7 @@ > * > * Copyright (c) 2017,2018 HXT-semitech Corporation. > * Copyright (c) 2007-2009 Kip Macy km...@freebsd.org > + * Copyright (c) 2021 Arm Limited > * All rights reserved. > * Derived from FreeBSD's bufring.h > * Used as BSD-3 Licensed with permission from Kip Macy. > @@ -21,8 +22,7 @@ __rte_ring_update_tail(struct rte_ring_headtail *ht, > uint32_t old_val, > * we need to wait for them to complete > */ > if (!single) > - while (unlikely(ht->tail != old_val)) > - rte_pause(); > + rte_wait_until_equal_32(&ht->tail, old_val, __ATOMIC_RELAXED); > > __atomic_store_n(&ht->tail, new_val, __ATOMIC_RELEASE); > } > diff --git a/lib/ring/rte_ring_generic_pvt.h b/lib/ring/rte_ring_generic_pvt.h > index 532deb5e7a..c95ad7e12c 100644 > --- a/lib/ring/rte_ring_generic_pvt.h > +++ b/lib/ring/rte_ring_generic_pvt.h > @@ -23,8 +23,7 @@ __rte_ring_update_tail(struct rte_ring_headtail *ht, > uint32_t old_val, > * we need to wait for them to complete > */ > if (!single) > - while (unlikely(ht->tail != old_val)) > - rte_pause(); > + rte_wait_until_equal_32(&ht->tail, old_val, __ATOMIC_RELAXED); > > ht->tail = new_val; > } > -- > 2.25.1 >
[dpdk-dev] [PATCH v4 1/2] net/ice: clean redundant macro definition of filters
The input set has been divided into two parts to distinguish
inner and outer field. ICE_INSET_TUN_* is the same as non tunnel
macro definition. Clean redundant ICE_INSET_TUN_* codes.
Signed-off-by: Yuying Zhang
---
drivers/net/ice/ice_fdir_filter.c | 22 ++---
drivers/net/ice/ice_generic_flow.h | 61 +
drivers/net/ice/ice_switch_filter.c | 128 ++--
3 files changed, 78 insertions(+), 133 deletions(-)
diff --git a/drivers/net/ice/ice_fdir_filter.c
b/drivers/net/ice/ice_fdir_filter.c
index 3b8ea32b1a..ad2dc40815 100644
--- a/drivers/net/ice/ice_fdir_filter.c
+++ b/drivers/net/ice/ice_fdir_filter.c
@@ -72,7 +72,7 @@
#define ICE_FDIR_INSET_ETH_IPV4_VXLAN (\
ICE_FDIR_INSET_ETH | ICE_FDIR_INSET_ETH_IPV4 | \
- ICE_INSET_TUN_VXLAN_VNI)
+ ICE_INSET_VXLAN_VNI)
#define ICE_FDIR_INSET_IPV4_GTPU (\
ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_GTPU_TEID)
@@ -893,17 +893,17 @@ ice_fdir_input_set_parse(uint64_t inset, enum
ice_flow_field *field)
{ICE_INSET_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT},
{ICE_INSET_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},
{ICE_INSET_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},
- {ICE_INSET_TUN_IPV4_SRC, ICE_FLOW_FIELD_IDX_IPV4_SA},
- {ICE_INSET_TUN_IPV4_DST, ICE_FLOW_FIELD_IDX_IPV4_DA},
- {ICE_INSET_TUN_TCP_SRC_PORT, ICE_FLOW_FIELD_IDX_TCP_SRC_PORT},
- {ICE_INSET_TUN_TCP_DST_PORT, ICE_FLOW_FIELD_IDX_TCP_DST_PORT},
- {ICE_INSET_TUN_UDP_SRC_PORT, ICE_FLOW_FIELD_IDX_UDP_SRC_PORT},
- {ICE_INSET_TUN_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT},
- {ICE_INSET_TUN_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},
- {ICE_INSET_TUN_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},
+ {ICE_INSET_IPV4_SRC, ICE_FLOW_FIELD_IDX_IPV4_SA},
+ {ICE_INSET_IPV4_DST, ICE_FLOW_FIELD_IDX_IPV4_DA},
+ {ICE_INSET_TCP_SRC_PORT, ICE_FLOW_FIELD_IDX_TCP_SRC_PORT},
+ {ICE_INSET_TCP_DST_PORT, ICE_FLOW_FIELD_IDX_TCP_DST_PORT},
+ {ICE_INSET_UDP_SRC_PORT, ICE_FLOW_FIELD_IDX_UDP_SRC_PORT},
+ {ICE_INSET_UDP_DST_PORT, ICE_FLOW_FIELD_IDX_UDP_DST_PORT},
+ {ICE_INSET_SCTP_SRC_PORT, ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT},
+ {ICE_INSET_SCTP_DST_PORT, ICE_FLOW_FIELD_IDX_SCTP_DST_PORT},
{ICE_INSET_GTPU_TEID, ICE_FLOW_FIELD_IDX_GTPU_IP_TEID},
{ICE_INSET_GTPU_QFI, ICE_FLOW_FIELD_IDX_GTPU_EH_QFI},
- {ICE_INSET_TUN_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI},
+ {ICE_INSET_VXLAN_VNI, ICE_FLOW_FIELD_IDX_VXLAN_VNI},
};
for (i = 0, j = 0; i < RTE_DIM(ice_inset_map); i++) {
@@ -1916,7 +1916,7 @@ ice_fdir_parse_pattern(__rte_unused struct ice_adapter
*ad,
}
if (vxlan_mask->hdr.vx_vni)
- *input_set |= ICE_INSET_TUN_VXLAN_VNI;
+ *input_set |= ICE_INSET_VXLAN_VNI;
filter->input.vxlan_data.vni = vxlan_spec->hdr.vx_vni;
diff --git a/drivers/net/ice/ice_generic_flow.h
b/drivers/net/ice/ice_generic_flow.h
index a4d0b6671d..b7634b9662 100644
--- a/drivers/net/ice/ice_generic_flow.h
+++ b/drivers/net/ice/ice_generic_flow.h
@@ -92,64 +92,9 @@
/* tunnel */
-#define ICE_INSET_TUN_SMAC \
- (ICE_PROT_MAC | ICE_SMAC)
-#define ICE_INSET_TUN_DMAC \
- (ICE_PROT_MAC | ICE_DMAC)
-
-#define ICE_INSET_TUN_IPV4_SRC \
- (ICE_PROT_IPV4 | ICE_IP_SRC)
-#define ICE_INSET_TUN_IPV4_DST \
- (ICE_PROT_IPV4 | ICE_IP_DST)
-#define ICE_INSET_TUN_IPV4_TTL \
- (ICE_PROT_IPV4 | ICE_IP_TTL)
-#define ICE_INSET_TUN_IPV4_PROTO \
- (ICE_PROT_IPV4 | ICE_IP_PROTO)
-#define ICE_INSET_TUN_IPV4_TOS \
- (ICE_PROT_IPV4 | ICE_IP_TOS)
-#define ICE_INSET_TUN_IPV6_SRC \
- (ICE_PROT_IPV6 | ICE_IP_SRC)
-#define ICE_INSET_TUN_IPV6_DST \
- (ICE_PROT_IPV6 | ICE_IP_DST)
-#define ICE_INSET_TUN_IPV6_HOP_LIMIT \
- (ICE_PROT_IPV6 | ICE_IP_TTL)
-#define ICE_INSET_TUN_IPV6_NEXT_HDR \
- (ICE_PROT_IPV6 | ICE_IP_PROTO)
-#define ICE_INSET_TUN_IPV6_TC \
- (ICE_PROT_IPV6 | ICE_IP_TOS)
-
-#define ICE_INSET_TUN_TCP_SRC_PORT \
- (ICE_PROT_TCP | ICE_SPORT)
-#define ICE_INSET_TUN_TCP_DST_PORT \
- (ICE_PROT_TCP | ICE_DPORT)
-#define ICE_INSET_TUN_UDP_SRC_PORT \
- (ICE_PROT_UDP | ICE_SPORT)
-#define ICE_INSET_TUN_UDP_DST_PORT \
- (ICE_PROT_UDP | ICE_DPORT)
-#define ICE_INSET_TUN_SCTP_SRC_PORT \
- (ICE_PROT_SCTP | ICE_SPORT)
-#define ICE_INSET_TUN_SCTP_DST_PORT \
- (ICE_PROT_SCTP | ICE_DPORT)
-#define ICE_INSET_TUN_ICMP4_SRC_PORT \
- (ICE_PROT_ICMP4 | ICE_SPORT)
-#define ICE_INSET_TUN_ICMP4_DST_PORT \
- (ICE_PROT_ICMP4 | ICE_DPORT)
-#define ICE_INSET_TUN_ICMP6_SRC_PORT \
- (ICE_PROT_ICMP6 | ICE_SPORT)
-#define ICE_INSET_
[dpdk-dev] [PATCH v4 2/2] net/ice: refactor input set fields for switch filter
Input set has been divided into inner and outer part to distinguish different fields. However, the parse method of switch filter doesn't match this update. Refactor switch filter to distingush inner and outer input set in the same way as other filters. Signed-off-by: Yuying Zhang --- v4: - Change last input parameter of ice_switch_parse_pattern from const value to pointer to const value. - Use ! for boolean conditional judgment. --- drivers/net/ice/ice_switch_filter.c | 746 1 file changed, 323 insertions(+), 423 deletions(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index aa395094ca..4a64db5385 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -35,8 +35,7 @@ #define ICE_SW_INSET_ETHER ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE) #define ICE_SW_INSET_MAC_VLAN ( \ - ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_ETHERTYPE | \ - ICE_INSET_VLAN_INNER) + ICE_SW_INSET_ETHER | ICE_INSET_VLAN_INNER) #define ICE_SW_INSET_MAC_QINQ ( \ ICE_INSET_DMAC | ICE_INSET_SMAC | ICE_INSET_VLAN_INNER | \ ICE_INSET_VLAN_OUTER) @@ -68,27 +67,27 @@ ICE_INSET_IPV6_HOP_LIMIT | ICE_INSET_IPV6_TC | \ ICE_INSET_UDP_DST_PORT | ICE_INSET_UDP_SRC_PORT) #define ICE_SW_INSET_DIST_NVGRE_IPV4 ( \ - ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ - ICE_INSET_DMAC | ICE_INSET_NVGRE_TNI | ICE_INSET_IPV4_DST) + ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_DMAC | \ + ICE_INSET_NVGRE_TNI) #define ICE_SW_INSET_DIST_VXLAN_IPV4 ( \ - ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ - ICE_INSET_DMAC | ICE_INSET_VXLAN_VNI | ICE_INSET_IPV4_DST) + ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | ICE_INSET_DMAC | \ + ICE_INSET_VXLAN_VNI) #define ICE_SW_INSET_DIST_NVGRE_IPV4_TCP ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT | \ - ICE_INSET_DMAC | ICE_INSET_NVGRE_TNI | ICE_INSET_IPV4_DST) + ICE_INSET_DMAC | ICE_INSET_NVGRE_TNI) #define ICE_SW_INSET_DIST_NVGRE_IPV4_UDP ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT | \ - ICE_INSET_DMAC | ICE_INSET_NVGRE_TNI | ICE_INSET_IPV4_DST) + ICE_INSET_DMAC | ICE_INSET_NVGRE_TNI) #define ICE_SW_INSET_DIST_VXLAN_IPV4_TCP ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT | \ - ICE_INSET_DMAC | ICE_INSET_VXLAN_VNI | ICE_INSET_IPV4_DST) + ICE_INSET_DMAC | ICE_INSET_VXLAN_VNI) #define ICE_SW_INSET_DIST_VXLAN_IPV4_UDP ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT | \ - ICE_INSET_DMAC | ICE_INSET_VXLAN_VNI | ICE_INSET_IPV4_DST) + ICE_INSET_DMAC | ICE_INSET_VXLAN_VNI) #define ICE_SW_INSET_PERM_TUNNEL_IPV4 ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST | \ ICE_INSET_IPV4_PROTO | ICE_INSET_IPV4_TOS) @@ -141,74 +140,26 @@ ICE_SW_INSET_MAC_IPV4 | ICE_INSET_GTPU_TEID) #define ICE_SW_INSET_MAC_IPV6_GTPU ( \ ICE_SW_INSET_MAC_IPV6 | ICE_INSET_GTPU_TEID) -#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV4 ( \ - ICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \ - ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST) -#define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4 ( \ - ICE_SW_INSET_MAC_IPV4_GTPU_IPV4 | ICE_INSET_GTPU_QFI) -#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV6 ( \ - ICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \ - ICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST) -#define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV6 ( \ - ICE_SW_INSET_MAC_IPV4_GTPU_IPV6 | ICE_INSET_GTPU_QFI) -#define ICE_SW_INSET_MAC_IPV6_GTPU_IPV4 ( \ - ICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \ +#define ICE_SW_INSET_MAC_GTPU_OUTER ( \ + ICE_INSET_DMAC | ICE_INSET_GTPU_TEID) +#define ICE_SW_INSET_MAC_GTPU_EH_OUTER ( \ + ICE_SW_INSET_MAC_GTPU_OUTER | ICE_INSET_GTPU_QFI) +#define ICE_SW_INSET_GTPU_IPV4 ( \ ICE_INSET_IPV4_SRC | ICE_INSET_IPV4_DST) -#define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV4 ( \ - ICE_SW_INSET_MAC_IPV6_GTPU_IPV4 | ICE_INSET_GTPU_QFI) -#define ICE_SW_INSET_MAC_IPV6_GTPU_IPV6 ( \ - ICE_INSET_DMAC | ICE_INSET_GTPU_TEID | \ +#define ICE_SW_INSET_GTPU_IPV6 ( \ ICE_INSET_IPV6_SRC | ICE_INSET_IPV6_DST) -#define ICE_SW_INSET_MAC_IPV6_GTPU_EH_IPV6 ( \ - ICE_SW_INSET_MAC_IPV6_GTPU_IPV6 | ICE_INSET_GTPU_QFI) -#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV4_UDP ( \ - ICE_SW_INSET_MAC_IPV4_GTPU_IPV4 | \ - ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT) -#define ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4_UDP ( \ - ICE_SW_INSET_MAC_IPV4_GTPU_EH_IPV4 | \ - ICE_INSET_UDP_SRC_PORT | ICE_INSET_UDP_DST_PORT) -#define ICE_SW_INSET_MAC_IPV4_GTPU_IPV4_TCP ( \ - ICE_SW_INSET_MAC_IPV4_GTPU_IPV4 | \ - ICE_INSET_TCP_SRC_PORT | ICE_INSET_TCP_DST_PORT) -#define IC
[dpdk-dev] [PATCH v1] net/ice/base: fix inner L4 offset for gptu dummy packet
Fix inner L4 offset of ipv6_gtpu_ipv6_tcp/udp dummy packet.
Fixes: bd4d9a89dbc1 ("net/ice/base: add GTP filtering via advanced switch
filter")
Cc: sta...@dpdk.org
Signed-off-by: Yuying Zhang
---
drivers/net/ice/base/ice_switch.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ice/base/ice_switch.c
b/drivers/net/ice/base/ice_switch.c
index 2a9bea4261..c48e7b7232 100644
--- a/drivers/net/ice/base/ice_switch.c
+++ b/drivers/net/ice/base/ice_switch.c
@@ -808,7 +808,7 @@ static const struct ice_dummy_pkt_offsets
dummy_ipv6_gtpu_ipv6_tcp_packet_offset
{ ICE_UDP_OF, 54 },
{ ICE_GTP, 62 },
{ ICE_IPV6_IL, 82 },
- { ICE_TCP_IL, 102 },
+ { ICE_TCP_IL, 122 },
{ ICE_PROTOCOL_LAST,0 },
};
@@ -865,7 +865,7 @@ static const struct ice_dummy_pkt_offsets
dummy_ipv6_gtpu_ipv6_udp_packet_offset
{ ICE_UDP_OF, 54 },
{ ICE_GTP, 62 },
{ ICE_IPV6_IL, 82 },
- { ICE_UDP_ILOS, 102 },
+ { ICE_UDP_ILOS, 122 },
{ ICE_PROTOCOL_LAST,0 },
};
--
2.25.1
