From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2A202A04AF for ; Thu, 20 Aug 2020 17:35:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1F3981BEC4; Thu, 20 Aug 2020 17:35:11 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 627121C0C6 for ; Thu, 20 Aug 2020 17:35:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597937708; 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=2yfgwvXQ2FVcX9em+1kUfBO0CkfEw2eO8JdKk3DFlf8=; b=jIc2Onbd/83nPPvqq0EHT8B3k33BOwERx/YnrPEJJ6B/E+JRDlTfxfdHLznfP/us4Wg6ju sbMGVxlNRIKGlXPLGtNebMugqzgZ02wic8ykceqOP9MKvoHkxEVtJEAVtGC3xIeVCV8bXf +ttIikSx+hdWv4Af+RP2rIRkVHoxu+A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-309-RPCNfJ5TPh2p6DvXvDbCRQ-1; Thu, 20 Aug 2020 11:34:59 -0400 X-MC-Unique: RPCNfJ5TPh2p6DvXvDbCRQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 12B681007460; Thu, 20 Aug 2020 15:34:58 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1FE78100EBA7; Thu, 20 Aug 2020 15:34:56 +0000 (UTC) From: Kevin Traynor To: Yicai Lu Cc: Wei Hu , dpdk stable Date: Thu, 20 Aug 2020 16:33:38 +0100 Message-Id: <20200820153341.171927-33-ktraynor@redhat.com> In-Reply-To: <20200820153341.171927-1-ktraynor@redhat.com> References: <20200820153341.171927-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: fix LACP negotiation' has been queued to LTS release 18.11.10 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.10 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/25/20. 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-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/42f2a8331c4b65fa1f18e61533d60fbca2f408a1 Thanks. Kevin. --- >From 42f2a8331c4b65fa1f18e61533d60fbca2f408a1 Mon Sep 17 00:00:00 2001 From: Yicai Lu Date: Fri, 10 Jul 2020 11:29:35 +0800 Subject: [PATCH] net/bonding: fix LACP negotiation [ upstream commit a9cbca743083ace5232e9df90119b4defa7df6e5 ] When two host is connected directly without any devices like switch, rx_machine_update would receiving partner LACP negotiation packets, and partner's port mac is filled with zeros in this packet, which is different with internal's mode4 mac. So in this situation, it would never go rx_machine branch and then execute mac swap for negotiation! Thus bond mode 4 will negotiation failed. Fixes: 56cbc0817399 ("net/bonding: fix LACP negotiation") Signed-off-by: Yicai Lu Reviewed-by: Wei Hu (Xavier) --- drivers/net/bonding/rte_eth_bond_8023ad.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c index a66a027545..99884c0049 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -790,5 +790,6 @@ rx_machine_update(struct bond_dev_private *internals, uint16_t slave_id, partner = &lacp->lacpdu.partner; - if (is_same_ether_addr(&partner->port_params.system, + if (is_zero_ether_addr(&partner->port_params.system) || + is_same_ether_addr(&partner->port_params.system, &internals->mode4.mac_addr)) { /* This LACP frame is sending to the bonding port -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-08-20 16:26:16.988120619 +0100 +++ 0033-net-bonding-fix-LACP-negotiation.patch 2020-08-20 16:26:15.829324369 +0100 @@ -1 +1 @@ -From a9cbca743083ace5232e9df90119b4defa7df6e5 Mon Sep 17 00:00:00 2001 +From 42f2a8331c4b65fa1f18e61533d60fbca2f408a1 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a9cbca743083ace5232e9df90119b4defa7df6e5 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index b7ffa2f2cf..3991825ad9 100644 +index a66a027545..99884c0049 100644 @@ -26 +27 @@ -@@ -799,5 +799,6 @@ rx_machine_update(struct bond_dev_private *internals, uint16_t slave_id, +@@ -790,5 +790,6 @@ rx_machine_update(struct bond_dev_private *internals, uint16_t slave_id, @@ -29,3 +30,3 @@ -- if (rte_is_same_ether_addr(&partner->port_params.system, -+ if (rte_is_zero_ether_addr(&partner->port_params.system) || -+ rte_is_same_ether_addr(&partner->port_params.system, +- if (is_same_ether_addr(&partner->port_params.system, ++ if (is_zero_ether_addr(&partner->port_params.system) || ++ is_same_ether_addr(&partner->port_params.system,