Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bonding bugfix #750

Merged
merged 7 commits into from
Aug 6, 2021
Merged

Bonding bugfix #750

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
c68bd02
patch: allow bonding slaves from different numa nodes
ywc689 Aug 2, 2021
19b3475
netif: make bonding numa node configurable
ywc689 Aug 2, 2021
531b178
netif: fix kni mac address update problem
ywc689 Aug 3, 2021
1e9d036
update bonding mode 4 patch
Aug 4, 2021
7dae118
clean whitespace
Aug 4, 2021
a1fa2a0
neigh: fix -Wpacked-not-aligned error
ywc689 Aug 5, 2021
5457e8c
Merge pull request #7 from you-looks-not-tasty/dpdk2011-rebase
ywc689 Aug 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
clean whitespace
  • Loading branch information
huangyichen committed Aug 4, 2021
commit 7dae11815426a8af66ac32befbdb75d8c41e7e8b
14 changes: 7 additions & 7 deletions patch/dpdk-stable-20.11.1/0005-Fix-bonding-mode-4-problem.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From b6d30dfa410c5515ecc153dbe68df374f148ee76 Mon Sep 17 00:00:00 2001
From 3faf16f377052bb9f40c0d17c2590c1a0884abd1 Mon Sep 17 00:00:00 2001
From: huangyichen <[email protected]>
Date: Wed, 4 Aug 2021 14:02:09 +0800
Date: Wed, 4 Aug 2021 15:14:04 +0800
Subject: [PATCH 5/6] Fix bonding mode 4 problem:

1. Faulted lacp negotiation, The problem is disscussed in Issue [#725](https://github.com/iqiyi/dpvs/issues/725) of iqiyi/dpvs in detail.
Expand Down Expand Up @@ -57,17 +57,17 @@ index 5fe004e..52bd960 100644

periodic_machine(internals, slave_id);
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 057b1ad..37973ce 100644
index 057b1ad..27f35fb 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -322,6 +322,15 @@ rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts,

/* Handle slow protocol packets. */
while (j < num_rx_total) {
+ /* If packet is not pure L2 and is known:
+ * Such as OSPF protocol multcast packet,
+ * we want to handle it in user mode by ourselves,
+ * skip slow protocol flow*/
+ /* If packet is not pure L2 and is known:
+ * Such as OSPF protocol multcast packet,
+ * we want to handle it in user mode by ourselves,
+ * skip slow protocol flow*/
+ if ((bufs[j]->packet_type & ~RTE_PTYPE_L2_ETHER) != 0) {
+ j++;
+ continue;
Expand Down
6 changes: 3 additions & 3 deletions patch/dpdk-stable-20.11.1/0006-bonding-allow-slaves-from-different-numa-nodes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
From 256eb959c5a3ae3661568028271367f2facd709b Mon Sep 17 00:00:00 2001
From ca13a127a220fecbcc080f208339c455e12a61a8 Mon Sep 17 00:00:00 2001
From: huangyichen <[email protected]>
Date: Wed, 4 Aug 2021 14:27:34 +0800
Date: Wed, 4 Aug 2021 15:16:04 +0800
Subject: [PATCH 6/6] bonding: allow slaves from different numa nodes

Note the patch may have a negative influnce on performance.
Expand All @@ -10,7 +10,7 @@ It's not a good practice to bonding slaves across numa nodes.
1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 37973ce..f31cd4d 100644
index 27f35fb..7184e0b 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1771,7 +1771,14 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
Expand Down