diff mbox

[dpdk-dev,3/5] bond mode 4: do not ignore multicast

Message ID 1428339685-27686-4-git-send-email-ehkinzie@gmail.com (mailing list archive)
State Superseded, archived
Headers

Commit Message

Eric Kinzie April 6, 2015, 5:01 p.m. UTC 
  The bonding PMD in mode 4 puts all enslaved interfaces into promiscuous
mode in order to receive LACPDUs and must filter unwanted packets
after the traffic has been "collected".  Allow broadcast and multicast
through so that ARP and IPv6 neighbor discovery continue to work.

Signed-off-by: Eric Kinzie <ehkinzie@gmail.com>
---
 app/test/test_link_bonding_mode4.c     |    7 +++++--
 lib/librte_pmd_bond/rte_eth_bond_pmd.c |    3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

Comments

Wodkowski, PawelX April 10, 2015, 7:56 a.m. UTC | #1 
On 2015-04-06 19:01, Eric Kinzie wrote:

>   			if (unlikely(hdr->ether_type == ether_type_slow_be ||
>   				!collecting || (!promisc &&
> -					!is_same_ether_addr(&bond_mac, &hdr->d_addr)))) {
> +					(!is_multicast_ether_addr(&hdr->d_addr) &&
> +					 !is_same_ether_addr(&bond_mac, &hdr->d_addr))))) {
>

You can drop extra parenthesis here, but beside that I think it is OK.

Should be marked as bugfix.

Acked-by: Pawel Wodkowski <pawelx.wodkowski@intel.com>
diff mbox

Patch

diff --git a/app/test/test_link_bonding_mode4.c b/app/test/test_link_bonding_mode4.c
index 02380f9..5a726af 100644
--- a/app/test/test_link_bonding_mode4.c
+++ b/app/test/test_link_bonding_mode4.c
@@ -755,8 +755,11 @@  test_mode4_rx(void)
 	rte_eth_macaddr_get(test_params.bonded_port_id, &bonded_mac);
 	ether_addr_copy(&bonded_mac, &dst_mac);
 
-	/* Assert that dst address is not bonding address */
-	dst_mac.addr_bytes[0]++;
+	/* Assert that dst address is not bonding address.  Do not set the
+	 * least significant bit of the zero byte as this would create a
+	 * multicast address.
+	 */
+	dst_mac.addr_bytes[0] += 2;
 
 	/* First try with promiscuous mode enabled.
 	 * Add 2 packets to each slave. First with bonding MAC address, second with
diff --git a/lib/librte_pmd_bond/rte_eth_bond_pmd.c b/lib/librte_pmd_bond/rte_eth_bond_pmd.c
index 4fd7d97..8631e12 100644
--- a/lib/librte_pmd_bond/rte_eth_bond_pmd.c
+++ b/lib/librte_pmd_bond/rte_eth_bond_pmd.c
@@ -170,7 +170,8 @@  bond_ethdev_rx_burst_8023ad(void *queue, struct rte_mbuf **bufs,
 			 * mode and packet address does not match. */
 			if (unlikely(hdr->ether_type == ether_type_slow_be ||
 				!collecting || (!promisc &&
-					!is_same_ether_addr(&bond_mac, &hdr->d_addr)))) {
+					(!is_multicast_ether_addr(&hdr->d_addr) &&
+					 !is_same_ether_addr(&bond_mac, &hdr->d_addr))))) {
 
 				if (hdr->ether_type == ether_type_slow_be) {
 					bond_mode_8023ad_handle_slow_pkt(internals, slaves[i],