From patchwork Fri Mar 22 22:25:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damodharam Ammepalli X-Patchwork-Id: 138752 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 7BA7A43D26; Fri, 22 Mar 2024 23:26:53 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 68A1B42EFE; Fri, 22 Mar 2024 23:26:49 +0100 (CET) Received: from mail-vk1-f170.google.com (mail-vk1-f170.google.com [209.85.221.170]) by mails.dpdk.org (Postfix) with ESMTP id 0DB5D42EF5 for ; Fri, 22 Mar 2024 23:26:48 +0100 (CET) Received: by mail-vk1-f170.google.com with SMTP id 71dfb90a1353d-4d43d602cd6so925506e0c.0 for ; Fri, 22 Mar 2024 15:26:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1711146407; x=1711751207; darn=dpdk.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=qU6VSBcQxsvb8VTBqiW2OEKqYfFv4b/qxg2pVtnEqvs=; b=fVvh6Tvc3aZeccfGVmKy6yfo0FAqjp1pnem7PqZdGBnioW3No9Cv1ypcztX6Jpiq07 VP7FNH68m8kqr22ODTK7YbtNKiogK+3kNmMzItsplLFst84naud5aWv7gp+FaxhQNN6M BpjlJtkwnvkJVTDeaWj9cgpV2JZMOmmehBFgs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711146407; x=1711751207; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qU6VSBcQxsvb8VTBqiW2OEKqYfFv4b/qxg2pVtnEqvs=; b=CedSpR4bzhAodKUOBjIAjEwOoS/erK3M9GbeaJZnk8056Wc2NVT0vAmuXaJ6E2y8kk bdV3GWpQLO1b6rNf3MT9/Vo64OmKyU9nFxrcNd1B2FEyM6UKcduEGja6imNvey+ptxQq gnxgLL3UhPYFrybL41aPWDFWUAAqzc9Y5xS85uaZI2R2JAJSuG6GP8ly7dIDdpgANapC rUKvjpS2p+BEBQ86GjXLO+jGCc8yRhwuUS8YRd5oU1hn2j1Nqe3ypGmSStjC/nRS6vxi ElD1PRuNDdUdtArU8dWPQliDkxlNWbl0YlSNVTAW56J9atl1M3baqc7pnkc75Z8iMDzQ 3jMQ== X-Gm-Message-State: AOJu0YwmfOcxMIvuvw1T0zCHbBZvlasegsAUtesWrIxeA6bWB1fDmlbA jUNB34w4x+qnXiksIes61KtRJVe6ESu9PI1j+M8BeVq+sQUZ0rMZrNEFAgX+ODmED69XVZEJE7D 9SviigqR/97dLkrnhKgfSgOKTfMC2K89xIFZrc9UBqpI45p/kQdBDfzWtywmQeyvycFVF8H0e2m U6pxTBey9/UlUvaFHcl5UJCVQmD8p6Uz4pIG6y6w== X-Google-Smtp-Source: AGHT+IHCDlYIX8+ZAPoLOrKPmJPSnRB9778ySe2i6BJCE/uxbj500mEBUOlqmcxA9Ruo1ihfuiJUBg== X-Received: by 2002:a05:6122:3809:b0:4d4:1551:6ef6 with SMTP id em9-20020a056122380900b004d415516ef6mr1149920vkb.2.1711146406749; Fri, 22 Mar 2024 15:26:46 -0700 (PDT) Received: from dhcp-10-193-55-224.dhcp.broadcom.net ([192.19.224.250]) by smtp.gmail.com with ESMTPSA id mx17-20020a0562142e1100b0069679a663e6sm57003qvb.21.2024.03.22.15.26.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 15:26:45 -0700 (PDT) From: Damodharam Ammepalli To: dev@dpdk.org Cc: Kalesh AP , Ajit Khaparde Subject: [RFC 1/2] lib/ethdev: Add link_speed lanes support into rte lib Date: Fri, 22 Mar 2024 15:25:42 -0700 Message-Id: <20240322222543.23548-2-damodharam.ammepalli@broadcom.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240322222543.23548-1-damodharam.ammepalli@broadcom.com> References: <20240322222543.23548-1-damodharam.ammepalli@broadcom.com> MIME-Version: 1.0 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 Update the eth_dev_ops structure with new function vectors to get and set number of speed lanes. This will help user to configure the same fixed speed with different number of lanes based on the physical carrier type. Signed-off-by: Damodharam Ammepalli Reviewed-by: Kalesh AP Reviewed-by: Ajit Khaparde --- lib/ethdev/ethdev_driver.h | 49 +++++++++++++++++++++++++++++++++++ lib/ethdev/rte_ethdev.c | 26 +++++++++++++++++++ lib/ethdev/rte_ethdev.h | 52 ++++++++++++++++++++++++++++++++++++++ lib/ethdev/version.map | 2 ++ 4 files changed, 129 insertions(+) diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h index 0dbf2dd6a2..b1f473e4de 100644 --- a/lib/ethdev/ethdev_driver.h +++ b/lib/ethdev/ethdev_driver.h @@ -1179,6 +1179,51 @@ typedef int (*eth_rx_descriptor_dump_t)(const struct rte_eth_dev *dev, uint16_t queue_id, uint16_t offset, uint16_t num, FILE *file); +/** + * @internal + * Get number of current active lanes and max supported lanes + * + * @param dev + * ethdev handle of port. + * @param speed_lanes_capa + * Number of active lanes that the link is trained up. + * Max number of lanes supported by HW + * @return + * Negative errno value on error, 0 on success. + * + * @retval 0 + * Success, get speed_lanes data success. + * @retval -ENOTSUP + * Operation is not supported. + * @retval -EIO + * Device is removed. + */ +typedef int (*eth_speed_lanes_get_t)(struct rte_eth_dev *dev, + struct rte_eth_speed_lanes_capa *speed_lanes_capa); + +/** + * @internal + * Set speed lanes + * + * @param dev + * ethdev handle of port. + * @param speed_lanes_capa + * Non-negative number of lanes + * + * @return + * Negative errno value on error, 0 on success. + * + * @retval 0 + * Success, set lanes success. + * @retval -ENOTSUP + * Operation is not supported. + * @retval -EINVAL + * Unsupported mode requested. + * @retval -EIO + * Device is removed. + */ +typedef int (*eth_speed_lanes_set_t)(struct rte_eth_dev *dev, uint32_t speed_lanes_capa); + /** * @internal * Dump Tx descriptor info to a file. @@ -1474,6 +1519,10 @@ struct eth_dev_ops { eth_count_aggr_ports_t count_aggr_ports; /** Map a Tx queue with an aggregated port of the DPDK port */ eth_map_aggr_tx_affinity_t map_aggr_tx_affinity; + /** Get number of speed lanes supported and active lanes */ + eth_speed_lanes_get_t speed_lanes_get; + /** Set number of speed lanes */ + eth_speed_lanes_set_t speed_lanes_set; }; /** diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index f1c658f49e..45e2f7645b 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -7008,4 +7008,30 @@ int rte_eth_dev_map_aggr_tx_affinity(uint16_t port_id, uint16_t tx_queue_id, return ret; } +int +rte_eth_speed_lanes_get(uint16_t port_id, struct rte_eth_speed_lanes_capa *capa) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + if (*dev->dev_ops->speed_lanes_get == NULL) + return -ENOTSUP; + return eth_err(port_id, (*dev->dev_ops->speed_lanes_get)(dev, capa)); +} + +int +rte_eth_speed_lanes_set(uint16_t port_id, uint32_t speed_lanes_capa) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + if (*dev->dev_ops->speed_lanes_set == NULL) + return -ENOTSUP; + return eth_err(port_id, (*dev->dev_ops->speed_lanes_set)(dev, speed_lanes_capa)); +} + RTE_LOG_REGISTER_DEFAULT(rte_eth_dev_logtype, INFO); diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 147257d6a2..caae1f27c6 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -1997,6 +1997,12 @@ struct rte_eth_fec_capa { uint32_t capa; /**< FEC capabilities bitmask */ }; +/* A structure used to get and set lanes capabilities per link speed */ +struct rte_eth_speed_lanes_capa { + uint32_t active_lanes; + uint32_t max_lanes_cap; +}; + #define RTE_ETH_ALL RTE_MAX_ETHPORTS /* Macros to check for valid port */ @@ -6917,6 +6923,52 @@ rte_eth_tx_queue_count(uint16_t port_id, uint16_t queue_id) return rc; } +/** + * @warning + * @b EXPERIMENTAL: this API may change, or be removed, without prior notice + * + * Get maximum speed lanes supported by the NIC. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param speed_lanes_capa + * speed_lanes_capa is out only with max speed lanes capabilities. + * If set to NULL, then its assumed zero or not supported. + * + * @return + * - A non-negative value of active lanes that currently link is up with. + * - A non-negative value that this HW scales up to for all speeds. + * - (-ENOTSUP) if underlying hardware OR driver doesn't support. + * that operation. + * - (-EIO) if device is removed. + * - (-ENODEV) if *port_id* invalid. + * - (-EINVAL) if *speed_lanes_capa* invalid + */ +__rte_experimental +int rte_eth_speed_lanes_get(uint16_t port_id, struct rte_eth_speed_lanes_capa *capa); + +/** + * @warning + * @b EXPERIMENTAL: this API may change, or be removed, without prior notice + * + * Set speed lanes supported by the NIC. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param speed_lanes + * speed_lanes a non-zero value of number lanes for this speeds. + * + * @return + * - (>=0) valid input and supported by driver or hardware. + * - (-ENOTSUP) if underlying hardware OR driver doesn't support. + * that operation. + * - (-EIO) if device is removed. + * - (-ENODEV) if *port_id* invalid. + * - (-EINVAL) if *speed_lanes* invalid + */ +__rte_experimental +int rte_eth_speed_lanes_set(uint16_t port_id, uint32_t speed_lanes_capa); + #ifdef __cplusplus } #endif diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index 79f6f5293b..9c27980f3a 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -325,6 +325,8 @@ EXPERIMENTAL { rte_flow_template_table_resizable; rte_flow_template_table_resize; rte_flow_template_table_resize_complete; + rte_eth_speed_lanes_get; + rte_eth_speed_lanes_set; }; INTERNAL { From patchwork Fri Mar 22 22:25:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damodharam Ammepalli X-Patchwork-Id: 138753 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 790BB43D26; Fri, 22 Mar 2024 23:27:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1528842F1B; Fri, 22 Mar 2024 23:26:51 +0100 (CET) Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by mails.dpdk.org (Postfix) with ESMTP id AF97A42F03 for ; Fri, 22 Mar 2024 23:26:49 +0100 (CET) Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-696499bd61eso25800696d6.0 for ; Fri, 22 Mar 2024 15:26:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1711146408; x=1711751208; darn=dpdk.org; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=/ebsP1NAs8JOBSmY1qKb0o6BSCoUT1T61xbcHESCjlU=; b=LGVX+iPRgYJ/JTzJR2hBgNoOJj45tCFxvV/FEsPHJ/oRpPxBYrOlEi8nXihOXSdPpY 8QUc1u7XG3UsAehpn3Vq+cejcQSBf6y6LAZtypzP0Kl3MZjjn6qgOyqn2fZnJyXi+p8o aE5t2cu6wHA1TWkiUlo5/dTyHMEHH00zKF/g4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711146408; x=1711751208; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=/ebsP1NAs8JOBSmY1qKb0o6BSCoUT1T61xbcHESCjlU=; b=QM5P7dpY8kTyTiBpNYsfc3hZD+zO7auVJG3z5Qew46zBmQJhqKcNn+ORRKL3mP613V hCV/Ex9B9s9MnZEo5Mz3NBqtpj2z6GBig6B+HSNQ2EwCZSimuUPo1+XWSS0H5pC4D3Xl pxFl2y5fFvNl0OXcyi/ZfBhjVBb+UHTgvpDVUqYHFwCXZOxgrAfqfbWFgy9JFvUo9ZY9 7w31TSm+lkCHqEN+LseJRbusGsuSAvfE+DJG5IZphlujJE5Mz2ga4poV82WkSZLCc9mo yA/MCEqdnVTVtlfvsY9zOohAcuEogvP2JH+8tvxQ5SoLKsK+fg+c63243rg953Jwb9J1 j3rQ== X-Gm-Message-State: AOJu0YxNymUBVp6W4acZ/DiiuSa+CWiOqVnW/5mOZEyAbhjWyWO7O9id 67MCKkM1jaVk2GuVz7eVeo6lMsxtktoPKmFL4spL7H8evpen7ArvSVmTbrjNC4wx2VsAumO9gUm eHanf0+Br4pIfnXC8syNYX0OroktzFrIZf53xEOJDmLWMN1okwd2M4JjXcmAdu79w8BVjsCuwRV bRigsvz4oR1xMqeKOXts/wOu2b1OT4Czo9Ug57/w== X-Google-Smtp-Source: AGHT+IGLZ8tuse2M85B60vzgEnMqpxjSu0iHOm03ddNrc+0jLRzsttO4BmPoQhQlAbNJ1+QW8c0iXA== X-Received: by 2002:a05:6214:c8f:b0:690:b887:901a with SMTP id r15-20020a0562140c8f00b00690b887901amr883238qvr.48.1711146408104; Fri, 22 Mar 2024 15:26:48 -0700 (PDT) Received: from dhcp-10-193-55-224.dhcp.broadcom.net ([192.19.224.250]) by smtp.gmail.com with ESMTPSA id mx17-20020a0562142e1100b0069679a663e6sm57003qvb.21.2024.03.22.15.26.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 Mar 2024 15:26:47 -0700 (PDT) From: Damodharam Ammepalli To: dev@dpdk.org Cc: Kalesh AP , Ajit Khaparde Subject: [RFC 2/2] testpmd: Add speed lanes to testpmd config and show command Date: Fri, 22 Mar 2024 15:25:43 -0700 Message-Id: <20240322222543.23548-3-damodharam.ammepalli@broadcom.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20240322222543.23548-1-damodharam.ammepalli@broadcom.com> References: <20240322222543.23548-1-damodharam.ammepalli@broadcom.com> MIME-Version: 1.0 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 Add speed lanes configuration and display commands support to testpmd. Also provide display the lanes info show device info. testpmd> testpmd> port stop 0 testpmd> port config 0 speed_lanes 4 testpmd> port config 0 speed 200000 duplex full testpmd> port start 0 testpmd> show port summary 0 Number of available ports: 2 Port MAC Address Name Driver Status Link Lanes 0 14:23:F2:C3:BA:D2 0000:b1:00.0 net_bnxt up 200 Gbps 4 testpmd> testpmd> show port info 0 ********************* Infos for port 0 ********************* MAC address: 14:23:F2:C3:BA:D2 Device name: 0000:b1:00.0 Driver name: net_bnxt Firmware-version: 228.9.115.0 Connect to socket: 2 memory allocation on the socket: 2 Link status: up Link speed: 200 Gbps Lanes: 4 Link duplex: full-duplex Autoneg status: Off Signed-off-by: Damodharam Ammepalli Reviewed-by: Kalesh AP Reviewed-by: Ajit Khaparde --- app/test-pmd/cmdline.c | 142 +++++++++++++++++++++++++++++++++++++++++ app/test-pmd/config.c | 13 ++-- 2 files changed, 151 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index b7759e38a8..785e5dd4de 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -1361,6 +1361,27 @@ struct cmd_config_speed_all { cmdline_fixed_string_t value2; }; +static int +cmd_validate_lanes(portid_t pid, uint32_t *lanes) +{ + struct rte_eth_speed_lanes_capa spd_lanes = {0}; + int ret; + + ret = rte_eth_speed_lanes_get(pid, &spd_lanes); + /* if not supported default lanes to 0 */ + if (ret == -ENOTSUP) { + *lanes = 0; + return 0; + } + + if (*lanes > spd_lanes.max_lanes_cap) { + fprintf(stderr, "Invalid lanes %d configuration\n", *lanes); + return -1; + } + + return 0; +} + static int parse_and_check_speed_duplex(char *speedstr, char *duplexstr, uint32_t *speed) { @@ -1676,6 +1697,125 @@ static cmdline_parse_inst_t cmd_config_loopback_specific = { }, }; +/* *** configure speed_lanes for all ports *** */ +struct cmd_config_speed_lanes_all { + cmdline_fixed_string_t port; + cmdline_fixed_string_t keyword; + cmdline_fixed_string_t all; + cmdline_fixed_string_t item; + uint32_t lanes; +}; + +static void +cmd_config_speed_lanes_all_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_config_speed_lanes_all *res = parsed_result; + portid_t pid; + + if (!all_ports_stopped()) { + fprintf(stderr, "Please stop all ports first\n"); + return; + } + + RTE_ETH_FOREACH_DEV(pid) { + if (cmd_validate_lanes(pid, &res->lanes)) + return; + rte_eth_speed_lanes_set(pid, res->lanes); + } + + cmd_reconfig_device_queue(RTE_PORT_ALL, 1, 1); +} + +static cmdline_parse_token_string_t cmd_config_speed_lanes_all_port = + TOKEN_STRING_INITIALIZER(struct cmd_config_speed_lanes_all, port, "port"); +static cmdline_parse_token_string_t cmd_config_speed_lanes_all_keyword = + TOKEN_STRING_INITIALIZER(struct cmd_config_speed_lanes_all, keyword, + "config"); +static cmdline_parse_token_string_t cmd_config_speed_lanes_all_all = + TOKEN_STRING_INITIALIZER(struct cmd_config_speed_lanes_all, all, "all"); +static cmdline_parse_token_string_t cmd_config_speed_lanes_all_item = + TOKEN_STRING_INITIALIZER(struct cmd_config_speed_lanes_all, item, + "speed_lanes"); +static cmdline_parse_token_num_t cmd_config_speed_lanes_all_lanes = + TOKEN_NUM_INITIALIZER(struct cmd_config_speed_lanes_all, lanes, RTE_UINT32); + +static cmdline_parse_inst_t cmd_config_speed_lanes_all = { + .f = cmd_config_speed_lanes_all_parsed, + .data = NULL, + .help_str = "port config all speed_lanes ", + .tokens = { + (void *)&cmd_config_speed_lanes_all_port, + (void *)&cmd_config_speed_lanes_all_keyword, + (void *)&cmd_config_speed_lanes_all_all, + (void *)&cmd_config_speed_lanes_all_item, + (void *)&cmd_config_speed_lanes_all_lanes, + NULL, + }, +}; + +/* *** configure speed_lanes for specific port *** */ +struct cmd_config_speed_lanes_specific { + cmdline_fixed_string_t port; + cmdline_fixed_string_t keyword; + uint16_t port_id; + cmdline_fixed_string_t item; + uint32_t lanes; +}; + +static void +cmd_config_speed_lanes_specific_parsed(void *parsed_result, + __rte_unused struct cmdline *cl, + __rte_unused void *data) +{ + struct cmd_config_speed_lanes_specific *res = parsed_result; + + if (port_id_is_invalid(res->port_id, ENABLED_WARN)) + return; + + if (!port_is_stopped(res->port_id)) { + fprintf(stderr, "Please stop port %u first\n", res->port_id); + return; + } + + if (cmd_validate_lanes(res->port_id, &res->lanes)) + return; + rte_eth_speed_lanes_set(res->port_id, res->lanes); + + cmd_reconfig_device_queue(res->port_id, 1, 1); +} + +static cmdline_parse_token_string_t cmd_config_speed_lanes_specific_port = + TOKEN_STRING_INITIALIZER(struct cmd_config_speed_lanes_specific, port, + "port"); +static cmdline_parse_token_string_t cmd_config_speed_lanes_specific_keyword = + TOKEN_STRING_INITIALIZER(struct cmd_config_speed_lanes_specific, keyword, + "config"); +static cmdline_parse_token_num_t cmd_config_speed_lanes_specific_id = + TOKEN_NUM_INITIALIZER(struct cmd_config_speed_lanes_specific, port_id, + RTE_UINT16); +static cmdline_parse_token_string_t cmd_config_speed_lanes_specific_item = + TOKEN_STRING_INITIALIZER(struct cmd_config_speed_lanes_specific, item, + "speed_lanes"); +static cmdline_parse_token_num_t cmd_config_speed_lanes_specific_lanes = + TOKEN_NUM_INITIALIZER(struct cmd_config_speed_lanes_specific, lanes, + RTE_UINT32); + +static cmdline_parse_inst_t cmd_config_speed_lanes_specific = { + .f = cmd_config_speed_lanes_specific_parsed, + .data = NULL, + .help_str = "port config speed_lanes ", + .tokens = { + (void *)&cmd_config_speed_lanes_specific_port, + (void *)&cmd_config_speed_lanes_specific_keyword, + (void *)&cmd_config_speed_lanes_specific_id, + (void *)&cmd_config_speed_lanes_specific_item, + (void *)&cmd_config_speed_lanes_specific_lanes, + NULL, + }, +}; + /* *** configure txq/rxq, txd/rxd *** */ struct cmd_config_rx_tx { cmdline_fixed_string_t port; @@ -13381,6 +13521,8 @@ static cmdline_parse_ctx_t builtin_ctx[] = { (cmdline_parse_inst_t *)&cmd_show_port_cman_config, (cmdline_parse_inst_t *)&cmd_set_port_cman_config, (cmdline_parse_inst_t *)&cmd_config_tx_affinity_map, + (cmdline_parse_inst_t *)&cmd_config_speed_lanes_all, + (cmdline_parse_inst_t *)&cmd_config_speed_lanes_specific, NULL, }; diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index ba1007ace6..9f846c5e84 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -779,6 +779,7 @@ port_infos_display(portid_t port_id) struct rte_ether_addr mac_addr; struct rte_eth_link link; struct rte_eth_dev_info dev_info; + struct rte_eth_speed_lanes_capa spd_lanes = {0}; int vlan_offload; struct rte_mempool * mp; static const char *info_border = "*********************"; @@ -828,6 +829,8 @@ port_infos_display(portid_t port_id) printf("\nLink status: %s\n", (link.link_status) ? ("up") : ("down")); printf("Link speed: %s\n", rte_eth_link_speed_to_str(link.link_speed)); + rte_eth_speed_lanes_get(port_id, &spd_lanes); + printf("Lanes: %d\n", spd_lanes.active_lanes); printf("Link duplex: %s\n", (link.link_duplex == RTE_ETH_LINK_FULL_DUPLEX) ? ("full-duplex") : ("half-duplex")); printf("Autoneg status: %s\n", (link.link_autoneg == RTE_ETH_LINK_AUTONEG) ? @@ -962,8 +965,8 @@ port_summary_header_display(void) port_number = rte_eth_dev_count_avail(); printf("Number of available ports: %i\n", port_number); - printf("%-4s %-17s %-12s %-14s %-8s %s\n", "Port", "MAC Address", "Name", - "Driver", "Status", "Link"); + printf("%-4s %-17s %-12s %-14s %-8s %-8s %s\n", "Port", "MAC Address", "Name", + "Driver", "Status", "Link", "Lanes"); } void @@ -972,6 +975,7 @@ port_summary_display(portid_t port_id) struct rte_ether_addr mac_addr; struct rte_eth_link link; struct rte_eth_dev_info dev_info; + struct rte_eth_speed_lanes_capa spd_lanes = {0}; char name[RTE_ETH_NAME_MAX_LEN]; int ret; @@ -993,10 +997,11 @@ port_summary_display(portid_t port_id) if (ret != 0) return; - printf("%-4d " RTE_ETHER_ADDR_PRT_FMT " %-12s %-14s %-8s %s\n", + rte_eth_speed_lanes_get(port_id, &spd_lanes); + printf("%-4d " RTE_ETHER_ADDR_PRT_FMT " %-12s %-14s %-8s %-8s %d\n", port_id, RTE_ETHER_ADDR_BYTES(&mac_addr), name, dev_info.driver_name, (link.link_status) ? ("up") : ("down"), - rte_eth_link_speed_to_str(link.link_speed)); + rte_eth_link_speed_to_str(link.link_speed), spd_lanes.active_lanes); } void