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 3D7E8A0A02 for ; Mon, 17 May 2021 18:16:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 32EDC4014E; Mon, 17 May 2021 18:16:01 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id A8A7C40041 for ; Mon, 17 May 2021 18:15:59 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lifuR-0008HI-F5; Mon, 17 May 2021 16:15:59 +0000 From: Christian Ehrhardt To: Chengchang Tang Cc: Min Hu , dpdk stable Date: Mon, 17 May 2021 18:09:25 +0200 Message-Id: <20210517161039.3132619-136-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bonding: fix adding itself as its slave' has been queued to stable release 19.11.9 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.9 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/19/21. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/09f576bc5b8641efd668a0348016b0b6c4802c2d Thanks. Christian Ehrhardt --- >From 09f576bc5b8641efd668a0348016b0b6c4802c2d Mon Sep 17 00:00:00 2001 From: Chengchang Tang Date: Thu, 15 Apr 2021 15:09:54 +0800 Subject: [PATCH] net/bonding: fix adding itself as its slave [ upstream commit 324d6577ba678c00673427df681bf2debec1db8d ] Adding the bond device as its own slave should be forbidden. This will cause a recursive endless loop in many subsequent operations, and eventually lead to coredump. This problem was found in testpmd, the related logs are as follows: testpmd> create bonded device 1 0 Created new bonded device net_bonding_testpmd_0 on (port 4). testpmd> add bonding slave 4 4 Segmentation fault (core dumped) The call stack is as follows: 0x000000000064eb90 in rte_eth_dev_info_get () 0x00000000006df4b4 in bond_ethdev_info () 0x000000000064eb90 in rte_eth_dev_info_get () 0x00000000006df4b4 in bond_ethdev_info () 0x000000000064eb90 in rte_eth_dev_info_get () 0x0000000000564e58 in eth_dev_info_get_print_err () 0x000000000055e8a4 in init_port_config () 0x000000000052730c in cmd_add_bonding_slave_parsed () 0x0000000000646f60 in cmdline_parse () 0x0000000000645e08 in cmdline_valid_buffer () 0x000000000064956c in rdline_char_in () 0x0000000000645ee0 in cmdline_in () 0x00000000006460a4 in cmdline_interact () 0x0000000000531904 in prompt () 0x000000000051cca8 in main () Fixes: 2efb58cbab6e ("bond: new link bonding library") Signed-off-by: Chengchang Tang Signed-off-by: Min Hu (Connor) --- drivers/net/bonding/eth_bond_private.h | 2 +- drivers/net/bonding/rte_eth_bond_api.c | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/drivers/net/bonding/eth_bond_private.h b/drivers/net/bonding/eth_bond_private.h index af92a4c52a..72f99e1140 100644 --- a/drivers/net/bonding/eth_bond_private.h +++ b/drivers/net/bonding/eth_bond_private.h @@ -212,7 +212,7 @@ int valid_bonded_port_id(uint16_t port_id); int -valid_slave_port_id(uint16_t port_id, uint8_t mode); +valid_slave_port_id(struct bond_dev_private *internals, uint16_t port_id); void deactivate_slave(struct rte_eth_dev *eth_dev, uint16_t port_id); diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c index a4007fe07c..2a37dd5d61 100644 --- a/drivers/net/bonding/rte_eth_bond_api.c +++ b/drivers/net/bonding/rte_eth_bond_api.c @@ -56,19 +56,25 @@ check_for_master_bonded_ethdev(const struct rte_eth_dev *eth_dev) } int -valid_slave_port_id(uint16_t port_id, uint8_t mode) +valid_slave_port_id(struct bond_dev_private *internals, uint16_t slave_port_id) { - RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -1); + RTE_ETH_VALID_PORTID_OR_ERR_RET(slave_port_id, -1); - /* Verify that port_id refers to a non bonded port */ - if (check_for_bonded_ethdev(&rte_eth_devices[port_id]) == 0 && - mode == BONDING_MODE_8023AD) { + /* Verify that slave_port_id refers to a non bonded port */ + if (check_for_bonded_ethdev(&rte_eth_devices[slave_port_id]) == 0 && + internals->mode == BONDING_MODE_8023AD) { RTE_BOND_LOG(ERR, "Cannot add slave to bonded device in 802.3ad" " mode as slave is also a bonded device, only " "physical devices can be support in this mode."); return -1; } + if (internals->port_id == slave_port_id) { + RTE_BOND_LOG(ERR, + "Cannot add the bonded device itself as its slave."); + return -1; + } + return 0; } @@ -451,7 +457,7 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id) bonded_eth_dev = &rte_eth_devices[bonded_port_id]; internals = bonded_eth_dev->data->dev_private; - if (valid_slave_port_id(slave_port_id, internals->mode) != 0) + if (valid_slave_port_id(internals, slave_port_id) != 0) return -1; slave_eth_dev = &rte_eth_devices[slave_port_id]; @@ -600,13 +606,15 @@ rte_eth_bond_slave_add(uint16_t bonded_port_id, uint16_t slave_port_id) int retval; - /* Verify that port id's are valid bonded and slave ports */ if (valid_bonded_port_id(bonded_port_id) != 0) return -1; bonded_eth_dev = &rte_eth_devices[bonded_port_id]; internals = bonded_eth_dev->data->dev_private; + if (valid_slave_port_id(internals, slave_port_id) != 0) + return -1; + rte_spinlock_lock(&internals->lock); retval = __eth_bond_slave_add_lock_free(bonded_port_id, slave_port_id); @@ -630,7 +638,7 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id, bonded_eth_dev = &rte_eth_devices[bonded_port_id]; internals = bonded_eth_dev->data->dev_private; - if (valid_slave_port_id(slave_port_id, internals->mode) < 0) + if (valid_slave_port_id(internals, slave_port_id) < 0) return -1; /* first remove from active slave list */ @@ -778,7 +786,7 @@ rte_eth_bond_primary_set(uint16_t bonded_port_id, uint16_t slave_port_id) internals = rte_eth_devices[bonded_port_id].data->dev_private; - if (valid_slave_port_id(slave_port_id, internals->mode) != 0) + if (valid_slave_port_id(internals, slave_port_id) != 0) return -1; internals->user_defined_primary_port = 1; -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:34.741353271 +0200 +++ 0136-net-bonding-fix-adding-itself-as-its-slave.patch 2021-05-17 17:40:29.407811335 +0200 @@ -1 +1 @@ -From 324d6577ba678c00673427df681bf2debec1db8d Mon Sep 17 00:00:00 2001 +From 09f576bc5b8641efd668a0348016b0b6c4802c2d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 324d6577ba678c00673427df681bf2debec1db8d ] + @@ -34 +35,0 @@ -Cc: stable@dpdk.org @@ -44 +45 @@ -index 75fb8dc02e..fc179a2732 100644 +index af92a4c52a..72f99e1140 100644 @@ -57 +58 @@ -index 17e6ff8b90..eb8d15d160 100644 +index a4007fe07c..2a37dd5d61 100644 @@ -91 +92 @@ -@@ -456,7 +462,7 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id) +@@ -451,7 +457,7 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id) @@ -100 +101 @@ -@@ -605,13 +611,15 @@ rte_eth_bond_slave_add(uint16_t bonded_port_id, uint16_t slave_port_id) +@@ -600,13 +606,15 @@ rte_eth_bond_slave_add(uint16_t bonded_port_id, uint16_t slave_port_id) @@ -117 +118 @@ -@@ -635,7 +643,7 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id, +@@ -630,7 +638,7 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id, @@ -126 +127 @@ -@@ -783,7 +791,7 @@ rte_eth_bond_primary_set(uint16_t bonded_port_id, uint16_t slave_port_id) +@@ -778,7 +786,7 @@ rte_eth_bond_primary_set(uint16_t bonded_port_id, uint16_t slave_port_id)