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 2B9EFA0555 for ; Wed, 25 May 2022 18:29:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 25AC3400EF; Wed, 25 May 2022 18:29:21 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id AF10D400EF for ; Wed, 25 May 2022 18:29:19 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1653496159; 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=tc/tTQ6AQb+PHGPLKEw9J6iSY68+3ZBZvQYbmQXVmbc=; b=OlwG113zDjgAxp6/W5g2nXjNfSn7r1JomQR9AIVKTKwSiTamUH97xI5a7bQpJFuy7Tw2hh yzQizhEkUdf0RcofRQchjSQyuRLlZksHJJF425KpkcczlMS8/BgjCQ7/iDCeIJ5QCRyPhQ buwiiWY1ioc1/cgn/RMrhFOy9BZJPxg= 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-113-wznSHYd0M7S2CTYDkFKktg-1; Wed, 25 May 2022 12:29:15 -0400 X-MC-Unique: wznSHYd0M7S2CTYDkFKktg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1256E8517F6; Wed, 25 May 2022 16:29:15 +0000 (UTC) Received: from rh.Home (unknown [10.39.193.216]) by smtp.corp.redhat.com (Postfix) with ESMTP id 040302024CB7; Wed, 25 May 2022 16:29:13 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Min Hu , dpdk stable Subject: patch 'net/bonding: fix stopping non-active slaves' has been queued to stable release 21.11.2 Date: Wed, 25 May 2022 17:28:07 +0100 Message-Id: <20220525162847.711753-15-ktraynor@redhat.com> In-Reply-To: <20220525162847.711753-1-ktraynor@redhat.com> References: <20220525162847.711753-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/30/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/5a8afc69afabd3c69efbc1b0c048f31d06f7d875 Thanks. Kevin --- >From 5a8afc69afabd3c69efbc1b0c048f31d06f7d875 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Tue, 3 May 2022 18:02:13 +0800 Subject: [PATCH] net/bonding: fix stopping non-active slaves [ upstream commit f5e72e8e8d57b331baf1a86d15eb7fae921f57fb ] When stopping a bonded port, all slaves should be stopped. But only active slaves are stopped. So fix by stopping all slave ports and later do "deactivate_slave()" for active slaves. Fixes: 0911d4ec0183 ("net/bonding: fix crash when stopping mode 4 port") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/bonding/rte_eth_bond_pmd.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index e8a9341777..121a6b3e4e 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2119,16 +2119,18 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev) for (i = 0; i < internals->slave_count; i++) { uint16_t slave_id = internals->slaves[i].port_id; + + internals->slaves[i].last_link_status = 0; + ret = rte_eth_dev_stop(slave_id); + if (ret != 0) { + RTE_BOND_LOG(ERR, "Failed to stop device on port %u", + slave_id); + return ret; + } + + /* active slaves need to be deactivated. */ if (find_slave_by_id(internals->active_slaves, internals->active_slave_count, slave_id) != - internals->active_slave_count) { - internals->slaves[i].last_link_status = 0; - ret = rte_eth_dev_stop(slave_id); - if (ret != 0) { - RTE_BOND_LOG(ERR, "Failed to stop device on port %u", - slave_id); - return ret; - } + internals->active_slave_count) deactivate_slave(eth_dev, slave_id); - } } -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-25 17:26:58.966423692 +0100 +++ 0015-net-bonding-fix-stopping-non-active-slaves.patch 2022-05-25 17:26:58.549828305 +0100 @@ -1 +1 @@ -From f5e72e8e8d57b331baf1a86d15eb7fae921f57fb Mon Sep 17 00:00:00 2001 +From 5a8afc69afabd3c69efbc1b0c048f31d06f7d875 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f5e72e8e8d57b331baf1a86d15eb7fae921f57fb ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 5cbe89031b..605fc2ffb5 100644 +index e8a9341777..121a6b3e4e 100644