From patchwork Tue Oct 12 02:54:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Wang X-Patchwork-Id: 101137 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 F13E2A034F; Tue, 12 Oct 2021 04:54:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B453410F2; Tue, 12 Oct 2021 04:54:30 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id AEAB7410EA for ; Tue, 12 Oct 2021 04:54:28 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10134"; a="224441829" X-IronPort-AV: E=Sophos;i="5.85,366,1624345200"; d="scan'208";a="224441829" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2021 19:54:27 -0700 X-IronPort-AV: E=Sophos;i="5.85,366,1624345200"; d="scan'208";a="480118358" Received: from dpdk.cd.intel.com ([10.240.178.133]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2021 19:54:25 -0700 From: Jie Wang To: dev@dpdk.org Cc: ferruh.yigit@intel.com, thomas@monjalon.net, andrew.rybchenko@oktetlabs.ru, xiaoyun.li@intel.com, stevex.yang@intel.com, Jie Wang Date: Tue, 12 Oct 2021 10:54:16 +0800 Message-Id: <20211012025417.134866-2-jie1x.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211012025417.134866-1-jie1x.wang@intel.com> References: <20211011180111.99281-1-jie1x.wang@intel.com> <20211012025417.134866-1-jie1x.wang@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v12 1/2] ethdev: add an API to get device configuration 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 Sender: "dev" The driver may change offloads info into dev->data->dev_conf in dev_configure which may cause apps use outdated values. Add a new API to get actual device configuration. Signed-off-by: Jie Wang Acked-by: Andrew Rybchenko --- doc/guides/rel_notes/release_21_11.rst | 4 ++++ lib/ethdev/rte_ethdev.c | 20 ++++++++++++++++++++ lib/ethdev/rte_ethdev.h | 20 ++++++++++++++++++++ lib/ethdev/version.map | 3 +++ 4 files changed, 47 insertions(+) diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst index 93082723cf..c02c5ddf6e 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -67,6 +67,10 @@ New Features Added macros ETH_RSS_IPV4_CHKSUM and ETH_RSS_L4_CHKSUM, now IPv4 and TCP/UDP/SCTP header checksum field can be used as input set for RSS. +* **Added support for users get device configuration in ethdev.** + + Added an ethdev API which can help users get device configuration. + * **Updated Broadcom bnxt PMD.** * Added flow offload support for Thor. diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 028907bc4b..be3ceb8131 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -3437,6 +3437,26 @@ rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info) return 0; } +int +rte_eth_dev_conf_get(uint16_t port_id, struct rte_eth_conf *dev_conf) +{ + struct rte_eth_dev *dev; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + if (dev_conf == NULL) { + RTE_ETHDEV_LOG(ERR, + "Cannot get ethdev port %u configuration to NULL\n", + port_id); + return -EINVAL; + } + + memcpy(dev_conf, &dev->data->dev_conf, sizeof(struct rte_eth_conf)); + + return 0; +} + int rte_eth_dev_get_supported_ptypes(uint16_t port_id, uint32_t ptype_mask, uint32_t *ptypes, int num) diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 6d80514ba7..7b5d5fb379 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -3052,6 +3052,26 @@ int rte_eth_macaddr_get(uint16_t port_id, struct rte_ether_addr *mac_addr); */ int rte_eth_dev_info_get(uint16_t port_id, struct rte_eth_dev_info *dev_info); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Retrieve the configuration of an Ethernet device. + * + * @param port_id + * The port identifier of the Ethernet device. + * @param dev_conf + * A pointer to a structure to be filled with the configuration of + * the Ethernet device. + * Location for Ethernet device configuration to be filled in. + * @return + * - (0) if successful. + * - (-ENODEV) if *port_id* invalid. + * - (-EINVAL) if bad parameter. + */ +__rte_experimental +int rte_eth_dev_conf_get(uint16_t port_id, struct rte_eth_conf *dev_conf); + /** * Retrieve the firmware version of a device. * diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index efd729c0f2..c516837723 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -245,6 +245,9 @@ EXPERIMENTAL { rte_mtr_meter_policy_delete; rte_mtr_meter_policy_update; rte_mtr_meter_policy_validate; + + # added in 21.11 + rte_eth_dev_conf_get; }; INTERNAL { From patchwork Tue Oct 12 02:54:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jie Wang X-Patchwork-Id: 101138 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 84242A034F; Tue, 12 Oct 2021 04:54:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EC18A41130; Tue, 12 Oct 2021 04:54:32 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 6D16F4111D for ; Tue, 12 Oct 2021 04:54:31 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10134"; a="224441858" X-IronPort-AV: E=Sophos;i="5.85,366,1624345200"; d="scan'208";a="224441858" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2021 19:54:30 -0700 X-IronPort-AV: E=Sophos;i="5.85,366,1624345200"; d="scan'208";a="480118370" Received: from dpdk.cd.intel.com ([10.240.178.133]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Oct 2021 19:54:28 -0700 From: Jie Wang To: dev@dpdk.org Cc: ferruh.yigit@intel.com, thomas@monjalon.net, andrew.rybchenko@oktetlabs.ru, xiaoyun.li@intel.com, stevex.yang@intel.com, Jie Wang Date: Tue, 12 Oct 2021 10:54:17 +0800 Message-Id: <20211012025417.134866-3-jie1x.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211012025417.134866-1-jie1x.wang@intel.com> References: <20211011180111.99281-1-jie1x.wang@intel.com> <20211012025417.134866-1-jie1x.wang@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v12 2/2] app/testpmd: fix testpmd doesn't show RSS hash offload 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 Sender: "dev" The driver may change offloads info into dev->data->dev_conf in dev_configure which may cause port->dev_conf and port->rx_conf contain outdated values. This patch updates the offloads info if it changes to fix this issue. Fixes: ce8d561418d4 ("app/testpmd: add port configuration settings") Signed-off-by: Jie Wang --- app/test-pmd/cmdline.c | 14 ++++++++++++-- app/test-pmd/testpmd.c | 33 +++++++++++++++++++++++++++++++++ app/test-pmd/testpmd.h | 2 ++ app/test-pmd/util.c | 14 ++++++++++++++ 4 files changed, 61 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 826256b0b3..514a2d6f35 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -15717,6 +15717,7 @@ cmd_rx_offload_get_configuration_parsed( struct rte_eth_dev_info dev_info; portid_t port_id = res->port_id; struct rte_port *port = &ports[port_id]; + struct rte_eth_conf dev_conf; uint64_t port_offloads; uint64_t queue_offloads; uint16_t nb_rx_queues; @@ -15725,7 +15726,11 @@ cmd_rx_offload_get_configuration_parsed( printf("Rx Offloading Configuration of port %d :\n", port_id); - port_offloads = port->dev_conf.rxmode.offloads; + ret = eth_dev_conf_get_print_err(port_id, &dev_conf); + if (ret != 0) + return; + + port_offloads = dev_conf.rxmode.offloads; printf(" Port :"); print_rx_offloads(port_offloads); printf("\n"); @@ -16131,6 +16136,7 @@ cmd_tx_offload_get_configuration_parsed( struct rte_eth_dev_info dev_info; portid_t port_id = res->port_id; struct rte_port *port = &ports[port_id]; + struct rte_eth_conf dev_conf; uint64_t port_offloads; uint64_t queue_offloads; uint16_t nb_tx_queues; @@ -16139,7 +16145,11 @@ cmd_tx_offload_get_configuration_parsed( printf("Tx Offloading Configuration of port %d :\n", port_id); - port_offloads = port->dev_conf.txmode.offloads; + ret = eth_dev_conf_get_print_err(port_id, &dev_conf); + if (ret != 0) + return; + + port_offloads = dev_conf.txmode.offloads; printf(" Port :"); print_tx_offloads(port_offloads); printf("\n"); diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 97ae52e17e..d7f463df51 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2531,6 +2531,9 @@ start_port(portid_t pid) } if (port->need_reconfig > 0) { + struct rte_eth_conf dev_conf; + int k; + port->need_reconfig = 0; if (flow_isolate_all) { @@ -2568,6 +2571,36 @@ start_port(portid_t pid) port->need_reconfig = 1; return -1; } + /* get device configuration*/ + if (0 != + eth_dev_conf_get_print_err(pi, &dev_conf)) { + fprintf(stderr, + "port %d can not get device configuration\n", + pi); + return -1; + } + /* Apply Rx offloads configuration */ + if (dev_conf.rxmode.offloads != + port->dev_conf.rxmode.offloads) { + port->dev_conf.rxmode.offloads |= + dev_conf.rxmode.offloads; + for (k = 0; + k < port->dev_info.max_rx_queues; + k++) + port->rx_conf[k].offloads |= + dev_conf.rxmode.offloads; + } + /* Apply Tx offloads configuration */ + if (dev_conf.txmode.offloads != + port->dev_conf.txmode.offloads) { + port->dev_conf.txmode.offloads |= + dev_conf.txmode.offloads; + for (k = 0; + k < port->dev_info.max_tx_queues; + k++) + port->tx_conf[k].offloads |= + dev_conf.txmode.offloads; + } } if (port->need_reconfig_queues > 0 && is_proc_primary()) { port->need_reconfig_queues = 0; diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 5863b2f43f..45a79f9085 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -960,6 +960,8 @@ void show_gro(portid_t port_id); void setup_gso(const char *mode, portid_t port_id); int eth_dev_info_get_print_err(uint16_t port_id, struct rte_eth_dev_info *dev_info); +int eth_dev_conf_get_print_err(uint16_t port_id, + struct rte_eth_conf *dev_conf); void eth_set_promisc_mode(uint16_t port_id, int enable); void eth_set_allmulticast_mode(uint16_t port, int enable); int eth_link_get_nowait_print_err(uint16_t port_id, struct rte_eth_link *link); diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c index 14a9a251fb..55c07e1b82 100644 --- a/app/test-pmd/util.c +++ b/app/test-pmd/util.c @@ -444,6 +444,20 @@ eth_dev_info_get_print_err(uint16_t port_id, return ret; } +int +eth_dev_conf_get_print_err(uint16_t port_id, struct rte_eth_conf *dev_conf) +{ + int ret; + + ret = rte_eth_dev_conf_get(port_id, dev_conf); + if (ret != 0) + fprintf(stderr, + "Error during getting device configuration (port %u): %s\n", + port_id, strerror(-ret)); + + return ret; +} + void eth_set_promisc_mode(uint16_t port, int enable) {