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 1E0E5A04B5 for ; Tue, 3 Dec 2019 19:28:17 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0BDCA235; Tue, 3 Dec 2019 19:28:17 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id B196237AF for ; Tue, 3 Dec 2019 19:28:15 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397695; 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=pkdgL5cnLZmypK3xDZOqel/aaArBYuF60cXhoAkDfJI=; b=KHR5ECOzJvrlDwO4BwCfIeqiyaSGFkV7eFGbUwcIW8fAAyXt26dxfKJfOQKEpFvsuuhmZa n7mOzMKIPWBtASJ4Msih4UdHstpKsiW+gfQo5ZXDX7oSt4CxYP4wrle2iw+QyNWY03jFLr AURy7uy/OIiuxRpJgRw0ErdEczHdxCo= 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-278-etB8lShGNTKMkrLS1rzlrQ-1; Tue, 03 Dec 2019 13:28:13 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9C780107ACC9; Tue, 3 Dec 2019 18:28:12 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id BAFA95C3FA; Tue, 3 Dec 2019 18:28:06 +0000 (UTC) From: Kevin Traynor To: Hui Zhao Cc: David Marchand , Maxime Coquelin , dpdk stable Date: Tue, 3 Dec 2019 18:26:31 +0000 Message-Id: <20191203182714.17297-22-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: etB8lShGNTKMkrLS1rzlrQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/bonding: fix slave id types' has been queued to LTS release 18.11.6 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.6 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/10/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 rebasi= ng (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/ca538e25f0c02f47a3= 9949f7dc41c8411483b914 Thanks. Kevin. --- >From ca538e25f0c02f47a39949f7dc41c8411483b914 Mon Sep 17 00:00:00 2001 From: Hui Zhao Date: Thu, 21 Mar 2019 21:28:13 +0100 Subject: [PATCH] net/bonding: fix slave id types [ upstream commit c28aff1e41eedd9d44c480264efbd7f4dd5cf31e ] mode_bond_id and mode_band_id are slave ids, stored on 16bits. Fixes: f8244c6399d9 ("ethdev: increase port id range") Signed-off-by: Hui Zhao Signed-off-by: David Marchand Reviewed-by: Maxime Coquelin --- drivers/net/bonding/rte_eth_bond_8023ad.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c b/drivers/net/bondin= g/rte_eth_bond_8023ad.c index 1e6a3fc7c..3943ec139 100644 --- a/drivers/net/bonding/rte_eth_bond_8023ad.c +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c @@ -639,5 +639,5 @@ tx_machine(struct bond_dev_private *internals, uint16_t= slave_id) } =20 -static uint8_t +static uint16_t max_index(uint64_t *a, int n) { @@ -673,5 +673,6 @@ selection_logic(struct bond_dev_private *internals, uin= t16_t slave_id) =09uint64_t agg_count[8] =3D {0}; =09uint16_t default_slave =3D 0; -=09uint8_t mode_count_id, mode_band_id; +=09uint16_t mode_count_id; +=09uint16_t mode_band_id; =09struct rte_eth_link link_info; =20 @@ -709,11 +710,9 @@ selection_logic(struct bond_dev_private *internals, ui= nt16_t slave_id) =09switch (internals->mode4.agg_selection) { =09case AGG_COUNT: -=09=09mode_count_id =3D max_index( -=09=09=09=09(uint64_t *)agg_count, slaves_count); +=09=09mode_count_id =3D max_index(agg_count, slaves_count); =09=09new_agg_id =3D mode_count_id; =09=09break; =09case AGG_BANDWIDTH: -=09=09mode_band_id =3D max_index( -=09=09=09=09(uint64_t *)agg_bandwidth, slaves_count); +=09=09mode_band_id =3D max_index(agg_bandwidth, slaves_count); =09=09new_agg_id =3D mode_band_id; =09=09break; --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:53.118919055 +0000 +++ 0022-net-bonding-fix-slave-id-types.patch=092019-12-03 17:29:51.7397501= 82 +0000 @@ -1 +1 @@ -From c28aff1e41eedd9d44c480264efbd7f4dd5cf31e Mon Sep 17 00:00:00 2001 +From ca538e25f0c02f47a39949f7dc41c8411483b914 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c28aff1e41eedd9d44c480264efbd7f4dd5cf31e ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index e50d946eb..c6a645a65 100644 +index 1e6a3fc7c..3943ec139 100644 @@ -22 +23 @@ -@@ -640,5 +640,5 @@ tx_machine(struct bond_dev_private *internals, uint16_= t slave_id) +@@ -639,5 +639,5 @@ tx_machine(struct bond_dev_private *internals, uint16_= t slave_id) @@ -29 +30 @@ -@@ -674,5 +674,6 @@ selection_logic(struct bond_dev_private *internals, ui= nt16_t slave_id) +@@ -673,5 +673,6 @@ selection_logic(struct bond_dev_private *internals, ui= nt16_t slave_id) @@ -36,2 +37,2 @@ - =09int ret; -@@ -718,11 +719,9 @@ selection_logic(struct bond_dev_private *internals, u= int16_t slave_id) +=20 +@@ -709,11 +710,9 @@ selection_logic(struct bond_dev_private *internals, u= int16_t slave_id)