From patchwork Mon Dec 5 08:10:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fengchengwen X-Patchwork-Id: 120450 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 DF544A0547; Mon, 5 Dec 2022 09:17:29 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3433242D24; Mon, 5 Dec 2022 09:17:22 +0100 (CET) Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by mails.dpdk.org (Postfix) with ESMTP id E937F40F18 for ; Mon, 5 Dec 2022 09:17:18 +0100 (CET) Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.55]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4NQbwt20Hlz15Mqc; Mon, 5 Dec 2022 16:16:30 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 5 Dec 2022 16:17:16 +0800 From: Chengwen Feng To: , CC: , , Subject: [PATCH 1/2] net/bonding: support private dump ops Date: Mon, 5 Dec 2022 08:10:50 +0000 Message-ID: <20221205081051.25905-2-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221205081051.25905-1-fengchengwen@huawei.com> References: <20221205081051.25905-1-fengchengwen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpeml500024.china.huawei.com (7.185.36.10) 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 implements eth_dev_priv_dump ops which could enhance the debug capability. The dump output is similar to testpmd command "show bonding config [port]". Signed-off-by: Chengwen Feng --- drivers/net/bonding/rte_eth_bond_pmd.c | 103 ++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 1 deletion(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index b9bcebc6cb..80fb2dc462 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3329,6 +3329,106 @@ bond_ethdev_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index) rte_spinlock_unlock(&internals->lock); } +static const char * +bond_mode_name(uint8_t mode) +{ + switch (mode) { + case BONDING_MODE_ROUND_ROBIN: + return "ROUND_ROBIN"; + case BONDING_MODE_ACTIVE_BACKUP: + return "ACTIVE_BACKUP"; + case BONDING_MODE_BALANCE: + return "BALANCE"; + case BONDING_MODE_BROADCAST: + return "BROADCAST"; + case BONDING_MODE_8023AD: + return "8023AD"; + case BONDING_MODE_TLB: + return "TLB"; + case BONDING_MODE_ALB: + return "ALB"; + default: + return "Unknown"; + } +} + +static int +bond_ethdev_priv_dump(struct rte_eth_dev *dev, FILE *f) +{ + struct bond_dev_private instant_priv; + const struct bond_dev_private *internals = &instant_priv; + int bonding_mode; + int i; + + /* Obtain a instance of dev_private to prevent data from being modified. */ + memcpy(&instant_priv, dev->data->dev_private, sizeof(struct bond_dev_private)); + bonding_mode = internals->mode; + + fprintf(f, " - Dev basic:\n"); + fprintf(f, "\tBonding mode: %s(%d)\n", bond_mode_name(bonding_mode), bonding_mode); + + if (bonding_mode == BONDING_MODE_BALANCE || + bonding_mode == BONDING_MODE_8023AD) { + fprintf(f, "\tBalance Xmit Policy: "); + switch (internals->balance_xmit_policy) { + case BALANCE_XMIT_POLICY_LAYER2: + fprintf(f, "BALANCE_XMIT_POLICY_LAYER2"); + break; + case BALANCE_XMIT_POLICY_LAYER23: + fprintf(f, "BALANCE_XMIT_POLICY_LAYER23"); + break; + case BALANCE_XMIT_POLICY_LAYER34: + fprintf(f, "BALANCE_XMIT_POLICY_LAYER34"); + break; + } + fprintf(f, "\n"); + } + + if (bonding_mode == BONDING_MODE_8023AD) { + fprintf(f, "\tIEEE802.3AD Aggregator Mode: "); + switch (internals->mode4.agg_selection) { + case AGG_BANDWIDTH: + fprintf(f, "bandwidth"); + break; + case AGG_STABLE: + fprintf(f, "stable"); + break; + case AGG_COUNT: + fprintf(f, "count"); + break; + } + fprintf(f, "\n"); + } + + if (internals->slave_count > 0) { + fprintf(f, "\tSlaves (%u): [", internals->slave_count); + for (i = 0; i < internals->slave_count - 1; i++) + fprintf(f, "%u ", internals->slaves[i].port_id); + + fprintf(f, "%u]\n", internals->slaves[internals->slave_count - 1].port_id); + } else { + fprintf(f, "\tSlaves: []\n"); + } + + if (internals->active_slave_count > 0) { + fprintf(f, "\tActive Slaves (%u): [", internals->active_slave_count); + for (i = 0; i < internals->active_slave_count - 1; i++) + fprintf(f, "%u ", internals->active_slaves[i]); + + fprintf(f, "%u]\n", internals->active_slaves[internals->active_slave_count - 1]); + + } else { + fprintf(f, "\tActive Slaves: []\n"); + } + + if (internals->user_defined_primary_port) + fprintf(f, "\tUser Defined Primary: [%u]\n", internals->primary_port); + if (internals->slave_count > 0) + fprintf(f, "\tCurrent Primary: [%u]\n", internals->current_primary_port); + + return 0; +} + const struct eth_dev_ops default_dev_ops = { .dev_start = bond_ethdev_start, .dev_stop = bond_ethdev_stop, @@ -3355,7 +3455,8 @@ const struct eth_dev_ops default_dev_ops = { .mac_addr_set = bond_ethdev_mac_address_set, .mac_addr_add = bond_ethdev_mac_addr_add, .mac_addr_remove = bond_ethdev_mac_addr_remove, - .flow_ops_get = bond_flow_ops_get + .flow_ops_get = bond_flow_ops_get, + .eth_dev_priv_dump = bond_ethdev_priv_dump }; static int From patchwork Mon Dec 5 08:10:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fengchengwen X-Patchwork-Id: 120448 X-Patchwork-Delegate: ferruh.yigit@amd.com 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 F30F0A0547; Mon, 5 Dec 2022 09:17:20 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9C48D40F18; Mon, 5 Dec 2022 09:17:20 +0100 (CET) Received: from szxga02-in.huawei.com (szxga02-in.huawei.com [45.249.212.188]) by mails.dpdk.org (Postfix) with ESMTP id AAA3240A87 for ; Mon, 5 Dec 2022 09:17:18 +0100 (CET) Received: from dggpeml500024.china.huawei.com (unknown [172.30.72.56]) by szxga02-in.huawei.com (SkyGuard) with ESMTP id 4NQbwt09bPzFqx3; Mon, 5 Dec 2022 16:16:30 +0800 (CST) Received: from localhost.localdomain (10.67.165.24) by dggpeml500024.china.huawei.com (7.185.36.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 5 Dec 2022 16:17:16 +0800 From: Chengwen Feng To: , CC: , , Subject: [PATCH 2/2] net/bonding: support dump LACP info Date: Mon, 5 Dec 2022 08:10:51 +0000 Message-ID: <20221205081051.25905-3-fengchengwen@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20221205081051.25905-1-fengchengwen@huawei.com> References: <20221205081051.25905-1-fengchengwen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.165.24] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpeml500024.china.huawei.com (7.185.36.10) 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 dump lacp info in eth_dev_priv_dump ops. The extra dump output is to testpmd command "show bonding lacp info [port]". Signed-off-by: Chengwen Feng --- drivers/net/bonding/rte_eth_bond_pmd.c | 143 ++++++++++++++++++++++++- 1 file changed, 141 insertions(+), 2 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index 80fb2dc462..617625a6d5 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -3352,8 +3352,8 @@ bond_mode_name(uint8_t mode) } } -static int -bond_ethdev_priv_dump(struct rte_eth_dev *dev, FILE *f) +static void +dump_basic(const struct rte_eth_dev *dev, FILE *f) { struct bond_dev_private instant_priv; const struct bond_dev_private *internals = &instant_priv; @@ -3425,6 +3425,145 @@ bond_ethdev_priv_dump(struct rte_eth_dev *dev, FILE *f) fprintf(f, "\tUser Defined Primary: [%u]\n", internals->primary_port); if (internals->slave_count > 0) fprintf(f, "\tCurrent Primary: [%u]\n", internals->current_primary_port); +} + +static void +dump_lacp_conf(const struct rte_eth_bond_8023ad_conf *conf, FILE *f) +{ + fprintf(f, "\tfast period: %u ms\n", conf->fast_periodic_ms); + fprintf(f, "\tslow period: %u ms\n", conf->slow_periodic_ms); + fprintf(f, "\tshort timeout: %u ms\n", conf->short_timeout_ms); + fprintf(f, "\tlong timeout: %u ms\n", conf->long_timeout_ms); + fprintf(f, "\taggregate wait timeout: %u ms\n", + conf->aggregate_wait_timeout_ms); + fprintf(f, "\ttx period: %u ms\n", conf->tx_period_ms); + fprintf(f, "\trx marker period: %u ms\n", conf->rx_marker_period_ms); + fprintf(f, "\tupdate timeout: %u ms\n", conf->update_timeout_ms); + switch (conf->agg_selection) { + case AGG_BANDWIDTH: + fprintf(f, "\taggregation mode: bandwidth\n"); + break; + case AGG_STABLE: + fprintf(f, "\taggregation mode: stable\n"); + break; + case AGG_COUNT: + fprintf(f, "\taggregation mode: count\n"); + break; + default: + fprintf(f, "\taggregation mode: invalid\n"); + break; + } + fprintf(f, "\n"); +} + +static void +dump_lacp_port_param(const struct port_params *params, FILE *f) +{ + char buf[RTE_ETHER_ADDR_FMT_SIZE]; + fprintf(f, "\t\tsystem priority: %u\n", params->system_priority); + rte_ether_format_addr(buf, RTE_ETHER_ADDR_FMT_SIZE, ¶ms->system); + fprintf(f, "\t\tsystem mac address: %s\n", buf); + fprintf(f, "\t\tport key: %u\n", params->key); + fprintf(f, "\t\tport priority: %u\n", params->port_priority); + fprintf(f, "\t\tport number: %u\n", params->port_number); +} + +static void +dump_lacp_slave(const struct rte_eth_bond_8023ad_slave_info *info, FILE *f) +{ + char a_state[256] = { 0 }; + char p_state[256] = { 0 }; + int a_len = 0; + int p_len = 0; + uint32_t i; + + static const char * const state[] = { + "ACTIVE", + "TIMEOUT", + "AGGREGATION", + "SYNCHRONIZATION", + "COLLECTING", + "DISTRIBUTING", + "DEFAULTED", + "EXPIRED" + }; + static const char * const selection[] = { + "UNSELECTED", + "STANDBY", + "SELECTED" + }; + + for (i = 0; i < RTE_DIM(state); i++) { + if ((info->actor_state >> i) & 1) + a_len += snprintf(&a_state[a_len], + RTE_DIM(a_state) - a_len, "%s ", + state[i]); + + if ((info->partner_state >> i) & 1) + p_len += snprintf(&p_state[p_len], + RTE_DIM(p_state) - p_len, "%s ", + state[i]); + } + fprintf(f, "\tAggregator port id: %u\n", info->agg_port_id); + fprintf(f, "\tselection: %s\n", selection[info->selected]); + fprintf(f, "\tActor detail info:\n"); + dump_lacp_port_param(&info->actor, f); + fprintf(f, "\t\tport state: %s\n", a_state); + fprintf(f, "\tPartner detail info:\n"); + dump_lacp_port_param(&info->partner, f); + fprintf(f, "\t\tport state: %s\n", p_state); + fprintf(f, "\n"); +} + +static void +dump_lacp(uint16_t port_id, FILE *f) +{ + struct rte_eth_bond_8023ad_slave_info slave_info; + struct rte_eth_bond_8023ad_conf port_conf; + uint16_t slaves[RTE_MAX_ETHPORTS]; + int num_active_slaves; + int i, ret; + + fprintf(f, " - Lacp info:\n"); + + num_active_slaves = rte_eth_bond_active_slaves_get(port_id, slaves, + RTE_MAX_ETHPORTS); + if (num_active_slaves < 0) { + fprintf(f, "\tFailed to get active slave list for port %u\n", + port_id); + return; + } + + fprintf(f, "\tIEEE802.3 port: %u\n", port_id); + ret = rte_eth_bond_8023ad_conf_get(port_id, &port_conf); + if (ret) { + fprintf(f, "\tGet bonded device %u 8023ad config failed\n", + port_id); + return; + } + dump_lacp_conf(&port_conf, f); + + for (i = 0; i < num_active_slaves; i++) { + ret = rte_eth_bond_8023ad_slave_info(port_id, slaves[i], + &slave_info); + if (ret) { + fprintf(f, "\tGet slave device %u 8023ad info failed\n", + slaves[i]); + return; + } + fprintf(f, "\tSlave Port: %u\n", slaves[i]); + dump_lacp_slave(&slave_info, f); + } +} + +static int +bond_ethdev_priv_dump(struct rte_eth_dev *dev, FILE *f) +{ + const struct bond_dev_private *internals = dev->data->dev_private; + + dump_basic(dev, f); + if (internals->mode == BONDING_MODE_8023AD) + dump_lacp(dev->data->port_id, f); return 0; }