From patchwork Fri Jan 22 09:01:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Yang X-Patchwork-Id: 87054 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 9DFA7A0A0A; Fri, 22 Jan 2021 10:04:37 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 85A21140DD3; Fri, 22 Jan 2021 10:04:35 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 5A63D140DD2 for ; Fri, 22 Jan 2021 10:04:34 +0100 (CET) IronPort-SDR: hOIkLv9fPX25qscn6bMuO9RISkSxM8F5o3ODaBda7cfijEvqas/mSeiAfQdvyqsZmKx26c/jOq 6fYeJo5lsJgg== X-IronPort-AV: E=McAfee;i="6000,8403,9871"; a="240962310" X-IronPort-AV: E=Sophos;i="5.79,366,1602572400"; d="scan'208";a="240962310" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jan 2021 01:04:33 -0800 IronPort-SDR: EBfHt2HXkQKE/4A8eV7LfvB3ARxSkZBIRjiGxRy7O/KTYtSclfTmkpb9ofPFaq9jHHvtgNXUQp PQUStAG+mmpw== X-IronPort-AV: E=Sophos;i="5.79,366,1602572400"; d="scan'208";a="427910757" Received: from intel-npg-odc-srv01.cd.intel.com ([10.240.178.136]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jan 2021 01:04:31 -0800 From: Steve Yang To: dev@dpdk.org Cc: wenzhuo.lu@intel.com, xiaoyun.li@intel.com, bernard.iremonger@intel.com, thomas@monjalon.net, ferruh.yigit@intel.com, andrew.rybchenko@oktetlabs.ru, stevex.yang@intel.com, qiming.yang@intel.com Date: Fri, 22 Jan 2021 09:01:08 +0000 Message-Id: <20210122090110.50453-2-stevex.yang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210122090110.50453-1-stevex.yang@intel.com> References: <20201223085152.20866-1-stevex.yang@intel.com> <20210122090110.50453-1-stevex.yang@intel.com> Subject: [dpdk-dev] [PATCH v3 1/3] ethdev: fix MTU doesn't update when jumbo frame disabled 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 MTU value should be updated to 'max_rx_pkt_len - overhead' no matter if the JUMBO FRAME offload enabled. If not update this MTU, use will get the wrong MTU info via some command. E.g.: 'show port info all' in testpmd tool. Actually, the 'max_rx_pkt_len' has been used for other purposes in many places now, even though the 'max_rx_pkt_len' is expected 'Only used if JUMBO_FRAME enabled'. For examples, 'max_rx_pkt_len' perhaps can be used as the 'rx_ctx.rxmax' in i40e. Fixes: bf0f90d92d30 ("ethdev: fix max Rx packet length check") Signed-off-by: Steve Yang --- lib/librte_ethdev/rte_ethdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/librte_ethdev/rte_ethdev.c b/lib/librte_ethdev/rte_ethdev.c index daf5f24f7e..42857e3b67 100644 --- a/lib/librte_ethdev/rte_ethdev.c +++ b/lib/librte_ethdev/rte_ethdev.c @@ -1421,10 +1421,6 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, ret = -EINVAL; goto rollback; } - - /* Scale the MTU size to adapt max_rx_pkt_len */ - dev->data->mtu = dev->data->dev_conf.rxmode.max_rx_pkt_len - - overhead_len; } else { uint16_t pktlen = dev_conf->rxmode.max_rx_pkt_len; if (pktlen < RTE_ETHER_MIN_MTU + overhead_len || @@ -1434,6 +1430,10 @@ rte_eth_dev_configure(uint16_t port_id, uint16_t nb_rx_q, uint16_t nb_tx_q, RTE_ETHER_MTU + overhead_len; } + /* Scale the MTU size to adapt max_rx_pkt_len */ + dev->data->mtu = dev->data->dev_conf.rxmode.max_rx_pkt_len - + overhead_len; + /* * If LRO is enabled, check that the maximum aggregated packet * size is supported by the configured device. From patchwork Fri Jan 22 09:01:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Yang X-Patchwork-Id: 87055 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 72ADEA0A0A; Fri, 22 Jan 2021 10:04:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C2973140DDC; Fri, 22 Jan 2021 10:04:38 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 2EFCD140DDC for ; Fri, 22 Jan 2021 10:04:37 +0100 (CET) IronPort-SDR: sZNdFN36N1LEB0/NANz2bkg6jTudIOywmw0qB6Vo2L52HRS5vfxsboVoGDLWlHSNZMP4+pJ6h/ 5lHW2ZZssrqw== X-IronPort-AV: E=McAfee;i="6000,8403,9871"; a="240962315" X-IronPort-AV: E=Sophos;i="5.79,366,1602572400"; d="scan'208";a="240962315" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jan 2021 01:04:36 -0800 IronPort-SDR: 8FuI5ZtP+Xcov7eLv2IKulnPgms4OyBTK0aWt4Jv81c5sO9CLB0Noby2YiQvj4bmZ+dnG9keBK gIR3rkVK+Rdg== X-IronPort-AV: E=Sophos;i="5.79,366,1602572400"; d="scan'208";a="427910769" Received: from intel-npg-odc-srv01.cd.intel.com ([10.240.178.136]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jan 2021 01:04:34 -0800 From: Steve Yang To: dev@dpdk.org Cc: wenzhuo.lu@intel.com, xiaoyun.li@intel.com, bernard.iremonger@intel.com, thomas@monjalon.net, ferruh.yigit@intel.com, andrew.rybchenko@oktetlabs.ru, stevex.yang@intel.com, qiming.yang@intel.com Date: Fri, 22 Jan 2021 09:01:09 +0000 Message-Id: <20210122090110.50453-3-stevex.yang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210122090110.50453-1-stevex.yang@intel.com> References: <20201223085152.20866-1-stevex.yang@intel.com> <20210122090110.50453-1-stevex.yang@intel.com> Subject: [dpdk-dev] [PATCH v3 2/3] app/testpmd: fix max-pkt-len option invalid 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" Moved the setting of 'DEV_RX_OFFLOAD_JUMBO_FRAME' from 'cmd_config_max_pkt_len_parsed()' to 'init_config()' caused fail the case where 'max_rx_pkt_len' is changed from the command line via "port config all max-pkt-len". The 'init_config()' function is only called when testpmd is started, but the DEV_RX_OFFLOAD_JUMBO_FRAME setting needs to be recomputed whenever 'max_rx_pkt_len' changes. Define the 'update_jumbo_frame_offload()' function for both 'init_config()' and 'cmd_config_max_pkt_len_parsed()', and detect if 'max_rx_pkt_len' should be update to 1500 + overhead as default configuration. Fixes: 761c4d6690 ("app/testpmd: fix max Rx packet length for VLAN packets") Signed-off-by: Steve Yang --- app/test-pmd/cmdline.c | 1 + app/test-pmd/parameters.c | 1 + app/test-pmd/testpmd.c | 47 +++++++++++++++++++++++++-------------- app/test-pmd/testpmd.h | 2 ++ 4 files changed, 34 insertions(+), 17 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 89034c8b72..600e0f8943 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -1901,6 +1901,7 @@ cmd_config_max_pkt_len_parsed(void *parsed_result, printf("Unknown parameter\n"); return; } + update_jumbo_frame_offload(port, false); } init_port_config(); diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index df5eb10d84..1c63156ddd 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -833,6 +833,7 @@ launch_args_parse(int argc, char** argv) "total-num-mbufs should be > 1024\n"); } if (!strcmp(lgopts[opt_idx].name, "max-pkt-len")) { + default_max_pktlen = false; n = atoi(optarg); if (n >= RTE_ETHER_MIN_LEN) rx_mode.max_rx_pkt_len = (uint32_t) n; diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index c256e719ae..a2c9aad960 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -531,6 +531,8 @@ uint16_t gso_max_segment_size = RTE_ETHER_MAX_LEN - RTE_ETHER_CRC_LEN; /* Holds the registered mbuf dynamic flags names. */ char dynf_names[64][RTE_MBUF_DYN_NAMESIZE]; +bool default_max_pktlen = true; + /* * Helper function to check if socket is already discovered. * If yes, return positive value. If not, return zero. @@ -1410,7 +1412,6 @@ init_config(void) struct rte_gro_param gro_param; uint32_t gso_types; uint16_t data_size; - uint16_t eth_overhead; bool warning = 0; int k; int ret; @@ -1447,22 +1448,7 @@ init_config(void) rte_exit(EXIT_FAILURE, "rte_eth_dev_info_get() failed\n"); - /* Update the max_rx_pkt_len to have MTU as RTE_ETHER_MTU */ - if (port->dev_info.max_mtu != UINT16_MAX && - port->dev_info.max_rx_pktlen > port->dev_info.max_mtu) - eth_overhead = port->dev_info.max_rx_pktlen - - port->dev_info.max_mtu; - else - eth_overhead = - RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN; - - if (port->dev_conf.rxmode.max_rx_pkt_len <= - (uint32_t)(RTE_ETHER_MTU + eth_overhead)) - port->dev_conf.rxmode.max_rx_pkt_len = - RTE_ETHER_MTU + eth_overhead; - else - port->dev_conf.rxmode.offloads |= - DEV_RX_OFFLOAD_JUMBO_FRAME; + update_jumbo_frame_offload(port, default_max_pktlen); if (!(port->dev_info.tx_offload_capa & DEV_TX_OFFLOAD_MBUF_FAST_FREE)) @@ -3358,6 +3344,33 @@ rxtx_port_config(struct rte_port *port) } } +void +update_jumbo_frame_offload(struct rte_port *port, bool def_max_pktlen) +{ + uint16_t eth_overhead; + + /* Update the max_rx_pkt_len to have MTU as RTE_ETHER_MTU */ + if (port->dev_info.max_mtu != UINT16_MAX && + port->dev_info.max_rx_pktlen > port->dev_info.max_mtu) + eth_overhead = port->dev_info.max_rx_pktlen - + port->dev_info.max_mtu; + else + eth_overhead = RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN; + + if (port->dev_conf.rxmode.max_rx_pkt_len <= + (uint32_t)(RTE_ETHER_MTU + eth_overhead)) { + /* + * If command line option doesn't include --max-pkt-len, + * the default max_rx_pkt_len should be set to 1500 + overhead. + */ + if (def_max_pktlen) + port->dev_conf.rxmode.max_rx_pkt_len = + RTE_ETHER_MTU + eth_overhead; + port->dev_conf.rxmode.offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME; + } else + port->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME; +} + void init_port_config(void) { diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 5f23162107..aac7b69735 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -304,6 +304,7 @@ extern cmdline_parse_inst_t cmd_show_set_raw_all; extern uint16_t mempool_flags; +extern bool default_max_pktlen; /** * Forwarding Configuration * @@ -1005,6 +1006,7 @@ uint16_t tx_pkt_set_dynf(uint16_t port_id, __rte_unused uint16_t queue, __rte_unused void *user_param); void add_tx_dynf_callback(portid_t portid); void remove_tx_dynf_callback(portid_t portid); +void update_jumbo_frame_offload(struct rte_port *port, bool def_max_pktlen); /* * Work-around of a compilation error with ICC on invocations of the From patchwork Fri Jan 22 09:01:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Yang X-Patchwork-Id: 87056 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 81671A0A0A; Fri, 22 Jan 2021 10:04:51 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C23B140DE5; Fri, 22 Jan 2021 10:04:42 +0100 (CET) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 626E5140DE5 for ; Fri, 22 Jan 2021 10:04:40 +0100 (CET) IronPort-SDR: kLXVA+/6v0VSAjy0IefP4XziuJcR4sTNZ+qoaaBoT5Vgf1j5aQ3Um+aPrDGOuufkfqU9tKnPCe CMQewmaT8RFA== X-IronPort-AV: E=McAfee;i="6000,8403,9871"; a="240962318" X-IronPort-AV: E=Sophos;i="5.79,366,1602572400"; d="scan'208";a="240962318" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jan 2021 01:04:40 -0800 IronPort-SDR: JnokwB9fy2rS0C7PXQP+ny313kSNaOfopHMwY9mTcTK0pr7Rtui96LUYBL6zsCksOdYm0+TSC/ jKqXTFmJ9OBg== X-IronPort-AV: E=Sophos;i="5.79,366,1602572400"; d="scan'208";a="427910777" Received: from intel-npg-odc-srv01.cd.intel.com ([10.240.178.136]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 22 Jan 2021 01:04:37 -0800 From: Steve Yang To: dev@dpdk.org Cc: wenzhuo.lu@intel.com, xiaoyun.li@intel.com, bernard.iremonger@intel.com, thomas@monjalon.net, ferruh.yigit@intel.com, andrew.rybchenko@oktetlabs.ru, stevex.yang@intel.com, qiming.yang@intel.com Date: Fri, 22 Jan 2021 09:01:10 +0000 Message-Id: <20210122090110.50453-4-stevex.yang@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210122090110.50453-1-stevex.yang@intel.com> References: <20201223085152.20866-1-stevex.yang@intel.com> <20210122090110.50453-1-stevex.yang@intel.com> Subject: [dpdk-dev] [PATCH v3 3/3] app/testpmd: fix dynamic config error 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 offloads of 'tx/rx_conf' didn't keep up with the corresponding offloads of 'dev_conf' if rx queue capability was 0, it would cause the configuration invalid. For example: Configuring 'max-pkt-len' would change 'rx_offloads' in dev_conf while rx_conf.offloads of each queue still kept the old value. It would cause the failure of offloads check in 'rte_eth_rx_queue_setup'. This patch applied tx/rx offloads configuration for each queue once it changed and corresponding tx/rx queue capability was 0. Fixes: 5e91aeef218c ("app/testpmd: fix offload flags after port config") Signed-off-by: Steve Yang --- app/test-pmd/testpmd.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index a2c9aad960..8307c7f9e9 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -3296,7 +3296,11 @@ rxtx_port_config(struct rte_port *port) for (qid = 0; qid < nb_rxq; qid++) { offloads = port->rx_conf[qid].offloads; port->rx_conf[qid] = port->dev_info.default_rxconf; - if (offloads != 0) + if (port->dev_info.rx_queue_offload_capa == 0 && + offloads != port->dev_conf.rxmode.offloads) + port->rx_conf[qid].offloads = + port->dev_conf.rxmode.offloads; + else if (offloads != 0) port->rx_conf[qid].offloads = offloads; /* Check if any Rx parameters have been passed */ @@ -3321,7 +3325,11 @@ rxtx_port_config(struct rte_port *port) for (qid = 0; qid < nb_txq; qid++) { offloads = port->tx_conf[qid].offloads; port->tx_conf[qid] = port->dev_info.default_txconf; - if (offloads != 0) + if (port->dev_info.tx_queue_offload_capa == 0 && + offloads != port->dev_conf.txmode.offloads) + port->tx_conf[qid].offloads = + port->dev_conf.txmode.offloads; + else if (offloads != 0) port->tx_conf[qid].offloads = offloads; /* Check if any Tx parameters have been passed */