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 2B6ABA00C3; Sun, 11 Sep 2022 14:24:10 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1F046400D4; Sun, 11 Sep 2022 14:24:10 +0200 (CEST) Received: from shelob.oktetlabs.ru (shelob.oktetlabs.ru [91.220.146.113]) by mails.dpdk.org (Postfix) with ESMTP id 6D9894003F for ; Sun, 11 Sep 2022 14:24:09 +0200 (CEST) Received: from bree.oktetlabs.ru (bree.oktetlabs.ru [192.168.34.5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by shelob.oktetlabs.ru (Postfix) with ESMTPS id 8E6C213DC; Sun, 11 Sep 2022 15:24:08 +0300 (MSK) DKIM-Filter: OpenDKIM Filter v2.11.0 shelob.oktetlabs.ru 8E6C213DC Authentication-Results: shelob.oktetlabs.ru/8E6C213DC; dkim=none; dkim-atps=neutral From: Ivan Malov To: dev@dpdk.org Cc: Andrew Rybchenko , Chas Williams , "Min Hu (Connor)" , Anatoly Burakov Subject: [PATCH] net/bonding: make bonded device configure method re-entrant Date: Sun, 11 Sep 2022 15:24:04 +0300 Message-Id: <20220911122405.3995083-1-ivan.malov@oktetlabs.ru> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org According to the documentation, rte_eth_dev_configure() can be invoked repeatedly while in stopped state. The current implementation in the bonding driver allows for that (technically), but the user sees warnings which say that back-end devices have already been harnessed. Re-factor the code to have cleanup before each (re-)configure. Signed-off-by: Ivan Malov Reviewed-by: Andrew Rybchenko --- drivers/net/bonding/rte_eth_bond_pmd.c | 27 ++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index d01c954296..92a33b45bd 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2143,18 +2143,13 @@ bond_ethdev_stop(struct rte_eth_dev *eth_dev) return 0; } -int -bond_ethdev_close(struct rte_eth_dev *dev) +static void +bond_ethdev_cfg_cleanup(struct rte_eth_dev *dev) { struct bond_dev_private *internals = dev->data->dev_private; uint16_t bond_port_id = internals->port_id; - int skipped = 0; struct rte_flow_error ferror; - - if (rte_eal_process_type() != RTE_PROC_PRIMARY) - return 0; - - RTE_BOND_LOG(INFO, "Closing bonded device %s", dev->device->name); + int skipped = 0; /* Flush flows in all back-end devices before removing them */ bond_flow_ops.flush(dev, &ferror); @@ -2176,6 +2171,20 @@ bond_ethdev_close(struct rte_eth_dev *dev) skipped++; } } +} + +int +bond_ethdev_close(struct rte_eth_dev *dev) +{ + struct bond_dev_private *internals = dev->data->dev_private; + + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return 0; + + RTE_BOND_LOG(INFO, "Closing bonded device %s", dev->device->name); + + bond_ethdev_cfg_cleanup(dev); + bond_ethdev_free_queues(dev); rte_bitmap_reset(internals->vlan_filter_bmp); rte_bitmap_free(internals->vlan_filter_bmp); @@ -3606,6 +3615,8 @@ bond_ethdev_configure(struct rte_eth_dev *dev) unsigned i, j; + bond_ethdev_cfg_cleanup(dev); + /* * If RSS is enabled, fill table with default values and * set key to the value specified in port RSS configuration. -- 2.30.2