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 0A7EEA0518 for ; Fri, 24 Jul 2020 14:09:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 04C911C1FD; Fri, 24 Jul 2020 14:09:59 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 6E92F1C1EF for ; Fri, 24 Jul 2020 14:09:57 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id f18so8117228wrs.0 for ; Fri, 24 Jul 2020 05:09:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=82ZwR+NbGZ5dEo246FTmLCCBHi1llx6bE7/DdiV+i+k=; b=RWP8FyxJ0niyasLp2j2Wq2j9fmCnda434e1C+fvLoxwOox9Pvz+WS8J4zshh69Vc32 lKxees/VO0z5beo+DtL337FwzKA/qGTadP3JC5wtUd329HJMRDYcyHjeWAr9KH2X1yxe AC82iEj6tP0Bj294O3P6Ep5kIRajt//wb1pQZqCuUMAtayIYlOuvTFXNNEa5X3+H+VpE X22TmmSDEnb0zwfdSrF9E8k82zrTR52dKei2scHnXU8qODWtEk2NYheo85N/2R40Aobd 5ySt0wtqoy28NWQjE7KTKM3GckA5WFsJ7NC4rqGCyuYTqrjNL5R4BzVOypzJFrwFDKmx SVWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=82ZwR+NbGZ5dEo246FTmLCCBHi1llx6bE7/DdiV+i+k=; b=CnCa2R+62uv0iBjNpMc7Qwz6c3GSKeFT4TPhnfwLKhImifpNRo8QC338N8rMczfW/3 z3INfsYpXkM/484pX1ESWrhL5Q24lHJxLjULIA3A1nr1J+Nn2zLjTdmd2ySxY8PPkHMg +Q45+eEPoMvKRxm0gmnT935HXM4ZJlOCdKQsp08iFoQAY39CW8uh4sZc7zjNg5FR8Aon ywln85Q9CJNGdLdCvTR78wvj3VsGowwZpCz/xziKLzyd6EURd/2sHHnGQJJaseI2PmX6 UGRoU+WDnZZxpHE0pcewAUF5taFEGhBHIsk6MMnntePWAwRoaIFH0eri0DcajY1sAy61 UVnw== X-Gm-Message-State: AOAM530hRqFgtYyoBncfUGR9eHSPkRtiSg43FFbNt+8dyRoQmKGxEL2y ikRiOCLRoyiccPxnW6gekXc= X-Google-Smtp-Source: ABdhPJzHlucEWqG3UngVniuRFCDM/4OSJmyMBCQ9mboE+MYJlZKWCW6od/s5TLVS3+g17SVQt3B/mA== X-Received: by 2002:adf:bbc1:: with SMTP id z1mr8223780wrg.173.1595592597193; Fri, 24 Jul 2020 05:09:57 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id g145sm10798502wmg.23.2020.07.24.05.09.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:09:56 -0700 (PDT) From: luca.boccassi@gmail.com To: Yicai Lu Cc: Wei Hu , dpdk stable Date: Fri, 24 Jul 2020 12:59:41 +0100 Message-Id: <20200724120030.1863487-143-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: fix LACP negotiation' has been queued to stable release 19.11.4 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 stable release 19.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/26/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. Thanks. Luca Boccassi --- >From 6c80d377ec382218298318e1a22a92e319710da6 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 b7ffa2f2c..3991825ad 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -798,7 +798,8 @@ rx_machine_update(struct bond_dev_private *internals, uint16_t slave_id, RTE_ASSERT(lacp->lacpdu.subtype == SLOW_SUBTYPE_LACP); partner = &lacp->lacpdu.partner; - 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, &internals->mode4.mac_addr)) { /* This LACP frame is sending to the bonding port * so pass it to rx_machine. -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:54.073524306 +0100 +++ 0143-net-bonding-fix-LACP-negotiation.patch 2020-07-24 12:53:48.483010111 +0100 @@ -1,8 +1,10 @@ -From a9cbca743083ace5232e9df90119b4defa7df6e5 Mon Sep 17 00:00:00 2001 +From 6c80d377ec382218298318e1a22a92e319710da6 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 @@ -11,7 +13,6 @@ Thus bond mode 4 will negotiation failed. Fixes: 56cbc0817399 ("net/bonding: fix LACP negotiation") -Cc: stable@dpdk.org Signed-off-by: Yicai Lu Reviewed-by: Wei Hu (Xavier)