From patchwork Thu Sep 22 01:33:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "lihuisong (C)" X-Patchwork-Id: 116611 X-Patchwork-Delegate: andrew.rybchenko@oktetlabs.ru Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 54B29A0540; Thu, 22 Sep 2022 03:34:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 02B4E40691; Thu, 22 Sep 2022 03:34:56 +0200 (CEST) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id B23AC4067C for ; Thu, 22 Sep 2022 03:34:53 +0200 (CEST) Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MXySK733LzpTCv; Thu, 22 Sep 2022 09:32:01 +0800 (CST) Received: from kwepemm600004.china.huawei.com (7.193.23.242) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 22 Sep 2022 09:34:51 +0800 Received: from localhost.localdomain (10.28.79.22) by kwepemm600004.china.huawei.com (7.193.23.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 22 Sep 2022 09:34:50 +0800 From: Huisong Li To: CC: <3chas3@gmail.com>, , , , , Subject: [PATCH V3] net/bonding: add link speeds configuration Date: Thu, 22 Sep 2022 09:33:17 +0800 Message-ID: <20220922013317.10051-1-lihuisong@huawei.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20220805031912.11729-1-lihuisong@huawei.com> References: <20220805031912.11729-1-lihuisong@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.28.79.22] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To kwepemm600004.china.huawei.com (7.193.23.242) X-CFilter-Loop: Reflected 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 This patch adds link speeds configuration. Signed-off-by: 3chas3@gmail.com Acked-by: Chas Williams <3chas3@gmail.com> --- -v3: add an intersection of the supported speeds to check 'link_speeds'. -v2: resend due to CI compiling failure. Signed-off-by: Huisong Li --- drivers/net/bonding/eth_bond_private.h | 3 +++ drivers/net/bonding/rte_eth_bond_api.c | 3 +++ drivers/net/bonding/rte_eth_bond_pmd.c | 27 ++++++++++++++++++++++++++ 3 files changed, 33 insertions(+) diff --git a/drivers/net/bonding/eth_bond_private.h b/drivers/net/bonding/eth_bond_private.h index 8222e3cd38..d067ea8c9a 100644 --- a/drivers/net/bonding/eth_bond_private.h +++ b/drivers/net/bonding/eth_bond_private.h @@ -131,6 +131,9 @@ struct bond_dev_private { uint32_t link_down_delay_ms; uint32_t link_up_delay_ms; + uint32_t speed_capa; + /**< Supported speeds bitmap (RTE_ETH_LINK_SPEED_). */ + uint16_t nb_rx_queues; /**< Total number of rx queues */ uint16_t nb_tx_queues; /**< Total number of tx queues*/ diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c index 4ac191c468..e64ec0ed20 100644 --- a/drivers/net/bonding/rte_eth_bond_api.c +++ b/drivers/net/bonding/rte_eth_bond_api.c @@ -513,6 +513,8 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id) internals->primary_port = slave_port_id; internals->current_primary_port = slave_port_id; + internals->speed_capa = dev_info.speed_capa; + /* Inherit queues settings from first slave */ internals->nb_rx_queues = slave_eth_dev->data->nb_rx_queues; internals->nb_tx_queues = slave_eth_dev->data->nb_tx_queues; @@ -527,6 +529,7 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id, uint16_t slave_port_id) } else { int ret; + internals->speed_capa &= dev_info.speed_capa; eth_bond_slave_inherit_dev_info_rx_next(internals, &dev_info); eth_bond_slave_inherit_dev_info_tx_next(internals, &dev_info); diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 3191158ca7..0adbf0e1b2 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -1717,6 +1717,8 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev, slave_eth_dev->data->dev_conf.rxmode.mtu = bonded_eth_dev->data->dev_conf.rxmode.mtu; + slave_eth_dev->data->dev_conf.link_speeds = + bonded_eth_dev->data->dev_conf.link_speeds; slave_eth_dev->data->dev_conf.txmode.offloads |= bonded_eth_dev->data->dev_conf.txmode.offloads; @@ -2275,6 +2277,7 @@ bond_ethdev_info(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) dev_info->reta_size = internals->reta_size; dev_info->hash_key_size = internals->rss_key_len; + dev_info->speed_capa = internals->speed_capa; return 0; } @@ -3591,6 +3594,7 @@ bond_ethdev_configure(struct rte_eth_dev *dev) uint64_t offloads; int arg_count; uint16_t port_id = dev - rte_eth_devices; + uint32_t link_speeds; uint8_t agg_mode; static const uint8_t default_rss_key[40] = { @@ -3659,6 +3663,29 @@ bond_ethdev_configure(struct rte_eth_dev *dev) dev->data->dev_conf.txmode.offloads = offloads; } + link_speeds = dev->data->dev_conf.link_speeds; + /* + * The default value of 'link_speeds' is zero. From its definition, + * this value actually means auto-negotiation. But not all PMDs support + * auto-negotiation. So ignore the check for the auto-negotiation and + * only consider fixed speed to reduce the impact on PMDs. + */ + if (link_speeds & RTE_ETH_LINK_SPEED_FIXED) { + if ((link_speeds & + (internals->speed_capa & ~RTE_ETH_LINK_SPEED_FIXED)) == 0) { + RTE_BOND_LOG(ERR, "the fixed speed is not supported by all slave devices."); + return -EINVAL; + } + /* + * Two '1' in binary of 'link_speeds': bit0 and a unique + * speed bit. + */ + if (__builtin_popcountl(link_speeds) != 2) { + RTE_BOND_LOG(ERR, "please set a unique speed."); + return -EINVAL; + } + } + /* set the max_rx_pktlen */ internals->max_rx_pktlen = internals->candidate_max_rx_pktlen;