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 A13AEA0547 for ; Sun, 26 Sep 2021 11:21:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BDF72410F4; Sun, 26 Sep 2021 11:21:55 +0200 (CEST) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mails.dpdk.org (Postfix) with ESMTP id B88DE4003C; Sun, 26 Sep 2021 11:21:52 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10118"; a="224360710" X-IronPort-AV: E=Sophos;i="5.85,323,1624345200"; d="scan'208";a="224360710" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2021 02:21:52 -0700 X-IronPort-AV: E=Sophos;i="5.85,323,1624345200"; d="scan'208";a="560509668" Received: from dpdk.cd.intel.com ([10.240.178.133]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Sep 2021 02:21:49 -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 , stable@dpdk.org Date: Sun, 26 Sep 2021 17:20:55 +0800 Message-Id: <20210926092055.495322-4-jie1x.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210926092055.495322-1-jie1x.wang@intel.com> References: <20210827081740.365037-1-jie1x.wang@intel.com> <20210926092055.495322-1-jie1x.wang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH v9 3/3] app/testpmd: fix testpmd doesn't show RSS hash offload X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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") Cc: stable@dpdk.org Signed-off-by: Jie Wang --- app/test-pmd/cmdline.c | 14 ++++++++++++-- app/test-pmd/testpmd.c | 34 ++++++++++++++++++++++++++++++++++ app/test-pmd/testpmd.h | 2 ++ app/test-pmd/util.c | 15 +++++++++++++++ 4 files changed, 63 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index a9efd027c3..3ef8f99358 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -15997,6 +15997,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_info; uint64_t port_offloads; uint64_t queue_offloads; uint16_t nb_rx_queues; @@ -16005,7 +16006,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_info_get_print_err(port_id, &dev_conf_info); + if (ret != 0) + return; + + port_offloads = dev_conf_info.rxmode.offloads; printf(" Port :"); print_rx_offloads(port_offloads); printf("\n"); @@ -16411,6 +16416,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_info; uint64_t port_offloads; uint64_t queue_offloads; uint16_t nb_tx_queues; @@ -16419,7 +16425,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_info_get_print_err(port_id, &dev_conf_info); + if (ret != 0) + return; + + port_offloads = dev_conf_info.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..56e6e80739 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_info; + int k; + port->need_reconfig = 0; if (flow_isolate_all) { @@ -2568,6 +2571,37 @@ start_port(portid_t pid) port->need_reconfig = 1; return -1; } + /* get rte_eth_conf info */ + if (0 != + eth_dev_conf_info_get_print_err(pi, + &dev_conf_info)) { + fprintf(stderr, + "port %d can not get device configuration info\n", + pi); + return -1; + } + /* Apply Rx offloads configuration */ + if (dev_conf_info.rxmode.offloads != + port->dev_conf.rxmode.offloads) { + port->dev_conf.rxmode.offloads |= + dev_conf_info.rxmode.offloads; + for (k = 0; + k < port->dev_info.max_rx_queues; + k++) + port->rx_conf[k].offloads |= + dev_conf_info.rxmode.offloads; + } + /* Apply Tx offloads configuration */ + if (dev_conf_info.txmode.offloads != + port->dev_conf.txmode.offloads) { + port->dev_conf.txmode.offloads |= + dev_conf_info.txmode.offloads; + for (k = 0; + k < port->dev_info.max_tx_queues; + k++) + port->tx_conf[k].offloads |= + dev_conf_info.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..48dad40986 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_info_get_print_err(uint16_t port_id, + struct rte_eth_conf *dev_conf_info); 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..f04786c50f 100644 --- a/app/test-pmd/util.c +++ b/app/test-pmd/util.c @@ -444,6 +444,21 @@ eth_dev_info_get_print_err(uint16_t port_id, return ret; } +int +eth_dev_conf_info_get_print_err(uint16_t port_id, + struct rte_eth_conf *dev_conf_info) +{ + int ret; + + ret = rte_eth_dev_conf_info_get(port_id, dev_conf_info); + if (ret != 0) + fprintf(stderr, + "Error during getting device configuration (port %u) info: %s\n", + port_id, strerror(-ret)); + + return ret; +} + void eth_set_promisc_mode(uint16_t port, int enable) { -- 2.25.1