packages/dpdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!601 sync some patches from upstream about bond4

Browse Source 
From: @hantwofish 
Reviewed-by: @jiangheng12 
Signed-off-by: @jiangheng12
This commit is contained in:
openeuler-ci-bot 2024-07-12 09:36:22 +00:00 committed by Gitee
commit bf241b92b6
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 68 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
0433-fix-mode4-with-dedicated-queues.patch Normal file
View File

@ -0,0 +1,60 @@
From 49c1abe125853e4515bec6fefdd2b726dcb81344 Mon Sep 17 00:00:00 2001
From: Usman Tanveer <usman.tanveer@emumba.com>
Date: Thu, 11 Jul 2024 13:09:24 +0800
Subject: [PATCH] fix mode4 with dedicated queues
---
drivers/net/bonding/rte_eth_bond_pmd.c | 26 +++++++++++++++++---------
1 file changed, 17 insertions(+), 9 deletions(-)
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 0f2b21a..446a80b 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1843,19 +1843,15 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
return errval;
}
- if (internals->mode4.dedicated_queues.flow[slave_eth_dev->data->port_id] != NULL)
- rte_flow_destroy(slave_eth_dev->data->port_id,
+ if (internals->mode4.dedicated_queues.flow[slave_eth_dev->data->port_id] != NULL) {
+ errval = rte_flow_destroy(slave_eth_dev->data->port_id,
internals->mode4.dedicated_queues.flow[slave_eth_dev->data->port_id],
&flow_error);
-
- errval = bond_ethdev_8023ad_flow_set(bonded_eth_dev,
- slave_eth_dev->data->port_id);
- if (errval != 0) {
- RTE_BOND_LOG(ERR,
- "bond_ethdev_8023ad_flow_set: port=%d, err (%d)",
+ RTE_BOND_LOG(ERR, "bond_ethdev_8023ad_flow_destroy: port=%d, err (%d)",
slave_eth_dev->data->port_id, errval);
- return errval;
}
+
+
}
/* Start device */
@@ -1866,6 +1862,18 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
return -1;
}
+ if (internals->mode == BONDING_MODE_8023AD &&
+ internals->mode4.dedicated_queues.enabled == 1) {
+ errval = bond_ethdev_8023ad_flow_set(bonded_eth_dev,
+ slave_eth_dev->data->port_id);
+ if (errval != 0) {
+ RTE_BOND_LOG(ERR,
+ "bond_ethdev_8023ad_flow_set: port=%d, err (%d)",
+ slave_eth_dev->data->port_id, errval);
+ return errval;
+ }
+ }
+
/* If RSS is enabled for bonding, synchronize RETA */
if (bonded_eth_dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS) {
int i;
--
2.33.0

9
dpdk.spec
View File

@ -1,6 +1,6 @@
Name: dpdk
Version: 21.11
Release: 67
Release: 68
Packager: packaging@6wind.com
URL: http://dpdk.org
%global source_version 21.11
@ -466,6 +466,8 @@ Patch6429: 0430-app-testpmd-fix-crash-in-multi-process-forwarding.patch
Patch6430: 0431-dma-hisilicon-remove-support-for-HIP09-platform.patch
Patch6431: 0432-net-hns3-support-new-device.patch
patch6432: 0433-fix-mode4-with-dedicated-queues.patch
Summary: Data Plane Development Kit core
Group: System Environment/Libraries
@ -622,6 +624,11 @@ strip -g $RPM_BUILD_ROOT/lib/modules/%{kern_devel_ver}/extra/dpdk/igb_uio.ko
/usr/sbin/depmod
%changelog
* Thu Jul 11 2024 hankangknag <hankangknag5@huawei.com> - 21.11-68
Sync some patches from upstream about bugfix, modifies
are as follow:
- mlx5: device should be started to set the flow
* Mon Jun 3 2024 chenyi <chenyi211@huawei.com> - 21.11-67
Sync some patches from upstream about bugfix, modifies
are as follow: