From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 79CFCA00C2 for ; Wed, 23 Nov 2022 19:04:36 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6DCEC42DA5; Wed, 23 Nov 2022 19:04:36 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id B9D5D40E5A for ; Wed, 23 Nov 2022 19:04:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1669226674; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=jBGzZe0sZz+GK+yEF/oHfXAezRjFGAF2XFfHRg8kGho=; b=WIenYBuJNSDzjo028zIKo3JGKns75BNnyi/DLL8DvZiaTL8odOrt8tt9XTOCvgIogSfPS7 QexOPzDeBn4l90dv7N8fH/DTwHVt6KDfakxoT1veuOY/agyd+xOWGCoYd5RjrnbVqkVzG4 z2eqkuvga64PDCGi4pOXhHT91wR3Z2w= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-382-tk0f3dYyNyuxGRmya8M2tg-1; Wed, 23 Nov 2022 13:04:31 -0500 X-MC-Unique: tk0f3dYyNyuxGRmya8M2tg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AD07F848549; Wed, 23 Nov 2022 18:04:30 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 54F17492B07; Wed, 23 Nov 2022 18:04:29 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Andrew Rybchenko , dpdk stable Subject: patch 'net/bonding: fix dropping valid MAC packets' has been queued to stable release 21.11.3 Date: Wed, 23 Nov 2022 18:03:16 +0000 Message-Id: <20221123180413.733554-3-ktraynor@redhat.com> In-Reply-To: <20221123180413.733554-1-ktraynor@redhat.com> References: <20221123180413.733554-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 21.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/28/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/194dea76b12d312adfba4fbc2faa1e62a9603b37 Thanks. Kevin --- >From 194dea76b12d312adfba4fbc2faa1e62a9603b37 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Wed, 19 Oct 2022 11:32:31 +0800 Subject: [PATCH] net/bonding: fix dropping valid MAC packets [ upstream commit 30bfba52cf356c03743b6f7deaeefce2f6cb39ed ] Currently, by default, bond4 will first try to enable allmulti and then enable promiscuous if fail to enable allmulti. On reception, whether unicast and multicast packets should be dropped depends on which mode has been enabled on the bonding interface. In fact, if MAC address of packets in mac_addrs array of bonding interface, these packets should not be dropped. However, now only check the default MAC address, which will cause the packets with MAC added by the '.mac_addr_add' are dropped. Fixes: 68218b87c184 ("net/bonding: prefer allmulti to promiscuous for LACP") Signed-off-by: Huisong Li Reviewed-by: Andrew Rybchenko --- drivers/net/bonding/rte_eth_bond_pmd.c | 33 +++++++++++++++++++------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index c25fa9df24..51758d4cca 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -272,4 +272,22 @@ bond_ethdev_8023ad_flow_set(struct rte_eth_dev *bond_dev, uint16_t slave_port) { } +static bool +is_bond_mac_addr(const struct rte_ether_addr *ea, + const struct rte_ether_addr *mac_addrs, uint32_t max_mac_addrs) +{ + uint32_t i; + + for (i = 0; i < max_mac_addrs; i++) { + /* skip zero address */ + if (rte_is_zero_ether_addr(&mac_addrs[i])) + continue; + + if (rte_is_same_ether_addr(ea, &mac_addrs[i])) + return true; + } + + return false; +} + static inline uint16_t rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts, @@ -332,6 +350,7 @@ rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts, * - it is slow packet but no dedicated rxq is present, * - slave is not in collecting state, - * - bonding interface is not in promiscuous mode: - * - packet is unicast and address does not match, + * - bonding interface is not in promiscuous mode and + * packet address isn't in mac_addrs array: + * - packet is unicast, * - packet is multicast and bonding interface * is not in allmulti, @@ -343,10 +362,8 @@ rx_burst_8023ad(void *queue, struct rte_mbuf **bufs, uint16_t nb_pkts, !collecting || (!promisc && - ((rte_is_unicast_ether_addr(&hdr->dst_addr) && - !rte_is_same_ether_addr(bond_mac, - &hdr->dst_addr)) || - (!allmulti && - rte_is_multicast_ether_addr(&hdr->dst_addr)))))) { - + !is_bond_mac_addr(&hdr->dst_addr, bond_mac, + BOND_MAX_MAC_ADDRS) && + (rte_is_unicast_ether_addr(&hdr->dst_addr) || + !allmulti)))) { if (hdr->ether_type == ether_type_slow_be) { bond_mode_8023ad_handle_slow_pkt( -- 2.38.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-23 09:55:57.199068567 +0000 +++ 0003-net-bonding-fix-dropping-valid-MAC-packets.patch 2022-11-23 09:55:57.006149148 +0000 @@ -1 +1 @@ -From 30bfba52cf356c03743b6f7deaeefce2f6cb39ed Mon Sep 17 00:00:00 2001 +From 194dea76b12d312adfba4fbc2faa1e62a9603b37 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 30bfba52cf356c03743b6f7deaeefce2f6cb39ed ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 006e13838a..864e073db8 100644 +index c25fa9df24..51758d4cca 100644