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 E8A76A04F0 for ; Thu, 19 Dec 2019 15:41:56 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D8AF11C021; Thu, 19 Dec 2019 15:41:56 +0100 (CET) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id E9C501C021 for ; Thu, 19 Dec 2019 15:41:55 +0100 (CET) Received: by mail-wm1-f68.google.com with SMTP id d139so7210324wmd.0 for ; Thu, 19 Dec 2019 06:41:55 -0800 (PST) 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=fLWKtkNrONm5QnTMfZmaaIz9WJ4ArTt7uZXuKXAcNeQ=; b=OX8M0sd1jDa/cXMoSa9V822FiY52w/wNk2MeZLJRHiJxKWd3U7c8gH/3VAQjYXN/LF tA+BaxFQKWyPAds86ScgcpbjVAhOrDrZjYEU1x8uz/M4J2IWLm9ZwZZvGoi+GfExi5sj P2wNPfd2/y3/bbnEd/FO0xQK/xNYUC5c+1IVGI28l7wOhM+xu1z6NjrYnSAUSsNfmE8U PqnZVfaGYdEAvRpsYI4i/wsVqHxYwuoMBK4v7RlKAI3M6Ew/gw/LDvPlpNYcxHk/91JE waeOrvOWXvRkomi2paxZDuzeWNNBXbzBVPxpz+hYS32oGtKZWj54zjgAbueph0p8Gu5j 59JQ== 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=fLWKtkNrONm5QnTMfZmaaIz9WJ4ArTt7uZXuKXAcNeQ=; b=Q0PQl59H6c1ROgXj4PYcknVWJ55Symq3JiYQ0WBQeXGPnVJBPDvrJcgcrvBu6E5/lF Uncl6yDFeFrCJfKSdBosHWLfcEvri6hKM07idnk2Z2i7Fxn3NKKzLGwfShv+qW1HuRl/ Jj6NuuXWddDjwcr6/bQn04tkmsD1iGT3TcrmhYb1yxPKix2vlVqKwFT191hcXNozihIj bRRY1jHPfC0QFcm/ESsnXW36LeA0zQT+M5C9twyu8cB+ew05Yd9h98Pd/tZbaskDvMCE 85aWqADQEtaT0nPDIe9VZZLhJPHXXGEvfBgk4RGeTxgdCDxoNuO2zNW+gYv+8rcG0D+c uh7Q== X-Gm-Message-State: APjAAAViEDgDzWbjKb+hQXqGX4neWQYjtA9kdbTu9DsULViY0xG/F1N3 HHdvCXlf1Z6hBTxJdNeD4a4= X-Google-Smtp-Source: APXvYqzDntIPon6nyzCCYcLUtaSDnTaThK5pvBoAmI75hyt+p8cQ62UccO319yu/sjEHaCVHMANzDQ== X-Received: by 2002:a7b:c151:: with SMTP id z17mr10452247wmi.137.1576766515676; Thu, 19 Dec 2019 06:41:55 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id a184sm6495292wmf.29.2019.12.19.06.41.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2019 06:41:55 -0800 (PST) From: luca.boccassi@gmail.com To: Krzysztof Kanas Cc: Chas Williams , Ferruh Yigit , dpdk stable Date: Thu, 19 Dec 2019 14:34:35 +0000 Message-Id: <20191219143447.21506-128-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191219143447.21506-1-luca.boccassi@gmail.com> References: <20191219143447.21506-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: fix selection logic' has been queued to LTS release 17.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 17.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 12/21/19. 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 7e0491c6cedd771c89ddc5bb5d5cb63f21eb41b4 Mon Sep 17 00:00:00 2001 From: Krzysztof Kanas Date: Wed, 13 Nov 2019 09:22:24 +0100 Subject: [PATCH] net/bonding: fix selection logic [ upstream commit 8d75f49e61c11bff2ecf48818f7acf4520329848 ] Arrays agg_count and agg_bandwidth should be indexed by slave_id not by aggregator port_id. The new_agg_id should be chosen as slave_id from slaves table in different selection modes. Fixes: 6d72657ce379 ("net/bonding: add other aggregator modes") Signed-off-by: Krzysztof Kanas Acked-by: Chas Williams Acked-by: Ferruh Yigit --- drivers/net/bonding/rte_eth_bond_8023ad.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c index 4b98730bd7..d369576c6a 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -693,9 +693,8 @@ selection_logic(struct bond_dev_private *internals, uint8_t slave_id) uint64_t agg_bandwidth[RTE_MAX_ETHPORTS] = {0}; uint64_t agg_count[RTE_MAX_ETHPORTS] = {0}; uint16_t default_slave = 0; - uint16_t mode_count_id; - uint16_t mode_band_id; struct rte_eth_link link_info; + uint16_t agg_new_idx = 0; slaves = internals->active_slaves; slaves_count = internals->active_slave_count; @@ -708,9 +707,9 @@ selection_logic(struct bond_dev_private *internals, uint8_t slave_id) if (agg->aggregator_port_id != slaves[i]) continue; - agg_count[agg->aggregator_port_id] += 1; + agg_count[i] += 1; rte_eth_link_get_nowait(slaves[i], &link_info); - agg_bandwidth[agg->aggregator_port_id] += link_info.link_speed; + agg_bandwidth[i] += link_info.link_speed; /* Actors system ID is not checked since all slave device have the same * ID (MAC address). */ @@ -730,22 +729,22 @@ selection_logic(struct bond_dev_private *internals, uint8_t slave_id) switch (internals->mode4.agg_selection) { case AGG_COUNT: - mode_count_id = max_index(agg_count, slaves_count); - new_agg_id = mode_count_id; + agg_new_idx = max_index(agg_count, slaves_count); + new_agg_id = slaves[agg_new_idx]; break; case AGG_BANDWIDTH: - mode_band_id = max_index(agg_bandwidth, slaves_count); - new_agg_id = mode_band_id; + agg_new_idx = max_index(agg_bandwidth, slaves_count); + new_agg_id = slaves[agg_new_idx]; break; case AGG_STABLE: if (default_slave == slaves_count) - new_agg_id = slave_id; + new_agg_id = slaves[slave_id]; else new_agg_id = slaves[default_slave]; break; default: if (default_slave == slaves_count) - new_agg_id = slave_id; + new_agg_id = slaves[slave_id]; else new_agg_id = slaves[default_slave]; break; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2019-12-19 14:32:31.421525867 +0000 +++ 0128-net-bonding-fix-selection-logic.patch 2019-12-19 14:32:26.333302346 +0000 @@ -1,8 +1,10 @@ -From 8d75f49e61c11bff2ecf48818f7acf4520329848 Mon Sep 17 00:00:00 2001 +From 7e0491c6cedd771c89ddc5bb5d5cb63f21eb41b4 Mon Sep 17 00:00:00 2001 From: Krzysztof Kanas Date: Wed, 13 Nov 2019 09:22:24 +0100 Subject: [PATCH] net/bonding: fix selection logic +[ upstream commit 8d75f49e61c11bff2ecf48818f7acf4520329848 ] + Arrays agg_count and agg_bandwidth should be indexed by slave_id not by aggregator port_id. @@ -10,7 +12,6 @@ different selection modes. Fixes: 6d72657ce379 ("net/bonding: add other aggregator modes") -Cc: stable@dpdk.org Signed-off-by: Krzysztof Kanas Acked-by: Chas Williams @@ -20,10 +21,10 @@ 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bonding/rte_eth_bond_8023ad.c -index 05b3004c4c..b77a37ddb3 100644 +index 4b98730bd7..d369576c6a 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c -@@ -673,9 +673,8 @@ selection_logic(struct bond_dev_private *internals, uint16_t slave_id) +@@ -693,9 +693,8 @@ selection_logic(struct bond_dev_private *internals, uint8_t slave_id) uint64_t agg_bandwidth[RTE_MAX_ETHPORTS] = {0}; uint64_t agg_count[RTE_MAX_ETHPORTS] = {0}; uint16_t default_slave = 0; @@ -31,21 +32,22 @@ - uint16_t mode_band_id; struct rte_eth_link link_info; + uint16_t agg_new_idx = 0; - int ret; slaves = internals->active_slaves; -@@ -696,8 +695,8 @@ selection_logic(struct bond_dev_private *internals, uint16_t slave_id) - slaves[i], rte_strerror(-ret)); + slaves_count = internals->active_slave_count; +@@ -708,9 +707,9 @@ selection_logic(struct bond_dev_private *internals, uint8_t slave_id) + if (agg->aggregator_port_id != slaves[i]) continue; - } + - agg_count[agg->aggregator_port_id] += 1; -- agg_bandwidth[agg->aggregator_port_id] += link_info.link_speed; + agg_count[i] += 1; + rte_eth_link_get_nowait(slaves[i], &link_info); +- agg_bandwidth[agg->aggregator_port_id] += link_info.link_speed; + agg_bandwidth[i] += link_info.link_speed; /* Actors system ID is not checked since all slave device have the same * ID (MAC address). */ -@@ -718,22 +717,22 @@ selection_logic(struct bond_dev_private *internals, uint16_t slave_id) +@@ -730,22 +729,22 @@ selection_logic(struct bond_dev_private *internals, uint8_t slave_id) switch (internals->mode4.agg_selection) { case AGG_COUNT: